21 files changed, 735 insertions, 815 deletions

diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index 39c1f4fe..8b4e90d2 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -70,16 +70,21 @@ Output control:\n\
   -m, --max-count=NUM       stop after NUM matches\n\
   -b, --byte-offset         print the byte offset with output lines\n\
   -n, --line-number         print line number with output lines\n\
+      --line-buffered       flush output on every line\n\
   -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\
       --binary-files=TYPE   assume that binary files are TYPE\n\
-                            TYPE is 'binary', 'text', or 'without-match'.\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\
+                            ACTION is 'read', 'recurse', or 'skip'\n\
+  -R, -r, --recursive       equivalent to --directories=recurse\n\
+      --include=PATTERN     equivalent to --directories=recurse but only\n\
+                            files that match PATTERN will be examine\n\
+      --exclude=PATTERN     equivalent to --directories=recurse, files that\n\
+                            match PATTERN will be skip.\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\
@@ -91,6 +96,7 @@ Context control:\n\
   -A, --after-context=NUM   print NUM lines of trailing context\n\
   -C, --context=NUM         print NUM lines of output context\n\
   -NUM                      same as --context=NUM\n\
+      --color, --colour     use markers to distinguish the matching string\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\
@@ -105,17 +111,11 @@ Report bugs to <bug-gnu-utils@gnu.org>.\n", 39},
   {"unknown directories method", 41},
   {"invalid max count", 42},
   {"unknown binary-files type", 43},
-  {"\
-invalid argument `%s' for `--color'\n\
-Valid arguments are:\n\
-  - `always', `yes', `force'\n\
-  - `never', `no', `none'\n\
-  - `auto', `tty', `if-tty'\n", 44},
-  {"%s (GNU grep) %s\n", 45},
-  {"Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n", 46},
+  {"%s (GNU grep) %s\n", 44},
+  {"Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n", 45},
   {"\
 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", 47},
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n", 46},
 };
 
-int _msg_tbl_length = 47;
+int _msg_tbl_length = 46;
diff --git a/po/cs.po b/po/cs.po
index 845ce62f..e3bf8a68 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grep 2.4f\n"
-"POT-Creation-Date: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-0500\n"
 "PO-Revision-Date: 2000-02-21 08:05+01:00\n"
 "Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Pame» vyèerpána"
 
@@ -116,57 +116,57 @@ msgstr "%s: pøepínaè `-W %s' není jednoznaèný\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: pøepínaè `-W %s' musí být zadán bez argumentu\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "pamì» vyèerpána"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "neplatný argument délky kontextu"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "zapisuje se výstup"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "Binární soubor %s odpovídá\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(standardní vstup)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: varování: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "smyèka pro rekurzivní prùchod"
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Pou¾ití: %s [PØEPÍNAÈ]... VZOREK [SOUBOR]...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Více informací získáte pøíkazem `%s --help'.\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Pou¾ití: %s [PØEPÍNAÈ]... VZOREK [SOUBOR]...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -181,7 +181,7 @@ msgstr ""
 "\n"
 "Výbìr a interpretace regulárního výrazu:\n"
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 #, fuzzy
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
@@ -194,7 +194,7 @@ msgstr ""
 "øádku\n"
 "  -G, --basic-regexp        VZOREK je základní regulární výraz\n"
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -211,7 +211,7 @@ msgstr ""
 "  -z, --null-data           øádek konèí nulovým bajtem místo znaku nového "
 "øádku\n"
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -229,7 +229,7 @@ msgstr ""
 "      --help                vypí¹e tuto nápovìdu a skonèí\n"
 "      --mmap                kdy¾ to jde, namapuje vstup do pamìti\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -237,16 +237,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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"
@@ -277,7 +282,7 @@ msgstr ""
 "  -c, --count               vypí¹e pouze poèet vyhovujících øádkù na SOUBOR\n"
 "  -Z, --null                vypí¹e nulový bajt za jménem SOUBORu\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -286,6 +291,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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"
@@ -313,7 +319,7 @@ msgstr ""
 "  Návratový kód je 0 pøi nalezení, 1 nevyhovoval-li ¾ádný øádek a 2 pøi\n"
 "syntaktické nebo systémové chybì.\n"
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -322,43 +328,33 @@ msgstr ""
 "  Chyby v programu oznamujte na adrese <bug-gnu-utils@gnu.org> (pouze\n"
 "anglicky), pøipomínky k pøekladu zasílejte na adresu <cs@li.org> (èesky).\n"
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 msgid "conflicting matchers specified"
 msgstr "zadány kolidující vzorky"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "neznámá obsluha adresáøù"
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "neukonèený zápis poètu opakování"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr "neznámý typ binárního souboru"
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (GNU grep) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 msgstr "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:1517
+#: src/grep.c:1532
 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/de.po b/po/de.po
index ad80f577..5ad1582f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.4f\n"
-"POT-Creation-Date: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-0500\n"
 "PO-Revision-Date: 2000-02-15 20:48+01:00\n"
 "Last-Translator: Martin von Löwis <martin@mira.isdn.cs.tu-berlin.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Virtueller Speicher erschöpft."
 
@@ -115,57 +115,57 @@ msgstr "%s: Option »-W %s« ist zweideutig.\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: Option »-W %s« erlaubt keinen Parameter.\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "Virtueller Speicher erschöpft."
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "Ungültige Kontextlänge."
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "schreibe Ausgabe"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "Übereinstimmungen in Binärdatei %s.\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(Standardeingabe)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: Warnung: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "Rekursive Verzeichnisschleife."
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI]...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt Ihnen mehr Informationen.\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI] ...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -178,7 +178,7 @@ msgstr ""
 "\n"
 "Auswahl und Interpretation regulärer Ausdrücke:\n"
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 #, fuzzy
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
@@ -191,7 +191,7 @@ msgstr ""
 "                            Zeichenketten.\n"
 "  -G, --basic-regexp        MUSTER ist ein regulärer Standardausdruck.\n"
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -208,7 +208,7 @@ msgstr ""
 "  -x, --line-regexp         MUSTER paßt nur auf ganze Zeilen.\n"
 "  -z, --null-data           Eine Zeile endet mit Nullbyte, nicht Newline.\n"
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -226,7 +226,7 @@ msgstr ""
 "      --help                Diese Hilfe ausgeben und beenden.\n"
 "      --mmap                Wenn möglich, Eingabe in den Speicher mappen.\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -234,16 +234,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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"
@@ -270,7 +275,7 @@ msgstr ""
 "ausgeben.\n"
 "  -Z, --null                Null-Byte nach jedem Dateinamen ausgeben.\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -279,6 +284,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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 +311,7 @@ msgstr ""
 "Weniger als zwei DATEIen implizieren -h. Status ist 0 bei \n"
 "Übereinstimmungen, 1 ohne, 2 bei Problemen.\n"
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -313,43 +319,33 @@ msgstr ""
 "\n"
 "Fehlerberichte bitte an <bug-gnu-utils@gnu.org>.\n"
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 msgid "conflicting matchers specified"
 msgstr "Festgelegte Vergleicher widersprechen einander."
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "Unbekannte Methode für Verzeichnisse."
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "Unbeendeter Wiederholungszähler."
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr "Unbekannter Typ für »--binary-files«."
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (GNU grep) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 msgstr "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:1517
+#: src/grep.c:1532
 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/el.po b/po/el.po
index c318830d..5b47134b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.4\n"
-"POT-Creation-Date: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-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"
@@ -15,7 +15,7 @@ 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
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Ç ìíÞìç åîáíôëÞèçêå"
 
@@ -159,73 +159,73 @@ msgstr "%s: ç åðéëïãÞ `-W %s' äåí äÝ÷åôáé ïñßóìáôá\n"
 # 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
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "ç ìíÞìç åîáíôëÞèçêå"
 
 # src/grep.c:785 src/grep.c:792
 # src/grep.c:1060 src/grep.c:1067 src/grep.c:1076
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "ìç Ýãêõñï üñéóìá ìÞêïõò ðåñéå÷ïìÝíïõ"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
 # src/grep.c:392 src/grep.c:1034
 # src/grep.c:487 src/grep.c:1284
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "åããñáöÞ áðïôåëÝóìáôïò"
 
 # src/grep.c:715
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "Äõáäéêü áñ÷åßï %s ôáéñéÜóìáôá\n"
 
 # src/grep.c:964 src/grep.c:1015
 # src/grep.c:730
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(óôÜíôáñô åßóïäïò)"
 
 # src/grep.c:293
 # src/grep.c:366
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: ðñïåéäïðïßçóç: %s: %s\n"
 
 # src/grep.c:844
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "áíáäñïìéêÞ áëëçëïäéáäï÷Þ êáôáëüãùí"
 
 # src/grep.c:597
 # src/grep.c:862
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... Ó×ÇÌÁÔÉÓÌÏÓ [ÁÑ×ÅÉÏ]...\n"
 
 # src/grep.c:598
 # src/grep.c:863
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n"
 
 # src/grep.c:602
 # src/grep.c:867
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... Ó×ÇÌÁÔÉÓÌÏÓ [ÁÑ×ÅÉÏ] ...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, fuzzy, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -238,7 +238,7 @@ msgstr ""
 "\n"
 "ÅðéëïãÞ êáíïíéêÞò Ýêöñáóçò êáé ìåôÜöñáóç:\n"
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 #, fuzzy
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
@@ -254,7 +254,7 @@ msgstr ""
 
 # src/grep.c:603
 # src/grep.c:868
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -273,7 +273,7 @@ msgstr ""
 
 # src/grep.c:615
 # src/grep.c:880
