Translation updates

7 files changed, 531 insertions, 448 deletions

diff --git a/po/de.po b/po/de.po
index e7ae84d5..3dcf5787 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,13 +1,13 @@
 # German messages for GNU grep
 # Copyright (C) 1997-99, 2000, 2001, 2002 Free Software Foundation, Inc.
-# Martin von Löwis <martin@mira.isdn.cs.tu-berlin.de>, 1997-99, 2000, 2001, 2002
+# Martin von Löwis <martin@mira.isdn.cs.tu-berlin.de>, 1997-99, 2000, 2001, 2002
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.5g\n"
 "POT-Creation-Date: 2002-01-22 14:39+0100\n"
 "PO-Revision-Date: 2002-03-09 01:27+0100\n"
-"Last-Translator: Martin von Löwis <martin@v.loewis.de>\n"
+"Last-Translator: Martin von Löwis <martin@v.loewis.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -15,13 +15,13 @@ msgstr ""
 
 #: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
 msgid "Memory exhausted"
-msgstr "Virtueller Speicher erschöpft."
+msgstr "Virtueller Speicher erschöpft."
 
 # Is this message used only for [ without matching ],
 # or for ] without [ as well?
 #: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
 msgid "Unbalanced ["
-msgstr "Öffnende [ ohne schließende."
+msgstr "Öffnende [ ohne schließende."
 
 #: src/dfa.c:741
 msgid "Unfinished \\ escape"
@@ -33,15 +33,15 @@ msgstr "Unbeendete \\-Escape-Sequenz."
 #. {M,N} - M through N
 #: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
 msgid "unfinished repeat count"
-msgstr "Unbeendeter Wiederholungszähler."
+msgstr "Unbeendeter Wiederholungszähler."
 
 #: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
 msgid "malformed repeat count"
-msgstr "Unförmiger Wiederholungszähler."
+msgstr "Unförmiger Wiederholungszähler."
 
 #: src/dfa.c:1253
 msgid "Unbalanced ("
-msgstr "Öffnende ( ohne schließende."
+msgstr "Öffnende ( ohne schließende."
 
 #: src/dfa.c:1378
 msgid "No syntax specified"
@@ -49,7 +49,7 @@ msgstr "Keine Syntax angegeben."
 
 #: src/dfa.c:1386
 msgid "Unbalanced )"
-msgstr "Schließende ) ohne öffnende."
+msgstr "Schließende ) ohne öffnende."
 
 #: src/dfa.c:2956
 msgid "out of memory"
@@ -57,15 +57,15 @@ msgstr "Speicher ist alle."
 
 #: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
 msgid "memory exhausted"
-msgstr "Virtueller Speicher erschöpft."
+msgstr "Virtueller Speicher erschöpft."
 
 #: src/grep.c:205
 msgid "invalid context length argument"
-msgstr "Ungültige Kontextlänge."
+msgstr "Ungültige Kontextlänge."
 
 #: src/grep.c:475
 msgid "input is too large to count"
-msgstr "Eingabe ist zu groß, um gezählt zu werden."
+msgstr "Eingabe ist zu groß, um gezählt zu werden."
 
 #: src/grep.c:597
 msgid "writing output"
@@ -74,7 +74,7 @@ msgstr "Politik, "
 #: src/grep.c:870
 #, c-format
 msgid "Binary file %s matches\n"
-msgstr "Übereinstimmungen in Binärdatei %s.\n"
+msgstr "Übereinstimmungen in Binärdatei %s.\n"
 
 #: src/grep.c:884
 msgid "(standard input)"
@@ -97,7 +97,7 @@ msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI]...\n"
 #: src/grep.c:1040
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "»%s --help« gibt Ihnen mehr Informationen.\n"
+msgstr "»%s --help« gibt Ihnen mehr Informationen.\n"
 
 #: src/grep.c:1045
 #, c-format
@@ -115,7 +115,7 @@ msgstr ""
 "Suche nach MUSTER in jeder DATEI oder der Standardeingabe.\n"
 "Beispiel: %s -i 'Hallo Welt' menu.h main.c\n"
 "\n"
-"Auswahl und Interpretation regulärer Ausdrücke:\n"
+"Auswahl und Interpretation regulärer Ausdrücke:\n"
 
 #: src/grep.c:1051
 msgid ""
@@ -124,11 +124,11 @@ msgid ""
 "  -G, --basic-regexp        PATTERN is a basic regular expression\n"
 "  -P, --perl-regexp         PATTERN is a Perl regular expression\n"
 msgstr ""
-"  -E, --extended-regexp     MUSTER ist ein erweiterter regulärer Ausdruck.\n"
+"  -E, --extended-regexp     MUSTER ist ein erweiterter regulärer Ausdruck.\n"
 "  -F, --fixed-strings       MUSTER ist eine Menge Newline-getrennter \n"
 "                            Zeichenketten.\n"
-"  -G, --basic-regexp        MUSTER ist ein regulärer Standardausdruck.\n"
-"  -P, --perl-regexp         MUSTER ist ein regulärer Ausdruck, \n"
+"  -G, --basic-regexp        MUSTER ist ein regulärer Standardausdruck.\n"
+"  -P, --perl-regexp         MUSTER ist ein regulärer Ausdruck, \n"
 "                            wie Perl ihn akzeptiert.\n"
 
 #: src/grep.c:1056
@@ -140,12 +140,12 @@ msgid ""
 "  -x, --line-regexp         force PATTERN to match only whole lines\n"
 "  -z, --null-data           a data line ends in 0 byte, not newline\n"
 msgstr ""
-"  -e, --regexp=MUSTER       MUSTER als regulären Ausdruck verwenden.\n"
+"  -e, --regexp=MUSTER       MUSTER als regulären Ausdruck verwenden.\n"
 "  -f, --file=FILE           MUSTER aus DATEI lesen.\n"
-"  -i, --ignore-case         Unterschied zwischen Groß- und Kleinschreibung\n"
+"  -i, --ignore-case         Unterschied zwischen Groß- und Kleinschreibung\n"
 "                            ignorieren.\n"
-"  -w, --word-regexp         MUSTER paßt nur auf ganze Wörter.\n"
-"  -x, --line-regexp         MUSTER paßt nur auf ganze Zeilen.\n"
+"  -w, --word-regexp         MUSTER paßt nur auf ganze Wörter.\n"
+"  -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:1063
@@ -160,11 +160,11 @@ msgid ""
 msgstr ""
 "\n"
 "Verschiedenes:\n"
-"  -s, --no-messages         Fehlermeldungen unterdrücken.\n"
+"  -s, --no-messages         Fehlermeldungen unterdrücken.\n"
 "  -v, --revert-match        Nicht-passende Zeilen anzeigen.\n"
 "  -V, --version             Versionsnummer ausgeben und beenden.\n"
 "      --help                Diese Hilfe ausgeben und beenden.\n"
-"      --mmap                Wenn möglich, Eingabe in den Speicher mappen.\n"
+"      --mmap                Wenn möglich, Eingabe in den Speicher mappen.\n"
 
 #: src/grep.c:1071
 msgid ""
@@ -198,32 +198,32 @@ msgid ""
 msgstr ""
 "\n"
 "Ausgabekontrolle:\n"
-"  -m, --max-count=ZAHL      Nach ZAHL Ãœbereinstimmungen abbrechen.\n"
+"  -m, --max-count=ZAHL      Nach ZAHL Übereinstimmungen abbrechen.\n"
 "  -b, --byte-offset         Byte-Offset anzeigen.\n"
 "  -n, --line-number         Zeilennummer anzeigen.\n"
 "      --line-buffered       Jede Zeile einzeln (ungepuffert) ausgeben.\n"
-"  -H, --with-filename       Dateinamen bei jeder Ãœbereinstimmung anzeigen.\n"
+"  -H, --with-filename       Dateinamen bei jeder Übereinstimmung anzeigen.\n"
 "  -h, --no-filename         Dateinamen nicht anzeigen.\n"
-"      --label=TEXT          TEXT als Dateiname für Standardeingabe ausgeben.\n"
+"      --label=TEXT          TEXT als Dateiname für Standardeingabe ausgeben.\n"
 "  -o, --only-matching       Nur den Teil der Zeile anzeigen, die mit MUSTER\n"
-"                            übereinstimmt.\n"
-"  -q, --quiet, --silent     Alle normalen Ausgaben unterdrücken.\n"
-"      --binary-files=TYP    Binärdateien als TYP annehmen. TYP kann \n"
-"                            »binary«, »text« oder »without-match« sein.\n"
+"                            übereinstimmt.\n"
+"  -q, --quiet, --silent     Alle normalen Ausgaben unterdrücken.\n"
+"      --binary-files=TYP    Binärdateien als TYP annehmen. TYP kann \n"
+"                            »binary«, »text« oder »without-match« sein.\n"
 "  -a, --text                Entspricht --binary-files=text.\n"
 "  -I                        Entspricht --binary-files=without-match.\n"
 "  -d, --directories=AKTION  Verarbeitung von Verzeichnissen festlegen.\n"
 "                            AKTION ist 'read', 'recurse', oder 'skip'.\n"
-"  -D, --devices=AKTION      Verarbeitung von Gerätedateien, FIFOs und\n"
-"                            Sockets festlegt. AKTION ist »read« oder »write«.\n"
-"  -R, -r, --recursive       Äquivalent zu --directories=recurse.\n"
+"  -D, --devices=AKTION      Verarbeitung von Gerätedateien, FIFOs und\n"
+"                            Sockets festlegt. AKTION ist »read« oder »write«.\n"
+"  -R, -r, --recursive       Äquivalent zu --directories=recurse.\n"
 "      --include=MUSTER      Dateien untersuchen, die auf MUSTER passen.\n"
-"      --exclude=MUSTER      Dateien überspringen, die auf MUSTER passen.\n"
-"      --exclude-from=DATEI  Dateien überspringen, die auf ein Muster \n"
+"      --exclude=MUSTER      Dateien überspringen, die auf MUSTER passen.\n"
+"      --exclude-from=DATEI  Dateien überspringen, die auf ein Muster \n"
 "                            in DATEI passen.\n"
 "  -L, --files-without-match Nur Namen von Dateien ausgeben, die keine\n"
-"                            Ãœbereinstimmung enthalten.\n"
-"  -l, --files-with-matches  Nur Dateinamen mit Ãœbereinstimmungen ausgeben.\n"
+"                            Übereinstimmung enthalten.\n"
+"  -l, --files-with-matches  Nur Dateinamen mit Übereinstimmungen ausgeben.\n"
 "  -c, --count               Nur Zahl der passenden Zeilen pro Datei ausgeben.\n"
 "  -Z, --null                Null-Byte nach jedem Dateinamen ausgeben.\n"
 
@@ -254,14 +254,14 @@ msgstr ""
 "  -ZAHL                     Wie --context=ZAHL.\n"
 "      --color[=WENN], \n"
 "      --colour=[WENN]       Passende Textfragmente markieren.\n"
-"                            WENN kann »always«, »never« oder »auto« sein.\n"
+"                            WENN kann »always«, »never« oder »auto« sein.\n"
 "  -U, --binary              CR-Zeichen am Zeilenende belassen (MSDOS).\n"
 "  -u, --unix-byte-offsets   Offsets ausgeben, als fehlten CR-Zeichen (MSDOS).\n"
 "\n"