-#: src/grep.c:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -294,7 +294,7 @@ msgstr ""
 
 # src/grep.c:622
 # src/grep.c:887
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -302,16 +302,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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"
@@ -341,7 +346,7 @@ msgstr ""
 
 # src/grep.c:633
 # src/grep.c:902
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -350,6 +355,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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"
@@ -381,7 +387,7 @@ msgstr ""
 
 # src/grep.c:647
 # src/grep.c:917
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -391,53 +397,43 @@ msgstr ""
 
 # src/grep.c:829
 # src/grep.c:1112
-#: src/grep.c:1080
+#: src/grep.c:1102
 msgid "conflicting matchers specified"
 msgstr "Ý÷ïõí ïñéóôåß ó÷çìáôéóìïß ôáéñéÜóìáôïò ðïõ áëëçëïóõãêñïýïíôáé"
 
 # src/grep.c:1133
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 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
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "ìç ôåñìáôéóìÝíïò ìåôñçôÞò åðáíÜëçøçò"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr ""
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
 # src/grep.c:915
 # src/grep.c:1219
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (GNU grep) %s\n"
 
 # src/grep.c:917
 # src/grep.c:1221
-#: src/grep.c:1515
+#: src/grep.c:1530
 #, 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
-#: src/grep.c:1517
+#: src/grep.c:1532
 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/eo.po b/po/eo.po
index 805f5118..a01d8e8d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.4f\n"
-"POT-Creation-Date: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-0500\n"
 "PO-Revision-Date: 2000-02-16 12:03+00:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Memoro elæerpita"
 
@@ -114,57 +114,57 @@ msgstr "%s: opcio `-W %s' estas plursenca\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcio `-W %s' ne akceptas argumenton\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "memoro elæerpita"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "nevalida argumento por kunteksto-longo"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "skribas eligon"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "Binara dosiero %s kongruas\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(normala enigo)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: averto: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "rekursa dosieruja ciklo"
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Uzado: %s [OPCIO]... ÞABLONO [DOSIERO]...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Provu `%s --help' por pliaj informoj.\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Uzado: %s [OPCIO]... ÞABLONO [DOSIERO] ...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "Elekto kaj interpreto de regulaj esprimoj:\n"
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 #, fuzzy
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
@@ -190,7 +190,7 @@ msgstr ""
 "linifinoj\n"
 "  -G, --basic-regexp        ÞABLONO estas simpla regula esprimo\n"
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -207,7 +207,7 @@ msgstr ""
 "  -z, --null-data           datenlinio finiøas per bitoko 0, ne per "
 "linifino\n"
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -225,7 +225,7 @@ msgstr ""
 "      --help                montri æi tiun helpon kaj fini\n"
 "      --mmap                uzi memoromapon por la enigo, se eble\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -233,16 +233,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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"
@@ -270,7 +275,7 @@ msgstr ""
 "dosiero\n"
 "  -Z, --null                presi la bitokon 0 post dosiernomo\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -279,6 +284,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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"
@@ -304,7 +310,7 @@ msgstr ""
 "kongruo,\n"
 "1, se ne estis, kaj 2 æe eraro.\n"
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -312,43 +318,33 @@ msgstr ""
 "\n"
 "Raportu cimojn al <bug-gnu-utils@prep.ai.mit.edu>.\n"
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 msgid "conflicting matchers specified"
 msgstr "malkongruaj kompariloj estas indikitaj"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "nekonata dosieruja metodo"
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "nefinita ripetonombro"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr "nekonata speco de binara dosiero"
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (GNU grep) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 msgstr "Kopirajto 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:1517
+#: src/grep.c:1532
 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/es.po b/po/es.po
index b3395576..e00e0b84 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.4f\n"
-"POT-Creation-Date: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-0500\n"
 "PO-Revision-Date: 2000-02-17 22:19+0100\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Memoria agotada"
 
@@ -115,58 +115,58 @@ msgstr "%s: la opción `-W %s' es ambigua\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción `-W %s' no admite ningún argumento\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "memoria agotada"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "longitud de contexto inválida"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "escribiendo el resultado"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "Coincidencia en el fichero binario %s\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(entrada estándar)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: atención: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "bucle de directorio recursivo"
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... PATRÓN [FICHERO]...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, 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:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... PATRÓN [FICHERO] ...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -179,7 +179,7 @@ msgstr ""
 "\n"
 "Selección e interpretación de Expreg:\n"
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 #, fuzzy
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
@@ -192,7 +192,7 @@ msgstr ""
 "                            caracteres de nueva línea\n"
 "  -G, --basic-regexp        PATRÓN es una expresión regular básica\n"
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -211,7 +211,7 @@ msgstr ""
 "  -z, --null-data           una línea de datos termina en un byte 0, no\n"
 "                            en un carácter de nueva línea\n"
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -230,7 +230,7 @@ msgstr ""
 "      --mmap                utiliza entrada asignada en memoria si es "
 "posible\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -238,16 +238,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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"
@@ -281,7 +286,7 @@ msgstr ""
 "  -Z, --null                imprime un byte 0 después del nombre del "
 "FICHERO\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -290,6 +295,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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"
@@ -315,7 +321,7 @@ msgstr ""
 "Si se dan menos de dos FICHEROs, se supone -h. La salida es 0 si hay\n"
 "coincidencias, 1 si no las hay, y 2 en caso de problema\n"
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -334,45 +340,35 @@ msgstr ""
 #
 # No me gusta nada lo de opción "a buscar".
 # Se admiten sugerencias. sv
-#: src/grep.c:1080
+#: src/grep.c:1102
 msgid "conflicting matchers specified"
 msgstr "se han especificado expresiones conflictivas"
 
 # Nota: Se refiere a la opción --directories=ACCIÓN cuando ACCIÓN
 # no es `read', `recurse' o `skip'.
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "método de directorios desconocido"
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "contador de repetición sin terminar"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr "tipo binary-files desconocido"
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (GNU grep) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 msgstr "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:1517
+#: src/grep.c:1532
 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/et.po b/po/et.po
index 046d22b0..9fcd7872 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grep 2.4f\n"
-"POT-Creation-Date: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-0500\n"
 "PO-Revision-Date: 2000-02-16 11:50+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <linux-ee@eenet.ee>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Mälu on otsas"
 
@@ -113,57 +113,57 @@ msgstr "%s: võti `-W %s' on segane\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: võti `-W %s' ei luba argumenti\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "mälu on otsas"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "vigane konteksti pikkuse argument"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "kirjutan väljundit"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "Kahendfail %s sobib\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(standardsisend)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: hoiatus: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "rekursiivne kataloogipuu tsükkel"
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Kasuta: %s [VÕTI]... MUSTER [FAIL] ...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Lisainfo saamiseks proovige võtit `%s --help'.\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Kasuta: %s [VÕTI]... MUSTER [FAIL] ...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -176,7 +176,7 @@ msgstr ""
 "\n"
 "Regulaaravaldise valik ja interpreteerimine:\n"
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 #, fuzzy
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
@@ -188,7 +188,7 @@ msgstr ""
 "  -F, --fixed-strings       MUSTER on hulk reavahetustega eraldatud sõnesid\n"
 "  -G, --basic-regexp        MUSTER on lihtne regulaaravaldis\n"
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -204,7 +204,7 @@ msgstr ""
 "  -x, --line-regexp         kasuta MUSTRIT ridade leidmiseks\n"
 "  -z, --null-data           andmerida lõppeb baidil 0, mitte reavahetusel\n"
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -222,7 +222,7 @@ msgstr ""
 "      --help                esita see abiinfo ja lõpeta töö\n"
 "      --mmap                kasuta kui võimalik sisendi mällu laadimist\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -230,16 +230,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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"
@@ -264,7 +269,7 @@ msgstr ""
 "  -c, --count               trüki ainult leitud ridade arv faili kaupa\n"
 "  -Z, --null                trüki peale filinime 0 bait\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -273,6 +278,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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 +305,7 @@ msgstr ""
 "lõpetab programm töö staatusega 0, kui ei leita, siis staatusega 1 ja\n"
 "kui oli mingi muu probleem, siis staatusega 2.\n"
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -307,43 +313,33 @@ msgstr ""
 "\n"
 "Teatage palun vigadest aadressil <bug-gnu-utils@gnu.org>.\n"
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 msgid "conflicting matchers specified"
 msgstr "määrati konfliktsed otsijad"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "tundmatu kataloogide meetod"
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "lõpetamata korduste arv"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr "tundmatu kahendfailide tüüp"
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (GNU grep) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 msgstr "Autoriõigus 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:1517
+#: src/grep.c:1532
 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/fr.po b/po/fr.po
index a30c141a..f572944b 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: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-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,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Mémoire épuisée."
 
@@ -113,57 +113,57 @@ msgstr "%s: l'option `-W %s' est ambiguë.\n"
 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/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "Mémoire épuisée."
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "paramètre de contexte de longueur invalide"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "Génération du résultat."
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "Fichier binaire %s concorde\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(entrée standard)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: AVERTISSEMENT: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "boucle récursive sur le répertoire"
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Usage: %s [OPTION]... PATRON [FICHIER]...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Usage: %s [OPTION]... PATRON [FICHIER] ...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, fuzzy, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -176,7 +176,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:1016
+#: src/grep.c:1032
 #, fuzzy
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
@@ -189,7 +189,7 @@ msgstr ""
 "retour de chariot\n"
 "  -G, --basic-regexp        PATRON est une expression régulière de base\n"
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -208,7 +208,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:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -227,7 +227,7 @@ msgstr ""
 "      --mmap                utiliser la table de mémoire à l'entrée si "
 "possible\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -235,16 +235,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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"
@@ -276,7 +281,7 @@ msgstr ""
 "                            concordantes par fichier\n"
 "  -Z, --null                afficher l'octet ZÉRO après le nom du fichier\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -285,6 +290,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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"
@@ -311,7 +317,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 de système.\n"
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -319,46 +325,36 @@ msgstr ""
 "\n"
 "Rapporter toutes anomalies à <bug-gnu-utils@gnu.org>.\n"
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 msgid "conflicting matchers specified"
 msgstr "opérateurs de concordance spécifiés en conflit"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "méthode inconnue des répertoires"
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "décompte de répétition non terminé."
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr "type de fichier binaire inconnu"
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
 # msgid "GNU grep version %s"
 # msgstr "«grep» de GNU version %s"
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (grep de GNU) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 #, 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:1517
+#: src/grep.c:1532
 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/grep.pot b/po/grep.pot
index cb9a66d4..260fe436 100644
--- a/po/grep.pot
+++ b/po/grep.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr ""
 
@@ -114,57 +114,57 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr ""
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr ""
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr ""
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr ""
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr ""
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr ""
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr ""
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr ""
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr ""
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -173,7 +173,7 @@ msgid ""
 "Regexp selection and interpretation:\n"
 msgstr ""
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
 "  -F, --fixed-strings       PATTERN is a set of newline-separated strings\n"
@@ -181,7 +181,7 @@ msgid ""
 "  -P, --perl-regexp         PATTERN is a Perl regular expression\n"
 msgstr ""
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -191,7 +191,7 @@ msgid ""
 "  -z, --null-data           a data line ends in 0 byte, not newline\n"
 msgstr ""
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -202,30 +202,35 @@ msgid ""
 "      --mmap                use memory-mapped input if possible\n"
 msgstr ""
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 msgid ""
 "\n"
 "Output control:\n"
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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:1056
+#: src/grep.c:1077
 msgid ""
 "\n"
 "Context control:\n"