-"»egrep« bedeutet »grep -E«. »fgrep« bedeutet »grep -F«.\n"
-"Wenn DATEI fehlt oder »-« ist, wird die Standardeingabe gelesen.\n"
+"»egrep« bedeutet »grep -E«. »fgrep« bedeutet »grep -F«.\n"
+"Wenn DATEI fehlt oder »-« ist, wird die Standardeingabe gelesen.\n"
 "Weniger als zwei DATEIen implizieren -h. Status ist 0 bei \n"
-"Ãœbereinstimmungen, 1 ohne, 2 bei Problemen.\n"
+"Übereinstimmungen, 1 ohne, 2 bei Problemen.\n"
 
 #: src/grep.c:1116
 msgid ""
@@ -277,19 +277,19 @@ msgstr "Festgelegte Vergleicher widersprechen einander."
 
 #: src/grep.c:1363
 msgid "unknown devices method"
-msgstr "Unbekannte Methode für Gerätedateien."
+msgstr "Unbekannte Methode für Gerätedateien."
 
 #: src/grep.c:1430
 msgid "unknown directories method"
-msgstr "Unbekannte Methode für Verzeichnisse."
+msgstr "Unbekannte Methode für Verzeichnisse."
 
 #: src/grep.c:1497
 msgid "invalid max count"
-msgstr "Unbeendeter Maximalzähler."
+msgstr "Unbeendeter Maximalzähler."
 
 #: src/grep.c:1551
 msgid "unknown binary-files type"
-msgstr "Unbekannter Typ für »--binary-files«."
+msgstr "Unbekannter Typ für »--binary-files«."
 
 #: src/grep.c:1646
 #, c-format
@@ -306,16 +306,16 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 "Dies ist freie Software; in den Quellen befinden sich die Lizenzbedingungen.\n"
-"Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n"
-"VERWENDBARKEIT FÃœR EINEN BESTIMMTEN ZWECK.\n"
+"Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n"
+"VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK.\n"
 
 #: src/search.c:606
 msgid "The -P option is not supported"
-msgstr "Die Option -P ist nicht unterstützt."
+msgstr "Die Option -P ist nicht unterstützt."
 
 #: src/search.c:619
 msgid "The -P and -z options cannot be combined"
-msgstr "Die Optionen -P und -z können nicht kombiniert werden."
+msgstr "Die Optionen -P und -z können nicht kombiniert werden."
 
 #: lib/error.c:117
 msgid "Unknown system error"
@@ -324,45 +324,45 @@ msgstr "Unbekannter Systemfehler."
 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: Die Option »%s« ist mehrdeutig.\n"
+msgstr "%s: Die Option »%s« ist mehrdeutig.\n"
 
 #: lib/getopt.c:700
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: Die Option »%s« erlaubt keinen Parameter.\n"
+msgstr "%s: Die Option »%s« erlaubt keinen Parameter.\n"
 
 #: lib/getopt.c:705
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: Die Option »%c%s« erlaubt keinen Parameter.\n"
+msgstr "%s: Die Option »%c%s« erlaubt keinen Parameter.\n"
 
 #: lib/getopt.c:723 lib/getopt.c:896
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: Die Option »%s« verlangt einen Parameter.\n"
+msgstr "%s: Die Option »%s« verlangt einen Parameter.\n"
 
 #. --option
 #: lib/getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: Nicht erkannte Option »--%s«\n"
+msgstr "%s: Nicht erkannte Option »--%s«\n"
 
 #. +option or -option
 #: lib/getopt.c:756
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: Nicht erkannte Option »%c%s«.\n"
+msgstr "%s: Nicht erkannte Option »%c%s«.\n"
 
 #. 1003.2 specifies the format of this message.
 #: lib/getopt.c:782
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr "%s: Ungültige Option -- %c.\n"
+msgstr "%s: Ungültige Option -- %c.\n"
 
 #: lib/getopt.c:785
 #, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s: Ungültige Option -- %c.\n"
+msgstr "%s: Ungültige Option -- %c.\n"
 
 #. 1003.2 specifies the format of this message.
 #: lib/getopt.c:815 lib/getopt.c:945
@@ -373,12 +373,12 @@ msgstr "%s: Option verlangt einen Parameter -- %c.\n"
 #: lib/getopt.c:862
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: Option »-W %s« ist zweideutig.\n"
+msgstr "%s: Option »-W %s« ist zweideutig.\n"
 
 #: lib/getopt.c:880
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: Option »-W %s« erlaubt keinen Parameter.\n"
+msgstr "%s: Option »-W %s« erlaubt keinen Parameter.\n"
 
 #. Get translations for open and closing quotation marks.
 #.
@@ -396,8 +396,8 @@ msgstr "%s: Option »-W %s« erlaubt keinen Parameter.\n"
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #: lib/quotearg.c:259
 msgid "`"
-msgstr "»"
+msgstr "»"
 
 #: lib/quotearg.c:260
 msgid "'"
-msgstr "«"
+msgstr "«"
diff --git a/po/el.po b/po/el.po
index 44cf9ede..eade9080 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,13 +1,13 @@
-# Greek messages for GNU grep-2.5e.
-# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-# Simos Xenitellis <S.Xenitellis@rhbnc.ac.uk>, 1998, 1999, 2000, 2001.
+# Greek messages for GNU grep-2.5g.
+# Copyright (C) 1998, 2002 Free Software Foundation, Inc.
+# Simos Xenitellis <simos@hellug.gr>, 1998, 2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU grep 2.5e\n"
-"POT-Creation-Date: 2001-03-07 00:02-0500\n"
-"PO-Revision-Date: 2001-05-07 00:02+0000\n"
-"Last-Translator: Simos Xenitellis <S.Xenitellis@rhbnc.ac.uk>\n"
+"Project-Id-Version: GNU grep 2.5g\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
+"PO-Revision-Date: 2002-03-11 12:00+0000\n"
+"Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\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:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
 msgid "Memory exhausted"
 msgstr "Ç ìíÞìç åîáíôëÞèçêå"
 
@@ -23,16 +23,13 @@ msgstr "Ç ìíÞìç åîáíôëÞèçêå"
 # src/dfa.c:690 src/dfa.c:703 src/dfa.c:704
 # src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
 # src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
-#: src/dfa.c:486 src/dfa.c:489 src/dfa.c:507 src/dfa.c:518 src/dfa.c:542
-#: src/dfa.c:601 src/dfa.c:606 src/dfa.c:619 src/dfa.c:620 src/dfa.c:998
-#: src/dfa.c:1001 src/dfa.c:1025 src/dfa.c:1029 src/dfa.c:1030 src/dfa.c:1033
-#: src/dfa.c:1045 src/dfa.c:1046
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
 msgid "Unbalanced ["
-msgstr "Ìç éóóïñïðçìÝíï ["
+msgstr "Ìç éóïññïðçìÝíï ["
 
 # src/dfa.c:444
 # src/dfa.c:452
-#: src/dfa.c:738
+#: src/dfa.c:741
 msgid "Unfinished \\ escape"
 msgstr "Ìç ôåñìáôéóìÝíïò ÷áñáêôÞñáò äéáöõãÞò \\"
 
@@ -42,111 +39,110 @@ msgstr "Ìç ôåñìáôéóìÝíïò ÷áñáêôÞñáò äéáöõãÞò \\"
 #. {M} - exact count
 #. {M,} - minimum count, maximum is infinity
 #. {M,N} - M through N
-#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
+#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
 msgid "unfinished repeat count"
 msgstr "ìç ôåñìáôéóìÝíïò ìåôñçôÞò åðáíÜëçøçò"
 
 # src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
 # src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
-#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
+#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
 msgid "malformed repeat count"
 msgstr "êáêïó÷çìáôéóìÝíïò ìåôñçôÞò åðáíÜëçøçò"
 
 # src/dfa.c:841
 # src/dfa.c:849
-#: src/dfa.c:1232
+#: src/dfa.c:1253
 msgid "Unbalanced ("
 msgstr "Ìç éóïññïðçìÝíï ("
 
 # src/dfa.c:962
 # src/dfa.c:970
-#: src/dfa.c:1357
+#: src/dfa.c:1378
 msgid "No syntax specified"
 msgstr "Äåí ïñßóôçêå óõíôáêôéêü"
 
 # src/dfa.c:970
 # src/dfa.c:978
-#: src/dfa.c:1365
+#: src/dfa.c:1386
 msgid "Unbalanced )"
 msgstr "Ìç éóïññïðçìÝíï )"
 
 # src/dfa.c:1990
 # src/dfa.c:1998
-#: src/dfa.c:2933
+#: src/dfa.c:2956
 msgid "out of memory"
-msgstr "åîáíôëÞèçêå ç ìíÞìç"
+msgstr "ç ìíÞìç åîáíôëÞèçêå"
 
 # src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
 # src/kwset.c:190
 # src/grep.c:164 src/grep.c:181 src/grep.c:283 src/grep.c:338 src/kwset.c:184
 # src/kwset.c:190
-#: lib/obstack.c:471 src/grep.c:343 src/kwset.c:171 src/kwset.c:177
-#: src/search.c:103 src/search.c:223 src/search.c:307
+#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
 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:191
+#: src/grep.c:205
 msgid "invalid context length argument"
 msgstr "ìç Ýãêõñï üñéóìá ìÞêïõò ðåñéå÷ïìÝíïõ"
 
-#: src/grep.c:466
+#: src/grep.c:475
 msgid "input is too large to count"
-msgstr ""
+msgstr "ç åßóïäïò åßíáé ðïëý ìåãÜëç ãéá íá ìåôñçèåß"
 
 # src/grep.c:392 src/grep.c:1034
 # src/grep.c:487 src/grep.c:1284
-#: src/grep.c:539
+#: src/grep.c:597
 msgid "writing output"
 msgstr "åããñáöÞ áðïôåëÝóìáôïò"
 
 # src/grep.c:715
-#: src/grep.c:812
+#: src/grep.c:870
 #, c-format
 msgid "Binary file %s matches\n"
-msgstr "Äõáäéêü áñ÷åßï %s ôáéñéÜóìáôá\n"
+msgstr "Ôï äõáäéêü áñ÷åßï %s ôáéñéÜæåé\n"
 
 # src/grep.c:964 src/grep.c:1015
 # src/grep.c:730
-#: src/grep.c:826
+#: src/grep.c:884
 msgid "(standard input)"
-msgstr "(óôÜíôáñô åßóïäïò)"
+msgstr "(êáíïíéêÞ åßóïäïò)"
 
 # src/grep.c:293
 # src/grep.c:366
-#: src/grep.c:931
-#, fuzzy, c-format
+#: src/grep.c:989
+#, c-format
 msgid "warning: %s: %s\n"
-msgstr "%s: ðñïåéäïðïßçóç: %s: %s\n"
+msgstr "ðñïåéäïðïßçóç: %s: %s\n"
 
 # src/grep.c:844
-#: src/grep.c:932
+#: src/grep.c:990
 msgid "recursive directory loop"
 msgstr "áíáäñïìéêÞ áëëçëïäéáäï÷Þ êáôáëüãùí"
 
 # src/grep.c:597
 # src/grep.c:862