@@ -233,6 +238,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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"
@@ -242,48 +248,38 @@ msgid ""
 "and 2 if trouble.\n"
 msgstr ""
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr ""
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 msgid "conflicting matchers specified"
 msgstr ""
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr ""
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 msgid "invalid max count"
 msgstr ""
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr ""
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr ""
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: src/grep.c:1517
+#: src/grep.c:1532
 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/hr.po b/po/hr.po
index 6b9de61b..c105b95d 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: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-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,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Memorija iscrpljena"
 
@@ -113,57 +113,57 @@ msgstr "%s: opcija `-W %s' je dvosmislena\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcija `-W %s' ne dopu¹ta argument\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "memorija iscrpljena"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "neispravan argument duljine konteksta"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "pi¹em izlaz"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "Binarna datoteka %s se podudara\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(standardni ulaz)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: upozorenje: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "petlja u rekurziji direktorijima"
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Kori¹tenje: %s [OPCIJA]... UZORAK [DATOTEKA]...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Za vi¹e informacija pokrenite `%s --help'.\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Kori¹tenje: %s [OPCIJA]... UZORAK [DATOTEKA] ...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -172,7 +172,7 @@ msgid ""
 "Regexp selection and interpretation:\n"
 msgstr ""
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
 "  -F, --fixed-strings       PATTERN is a set of newline-separated strings\n"
@@ -180,7 +180,7 @@ msgid ""
 "  -P, --perl-regexp         PATTERN is a Perl regular expression\n"
 msgstr ""
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 #, fuzzy
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
@@ -203,7 +203,7 @@ 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:1028
+#: src/grep.c:1044
 #, fuzzy
 msgid ""
 "\n"
@@ -221,7 +221,7 @@ msgstr ""
 "  -V, --version             ispi¹i informacije o verziji i zavr¹i\n"
 "      --help                prika¾i ovu pomoæ i zavr¹i\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -229,16 +229,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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"
@@ -260,7 +265,7 @@ msgstr ""
 "  -c, --count               ispisuj samo broj podudarajuæih redova po "
 "datoteci\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -269,6 +274,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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 +299,7 @@ msgstr ""
 "podudaranja, uz 1 ako nema. Zavr¹i uz 2 ako bude gre¹aka u sintaksi ili u\n"
 "sustavu.\n"
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -301,45 +307,35 @@ msgstr ""
 "\n"
 "Bugove prijavljujte na <bug-gnu-utils@gnu.org>.\n"
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 #, fuzzy
 msgid "conflicting matchers specified"
 msgstr "izraz veæ zadan"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "nepoznata metoda za direktorije"
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "broj ponavljanja nedovr¹en"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr ""
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, fuzzy, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "grep (GNU grep) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 #, 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:1517
+#: src/grep.c:1532
 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/id.po b/po/id.po
index c0e60c73..640cc17c 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: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-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,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Memori habis"
 
@@ -113,57 +113,57 @@ msgstr "%s: opsi `-W %s' rancu\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opsi `-W %s' tidak mengijinkan sebuah argumen\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "memori habis"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "argumen panjang konteks tidak valid"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "menulis output"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "File biner %s cocok\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(input standar)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: peringatan: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "perulangan direktori rekursif"
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Pemakaian: %s [OPSI]... POLA [FILE]...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Pemakaian: %s [OPSI]... POLA [FILE] ...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, fuzzy, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -175,7 +175,7 @@ msgstr ""
 "\n"
 "Seleksi dan interpretasi regexp:\n"
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 #, fuzzy
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
@@ -188,7 +188,7 @@ msgstr ""
 "newline\n"
 "  -G, --basic-regexp      POLA adalah ekspresi reguler dasar\n"
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -205,7 +205,7 @@ msgstr ""
 "  -z, --null-data      baris data berakhir dalam 0 byte, bukan newline\n"
 "\n"
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 #, fuzzy
 msgid ""
 "\n"
@@ -223,7 +223,7 @@ msgstr ""
 "  -V, --version         tampilkan informasi versi dan keluar\n"
 "      --help            tampilkan bantuan ini dan keluar\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -231,16 +231,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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,7 +268,7 @@ msgstr ""
 "  -c, --count               hanya mencetak jumlah baris yang cocok per FILE\n"
 "  -Z, --null                mencetak byte 0 setelah nama FILE\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -272,6 +277,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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"
@@ -298,7 +304,7 @@ msgstr ""
 "jika\n"
 "tidak. Keluar dengan 2 jika terjadi syntax atau system error.\n"
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -306,44 +312,34 @@ msgstr ""
 "\n"
 "Laporkan kesalahan ke <bug-gnu-utils@gnu.org>.\n"
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 msgid "conflicting matchers specified"
 msgstr "dispesifikasikan matcher yang konflik"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "metode direktori tidak dikenal"
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "perulangan count tidak selesai"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr ""
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (GNU grep) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 #, 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:1517
+#: src/grep.c:1532
 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/it.po b/po/it.po
index 9184a37b..3b9a93b1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grep 2.4a\n"
-"POT-Creation-Date: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-0500\n"
 "PO-Revision-Date: 2000-01-22 12:03+01:00\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Memoria esurita"
 
@@ -113,57 +113,57 @@ msgstr "%s: l'opzione `-W %s' è ambigua\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'opzione `-W %s' non accetta argomenti\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "memoria esaurita"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "argomento della lunghezza del contesto non valido"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "scrittura dell'output"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "Il file binario %s corrisponde\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(standard input)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: attenzione: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "loop ricorsivo di directory"
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Uso: %s [OPZIONE]... MODELLO [FILE]...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Usare `%s --help' per ulteriori informazioni.\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Uso: %s [OPZIONE]... MODELLO [FILE] ...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, fuzzy, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -176,7 +176,7 @@ msgstr ""
 "\n"
 "Selezione ed interpretazione delle regexp:\n"
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 #, fuzzy
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
@@ -189,7 +189,7 @@ msgstr ""
 "                            newline\n"
 "  -G, --basic-regexp        il MODELLO è una regular expression semplice\n"
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -208,7 +208,7 @@ msgstr ""
 "  -z, --null-data           una riga di dati termina con \\0 invece che "
 "newline\n"
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -226,7 +226,7 @@ msgstr ""
 "      --help                mostra questo aiuto ed esce\n"
 "      --mmap                se possibile mappa in memoria l'input\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -234,16 +234,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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"
@@ -272,7 +277,7 @@ msgstr ""
 "FILE\n"
 "  -Z, --null                stampa il byte 0 dopo ogni nome di FILE\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -281,6 +286,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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 +311,7 @@ msgstr ""
 "specificati meno di due file presume -h. Esce con 0 se corrisponde,\n"
 "altrimenti con 1. Esce con 2 se ci sono problemi.\n"
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -313,44 +319,34 @@ msgstr ""
 "\n"
 "Segnalare i bug a <bug-gnu-utils@gnu.org>.\n"
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 msgid "conflicting matchers specified"
 msgstr "specificate corrispondenze in conflitto"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "metodo delle directory sconosciuto"
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "conto di ripetizioni incompleto"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr "tipo di file binario sconosciuto"
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (grep GNU) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 #, 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:1517
+#: src/grep.c:1532
 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/ja.po b/po/ja.po
index f2d99bdc..21433476 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.4f\n"
-"POT-Creation-Date: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-0500\n"
 "PO-Revision-Date: 2000-02-16 21:05+09:00\n"
 "Last-Translator: IIDA Yosiaki <iida@secom.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "¥á¥â¥ê¡¼¤¬Â­¤ê¤Þ¤»¤ó"
 
@@ -118,57 +118,57 @@ msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Î»ØÄê`-W %s'¤¬Û£Ëæ¤Ç¤¹\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó`-W %s'¤Ï°ú¿ô¤ò¤È¤ê¤Þ¤»¤ó\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "¥á¥â¥ê¡¼¤¬Â­¤ê¤Þ¤»¤ó"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "¹Ô¿ô¤Î»ØÄ꤬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "½ÐÎϤνñ¹þ¤ß"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "¥Ð¥¤¥Ê¥ê¡¼¡¦¥Õ¥¡¥¤¥ë%s¤È°ìÃפ·¤Þ¤¹\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(ɸ½àÆþÎÏ)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: ·Ù¹ð: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¤¬ºÆµ¢Åª¥ë¡¼¥×¤ò¤·¤Æ¤¤¤Þ¤¹"
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó]¡Å¡Å ʸ»úÎó¥Ñ¥¿¡¼¥ó [¥Õ¥¡¥¤¥ë]¡Å¡Å\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "¾Ü¤·¤¯¤Ï`%s --help'¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó]¡Å¡Å ʸ»úÎó¥Ñ¥¿¡¼¥ó [¥Õ¥¡¥¤¥ë] ¡Å¡Å\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -181,7 +181,7 @@ msgstr ""
 "\n"
 "Àµµ¬É½¸½¤ÎÁªÂò¤È²ò¼áÊýË¡:\n"
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 #, fuzzy
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
@@ -194,7 +194,7 @@ msgstr ""
 "¡Ö¥Ñ¥¿¡¼¥ó¡×¤ò²þ¹Ô¤Ç¶èÀÚ¤é¤ì¤¿¸ÇÄê¤Îʸ»úÎó¤È¤¹¤ë\n"
 "  -G, --basic-regexp        ¡Ö¥Ñ¥¿¡¼¥ó¡×¤ò´ðËÜŪ¤ÊÀµµ¬É½¸½¤È¤¹¤ë\n"
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -210,7 +210,7 @@ msgstr ""
 "  -x, --line-regexp         ¥Ñ¥¿¡¼¥ó°ìÃפò¹ÔÁ´ÂÎ(¹Ôñ°Ì)¤Ç¹Ô¤Ê¤¦\n"
 "  -z, --null-data           ½ÐÎϤò²þ¹Ô¤Ç¤Ê¤¯¡¢¥Ì¥ëÃͤΥХ¤¥È¤Ç¶èÀÚ¤ë\n"
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -228,7 +228,7 @@ msgstr ""
 "      --help                »È¤¤Êý¤òɸ½à½ÐÎϤËɽ¼¨¤¹¤ë\n"
 "      --mmap                ¤â¤·²Äǽ¤Ê¤é¡¢ÆþÎϤò¥á¥â¥ê¡¼¡¦¥Þ¥Ã¥×¤¹¤ë\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -236,16 +236,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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"
@@ -270,7 +275,7 @@ msgstr ""
 "  -c, --count               °ìÃפ·¤¿¹Ô¿ô¤Î¤ß¤òɽ¼¨¤¹¤ë\n"
 "  -Z, --null                ¥Õ¥¡¥¤¥ë̾¤Î¸å¤Ë¡¢¥Ì¥ëÃͤΥХ¤¥È¤òɽ¼¨\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -279,6 +284,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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 +311,7 @@ msgstr ""
 "ɸ½àÆþÎϤ«¤éÆɤ߹þ¤ß¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤¬Æó¤Ä̤Ëþ¤Î¾ì¹ç¡¢-h¤È²¾Äꤷ¤Þ¤¹¡£\n"
 "¤â¤·°ìÃפ¬¤¢¤ë¤È0¤Ç¡¢¤Ê¤¤¤È1¤Ç¡¢¾ã³²¤¬¤¢¤ë¤È2¤Ç¡¢½ªÎ»¤·¤Þ¤¹¡£\n"
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -313,43 +319,33 @@ msgstr ""
 "\n"
 "¥Ð¥°¤Ï <bug-gnu-utils@gnu.org> ¤ØÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 msgid "conflicting matchers specified"
 msgstr "¾×Æͤ·¤¿matcher¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼Áàºî¤Î»ØÄ꤬ÉÔÌÀ¤Ç¤¹"
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "·«ÊÖ¤·¥«¥¦¥ó¥È¤¬½ªÎ»¤·¤Þ¤»¤ó"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr "¥Ð¥¤¥Ê¥ê¡¼¡¦¥Õ¥¡¥¤¥ë¤Î»ØÄ꤬ÉÔÌÀ¤Ç¤¹"
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (GNU grep) ¥Ð¡¼¥¸¥ç¥ó %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 msgstr "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:1517
+#: src/grep.c:1532
 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 b9a5b46e..0b1267ba 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: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-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,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
 
@@ -113,57 +113,57 @@ msgstr "%s: `-W %s'´Â ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr ""
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "Ãâ·ÂÀ» ±â·ÏÇÏ°í ÀÖ½À´Ï´Ù"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr ""
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(Ç¥ÁØ ÀÔ·Â)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: °æ°í: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr ""
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "»ç¿ë¹ý: %s [¿É¼Ç]... ÆÐÅÏ [ÆÄÀÏ]...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ.\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "»ç¿ë¹ý: %s [¿É¼Ç]... ÆÐÅÏ [ÆÄÀÏ] ...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -172,7 +172,7 @@ msgid ""
 "Regexp selection and interpretation:\n"
 msgstr ""
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
 "  -F, --fixed-strings       PATTERN is a set of newline-separated strings\n"
@@ -180,7 +180,7 @@ msgid ""
 "  -P, --perl-regexp         PATTERN is a Perl regular expression\n"
 msgstr ""
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -190,7 +190,7 @@ msgid ""
 "  -z, --null-data           a data line ends in 0 byte, not newline\n"
 msgstr ""
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -201,30 +201,35 @@ msgid ""
 "      --mmap                use memory-mapped input if possible\n"
 msgstr ""
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 msgid ""
 "\n"
 "Output control:\n"
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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:1056
+#: src/grep.c:1077
 msgid ""
 "\n"
 "Context control:\n"