-#: src/grep.c:980
+#: src/grep.c:1038
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
-msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... Ó×ÇÌÁÔÉÓÌÏÓ [ÁÑ×ÅÉÏ]...\n"
+msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... ÕÐÏÄÅÉÃÌÁ [ÁÑ×ÅÉÏ]...\n"
 
 # src/grep.c:598
 # src/grep.c:863
-#: src/grep.c:982
+#: src/grep.c:1040
 #, 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:987
+#: src/grep.c:1045
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... Ó×ÇÌÁÔÉÓÌÏÓ [ÁÑ×ÅÉÏ] ...\n"
+msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... ÕÐÏÄÅÉÃÌÁ [ÁÑ×ÅÉÏ] ...\n"
 
-#: src/grep.c:988
+#: src/grep.c:1046
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -154,19 +150,27 @@ msgid ""
 "\n"
 "Regexp selection and interpretation:\n"
 msgstr ""
+"Åýñåóç ôïõ ÕÐÏÄÅÉÃÌÁôïò óå êÜèå ÁÑ×ÅÉÏ Þ ôçí êáíïíéêÞ åßóïäï.\n"
+"ÐáñÜäåéãìá: %s -i 'hello world' menu.h main.c\n"
+"\n"
+"ÅðéëïãÞ êáíïíéêÞò Ýêöñáóçò êáé åñìçíåßá:\n"
 
-#: src/grep.c:993
+#: src/grep.c:1051
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
 "  -F, --fixed-strings       PATTERN is a set of newline-separated strings\n"
 "  -G, --basic-regexp        PATTERN is a basic regular expression\n"
 "  -P, --perl-regexp         PATTERN is a Perl regular expression\n"
 msgstr ""
+"  -E, --extended-regexp     ÕÐÏÄÅÉÃÌÁ åßíáé ìéá åêôåôáìÝíç êáíïíéêÞ Ýêöñáóç\n"
+"  -F, --fixed-regexp        ÕÐÏÄÅÉÃÌÁ åßíáé óôáôéêü áëöáñéèìçôéêü äéá÷ùñé-\n"
+"                              æüìåíï ìå ÷áñáêôÞñåò áëëáãÞò ãñáììÞò\n"
+"  -G, --basic-regexp        ÕÐÏÄÅÉÃÌÁ åßíáé áðëÞ êáíïíéêÞ Ýêöñáóç\n"
+"  -P, --perl-regexp         ÕÐÏÄÅÉÃÌÁ åßíáé êáíïíéêÞ Ýêöñáóç Perl\n"
 
 # src/grep.c:603
 # src/grep.c:868
-#: src/grep.c:998
-#, fuzzy
+#: src/grep.c:1056
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -175,25 +179,19 @@ msgid ""
 "  -x, --line-regexp         force PATTERN to match only whole lines\n"
 "  -z, --null-data           a data line ends in 0 byte, not newline\n"
 msgstr ""
-"ÁíáæÞôçóç ãéá Ó×ÇÌÁÔÉÓÌÏ óå êÜèå ÁÑ×ÅÉÏ Þ óôç óôÜíôáñô åßóïäï.\n"
-"\n"
-"ÅðéëïãÝò Þ regexp êáé åîÞãçóç:\n"
-"  -E, --extended-regexp     Ó×ÇÌÁÔÉÓÌÏÓ åßíáé ìéá åêôåôáìÝíç êáíïíéêÞ Ýêöñáóç\n"
-"  -F, --fixed-regexp        Ó×ÇÌÁÔÉÓÌÏÓ åßíáé óôáôéêü áëöáñéèìçôéêü äéá÷ùñé-\n"
-"                              æüìåíï ìå ÷áñáêôÞñåò áëëáãÞò ãñáììÞò\n"
-"  -G, --basic-regexp        Ó×ÇÌÁÔÉÓÌÏÓ åßíáé áðëÞ êáíïíéêÞ Ýêöñáóç\n"
-"  -e, --regexp=Ó×ÇÌÁÔÉÓÌÏÓ  ÷ñÞóç Ó×ÇÌÁÔÉÓÌÏÕ ãéá êáíïíéêÞ Ýêöñáóç\n"
-"  -f, --file=ÁÑ×ÅÉÏ         ëÞøç Ó×ÇÌÁÔÉÓÌÏÕ áðü ôï áñ÷åßï ÁÑ×ÅÉÏ\n"
+"  -e, --regexp=ÕÐÏÄÅÉÃÌÁ    ÷ñÞóç ÕÐÏÄÅÉÃÌÁôïò ãéá êáíïíéêÞ Ýêöñáóç\n"
+"  -f, --file=ÁÑ×ÅÉÏ         ëÞøç ÕÐÏÄÅÉÃÌÁôïò áðü ôï áñ÷åßï ÁÑ×ÅÉÏ\n"
 "  -i, --ignore-case         áãíüçóå äéáöïñÝò ðåæþí/êåöáëáßùí\n"
-"  -w, --word-regexp         åðéâïëÞ ôïõ Ó×ÇÌÁÔÉÓÌÏÕ íá ôáéñéÜæåé ìüíï\n"
+"  -w, --word-regexp         åðéâïëÞ ôïõ ÕÐÏÄÅÉÃÌÁôïò íá ôáéñéÜæåé ìüíï\n"
 "                              ïëüêëçñåò ëÝîåéò\n"
-"  -x, --line-regexp         åðéâïëÞ ôïõ Ó×ÇÌÁÔÉÓÌÏÕ íá ôáéñéÜæåé ìüíï\n"
+"  -x, --line-regexp         åðéâïëÞ ôïõ ÕÐÏÄÅÉÃÌÁôïò íá ôáéñéÜæåé ìüíï\n"
 "                              ïëüêëçñåò ãñáììÝò\n"
+"  -z, --null-data           ç ãñáììÞ äåäïìÝíùí ôåñìáôßæåôáé ìå byte 0\n"
+"                              êáé ü÷é ìå ÷áñáêôÞñá áëëáãÞò ãñáììÞò\n"
 
 # src/grep.c:615
 # src/grep.c:880
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1063
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -205,15 +203,16 @@ msgid ""
 msgstr ""
 "\n"
 "ËïéðÜ:\n"
-"  -s, --no-messages         áðïöõãÞ åìöÜíéóçò ìõíçìÜôùí óöáëìÜôùí\n"
+"  -s, --no-messages         áðïöõãÞ åìöÜíéóçò ìçíõìÜôùí óöáëìÜôùí\n"
 "  -v, --revert-match        åðéëïãÞ ãñáììþí ðïõ äåí ôáéñéÜæïõí\n"
 "  -V, --version             åìöÜíéóçò ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
 "      --help                åìöÜíéóçò áõôÞò ôçò âïÞèåéáò êáé Ýîïäïò\n"
+"      --mmap                ÷ñÞóç åéóüäïõ áðåéêïíéóìÝíç-óôç-ìíÞìç áí\n"
+"                              õðÜñ÷åé ôÝôïéá äõíáôüôçôá\n"
 
 # src/grep.c:622
 # src/grep.c:887
-#: src/grep.c:1013
-#, fuzzy
+#: src/grep.c:1071
 msgid ""
 "\n"
 "Output control:\n"
@@ -223,6 +222,8 @@ msgid ""
 "      --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"
+"      --label=LABEL         print LABEL as filename for standard input\n"
+"  -o, --only-matching       show only the part of a line matching PATTERN\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"
@@ -230,10 +231,12 @@ msgid ""
 "  -I                        equivalent to --binary-files=without-match\n"
 "  -d, --directories=ACTION  how to handle directories\n"
 "                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -D, --devices=ACTION      how to handle devices, FIFOs and sockets\n"
+"                            ACTION is 'read' or 'skip'\n"
 "  -R, -r, --recursive       equivalent to --directories=recurse\n"
-"      --include=PATTERN     files that match PATTERN will be examine\n"
-"      --exclude=PATTERN     files that match PATTERN will be skip.\n"
-"      --exclude-from=FILE   files that match PATTERN in FILE will be skip.\n"
+"      --include=PATTERN     files that match PATTERN will be examined\n"
+"      --exclude=PATTERN     files that match PATTERN will be skipped.\n"
+"      --exclude-from=FILE   files that match PATTERN in FILE will be skipped.\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"
@@ -241,28 +244,41 @@ msgid ""
 msgstr ""
 "\n"
 "¸ëåã÷ïò åîüäïõ:\n"
+"  -m, --max-count=ÁÑÉÈÌÏÓ   óôáìÜôçìá ìåôÜ áðü ÁÑÉÈÌÏ ôáéñéÜóìáôá\n"
 "  -b, --byte-offset         åìöÜíéóç ó÷åôéêÞò èÝóçò ôïõ byte ìå ôéò ãñáììÝò\n"
 "                              åîüäïõ\n"
 "  -n, --line-number         åìöÜíéóç áñéèìþí ãñáììÞò ìå ôéò ãñáììÝò åîüäïõ\n"
 "  -H, --with-filename       åìöÜíéóç ïíüìáôïò áñ÷åßïõ ìå êÜèå ôáßñéáóìá\n"
 "  -h, --no-filename         áðïöõãÞ åìöÜíéóçò ôïõ ïíüìáôïò ôïõ áñ÷åßïõ óôçí\n"
 "                              áñ÷Þ ôçò åîüäïõ\n"
+"      --label=LABEL         print LABEL as filename for standard input\n"
+"  -o, --only-matching       show only the part of a line matching PATTERN\n"
 "  -q, --quiet, --silent     áðïöõãÞ åìöÜíéóçò üëçò ôçò êáíïíéêÞò åîüäïõ\n"
+"      --binary-files=TYPE   assume that binary files are TYPE\n"
+"                            TYPE is 'binary', 'text', or 'without-match'\n"
 "  -a, --text                íá ìçí áðïöåõ÷èåß ç Ýîïäïò äõáäéêþí äåäïìÝíùí\n"
+"  -I                        equivalent to --binary-files=without-match\n"
 "  -d, --directories=ÅÍÅÑÃÅÉÁ  ôñüðïò ÷ñÞóçò ôùí êáôáëüãùí\n"
 "                            Ç ÅÍÅÑÃÅÉÁ åßíáé 'read', 'recurse' Þ 'skip'.\n"
 "                            (Ãéá áíÜãíùóç, áíáäñïìÞ êáé ðáñÜêáìøç áíôßóôïé÷á).\n"
-"  -r, --recursive           éóïäýíáìï ìå --directories=recurse.\n"
+"  -D, --devices=ÅÍÅÑÃÅÉÁ    ôñüðïò ÷ñÞóçò ôùí óõóêåõþí, FIFO êáé socket\n"
+"                            Ç ÅÍÅÑÃÅÉÁ åßíáé 'read' Þ 'skip'.\n"
+"                            (Ãéá áíÜãíùóç êáé ðáñÜêáìøç áíôßóôïé÷á).\n"
+"  -R, -r, --recursive       éóïäýíáìï ìå --directories=recurse.\n"
+"      --include=ÕÐÏÄÅÉÃÌÁ   èá åëåã÷èïýí áñ÷åßá ðïõ ôáéñéÜæïõí óôï ÕÐÏÄÅÉÃÌÁ.\n"
+"      --exclude=ÕÐÏÄÅÉÃÌÁ   èá ðáñáêáìöèïýí áñ÷åßá ðïõ ôáéñéÜæïõí óôï ÕÐÏÄÅÉÃÌÁ\n"
+"      --exclude-from=ÁÑ×ÅÉÏ èá ðáñáêáìöèïýí ôá áñ÷åßá ðïõ ôáéñéÜæïõí óôá\n"
+"                            ÕÐÏÄÅÉÃÌÁôá ðïõ ðåñéÝ÷ïíôáé ìÝóá óôï ÁÑ×ÅÉÏ.\n"
 "  -L, --files-without-match åìöÜíéóç ìüíï ôá ïíüìáôá ÁÑ×ÅÉÙÍ ðïõ äåí\n"
 "                              ðåñéÝ÷ïõí ôáéñéÜóìáôá\n"
 "  -l, --files-with-matches  åìöÜíéóç ìüíï ôá ïíüìáôá ÁÑ×ÅÉÙÍ ìå ôáéñéÜóìáôá\n"
 "  -c, --count               åìöÜíéóç ìüíï ôïí áñéèìü ôùí ãñáììþí ìå\n"
 "                              ôáéñéÜóìáôá ãéá êÜèå ÁÑ×ÅÉÏ\n"
+"  -Z, --null                åããñáöÞ åíüò ìçäåíéêïý byte ìåôÜ ôï üíïìá ÁÑ×ÅÉÏÕ\n"
 
 # src/grep.c:633
 # src/grep.c:902
-#: src/grep.c:1037
-#, fuzzy
+#: src/grep.c:1099
 msgid ""
 "\n"
 "Context control:\n"
@@ -270,7 +286,9 @@ 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"
+"      --color[=WHEN],\n"
+"      --colour[=WHEN]       use markers to distinguish the matching string\n"
+"                            WHEN may be `always', `never' or `auto'.\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"
@@ -280,90 +298,101 @@ msgid ""
 "and 2 if trouble.\n"
 msgstr ""
 "\n"
-"¸ëåã÷ïò âÜóç ôïõ ðåñéå÷ïìÝíïõ:\n"
-"  -B, --before-context=ÁÑÉÈÌÏÓ  åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí ìå áêïëïõèïýìåíï\n"
+"¸ëåã÷ïò âÜóåé ôïõ ðåñéå÷ïìÝíïõ:\n"
+"  -B, --before-context=ÁÑÉÈÌÏÓ åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí ìå áêïëïõèïýìåíï\n"
 "                              ðåñéå÷üìåíï\n"
 "  -A, --after-context=ÁÑÉÈÌÏÓ  åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí ìå ðñïðïñåõüìåíï\n"
 "                              ðåñéå÷üìåíï\n"
-"  -C, --context[=ÁÑÉÈÌÏÓ]   åìöÜíéóç ÁÑÉÈÌÏÓ (åî ïñéóìïý 2) ãñáììþí ìå\n"
+"  -C, --context=ÁÑÉÈÌÏÓ     åìöÜíéóç ÁÑÉÈÌÏÓ (åî ïñéóìïý 2) ãñáììþí ìå\n"
 "                              ðåñéå÷üìåíï åîüäïõ\n"
-"                            åêôüò êé áí áíáéñåèåß ìå -A Þ -B\n"
+"                              åêôüò êé áí áíáéñåèåß ìå -A Þ -B\n"
 "  -NUM                      ôï ßäéï ìå --context=ÁÑÉÈÌÏÓ\n"
+"      --color[=WHEN],\n"
+"      --colour[=WHEN]       use markers to distinguish the matching string\n"
+"                            WHEN may be `always', `never' or `auto'.\n"
 "  -U, --binary              íá ìçí áðáëåßöïíôáé ÷áñáêôÞñåò CR óôï EOL (MSDOS)\n"
 "  -u, --unix-byte-offsets   áíáöïñÜ ó÷åôéêþí èÝóåùí óá íá ìçí õðÞñ÷áí\n"
 "                              ÷áñáêôÞñåò CR (MSDOS)\n"
 "\n"
-"Áí äåí õðÜñ÷åé -[GEF], ôüôå ç `egrep' èåùñåß -E, ç `fgrep' -F áëëéþò -G.\n"
-"×ùñßò ÁÑ×ÅÉÏ Þ üôáí ôï ÁÑ×ÅÉÏ åßíáé -, áíÜãíùóç áðü óôÜíôáñô åßóïäï.\n"
-"Áí äßíïíôáé ëéãüôåñá áðü äýï ÁÑ×ÅÉÁ, èåþñçóå üôé äßíåôáé -h. ¸îïäïò ìå 0\n"
-"üôáí õðÜñ÷åé ôáßñéáóìá, äéáöïñåôéêÜ ìå 1. ¸îïäïò ìå 2 óôçí ðåñßðôùóç\n"
-"óõíôáêôéêþí óöáëìÜôùí Þ óöáëìÜôùí óõóôÞìáôïò.\n"
+"To `egrep' åßíáé éóïäýíáìï ôïõ `grep -E'. Ôï `fgrep' åßíáé éóïäýíáìï ôïõ\n"
+"`grep -F'.\n"
+"With no FILE, or when FILE is -, read standard input.  If less than\n"
+"×ùñßá ÁÑ×ÅÉÏ, Þ üôáí ôï ÁÑ×ÅÉÏ åßíáé -, äéáâÜæåôáé ç êáíïíéêÞ åßóïäïò.\n"
+"Áí óôá ïñßóìáôá õðÜñ÷ïõí ëéãüôåñá áðü äýï ÁÑ×ÅÉÁ, ôüôå õðïôßèåôáé üôé Ý÷åé\n"
+"äïèåß ç åðéëïãÞ -h.  Ç êáôÜóôáóç åîüäïõ ôïõ ðñïãñÜììáôïò åßíáé 0 áí âñÝèçêå\n"
+"ôï ÕÐÏÄÅÉÃÌÁ, 1 áí äåí âñÝèçêå êáé 2 áí ðñïÝêõøå êÜðïéï ðñüâëçìá.\n"
 
 # src/grep.c:647
 # src/grep.c:917
-#: src/grep.c:1052
-msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr "\nÓôåßëôå áíáöïñÝò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:1116
+msgid ""
+"\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr ""
+"\n"
+"Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
 
 # src/grep.c:829
 # src/grep.c:1112
-#: src/grep.c:1062
-#, fuzzy
+#: src/grep.c:1126
 msgid "conflicting matchers specified"
-msgstr "ôï óôïé÷åßï ðïõ ðñüêåéôáé íá áíáæçôçèåß, Ý÷åé Þäç ïñéóôåß"
+msgstr "ïñßóôçêáí áíôéêñïõüìåíá óôïé÷åßá áíáæÞôçóçò"
+
+# src/grep.c:1133
+#: src/grep.c:1363
+msgid "unknown devices method"
+msgstr "Üãíùóôç ìÝèïäïò óõóêåõþí"
 
 # src/grep.c:1133
-#: src/grep.c:1355
+#: src/grep.c:1430
 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:1422
-#, fuzzy
+#: src/grep.c:1497
 msgid "invalid max count"
-msgstr "ìç ôåñìáôéóìÝíïò ìåôñçôÞò åðáíÜëçøçò"
+msgstr "ìç Ýãêõñïò ìÝãéóôïò ìåôñçôÞò"
 
-#: src/grep.c:1472
+#: src/grep.c:1551
 msgid "unknown binary-files type"
-msgstr ""
+msgstr "Üãíùóôï åßäïò äõáäéêþí áñ÷åßùí"
 
 # src/grep.c:915
 # src/grep.c:1219
-#: src/grep.c:1543
-#, fuzzy, c-format
+#: src/grep.c:1646
+#, c-format
 msgid "%s (GNU grep) %s\n"
-msgstr "grep (GNU grep) %s\n"
+msgstr "%s (GNU grep) %s\n"
 
 # src/grep.c:917
 # src/grep.c:1221
-#: src/grep.c:1545
-#, fuzzy
+#: src/grep.c:1648
 msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1997, Free Software Foundation, Inc.\n"
+msgstr "Äéêáßùìá áíôéãñáöÞò 1988, 1992-1999, 2000, 2001 ºäñõìá Åëåýèåñïõ Ëïãéóìéêïý\n"
 
 # src/grep.c:919
 # src/grep.c:1223
-#: src/grep.c:1547
+#: src/grep.c:1650
 msgid ""
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
-"Áõôü åßíáé åëåýèåñï ëïãéóìéêü, äåßôå ôï ðçãáßï êþäéêá ãéá ôïõò êáíüíåò\n"
+"Áõôü åßíáé åëåýèåñï ëïãéóìéêü, äåßôå ôïí ðçãáßï êþäéêá ãéá ôïõò êáíüíåò\n"
 "áíôéãñáöÞò. ÄÅÍ õðÜñ÷åé åããýçóç, ïýôå áêüìá ãéá ×ÑÇÓÉÌÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ\n"
 "ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n"
 
-#: src/search.c:623
+#: src/search.c:606
 msgid "The -P option is not supported"
-msgstr ""
+msgstr "Ç åðéëïãÞ -P äåí õðïóôçñßæåôáé"
 
-#: src/search.c:636
+#: src/search.c:619
 msgid "The -P and -z options cannot be combined"
-msgstr ""
+msgstr "Ïé åðéëïãÝò -P êáé -z äåí ìðïñïýí íá óõíäõáóôïýí"
 
 #: lib/error.c:117
 msgid "Unknown system error"
-msgstr ""
+msgstr "¶ãíùóôï ëÜèïò óõóôÞìáôïò"
 
 # src/getopt.c:628
 # src/getopt.c:628
@@ -460,74 +489,74 @@ msgstr "%s: ç åðéëïãÞ `-W %s' äåí äÝ÷åôáé ïñßóìáôá\n"
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:265
+#: lib/quotearg.c:259
 msgid "`"
-msgstr ""
+msgstr "`"
 
-#: lib/quotearg.c:266
+#: lib/quotearg.c:260
 msgid "'"
-msgstr ""
+msgstr "'"
 
-#~ # src/getopt1.c:132
-#~ # src/getopt1.c:132
+# src/getopt1.c:132
+# src/getopt1.c:132
 #~ msgid "option %s"
 #~ msgstr "åðéëïãÞ %s"
 
-#~ # src/getopt1.c:134
-#~ # src/getopt1.c:134
+# src/getopt1.c:134
+# src/getopt1.c:134
 #~ msgid " with arg %s"
 #~ msgstr " ìå üñéóìá %s"
 
-#~ # src/getopt1.c:149
-#~ # src/getopt1.c:149
+# src/getopt1.c:149
+# src/getopt1.c:149
 #~ msgid "digits occur in two different argv-elements.\n"
 #~ msgstr "õðÜñ÷ïõí øçößá óå äýï äéáöïñåôéêÜ argv-óôïé÷åßá.\n"
 
-#~ # src/getopt1.c:151
-#~ # src/getopt1.c:151
+# src/getopt1.c:151
+# src/getopt1.c:151
 #~ msgid "option %c\n"
 #~ msgstr "åðéëïãÞ %c\n"
 
-#~ # src/getopt1.c:155
-#~ # src/getopt1.c:155
+# src/getopt1.c:155
+# src/getopt1.c:155
 #~ msgid "option a\n"
 #~ msgstr "åðéëïãÞ á\n"
 