@@ -232,6 +237,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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"
@@ -241,53 +247,43 @@ msgid ""
 "and 2 if trouble.\n"
 msgstr ""
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 #, fuzzy
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "¹®Á¦Á¡Àº <bug0gnu-utils@prep.ai.mit.edu>·Î º¸°íÇØ ÁֽʽÿÀ.\n"
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 #, fuzzy
 msgid "conflicting matchers specified"
 msgstr "¦ÀÌ ÀÌ¹Ì ÁöÁ¤µÇ¾úÀ½"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr ""
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "¿Ï°áµÇÁö ¾ÊÀº ¹Ýº¹ ȸ¼ö"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr ""
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, fuzzy, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "grep (GNU grep) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 #, fuzzy
 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:1517
+#: src/grep.c:1532
 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/nl.po b/po/nl.po
index 381ea180..86893053 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: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-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,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 #, fuzzy
 msgid "Memory exhausted"
 msgstr "geen geheugen meer beschikbaar"
@@ -114,57 +114,57 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "geen geheugen meer beschikbaar"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr ""
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "schrijven van uitvoer"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr ""
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(standaardinvoer)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: let op: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr ""
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr ""
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr ""
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -173,7 +173,7 @@ msgid ""
 "Regexp selection and interpretation:\n"
 msgstr ""
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
 "  -F, --fixed-strings       PATTERN is a set of newline-separated strings\n"
@@ -181,7 +181,7 @@ msgid ""
 "  -P, --perl-regexp         PATTERN is a Perl regular expression\n"
 msgstr ""
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -191,7 +191,7 @@ msgid ""
 "  -z, --null-data           a data line ends in 0 byte, not newline\n"
 msgstr ""
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -202,30 +202,35 @@ msgid ""
 "      --mmap                use memory-mapped input if possible\n"
 msgstr ""
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 msgid ""
 "\n"
 "Output control:\n"
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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:1056
+#: src/grep.c:1077
 msgid ""
 "\n"
 "Context control:\n"
@@ -233,6 +238,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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"
@@ -242,7 +248,7 @@ msgid ""
 "and 2 if trouble.\n"
 msgstr ""
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -256,43 +262,33 @@ msgstr ""
 #  grep --help ->
 #  usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
 #  La opcisn -X es a la que corresponde esta lmnea.
-#: src/grep.c:1080
+#: src/grep.c:1102
 #, fuzzy
 msgid "conflicting matchers specified"
 msgstr "overeenkomer (matcher FIXME) al gespecificeerd"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr ""
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 msgid "invalid max count"
 msgstr ""
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr ""
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr ""
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: src/grep.c:1517
+#: src/grep.c:1532
 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/no.po b/po/no.po
index eb014601..6ba0699b 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: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-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,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Minnet oppbrukt"
 
@@ -115,57 +115,57 @@ msgstr "%s: flagget «-W %s» er flertydig\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flagget «-W %s» tar ikke argumenter\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "minnet oppbrukt"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "ugyldig kontekstlengde"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "skriver utdata"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr ""
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(standard inn)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: advarsel: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr ""
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Bruk: %s [FLAGG]... MØNSTER [FIL]...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for mer informasjon.\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Bruk: %s [FLAGG]... MØNSTER [FIL] ...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -174,7 +174,7 @@ msgid ""
 "Regexp selection and interpretation:\n"
 msgstr ""
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
 "  -F, --fixed-strings       PATTERN is a set of newline-separated strings\n"
@@ -182,7 +182,7 @@ msgid ""
 "  -P, --perl-regexp         PATTERN is a Perl regular expression\n"
 msgstr ""
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 #, fuzzy
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
@@ -206,7 +206,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:1028
+#: src/grep.c:1044
 #, fuzzy
 msgid ""
 "\n"
@@ -224,7 +224,7 @@ msgstr ""
 "  -V, --version             vis versioninformasjon og avslutt\n"
 "      --help                vis denne helpeteksten og avslutt\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -232,16 +232,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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"
@@ -262,7 +267,7 @@ msgstr ""
 "treff\n"
 "                            per FIL\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -271,6 +276,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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 +295,7 @@ msgstr ""
 "  -u, --unix-byte-offsets   rapporter posisjoner som om CRene ikke var der\n"
 "                            (MSDOS)\n"
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -297,46 +303,36 @@ msgstr ""
 "\n"
 "Rapportér feil til <bug-gnu-utils@prep.ai.mit.edu>.\n"
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 #, fuzzy
 msgid "conflicting matchers specified"
 msgstr "søkeuttrykk er allerede spesifisert"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr ""
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "uferdig gjentagelsesantall"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr ""
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, fuzzy, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "grep (GNU grep) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 #, fuzzy
 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:1517
+#: src/grep.c:1532
 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/pl.po b/po/pl.po
index 3de24c66..9a6e6e79 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: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-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,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Pamiêæ wyczerpana"
 
@@ -114,57 +114,57 @@ msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentu\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "pamiêæ wyczerpana"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "b³êdny argument d³ugo¶ci kontekstowej"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "zapisujê wyniki"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "Plik binarny %s pasuje do wzorca\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(standardowe wej¶cie)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: uwaga: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "nieskoñczona pêtla przegl±dania katalogów"
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "U¿ycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Spróbuj `%s --help' dla uzyskania informacji.\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "U¿ycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -173,7 +173,7 @@ msgid ""
 "Regexp selection and interpretation:\n"
 msgstr ""
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
 "  -F, --fixed-strings       PATTERN is a set of newline-separated strings\n"
@@ -181,7 +181,7 @@ msgid ""
 "  -P, --perl-regexp         PATTERN is a Perl regular expression\n"
 msgstr ""
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 #, fuzzy
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
@@ -203,7 +203,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:1028
+#: src/grep.c:1044
 #, fuzzy
 msgid ""
 "\n"
@@ -221,7 +221,7 @@ msgstr ""
 "  -V, --version             wypisz informacjê o wersji i zakoñcz\n"
 "      --help                wy¶wietl tê informacjê i zakoñcz\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -229,16 +229,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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,7 +266,7 @@ msgstr ""
 "  -c, --count               wypisz tylko ilo¶æ pasuj±cych linii w ka¿dym "
 "PLIKu\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -270,6 +275,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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 +300,7 @@ msgstr ""
 "pasuje, z 1, je¿eli nie, z 2, je¿eli napotkano b³êdy syntaktyczne lub\n"
 "systemowe.\n"
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -310,45 +316,35 @@ msgstr ""
 #  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:1080
+#: src/grep.c:1102
 #, fuzzy
 msgid "conflicting matchers specified"
 msgstr "wzorzec ju¿ podany"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "nieznany sposób przegl±dania katalogów"
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "niedokoñczona liczba powtórzeñ"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr ""
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, fuzzy, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "grep (GNU grep) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 #, 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:1517
+#: src/grep.c:1532
 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/pt_BR.po b/po/pt_BR.po
index 7e30c2c9..a0c608c8 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: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-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,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Memória esgotada"
 