-#~ # src/getopt1.c:159
-#~ # src/getopt1.c:159
+# src/getopt1.c:159
+# src/getopt1.c:159
 #~ msgid "option b\n"
 #~ msgstr "åðéëïãÞ â\n"
 
-#~ # src/getopt1.c:163
-#~ # src/getopt1.c:163
+# src/getopt1.c:163
+# src/getopt1.c:163
 #~ msgid "option c with value `%s'\n"
 #~ msgstr "åðéëïãÞ ã ìå ôéìÞ `%s'\n"
 
-#~ # src/getopt1.c:167
-#~ # src/getopt1.c:167
+# src/getopt1.c:167
+# src/getopt1.c:167
 #~ msgid "option d with value `%s'\n"
 #~ msgstr "åðéëïãÞ ä ìå ôéìÞ `%s'\n"
 
-#~ # src/getopt1.c:174
-#~ # src/getopt1.c:174
+# src/getopt1.c:174
+# src/getopt1.c:174
 #~ msgid "?? getopt returned character code 0%o ??\n"
 #~ msgstr "?? ç getopt åðÝóôñåøå áëöáâçôéêü êùäéêü 0%o ??\n"
 
-#~ # src/getopt1.c:180
-#~ # src/getopt1.c:180
+# src/getopt1.c:180
+# src/getopt1.c:180
 #~ msgid "non-option ARGV-elements: "
 #~ msgstr "ARGV-óôïé÷åßá ðïõ äåí åßíáé åðéëïãÝò: "
 
-#~ # src/grep.c:800 src/grep.c:805 src/grep.c:810
-#~ # src/grep.c:1083 src/grep.c:1088 src/grep.c:1093
+# src/grep.c:800 src/grep.c:805 src/grep.c:810
+# src/grep.c:1083 src/grep.c:1088 src/grep.c:1093
 #~ msgid "you may specify only one of -E, -F, or -G"
 #~ msgstr "ìðïñåßôå íá ïñßóåôå ìüíï Ýíá áðü ôá-E, -F Þ -G"
 
-#~ # src/obstack.c:467
-#~ # src/obstack.c:467
+# src/obstack.c:467
+# src/obstack.c:467
 #~ msgid "memory exhausted\n"
 #~ msgstr "ç ìíÞìç åîáíôëÞèçêå\n"
 
-#~ # src/grep.c:1027 src/grep.c:1030
+# src/grep.c:1027 src/grep.c:1030
 #~ msgid "(standard input)\n"
 #~ msgstr "(êáíïíéêÞ åßóïäïò)\n"
diff --git a/po/fr.po b/po/fr.po
index d7dd2498..2e2d4261 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU grep 2.5g\n"
 "POT-Creation-Date: 2002-01-22 14:39+0100\n"
-"PO-Revision-Date: 2002-03-10 08:00-0500\n"
+"PO-Revision-Date: 2002-03-17 20:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -95,7 +95,7 @@ msgstr "Usage: %s [OPTION]... PATRON [FICHIER]...\n"
 #: src/grep.c:1040
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "Pour en savoir davantage, faites: «%s --help».\n"
+msgstr "Pour en savoir davantage, faites: « %s --help ».\n"
 
 #: src/grep.c:1045
 #, c-format
@@ -209,12 +209,12 @@ msgstr ""
 "  -o, --only-matching       afficher la partie d'une ligne concordant avec le PATRON\n"
 "  -q, --quiet, --silent     supprimer tout affichage en sortie\n"
 "      --binary-files=TYPE   assumer que les fichiers binaires sont de\n"
-"                            TYPE soit «binary», «text», ou «without-match»,\n"
+"                            TYPE soit « binary », « text », ou « without-match »,\n"
 "  -a, --text                ne pas supprimer la sortie binaire\n"
 "  -I                        équivalent à --binary-files=without-match\n"
 "  -d, --directories=ACTION  traiter les répertoires selon l'ACTION\n"
-"                            «read» (lecture), «recurse» (récursivité),\n"
-"                            ou «skip» (escamotage).\n"
+"                            « read » (lecture), « recurse » (récursivité),\n"
+"                            ou « skip » (escamotage).\n"
 "  -R, -r, --recursive       équivalent à --directories=recurse\n"
 "      --include=PATRON      fichiers concordant au PATRON seront examinés\n"
 "      --exclude=PATRON      fichiers concordant au PATRON ne seront pas examinés\n"
@@ -261,7 +261,7 @@ msgstr ""
 "  -u, --unix-byte-offsets   afficher les adresses relatives comme si\n"
 "                            aucun CR n'était présent (MS-DOS)\n"
 "\n"
-"«egrep» est équivalent à «grep -E». «fgrep» est équivalent à «grep -F».\n"
+"« egrep » est équivalent à « grep -E ». « fgrep » est équivalent à « grep -F ».\n"
 "Sans FICHIER, ou si - est utilisé comme nom de FICHIER, la lecture\n"
 "se fait de l'entrée standard. S'il y a moins de 2 FICHIERS, l'option -h\n"
 "est implicite. Termine avec 0 s'il y a concordance avec 1 si aucune.\n"
@@ -330,34 +330,34 @@ msgstr "Erreur système inconnue"
 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: l'option «%s» est ambiguë.\n"
+msgstr "%s: l'option « %s » est ambiguë.\n"
 
 #: lib/getopt.c:700
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: l'option «--%s» ne permet pas de paramètre.\n"
+msgstr "%s: l'option « --%s » ne permet pas de paramètre.\n"
 
 #: lib/getopt.c:705
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: l'option «%c%s» ne permet pas de paramètre.\n"
+msgstr "%s: l'option « %c%s » ne permet pas de paramètre.\n"
 
 #: lib/getopt.c:723 lib/getopt.c:896
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: l'option «%s» requiert un paramètre.\n"
+msgstr "%s: l'option « %s » requiert un paramètre.\n"
 
 #. --option
 #: lib/getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: l'option «--%s» n'est pas reconnue.\n"
+msgstr "%s: l'option « --%s » n'est pas reconnue.\n"
 
 #. +option or -option
 #: lib/getopt.c:756
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: l'option «%c%s» n'est pas reconnue.\n"
+msgstr "%s: l'option « %c%s » n'est pas reconnue.\n"
 
 #. 1003.2 specifies the format of this message.
 #: lib/getopt.c:782
@@ -379,12 +379,12 @@ msgstr "%s: l'option  -- %c requiert un paramètre.\n"
 #: lib/getopt.c:862
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: l'option «-W %s» est ambiguë.\n"
+msgstr "%s: l'option « -W %s » est ambiguë.\n"
 
 #: lib/getopt.c:880
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: l'option «-W %s» ne permet pas de paramètre.\n"
+msgstr "%s: l'option « -W %s » ne permet pas de paramètre.\n"
 
 #. Get translations for open and closing quotation marks.
 #.
diff --git a/po/id.po b/po/id.po
index 8975a380..a418e2f9 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,23 +1,28 @@
-# grep-2.3f (Indonesian).
-# Copyright (C) 1999 Free Software Foundation, Inc.
-# Tedi Heriyanto <tedi-h@usa.net>, 1999.
+# grep-2.5g (Indonesian).
+# Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Tedi Heriyanto <tedi_h@gmx.net>, 1999, 2000, 2001, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grep 2.3f.id.po\n"
-"POT-Creation-Date: 1999-10-05 22:33-0400\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"
+"Project-Id-Version: grep 2.5g.id.po\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
+"PO-Revision-Date: 2002-03-08 16:34GMT+0700\n"
+"Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
+"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.9.5\n"
 
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
 msgid "Memory exhausted"
 msgstr "Memori habis"
 
-#: src/dfa.c:457
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
+msgid "Unbalanced ["
+msgstr "[ tidak seimbang"
+
+#: src/dfa.c:741
 msgid "Unfinished \\ escape"
 msgstr "escape \\\\ tidak selesai"
 
@@ -25,203 +30,105 @@ msgstr "escape \\\\ tidak selesai"
 #. {M} - exact count
 #. {M,} - minimum count, maximum is infinity
 #. {M,N} - M through N
-#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
+#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
 msgid "unfinished repeat count"
 msgstr "perulangan count tidak selesai"
 
-#: src/dfa.c:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
+#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
 msgid "malformed repeat count"
 msgstr "perulangan count salah bentuk"
 
-#: src/dfa.c:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
-#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
-msgid "Unbalanced ["
-msgstr "[ tidak seimbang"
-
-#: src/dfa.c:886
+#: src/dfa.c:1253
 msgid "Unbalanced ("
 msgstr "( tidak seimbang"
 
-#: src/dfa.c:1007
+#: src/dfa.c:1378
 msgid "No syntax specified"
 msgstr "Tidak ada syntax dispesifikasikan"
 
-#: src/dfa.c:1015
+#: src/dfa.c:1386
 msgid "Unbalanced )"
 msgstr ") tidak seimbang"
 
-#: src/dfa.c:2036
+#: src/dfa.c:2956
 msgid "out of memory"
 msgstr "memori habis"
 
-#: src/getopt.c:628
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opsi `%s' rancu\n"
-
-#: src/getopt.c:652
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opsi `--%s' tidak mengijinkan argumen\n"
-
-#: src/getopt.c:657
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opsi `%c%s' tidak mengijinkan argumen\n"
-
-#: src/getopt.c:674 src/getopt.c:847
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: opsi `%s' membutuhkan sebuah argumen\n"
-
-#. --option
-#: src/getopt.c:703
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opsi tidak dikenal `--%s'\n"
-
-#. +option or -option
-#: src/getopt.c:707
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opsi tidak dikenal `%c%s'\n"
-
-#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opsi ilegal -- %c\n"
-
-#: src/getopt.c:736
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: opsi tidak valid -- %c\n"
-
-#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opsi membutuhkan sebuah argumen -- %c\n"
-
-#: src/getopt.c:813
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: opsi `-W %s' rancu\n"
-
-#: src/getopt.c:831
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opsi `-W %s' tidak mengijinkan sebuah argumen\n"
-
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr "opsi %s"
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr " dengan arg %s"
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr "digit muncul dalam dua argv-elemen yang berbeda.\n"
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr "opsi %c\n"
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr "opsi a\n"
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr "opsi b\n"
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr "opsi c dengan nilai `%s'\n"
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr "opsi d dengan nilai `%s'\n"
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr "?? getopt mengembalikan kode karakter 0%o ??\n"
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr "elemen-ARGV bukan opsi: "
-
-#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
-#: src/kwset.c:190
+#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
 msgid "memory exhausted"
 msgstr "memori habis"
 
-#: src/grep.c:418 src/grep.c:883
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: peringatan: %s: %s\n"
+#: src/grep.c:205
+msgid "invalid context length argument"
+msgstr "argumen panjang konteks tidak valid"
+
+#: src/grep.c:475
+msgid "input is too large to count"
+msgstr "input terlalu besar untuk dihitung"
 
-#: src/grep.c:543 src/grep.c:1429
+#: src/grep.c:597
 msgid "writing output"
 msgstr "menulis output"
 
-#: src/grep.c:775
+#: src/grep.c:870
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "File biner %s cocok\n"
 
-#: src/grep.c:791
+#: src/grep.c:884
 msgid "(standard input)"
 msgstr "(input standar)"
 