@@ -114,57 +114,57 @@ msgstr "%s: opção `-W %s' é ambígua\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opção `-W %s' não aceita um argumento\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "memória esgotada"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "argumento tamanho do contexto inválido"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "escrevendo saída"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "Arquivo binário %s casa com o padrão\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(entrada padrão)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: aviso: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "loop de diretório recursivo"
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Uso: %s [opção]... padrão [arquivo]...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Tente `%s --help' para mais informações.\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Uso: %s [opção]... padrão [arquivo]...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, fuzzy, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "Seleção de expressão regular e interpretação:\n"
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 #, fuzzy
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
@@ -190,7 +190,7 @@ msgstr ""
 "linha\n"
 "  -G, --basic-regexp        PADRÃO é um expressão regular básica\n"
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -207,7 +207,7 @@ msgstr ""
 "  -z, --null-data          uma linha de dados acaba com 0 bytes, não nova "
 "linha\n"
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -225,7 +225,7 @@ msgstr ""
 "      --help                exibe esta ajuda e sai\n"
 "      --mmap                usa entrada de memória mapeada se possível\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -233,16 +233,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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"
@@ -273,7 +278,7 @@ msgstr ""
 "arquivo\n"
 "  -Z, --null                mostra 0 bytes depois do nome do ARQUIVO\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -282,6 +287,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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"
@@ -308,7 +314,7 @@ 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:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -316,45 +322,35 @@ msgstr ""
 "\n"
 "Informe problemas para <bug-gnu-utils@gnu.org>.\n"
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 msgid "conflicting matchers specified"
 msgstr "padrões de procura especificados conflitam"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "método desconhecido de diretórios"
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "contador de repetição inválido"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr "tipo de arquivo binário desconhecido"
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
 # msgstr "la expresión a buscar ya fue especificada"
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (GNU grep) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 #, 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:1517
+#: src/grep.c:1532
 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/ru.po b/po/ru.po
index 8f6a23eb..875dba4c 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: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-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,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
 
@@ -113,57 +113,57 @@ msgstr "%s: ÏÐÃÉÑ `-W %s' ÎÅÏÄÎÏÚÎÁÞÎÁ\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ÏÐÃÉÑ `-W %s' ÎÅ ÒÁÚÒÅÛÁÅÔ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "ÎÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÉÎÙ ËÏÎÔÅËÓÔÁ"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "ÚÁÐÉÓÙ×ÁÀ ×ÙÈÏÄÎÙÅ ÄÁÎÎÙÅ"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "âÉÎÁÒÎÙÊ ÆÁÊÌ %s ÓÏ×ÐÁÄÁÅÔ\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "ËÁÔÁÌÏÇÉ ÚÁÃÉËÌÅÎÙ"
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [OPTION]... PATTERN [FILE]...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [OPTION]... PATTERN [FILE] ...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -172,7 +172,7 @@ msgid ""
 "Regexp selection and interpretation:\n"
 msgstr ""
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
 "  -F, --fixed-strings       PATTERN is a set of newline-separated strings\n"
@@ -180,7 +180,7 @@ msgid ""
 "  -P, --perl-regexp         PATTERN is a Perl regular expression\n"
 msgstr ""
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 #, fuzzy
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
@@ -203,7 +203,7 @@ msgstr ""
 "  -w, --word-regexp         PATTERN ÄÏÌÖÅÎ ÐÏÄÈÏÄÉÔØ ËÏ ×ÓÅÍÕ ÓÌÏ×Õ\n"
 "  -x, --line-regexp         PATTERN ÄÏÌÖÅÎ ÐÏÄÈÏÄÉÔØ ËÏ ×ÓÅÊ ÓÔÒÏËÅ\n"
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 #, fuzzy
 msgid ""
 "\n"
@@ -221,7 +221,7 @@ msgstr ""
 "  -V, --version             ÎÁÐÅÞÁÔÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
 "      --help                ÐÏËÁÚÁÔØ ÐÏÍÏÝØ É ×ÙÊÔÉ\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -229,16 +229,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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,7 +270,7 @@ msgstr ""
 "  -c, --count               ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ËÏÌÉÞÅÓÔ×Ï ÓÏ×ÐÁÄÁÀÝÉÈ ÓÔÒÏË ÎÁ "
 "ÆÁÊÌ\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -274,6 +279,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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"
@@ -300,7 +306,7 @@ msgstr ""
 "ÓÏ×ÐÁÄÅÎÉÑ,\n"
 "Ó 1, ÅÓÌÉ ÎÅÔ. ÷ÙÈÏÄÉÔ Ó 2, ÅÓÌÉ ÅÓÔØ ÓÉÎÔÁËÓÉÞÅÓËÉÏ ÉÌÉ ÓÉÓÔÅÍÎÙÅ ÏÛÉÂËÉ.\n"
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -308,45 +314,35 @@ msgstr ""
 "\n"
 "ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ <bug-gnu-utils@gnu.org>.\n"
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 #, fuzzy
 msgid "conflicting matchers specified"
 msgstr "ÏÂÒÁÚÅÃ ÕÖÅ ÚÁÄÁÎ"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÍÅÔÏÄ ÄÌÑ ËÁÔÁÌÏÇÏ×"
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÐÏ×ÔÏÒÅÎÉÊ"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr ""
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, fuzzy, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "grep (GNU grep) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 #, 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:1517
+#: src/grep.c:1532
 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/sl.po b/po/sl.po
index 0011aa11..f40b6245 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,12 +2,12 @@
 # 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.17 2001/02/09 06:32:37 alainm Exp $
+# $Id: sl.po,v 1.18 2001/02/18 05:56:27 alainm Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.4f\n"
-"POT-Creation-Date: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-0500\n"
 "PO-Revision-Date: 2000-02-15 20:11+01:00\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Pomnilnik porabljen"
 