-#: src/grep.c:884
+#: src/grep.c:989
+#, c-format
+msgid "warning: %s: %s\n"
+msgstr "peringatan: %s: %s\n"
+
+#: src/grep.c:990
 msgid "recursive directory loop"
 msgstr "perulangan direktori rekursif"
 
-#: src/grep.c:935
+#: src/grep.c:1038
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Pemakaian: %s [OPSI]... POLA [FILE]...\n"
 
-#: src/grep.c:936
+#: src/grep.c:1040
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n"
 
-#: src/grep.c:940
+#: src/grep.c:1045
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "Pemakaian: %s [OPSI]... POLA [FILE] ...\n"
 
-#: src/grep.c:941
+#: src/grep.c:1046
+#, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
 "\n"
 "Regexp selection and interpretation:\n"
 msgstr ""
-"Mencari POLA dalams setiap FILE atau input standar.\n"
+"Mencari POLA dalam setiap FILE atau input standar.\n"
+"Contoh: %s -i 'hello world' menu.h main.c\n"
 "\n"
 "Seleksi dan interpretasi regexp:\n"
 
-#: src/grep.c:945
+#: src/grep.c:1051
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
-"  -F, --fixed-regexp        PATTERN is a fixed string separated by newlines\n"
+"  -F, --fixed-strings       PATTERN is a set of newline-separated strings\n"
 "  -G, --basic-regexp        PATTERN is a basic regular expression\n"
+"  -P, --perl-regexp         PATTERN is a Perl regular expression\n"
 msgstr ""
 "  -E, --extended-regexp   POLA adalah ekspresi reguler ekstended\n"
 "  -F, --fixed-regexp      POLA adalah string tetap yang dipisah oleh newline\n"
 "  -G, --basic-regexp      POLA adalah ekspresi reguler dasar\n"
+"  -P, --perl-regexp         POLA adalah sebuah ekspresi reguler Perl\n"
 
-#: src/grep.c:949
+#: src/grep.c:1056
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -238,7 +145,7 @@ msgstr ""
 "  -z, --null-data      baris data berakhir dalam 0 byte, bukan newline\n"
 "\n"
 
-#: src/grep.c:956
+#: src/grep.c:1063
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -246,6 +153,7 @@ msgid ""
 "  -v, --invert-match        select non-matching lines\n"
 "  -V, --version             print version information and exit\n"
 "      --help                display this help and exit\n"
+"      --mmap                use memory-mapped input if possible\n"
 msgstr ""
 "\n"
 "Lain-lain:\n"
@@ -253,20 +161,33 @@ msgstr ""
 "  -v, --invert-match    pilih baris-baris yang tidak sesuai\n"
 "  -V, --version         tampilkan informasi versi dan keluar\n"
 "      --help            tampilkan bantuan ini dan keluar\n"
+"      --mmap          gunakan input memory-mapped bila memungkinkan\n"
 
-#: src/grep.c:963
+#: src/grep.c:1071
 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"
+"      --label=LABEL         print LABEL as filename for standard input\n"
+"  -o, --only-matching       show only the part of a line matching PATTERN\n"
 "  -q, --quiet, --silent     suppress all normal output\n"
-"  -a, --text                do not suppress binary output\n"
+"      --binary-files=TYPE   assume that binary files are TYPE\n"
+"                            TYPE is 'binary', 'text', or 'without-match'\n"
+"  -a, --text                equivalent to --binary-files=text\n"
+"  -I                        equivalent to --binary-files=without-match\n"
 "  -d, --directories=ACTION  how to handle directories\n"
-"                            ACTION is 'read', 'recurse', or 'skip'.\n"
-"  -r, --recursive           equivalent to --directories=recurse.\n"
+"                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -D, --devices=ACTION      how to handle devices, FIFOs and sockets\n"
+"                            ACTION is 'read' or 'skip'\n"
+"  -R, -r, --recursive       equivalent to --directories=recurse\n"
+"      --include=PATTERN     files that match PATTERN will be examined\n"
+"      --exclude=PATTERN     files that match PATTERN will be skipped.\n"
+"      --exclude-from=FILE   files that match PATTERN in FILE will be skipped.\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"
@@ -274,78 +195,105 @@ msgid ""
 msgstr ""
 "\n"
 "Kendali output:\n"
+"  -m, --max-count=NUM      berhenti setelah cocok sejumlah NUM\n"
 "  -b, --byte-offset         cetak offset byte dengan baris output\n"
 "  -n, --line-number         cetak nomor baris dengan baris output\n"
+"       --line-buffered         flush output setiap baris\n"
 "  -H, --with-filename       cetak namafile untuk setiap kecocokan\n"
 "  -h, --no-filename         tiadakan namafile di output\n"
+"       --label=LABEL       cetak LABEL sebagai nama file input standar\n"
 "  -q, --quiet, --silent     tiadakan seluruh output normal\n"
-"  -a, --text                jangan tiadakan output biner\n"
+"       --binary-files=TYPE    asumsikan bahwa file biner bertipe TYPE\n"
+"                           TYPE adalah 'binary', 'text', atau 'without match'\n"
+"  -a, --text                ekivalen dengan --binary-files=text\n"
+"  -l                           ekivalen dengan --binary-files=without-match\n"
 "  -d, --directories=AKSI    bagaimana menangani direktori\n"
 "                            AKSI adalah 'read', 'recurse', atau 'skip'.\n"
-"  -r, --recursive           ekivalen dengan --directories=recurse.\n"
+"  -D, --devices=AKSI        bagaimana menangani device, FIFO dan soket\n"
+"                                      AKSI adalah 'read' atau 'skip'\n"
+"  -R, -r, --recursive           ekivalen dengan --directories=recurse.\n"
+"        --include=POLA        file yang cocok dengan POLA akan diperiksa\n"
+"        --exclude=POLA       file yang cocok dengan POLA akan dilewati\n"
+"        --exclude-from=FILE  file yang cocok dengan POLA dalam FILE akan dilewati\n"
 "  -L, --files-without-match hanya mencetak nama FILE yang tidak ada kecocokan\n"
 "  -l, --files-with-match    hanya mencetak nama FILE yang ada kecocokan\n"
 "  -c, --count               hanya mencetak jumlah baris yang cocok per FILE\n"
 "  -Z, --null                mencetak byte 0 setelah nama FILE\n"
 
-#: src/grep.c:979
+#: src/grep.c:1099
 msgid ""
 "\n"
 "Context control:\n"
 "  -B, --before-context=NUM  print NUM lines of leading context\n"
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
-"  -C, --context[=NUM]       print NUM (default 2) lines of output context\n"
-"                            unless overriden by -A or -B\n"
+"  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
+"      --color[=WHEN],\n"
+"      --colour[=WHEN]       use markers to distinguish the matching string\n"
+"                            WHEN may be `always', `never' or `auto'.\n"
 "  -U, --binary              do not strip CR characters at EOL (MSDOS)\n"
 "  -u, --unix-byte-offsets   report offsets as if CRs were not there (MSDOS)\n"
 "\n"
 "`egrep' means `grep -E'.  `fgrep' means `grep -F'.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"With no FILE, or when FILE is -, read standard input.  If less than\n"
+"two FILEs given, assume -h.  Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
 msgstr ""
 "\n"
 "Kendali Konteks:\n"
 "  -B, --before-context=NUM  mencetak NUM baris leading context\n"
 "  -A, --after-context=NUM   mencetak NUM baris trailing context\n"
-"  -C, --context[=NUM]       mencetak NUM (baku 2) baris konteks output \n"
-"                            kecuali di-override dengan -A atau -B\n"
+"  -C, --context=NUM       mencetak NUM baris konteks output \n"
 "  -NUM                      sama seperti --context=NUM\n"
+"          --color[=WHEN],\n"
+"          --colour[=WHEN]       gunakan penanda untuk membedakan string yang cocok\n"
+"                                         WHEN dapat berupa 'always', 'never', atau 'auto'\n"
 "  -U, --binary              jangan hapus karakter CR di EOL (MSDOS)\n"
 "  -u, --unix-byte-offsets   laporkan offset seperti bila CR tidak ada (MSDOS)\n"
 "\n"
 "`egrep' berarti `grep -E'. `fgrep' berarti `grep -F'.\n"
 "Dengan tanpa FILE, atau ketika FILE adalah -, baca input standar. Jika diberi \n"
 "kurang dari dua file, asumsikan -h. Keluar dengan 0 jika cocok, dengan 1 jika\n"
-"tidak. Keluar dengan 2 jika terjadi syntax atau system error.\n"
+"tidak. 2 jika terjadi masalah.\n"
 
-#: src/grep.c:994
-msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr "\nLaporkan kesalahan ke <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:1116
+msgid ""
+"\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr ""
+"\n"
+"Laporkan kesalahan ke <bug-gnu-utils@gnu.org>.\n"
 
-#: src/grep.c:1005
+#: src/grep.c:1126
 msgid "conflicting matchers specified"
 msgstr "dispesifikasikan matcher yang konflik"
 
-#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
-msgid "invalid context length argument"
-msgstr "argumen panjang konteks tidak valid"
+#: src/grep.c:1363
+msgid "unknown devices method"
+msgstr "metode device tidak dikenal"
 
-#: src/grep.c:1271
+#: src/grep.c:1430
 msgid "unknown directories method"
 msgstr "metode direktori tidak dikenal"
 
-#: src/grep.c:1366
+#: src/grep.c:1497
+msgid "invalid max count"
+msgstr "jumlah max tidak valid"
+
+#: src/grep.c:1551
+msgid "unknown binary-files type"
+msgstr "tipe file biner tidak dikenal"
+
+#: src/grep.c:1646
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (GNU grep) %s\n"
 
-#: src/grep.c:1368
-msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
-msgstr "Hak Cipta (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+#: src/grep.c:1648
+msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
+msgstr "Hak Cipta (C) 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:1370
+#: src/grep.c:1650
 msgid ""
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -353,6 +301,95 @@ msgstr ""
 "Ini adalah free software; lihat sumber untuk syarat penyalinan. Tidak ada\n"
 "jaminan; sekalipun untuk PENJUALAN atau KESESUAIAN UNTUK TUJUAN TERTENTU.\n"
 
-#: src/obstack.c:467
-msgid "memory exhausted\n"
-msgstr "memori habis\n"
+#: src/search.c:606
+msgid "The -P option is not supported"
+msgstr "Option -P tidak didukung"
+
+#: src/search.c:619
+msgid "The -P and -z options cannot be combined"
+msgstr "Option -P dan -z tidak dapat digabungkan"
+
+#: lib/error.c:117
+msgid "Unknown system error"
+msgstr "Kesalahan sistem tidak dikenal"
+
+#: lib/getopt.c:675
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opsi `%s' rancu\n"
+
+#: lib/getopt.c:700
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opsi `--%s' tidak mengijinkan argumen\n"
+
+#: lib/getopt.c:705
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opsi `%c%s' tidak mengijinkan argumen\n"
+
+#: lib/getopt.c:723 lib/getopt.c:896
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opsi `%s' membutuhkan sebuah argumen\n"
+
+#. --option
+#: lib/getopt.c:752
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opsi tidak dikenal `--%s'\n"
+
+#. +option or -option
+#: lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opsi tidak dikenal `%c%s'\n"
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:782
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opsi ilegal -- %c\n"
+
+#: lib/getopt.c:785
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opsi tidak valid -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:815 lib/getopt.c:945
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opsi membutuhkan sebuah argumen -- %c\n"
+
+#: lib/getopt.c:862
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opsi `-W %s' rancu\n"
+
+#: lib/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opsi `-W %s' tidak mengijinkan sebuah argumen\n"
+
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#: lib/quotearg.c:259
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:260
+msgid "'"
+msgstr "'"
diff --git a/po/ja.po b/po/ja.po
index 4c7d5e88..555e2d7c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,6 +1,6 @@
 # Japanese messages for GNU grep
-# Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
-# IIDA Yosiaki <iida@gnu.org>, 1999, 2000, 2001.
+# Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
+# IIDA Yosiaki <iida@gnu.org>, 1999, 2000, 2001, 2002.
 # This file is distributed under the same license as the GNU grep package.
 # Contributed by
 # Yasuyuki Furukawa <yasu@on.cs.keio.ac.jp>, 1997
@@ -10,28 +10,25 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU grep 2.5e\n"
-"POT-Creation-Date: 2001-03-07 00:02-0500\n"
-"PO-Revision-Date: 2002-02-08 22:15+0900\n"
+"Project-Id-Version: GNU grep 2.5\n"
+"POT-Creation-Date: 2002-03-13 15:14+0100\n"
+"PO-Revision-Date: 2002-03-14 16:09+0000\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
-"Language-Team: Japanese <ja@li.org>\n"
+"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Comments: This file is part of GNU grep.\n"
 
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
 msgid "Memory exhausted"
 msgstr "¥á¥â¥ê¡¼¤¬Â­¤ê¤Þ¤»¤ó"
 
-#: src/dfa.c:486 src/dfa.c:489 src/dfa.c:507 src/dfa.c:518 src/dfa.c:542
-#: src/dfa.c:601 src/dfa.c:606 src/dfa.c:619 src/dfa.c:620 src/dfa.c:998
-#: src/dfa.c:1001 src/dfa.c:1025 src/dfa.c:1029 src/dfa.c:1030 src/dfa.c:1033
-#: src/dfa.c:1045 src/dfa.c:1046
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
 msgid "Unbalanced ["
 msgstr "[ ¤¬Äà¤ê¹ç¤¤¤Þ¤»¤ó"
 
-#: src/dfa.c:738
+#: src/dfa.c:741
 msgid "Unfinished \\ escape"
 msgstr "\\ ¥¨¥¹¥±¡¼¥×¤¬½ªÎ»¤·¤Æ¤¤¤Þ¤»¤ó"
 
@@ -39,81 +36,80 @@ msgstr "\\ ¥¨¥¹¥±¡¼¥×¤¬½ªÎ»¤·¤Æ¤¤¤Þ¤»¤ó"
 #. {M} - exact count
 #. {M,} - minimum count, maximum is infinity
 #. {M,N} - M through N
-#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
+#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
 msgid "unfinished repeat count"
 msgstr "·«ÊÖ¤·¥«¥¦¥ó¥È¤¬½ªÎ»¤·¤Þ¤»¤ó"
 
-#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
+#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
 msgid "malformed repeat count"
 msgstr "·«ÊÖ¤·¥«¥¦¥ó¥È¤¬°Û¾ï¤Ç¤¹"
 
-#: src/dfa.c:1232
+#: src/dfa.c:1253
 msgid "Unbalanced ("
 msgstr "( ¤¬Äà¤ê¹ç¤¤¤Þ¤»¤ó"
 
-#: src/dfa.c:1357
+#: src/dfa.c:1378
 msgid "No syntax specified"
 msgstr "¹½Ê¸¤¬ÆÃÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/dfa.c:1365
+#: src/dfa.c:1386
 msgid "Unbalanced )"
 msgstr ") ¤¬Äà¤ê¹ç¤¤¤Þ¤»¤ó"
 
-#: src/dfa.c:2933
+#: src/dfa.c:2956
 msgid "out of memory"
 msgstr "¥á¥â¥ê¡¼¤¬¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿"
 
-#: lib/obstack.c:471 src/grep.c:343 src/kwset.c:171 src/kwset.c:177
-#: src/search.c:103 src/search.c:223 src/search.c:307
+#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293 lib/obstack.c:471
 msgid "memory exhausted"
 msgstr "¥á¥â¥ê¡¼¤¬Â­¤ê¤Þ¤»¤ó"
 
-#: src/grep.c:191
+#: src/grep.c:205
 msgid "invalid context length argument"
 msgstr "¹Ô¿ô¤Î»ØÄ꤬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: src/grep.c:466
+#: src/grep.c:479
 msgid "input is too large to count"
 msgstr "ÆþÎϤ¬Â礭¤¹¤®¤Æ¿ô¤¨¤é¤ì¤Þ¤»¤ó"
 
-#: src/grep.c:539
+#: src/grep.c:601
 msgid "writing output"
 msgstr "½ÐÎϤνñ¹þ¤ß"
 
-#: src/grep.c:812
+#: src/grep.c:874
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "¥Ð¥¤¥Ê¥ê¡¼¡¦¥Õ¥¡¥¤¥ë%s¤Ï°ìÃפ·¤Þ¤·¤¿\n"
 
-#: src/grep.c:826
+#: src/grep.c:888
 msgid "(standard input)"
 msgstr "(ɸ½àÆþÎÏ)"
 
-#: src/grep.c:931
+#: src/grep.c:993
 #, c-format
 msgid "warning: %s: %s\n"
 msgstr "·Ù¹ð: %s: %s\n"
 
-#: src/grep.c:932
+#: src/grep.c:994
 msgid "recursive directory loop"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¤¬ºÆµ¢Åª¥ë¡¼¥×¤ò¤·¤Æ¤¤¤Þ¤¹"
 
-#: src/grep.c:980
+#: src/grep.c:1042
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó]¡Å¡Å ʸ»úÎó¥Ñ¥¿¡¼¥ó [¥Õ¥¡¥¤¥ë]¡Å¡Å\n"
 
-#: src/grep.c:982
+#: src/grep.c:1044
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "¾Ü¤·¤¯¤Ï`%s --help'¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/grep.c:987
+#: src/grep.c:1049
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó]¡Å¡Å ¥Ñ¥¿¡¼¥ó [¥Õ¥¡¥¤¥ë] ¡Å¡Å\n"
 
-#: src/grep.c:988
+#: src/grep.c:1050
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -126,7 +122,7 @@ msgstr ""
 "\n"
 "Àµµ¬É½¸½¤ÎÁªÂò¤È²ò¼áÊýË¡:\n"
 
-#: src/grep.c:993
+#: src/grep.c:1055
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
 "  -F, --fixed-strings       PATTERN is a set of newline-separated strings\n"
@@ -138,7 +134,7 @@ msgstr ""
 "  -G, --basic-regexp        ¡Ö¥Ñ¥¿¡¼¥ó¡×¤ò´ðËÜŪ¤ÊÀµµ¬É½¸½¤È¤¹¤ë\n"
 "  -P, --perl-regexp         ¡Ö¥Ñ¥¿¡¼¥ó¡×¤òPerl¤ÎÀµµ¬É½¸½¤È¤¹¤ë\n"
 
-#: src/grep.c:998
+#: src/grep.c:1060
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -154,7 +150,7 @@ msgstr ""
 "  -x, --line-regexp         ¡Ö¥Ñ¥¿¡¼¥ó¡×°ìÃפò¹ÔÁ´ÂÎ(¹Ôñ°Ì)¤Ç¹Ô¤Ê¤¦\n"
 "  -z, --null-data           ½ÐÎϤò²þ¹Ô¤Ç¤Ê¤¯¡¢¥Ì¥ëÃͤΥХ¤¥È¤Ç¶èÀÚ¤ë\n"
 
-#: src/grep.c:1005
+#: src/grep.c:1067
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -172,7 +168,7 @@ msgstr ""
 "      --help                »È¤¤Êý¤òɸ½à½ÐÎϤËɽ¼¨¤¹¤ë\n"
 "      --mmap                ¤â¤·²Äǽ¤Ê¤é¡¢ÆþÎϤò¥á¥â¥ê¡¼¡¦¥Þ¥Ã¥×¤¹¤ë\n"
 
-#: src/grep.c:1013
+#: src/grep.c:1075
 msgid ""
 "\n"
 "Output control:\n"
@@ -182,6 +178,8 @@ msgid ""
 "      --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"
+"      --label=LABEL         print LABEL as filename for standard input\n"
+"  -o, --only-matching       show only the part of a line matching PATTERN\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"
@@ -189,10 +187,12 @@ msgid ""
 "  -I                        equivalent to --binary-files=without-match\n"
 "  -d, --directories=ACTION  how to handle directories\n"
 "                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -D, --devices=ACTION      how to handle devices, FIFOs and sockets\n"
+"                            ACTION is 'read' or 'skip'\n"
 "  -R, -r, --recursive       equivalent to --directories=recurse\n"
-"      --include=PATTERN     files that match PATTERN will be examine\n"
-"      --exclude=PATTERN     files that match PATTERN will be skip.\n"
-"      --exclude-from=FILE   files that match PATTERN in FILE will be skip.\n"
+"      --include=PATTERN     files that match PATTERN will be examined\n"
+"      --exclude=PATTERN     files that match PATTERN will be skipped.\n"
+"      --exclude-from=FILE   files that match PATTERN in FILE will be skipped.\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"
@@ -201,29 +201,34 @@ msgstr ""
 "\n"
 "½ÐÎÏÀ©¸æ:\n"
 "  -m, --max-count=²ó¿ô      »ØÄꤷ¤¿°ìÃײó¿ô¤Î¸å¡¢½ªÎ»¤¹¤ë\n"
-"  -b, --byte-offset         ³Æ°ìÃפËÂФ·¤Æ¤½¤Î¥Ð¥¤¥È¡¦¥ª¥Õ¥»¥Ã¥È¤âɽ¼¨¤¹¤ë\n"
-"  -n, --line-number         ³Æ°ìÃפËÂФ·¤Æ¤½¤Î¹Ô¿ô¤âɽ¼¨¤¹¤ë\n"
+"  -b, --byte-offset         ½ÐÎϹԤ˥Х¤¥È¡¦¥ª¥Õ¥»¥Ã¥È¤âɽ¼¨¤¹¤ë\n"
+"  -n, --line-number         ½ÐÎϹԤ˹Կô¤âɽ¼¨¤¹¤ë\n"
 "      --line-buffered       ¹Ô¤´¤È¤Ë½ÐÎϤòÁݤ­½Ð¤¹\n"
-"  -H, --with-filename       ³Æ°ìÃפËÂФ·¤Æ¤½¤Î¥Õ¥¡¥¤¥ë̾¤âɽ¼¨¤¹¤ë\n"
-"  -h, --no-filename         ¥Õ¥¡¥¤¥ë̾¤òɽ¼¨¤·¤Ê¤¤\n"
+"  -H, --with-filename       ³Æ°ìÃפˤ¿¤¤¤·¤Æ¤½¤Î¥Õ¥¡¥¤¥ë̾¤âɽ¼¨¤¹¤ë\n"
+"  -h, --no-filename         Á°¤Î¥Õ¥¡¥¤¥ë̾¤ò½ÐÎϤ«¤éÍ޻ߤ¹¤ë\n"
+"      --label=¥é¥Ù¥ë        ¥é¥Ù¥ë¤ò¥Õ¥¡¥¤¥ë̾¤È¤·¤Æɸ½à½ÐÎϤËɽ¼¨¤¹¤ë\n"
+"  -o, --only-matching       ¥Ñ¥¿¡¼¥ó¤È°ìÃפ¹¤ë¹Ô¤ÎÉôʬ¤À¤±¤ò¼¨¤¹\n"
 "  -q, --quiet, --silent     Ä̾ï¤Î½ÐÎϤò¤¹¤Ù¤ÆÍ޻ߤ¹¤ë\n"