@@ -115,57 +115,57 @@ msgstr "%s: izbira ,-W %s` je dvoumna\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: izbira ,-W %s` ne dovoljuje argumenta\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "pomnilnik porabljen"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "velikost konteksta ni veljavna"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "pisanje rezultatov"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "Binarna datoteka %s ustreza\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(standardni vhod)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: pozor: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "rekurzivna zanka imenikov"
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Uporaba: %s [IZBIRA]... VZOREC [DATOTEKA]...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Poskusite ,%s --help` za dodatna pojasnila.\n"
 
-#: src/grep.c:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Uporaba: %s [IZBIRA]... VZOREC [DATOTEKA] ...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -178,7 +178,7 @@ msgstr ""
 "\n"
 "Izbira in tolmaèenje regularnih izrazov:\n"
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 #, fuzzy
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
@@ -190,7 +190,7 @@ msgstr ""
 "  -F, --fixed-strings       VZOREC je mno¾ica nizov, vsak v svoji vrstici\n"
 "  -G, --basic-regexp        VZOREC je osnovni regularni izraz\n"
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -207,7 +207,7 @@ msgstr ""
 "  -z, --null-data           vrstica podatkov je konèana z znakom NUL, ne z\n"
 "                            znakom za skok v novo vrstico\n"
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -225,7 +225,7 @@ msgstr ""
 "      --help                ta pomoè\n"
 "      --mmap                èe je mo¾no, uporabi pomnilni¹ko preslikan vhod\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -233,16 +233,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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"
@@ -270,7 +275,7 @@ msgstr ""
 "                            pojavi VZOREC\n"
 "  -Z, --null                izpi¹i znak NUL za imenom DATOTEKE\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -279,6 +284,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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 +311,7 @@ msgstr ""
 "na¹li, ena èe ga nismo. Izhodna koda 2 pomeni skladenjsko ali sistemsko "
 "napako.\n"
 
-#: src/grep.c:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -318,43 +324,33 @@ msgstr ""
 #  opt = getopt(argc, argv, "0123456789A:B:CEFGVX:bce:f:hiLlnqsvwxy"
 #  grep --help ->
 #  usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
-#: src/grep.c:1080
+#: src/grep.c:1102
 msgid "conflicting matchers specified"
 msgstr "podana navodila si nasprotujejo"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "neznana metoda imenikov"
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "nedokonèano ¹tevilo ponovitev"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr "neznan tip binarne datoteke"
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (GNU grep) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 msgstr "Copyright (C) 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:1517
+#: src/grep.c:1532
 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/sv.po b/po/sv.po
index 39a7685f..3c34c633 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,12 +2,12 @@
 # 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.11 2001/02/09 06:32:37 alainm Exp $
+# $Id: sv.po,v 1.12 2001/02/18 05:56:27 alainm Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.4f\n"
-"POT-Creation-Date: 2001-02-09 01:58-0500\n"
+"POT-Creation-Date: 2001-02-18 00:21-0500\n"
 "PO-Revision-Date: 2000-02-16 08:48+01:00\n"
 "Last-Translator: Daniel Resare <daniel@resare.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:969
+#: src/dfa.c:126 src/dfa.c:137 src/dfa.c:148 src/grep.c:985
 msgid "Memory exhausted"
 msgstr "Minnet slut"
 
@@ -115,57 +115,57 @@ msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"-W %s\" tillåter inget argument\n"
 
-#: src/grep.c:190 src/grep.c:205 src/grep.c:374 src/kwset.c:171
+#: src/grep.c:200 src/grep.c:215 src/grep.c:384 src/kwset.c:171
 #: src/kwset.c:177 src/obstack.c:471
 msgid "memory exhausted"
 msgstr "minnet slut"
 
-#: src/grep.c:221
+#: src/grep.c:231
 msgid "invalid context length argument"
 msgstr "ogiltigt argument till -A, -B eller -C"
 
-#: src/grep.c:493
+#: src/grep.c:507
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:566 src/grep.c:1581
+#: src/grep.c:580 src/grep.c:1596
 msgid "writing output"
 msgstr "skriver utdata"
 
-#: src/grep.c:837
+#: src/grep.c:853
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "Binär fil %s matchar\n"
 
-#: src/grep.c:851
+#: src/grep.c:867
 msgid "(standard input)"
 msgstr "(standard in)"
 
-#: src/grep.c:956
+#: src/grep.c:972
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr "%s: varning: %s: %s\n"
 
-#: src/grep.c:957
+#: src/grep.c:973
 msgid "recursive directory loop"
 msgstr "rekursiv katalogloop"
 
-#: src/grep.c:1005
+#: src/grep.c:1021
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Användning: %s [FLAGGA]... MÖNSTER [FIL]...\n"
 
-#: src/grep.c:1006 src/grep.c:1472
+#: src/grep.c:1022
 #, 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:1010
+#: src/grep.c:1026
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Användning: %s [FLAGGA]... MÖNSTER [FIL]...\n"
 
-#: src/grep.c:1011
+#: src/grep.c:1027
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -178,7 +178,7 @@ msgstr ""
 "\n"
 "Val och tolkning av reguljära uttryck:\n"
 
-#: src/grep.c:1016
+#: src/grep.c:1032
 #, fuzzy
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
@@ -191,7 +191,7 @@ msgstr ""
 "nyrad\n"
 " -G, --basic-regexp         MÖNSTER är ett enkelt reguljärt uttryck\n"
 
-#: src/grep.c:1021
+#: src/grep.c:1037
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -208,7 +208,7 @@ msgstr ""
 " -z, --null-data            en rad indata begränsas av en nolltecken, inte\n"
 "                            av ett nyrad-tecken\n"
 
-#: src/grep.c:1028
+#: src/grep.c:1044
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -227,7 +227,7 @@ msgstr ""
 "      --mmap                använd om möjligt minesmappning vid\n"
 "                            läsning av indata.\n"
 
-#: src/grep.c:1036
+#: src/grep.c:1052
 #, fuzzy
 msgid ""
 "\n"
@@ -235,16 +235,21 @@ msgid ""
 "  -m, --max-count=NUM       stop after NUM matches\n"
 "  -b, --byte-offset         print the byte offset with output lines\n"
 "  -n, --line-number         print line number with output lines\n"
+"      --line-buffered       flush output on every line\n"
 "  -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"
 "      --binary-files=TYPE   assume that binary files are TYPE\n"
-"                            TYPE is 'binary', 'text', or 'without-match'.\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"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     equivalent to --directories=recurse but only\n"
+"                            files that match PATTERN will be examine\n"
+"      --exclude=PATTERN     equivalent to --directories=recurse, files that\n"
+"                            match PATTERN will be skip.\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"
@@ -271,7 +276,7 @@ msgstr ""
 "rader\n"
 "  -Z, --null                skriv 0-byte efter FILnamn\n"
 
-#: src/grep.c:1056
+#: src/grep.c:1077
 #, fuzzy
 msgid ""
 "\n"
@@ -280,6 +285,7 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color, --colour     use markers to distinguish the matching string\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"
@@ -303,7 +309,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:1070
+#: src/grep.c:1092
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -312,43 +318,33 @@ msgstr ""
 "Rapportera buggar till <bug-gnu-utils@gnu.org>.\n"
 "Skicka anmärkningar på översättningar till <sv@li.org>\n"
 
-#: src/grep.c:1080
+#: src/grep.c:1102
 msgid "conflicting matchers specified"
 msgstr "motstridiga söksträngar specificerade"
 
-#: src/grep.c:1354
+#: src/grep.c:1376
 msgid "unknown directories method"
 msgstr "okänd metod gällande kataloger"
 
-#: src/grep.c:1414
+#: src/grep.c:1436
 #, fuzzy
 msgid "invalid max count"
 msgstr "oavslutad repetitionsräknare"
 
-#: src/grep.c:1453
+#: src/grep.c:1476
 msgid "unknown binary-files type"
 msgstr "okänd binärfiltyp"
 
-#: src/grep.c:1467
-#, c-format
-msgid ""
-"invalid argument `%s' for `--color'\n"
-"Valid arguments are:\n"
-"  - `always', `yes', `force'\n"
-"  - `never', `no', `none'\n"
-"  - `auto', `tty', `if-tty'\n"
-msgstr ""
-
-#: src/grep.c:1513
+#: src/grep.c:1528
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (GNU grep) %s\n"
 
-#: src/grep.c:1515
+#: src/grep.c:1530
 msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 msgstr "Copyright (C) 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:1517
+#: src/grep.c:1532
 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"