-"      --binary-files=·¿     ¥Ð¥¤¥Ê¥ê¡¼¡¦¥Õ¥¡¥¤¥ë¤Î¡Ö·¿¡×¡£¡Öbinary¡×\n"
-"                            ¡Ötext¡×¡Öwithout-match¡×¤ò»ØÄê¡£\n"
+"      --binary-files=·¿     ¥Ð¥¤¥Ê¥ê¡¼¡¦¥Õ¥¡¥¤¥ë¤Î·¿¡£¡Öbinary¡×\n"
+"                            ¡Ötext¡×¡Öwithout-match¡×¤ò»ØÄê\n"
 "  -a, --text                --binary-files=text¤ÈƱ¤¸\n"
 "  -I                        --binary-files=without-match¤ÈƱ¤¸\n"
-"  -d, --directories=Áàºî    ¥Ç¥£¥ì¥¯¥È¥ê¡¼¤Ø¤ÎÁàºî¡£¡Öread¡×(Æɹþ¤ß)¡¢\n"
-"                            ¡Örecurse¡×(ºÆµ¢)¡¢¡Öskip¡×(¾Êά)¤ò»ØÄê\n"
+"  -d, --directories=Áàºî    ¥Ç¥£¥ì¥¯¥È¥ê¡¼¤Ø¤ÎÁàºî\n"
+"                            ¡Öread¡×(Æɹþ¤ß)¡¢¡Örecurse¡×(ºÆµ¢)¡¢\n"
+"                            ¡Öskip¡×(¾Êά) ¤Î¤¤¤º¤ì¤«¤ò»ØÄê\n"
+"  -D, --devices=Áàºî        ¥Ç¥Ð¥¤¥¹¡¢FIFO¡¢¥½¥±¥Ã¥È¤Ø¤ÎÁàºî\n"
+"                            ¡Öread¡×¤«¡Öskip¡×¤ò»ØÄê\n"
 "  -R, -r, --recursive       --directories=recurse¤ÈƱ¤¸\n"
 "      --include=¥Ñ¥¿¡¼¥ó    ¥Ñ¥¿¡¼¥ó¤È°ìÃפ¹¤ë¥Õ¥¡¥¤¥ë¤ò¸¡ºº¤¹¤ë\n"
 "      --exclude=¥Ñ¥¿¡¼¥ó    ¥Ñ¥¿¡¼¥ó¤È°ìÃפ¹¤ë¥Õ¥¡¥¤¥ë¤ò¾Êά¤¹¤ë¡£\n"
-"      --exclude-from=¥Õ¥¡¥¤¥ë »ØÄꤷ¤¿¥Õ¥¡¥¤¥ëÆâ¤Î¡Ö¥Ñ¥¿¡¼¥ó¡×¤È\n"
+"      --exclude-from=¥Õ¥¡¥¤¥ë »ØÄꤷ¤¿¥Õ¥¡¥¤¥ëÆâ¤Î¥Ñ¥¿¡¼¥ó¤È\n"
 "                            °ìÃפ¹¤ë¥Õ¥¡¥¤¥ë¤ò¾Êά¤¹¤ë¡£\n"
 "  -L, --files-without-match °ìÃפΤʤ«¤Ã¤¿¥Õ¥¡¥¤¥ë̾¤Î¤ß¤òɽ¼¨¤¹¤ë\n"
 "  -l, --files-with-matches  °ìÃפ·¤¿¥Õ¥¡¥¤¥ë̾¤Î¤ß¤òɽ¼¨¤¹¤ë\n"
 "  -c, --count               ¥Õ¥¡¥¤¥ë¤´¤È¤Ë°ìÃפ·¤¿¹Ô¿ô¤Î¤ß¤òɽ¼¨¤¹¤ë\n"
 "  -Z, --null                ¥Õ¥¡¥¤¥ë̾¤Î¸å¤Ë¡¢¥Ì¥ëÃͤΥХ¤¥È¤òɽ¼¨\n"
 
-#: src/grep.c:1037
+#: src/grep.c:1103
 msgid ""
 "\n"
 "Context control:\n"
@@ -231,7 +236,9 @@ 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"
+"      --color[=WHEN],\n"
+"      --colour[=WHEN]       use markers to distinguish the matching string\n"
+"                            WHEN may be `always', `never' or `auto'.\n"
 "  -U, --binary              do not strip CR characters at EOL (MSDOS)\n"
 "  -u, --unix-byte-offsets   report offsets as if CRs were not there (MSDOS)\n"
 "\n"
@@ -246,7 +253,9 @@ msgstr ""
 "  -A, --after-context=¿ô    °ìÃ׸å¤Î¡Ö¿ô¡×¹Ô¤â½ÐÎϤ¹¤ë\n"
 "  -C, --context=¹Ô¿ô        °ìÃ×Á°¸å¤Î»ØÄê¹Ô¿ô¤ÎÆâÍƤâ½ÐÎϤ¹¤ë\n"
 "  -¹Ô¿ô                     --context=¹Ô¿ô ¤ÈƱ¤¸\n"
-"      --color, --colour     use markers to distinguish the matching string\n"
+"      --color[=¾ì¹ç]\n"
+"      --colour[=¾ì¹ç]       °ìÃפ¹¤ëʸ»úÎó¤òÌÜΩ¤¿¤»¤ë¥Þ¡¼¥«¡¼¤ò»È¤¦\n"
+"                            ¡Ö¾ì¹ç¡×¤Ë¤Ï¡¢¡Öalways¡×¡Önever¡×¡Öauto¡×¤ò»ØÄê¡£\n"
 "  -U, --binary              EOL¤Ç¤ÎCRʸ»ú¤ò¼è¤ê¾Ê¤«¤Ê¤¤(MS-DOS)\n"
 "  -u, --unix-byte-offsets   CRʸ»ú¤¬¤Ê¤¤¤â¤Î¤È¤·¤Æ¥ª¥Õ¥»¥Ã¥È¤ò\n"
 "                            ½ÐÎϤ¹¤ë(MS-DOS)\n"
@@ -256,36 +265,44 @@ msgstr ""
 "ɸ½àÆþÎϤ«¤éÆɤ߹þ¤ß¤Þ¤¹¡£¡Ö¥Õ¥¡¥¤¥ë¡×¤Î¸Ä¿ô¤¬1°Ê²¼¤Î¾ì¹ç¡¢-h¤È²¾Äꤷ¤Þ¤¹¡£\n"
 "¤â¤·°ìÃפ¬¤¢¤ë¤È0¤Ç¡¢¤Ê¤¤¤È1¤Ç¡¢¾ã³²¤¬¤¢¤ë¤È2¤Ç¡¢½ªÎ»¤·¤Þ¤¹¡£\n"
 
-#: src/grep.c:1052
-msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr "\n¥Ð¥°¤Ï <bug-gnu-utils@gnu.org> ¤ØÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+#: src/grep.c:1120
+msgid ""
+"\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr ""
+"\n"
+"¥Ð¥°¤Ï <bug-gnu-utils@gnu.org> ¤ØÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/grep.c:1062
+#: src/grep.c:1130
 msgid "conflicting matchers specified"
 msgstr "»ØÄꤷ¤¿¾È¹ç»Ò¤¬¾×Æͤ·¤Æ¤¤¤Þ¤¹"
 
-#: src/grep.c:1355
+#: src/grep.c:1367
+msgid "unknown devices method"
+msgstr "̤ÃΤΥǥХ¤¥¹Áàºî¤Ç¤¹"
+
+#: src/grep.c:1434
 msgid "unknown directories method"
 msgstr "̤ÃΤΥǥ£¥ì¥¯¥È¥ê¡¼Áàºî¤Ç¤¹"
 
-#: src/grep.c:1422
+#: src/grep.c:1501
 msgid "invalid max count"
 msgstr "°ìÃײó¿ô¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: src/grep.c:1472
+#: src/grep.c:1555
 msgid "unknown binary-files type"
 msgstr "̤ÃΤΥХ¤¥Ê¥ê¡¼¡¦¥Õ¥¡¥¤¥ë¤Î·¿¤Ç¤¹"
 
-#: src/grep.c:1543
+#: src/grep.c:1650
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr "%s (GNU grep) %s\n"
 
-#: src/grep.c:1545
+#: src/grep.c:1652
 msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
 msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
 
-#: src/grep.c:1547
+#: src/grep.c:1654
 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"
@@ -293,11 +310,11 @@ msgstr ""
 "¤³¤ì¤Ï¥Õ¥ê¡¼¡¦¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£Ê£À½¤Ë´Ø¤¹¤ë¾ò·ï¤Ï¥½¡¼¥¹¤ò¤´Í÷¤¯¤À¤µ¤¤¡£\n"
 "¤³¤ì¤Ï̵ÊݾڤǤ¹¡£±ÄÍøÌÜŪ¤ä¤¢¤ëÆÃÄê¤ÎÌÜŪ¤Ë¤à¤±¤¿Å¬Àµ¤Î¤â¤Î¤Ç¤â¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: src/search.c:623
+#: src/search.c:606
 msgid "The -P option is not supported"
 msgstr "-P¥ª¥×¥·¥ç¥ó¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/search.c:636
+#: src/search.c:619
 msgid "The -P and -z options cannot be combined"
 msgstr "-P¤È-z¤Î¥ª¥×¥·¥ç¥ó¤ÎÁȹ礻¤Ï¤Ç¤­¤Þ¤»¤ó"
 
@@ -378,10 +395,10 @@ msgstr "%s: ¥ª¥×¥·¥ç¥ó`-W %s'¤Ï°ú¿ô¤ò¤È¤ê¤Þ¤»¤ó\n"
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:265
+#: lib/quotearg.c:259
 msgid "`"
 msgstr "¡È"
 
-#: lib/quotearg.c:266
+#: lib/quotearg.c:260
 msgid "'"
 msgstr "¡É"
diff --git a/po/sl.po b/po/sl.po
index 8c542059..4658ae9c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@
 # Copyright (C) 1996, 1999, 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 1996, 1999, 2000.
 #
-# $Id: sl.po,v 1.27 2002/03/13 13:45:56 bero Exp $
+# $Id: sl.po,v 1.28 2002/03/26 15:33:24 bero Exp $
 #
 msgid ""
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 8735e981..4053b84a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Thomas Olsson <cid95tho@student1.lu.se>, 1996.
 # Daniel Resare <daniel@resare.com>, 1998, 1999, 2000, 2001
-# $Id: sv.po,v 1.21 2002/03/13 13:45:56 bero Exp $
+# $Id: sv.po,v 1.22 2002/03/26 15:33:24 bero Exp $
 #
 msgid ""
 msgstr ""