summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorAlain Magloire <alainm@rcsm.ee.mcgill.ca>2001-07-31 20:27:57 +0000
committerAlain Magloire <alainm@rcsm.ee.mcgill.ca>2001-07-31 20:27:57 +0000
commit092aab95fb1297a88cb23444476f2da0bbf98cbb (patch)
tree29fbeb541d1ffe4d49ff3d841c47a977ec667278 /po
parent5ca44259f6f0e22a37fbe7d5ca54a65a839dce20 (diff)
downloadgrep-092aab95fb1297a88cb23444476f2da0bbf98cbb.tar.gz
New translation pot.
Diffstat (limited to 'po')
-rw-r--r--po/de.po139
-rw-r--r--po/el.po246
-rw-r--r--po/eo.po330
-rw-r--r--po/es.po170
-rw-r--r--po/et.po169
-rw-r--r--po/fr.po212
-rw-r--r--po/grep.pot2
-rw-r--r--po/it.po222
-rw-r--r--po/pl.po273
-rw-r--r--po/sl.po162
10 files changed, 800 insertions, 1125 deletions
diff --git a/po/de.po b/po/de.po
index 66c7603b..ab395074 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,32 +1,32 @@
# German messages for GNU grep
-# Copyright (C) 1997-99, 2000 Free Software Foundation, Inc.
-# Martin von Lφwis <martin@mira.isdn.cs.tu-berlin.de>, 1997-99, 2000
+# Copyright (C) 1997-99, 2000, 2001 Free Software Foundation, Inc.
+# Martin von Lφwis <martin@mira.isdn.cs.tu-berlin.de>, 1997-99, 2000, 2001
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.4f\n"
-"POT-Creation-Date: 2001-07-30 10:50-0400\n"
-"PO-Revision-Date: 2000-02-15 20:48+01:00\n"
+"Project-Id-Version: GNU grep 2.5e\n"
+"POT-Creation-Date: 2001-03-07 00:02-0500\n"
+"PO-Revision-Date: 2001-06-03 10:25+02:00\n"
"Last-Translator: Martin von Lφwis <martin@mira.isdn.cs.tu-berlin.de>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
msgid "Memory exhausted"
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
+#: 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
msgid "Unbalanced ["
msgstr "Φffnende [ ohne schlieίende."
-#: src/dfa.c:741
+#: src/dfa.c:738
msgid "Unfinished \\ escape"
msgstr "Unbeendete \\-Escape-Sequenz."
@@ -34,32 +34,32 @@ msgstr "Unbeendete \\-Escape-Sequenz."
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {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
+#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
msgid "unfinished repeat count"
msgstr "Unbeendeter Wiederholungszδhler."
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
msgid "malformed repeat count"
msgstr "Unfφrmiger Wiederholungszδhler."
-#: src/dfa.c:1239
+#: src/dfa.c:1232
msgid "Unbalanced ("
msgstr "Φffnende ( ohne schlieίende."
-#: src/dfa.c:1364
+#: src/dfa.c:1357
msgid "No syntax specified"
msgstr "Keine Syntax angegeben."
-#: src/dfa.c:1372
+#: src/dfa.c:1365
msgid "Unbalanced )"
msgstr "Schlieίende ) ohne φffnende."
-#: src/dfa.c:2942
+#: src/dfa.c:2933
msgid "out of memory"
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
+#: 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
msgid "memory exhausted"
msgstr "Virtueller Speicher erschφpft."
@@ -67,48 +67,49 @@ msgstr "Virtueller Speicher erschφpft."
msgid "invalid context length argument"
msgstr "Ungόltige Kontextlδnge."
-#: src/grep.c:458
+#: src/grep.c:466
+#, fuzzy
msgid "input is too large to count"
-msgstr ""
+msgstr "Eingabe ist zu groί, um gezδhlt zu werden."
-#: src/grep.c:531
+#: src/grep.c:539
msgid "writing output"
msgstr "schreibe Ausgabe"
-#: src/grep.c:804
+#: src/grep.c:812
#, c-format
msgid "Binary file %s matches\n"
msgstr "άbereinstimmungen in Binδrdatei %s.\n"
-#: src/grep.c:818
+#: src/grep.c:826
msgid "(standard input)"
msgstr "(Standardeingabe)"
-#: src/grep.c:923
-#, fuzzy, c-format
+#: src/grep.c:931
+#, c-format
msgid "warning: %s: %s\n"
-msgstr "%s: Warnung: %s: %s\n"
+msgstr "Warnung: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:932
msgid "recursive directory loop"
msgstr "Rekursive Verzeichnisschleife."
-#: src/grep.c:972
+#: src/grep.c:980
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI]...\n"
-#: src/grep.c:974
+#: src/grep.c:982
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "»%s --help« gibt Ihnen mehr Informationen.\n"
-#: src/grep.c:979
+#: src/grep.c:987
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI] ...\n"
-#: src/grep.c:980
+#: src/grep.c:988
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -121,7 +122,7 @@ msgstr ""
"\n"
"Auswahl und Interpretation regulδrer Ausdrόcke:\n"
-#: src/grep.c:985
+#: src/grep.c:993
#, fuzzy
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
@@ -134,7 +135,7 @@ msgstr ""
" Zeichenketten.\n"
" -G, --basic-regexp MUSTER ist ein regulδrer Standardausdruck.\n"
-#: src/grep.c:990
+#: src/grep.c:998
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -151,7 +152,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:997
+#: src/grep.c:1005
msgid ""
"\n"
"Miscellaneous:\n"
@@ -169,7 +170,7 @@ msgstr ""
" --help Diese Hilfe ausgeben und beenden.\n"
" --mmap Wenn mφglich, Eingabe in den Speicher mappen.\n"
-#: src/grep.c:1005
+#: src/grep.c:1013
#, fuzzy
msgid ""
"\n"
@@ -188,10 +189,9 @@ msgid ""
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', 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"
+" --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"
" -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"
@@ -214,11 +214,10 @@ msgstr ""
" -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"
-" -c, --count Nur Zahl der passenden Zeilen pro Datei "
-"ausgeben.\n"
+" -c, --count Nur Zahl der passenden Zeilen pro Datei ausgeben.\n"
" -Z, --null Null-Byte nach jedem Dateinamen ausgeben.\n"
-#: src/grep.c:1029
+#: src/grep.c:1037
#, fuzzy
msgid ""
"\n"
@@ -238,78 +237,70 @@ msgid ""
msgstr ""
"\n"
"Kontextkontrolle:\n"
-" -B, --before-context=ZAHL ZAHL Zeilen von vorausgehendem Kontext "
-"anzeigen.\n"
+" -B, --before-context=ZAHL ZAHL Zeilen von vorausgehendem Kontext anzeigen.\n"
" -A, --after-context=ZAHL ZAHL Zeilen von folgendem Kontext anzeigen.\n"
" -C, --context[=ZAHL] ZAHL (Standard ist 2) Zeilen Kontext anzeigen,\n"
-" wenn nicht mit -A oder -B anderes festgelegt "
-"ist.\n"
+" wenn nicht mit -A oder -B anderes festgelegt ist.\n"
" -ZAHL Wie --context=ZAHL.\n"
" -U, --binary CR-Zeichen am Zeilenende belassen (MSDOS).\n"
-" -u, --unix-byte-offsets Offsets ausgeben, als fehlten CR-Zeichen "
-"(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"
"Weniger als zwei DATEIen implizieren -h. Status ist 0 bei \n"
"άbereinstimmungen, 1 ohne, 2 bei Problemen.\n"
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Fehlerberichte bitte an <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:1052
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nFehlerberichte bitte an <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1054
+#: src/grep.c:1062
msgid "conflicting matchers specified"
msgstr "Festgelegte Vergleicher widersprechen einander."
-#: src/grep.c:1347
+#: src/grep.c:1355
msgid "unknown directories method"
msgstr "Unbekannte Methode fόr Verzeichnisse."
-#: src/grep.c:1414
+#: src/grep.c:1422
#, fuzzy
msgid "invalid max count"
msgstr "Unbeendeter Wiederholungszδhler."
-#: src/grep.c:1464
+#: src/grep.c:1472
msgid "unknown binary-files type"
msgstr "Unbekannter Typ fόr »--binary-files«."
-#: src/grep.c:1535
+#: src/grep.c:1543
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
+#: src/grep.c:1545
#, fuzzy
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1547
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 ""
-"Dies ist freie Software; in den Quellen befinden sich die "
-"Lizenzbedingungen.\n"
+"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"
-#: src/search.c:606
+#: src/search.c:623
msgid "The -P option is not supported"
-msgstr ""
+msgstr "Die Option -P ist nicht unterstόtzt."
-#: src/search.c:619
+#: src/search.c:636
msgid "The -P and -z options cannot be combined"
-msgstr ""
+msgstr "Die Optionen -P und -z kφnnen nicht kombiniert werden."
#: lib/error.c:117
msgid "Unknown system error"
-msgstr ""
+msgstr "Unbekannter Systemfehler."
#: lib/getopt.c:675
#, c-format
@@ -384,10 +375,10 @@ msgstr "%s: Option »-W %s« erlaubt keinen Parameter.\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:259
+#: lib/quotearg.c:265
msgid "`"
-msgstr ""
+msgstr "»"
-#: lib/quotearg.c:260
+#: lib/quotearg.c:266
msgid "'"
-msgstr ""
+msgstr "«"
diff --git a/po/el.po b/po/el.po
index 2d2c0b0c..44cf9ede 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,12 +1,12 @@
-# Greek messages for GNU grep-2.4.
-# Copyright (C) 1998 Free Software Foundation, Inc.
-# Simos Xenitellis <S.Xenitellis@rhbnc.ac.uk>, 1998.
+# 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.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.4\n"
-"POT-Creation-Date: 2001-07-30 10:50-0400\n"
-"PO-Revision-Date: 2000-01-21 16:31+0000\n"
+"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"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
"MIME-Version: 1.0\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/search.c:689
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
msgid "Memory exhausted"
msgstr "Η μνήμη εξαντλήθηκε"
@@ -23,16 +23,16 @@ 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: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
+#: 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
msgid "Unbalanced ["
msgstr "Μη ισσοροπημένο ["
# src/dfa.c:444
# src/dfa.c:452
-#: src/dfa.c:741
+#: src/dfa.c:738
msgid "Unfinished \\ escape"
msgstr "Μη τερματισμένος χαρακτήρας διαφυγής \\"
@@ -42,37 +42,37 @@ msgstr "Μη τερματισμένος χαρακτήρας διαφυγής \\"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {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
+#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
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:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
msgid "malformed repeat count"
msgstr "κακοσχηματισμένος μετρητής επανάληψης"
# src/dfa.c:841
# src/dfa.c:849
-#: src/dfa.c:1239
+#: src/dfa.c:1232
msgid "Unbalanced ("
msgstr "Μη ισορροπημένο ("
# src/dfa.c:962
# src/dfa.c:970
-#: src/dfa.c:1364
+#: src/dfa.c:1357
msgid "No syntax specified"
msgstr "Δεν ορίστηκε συντακτικό"
# src/dfa.c:970
# src/dfa.c:978
-#: src/dfa.c:1372
+#: src/dfa.c:1365
msgid "Unbalanced )"
msgstr "Μη ισορροπημένο )"
# src/dfa.c:1990
# src/dfa.c:1998
-#: src/dfa.c:2942
+#: src/dfa.c:2933
msgid "out of memory"
msgstr "εξαντλήθηκε η μνήμη"
@@ -80,8 +80,8 @@ msgstr "εξαντλήθηκε η μνήμη"
# 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/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: 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
msgid "memory exhausted"
msgstr "η μνήμη εξαντλήθηκε"
@@ -91,91 +91,82 @@ msgstr "η μνήμη εξαντλήθηκε"
msgid "invalid context length argument"
msgstr "μη έγκυρο όρισμα μήκους περιεχομένου"
-#: src/grep.c:458
+#: src/grep.c:466
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:531
+#: src/grep.c:539
msgid "writing output"
msgstr "εγγραφή αποτελέσματος"
# src/grep.c:715
-#: src/grep.c:804
+#: src/grep.c:812
#, 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:818
+#: src/grep.c:826
msgid "(standard input)"
msgstr "(στάνταρτ είσοδος)"
# src/grep.c:293
# src/grep.c:366
-#: src/grep.c:923
+#: src/grep.c:931
#, fuzzy, c-format
msgid "warning: %s: %s\n"
msgstr "%s: προειδοποίηση: %s: %s\n"
# src/grep.c:844
-#: src/grep.c:924
+#: src/grep.c:932
msgid "recursive directory loop"
msgstr "αναδρομική αλληλοδιαδοχή καταλόγων"
# src/grep.c:597
# src/grep.c:862
-#: src/grep.c:972
+#: src/grep.c:980
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... ΣΧΗΜΑΤΙΣΜΟΣ [ΑΡΧΕΙΟ]...\n"
# src/grep.c:598
# src/grep.c:863
-#: src/grep.c:974
+#: src/grep.c:982
#, 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:979
+#: src/grep.c:987
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... ΣΧΗΜΑΤΙΣΜΟΣ [ΑΡΧΕΙΟ] ...\n"
-#: src/grep.c:980
-#, fuzzy, c-format
+#: src/grep.c:988
+#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
msgstr ""
-"Αναζήτηση ΣΧΗΜΑΤΙΣΜΟΥ σε κάθε ΑΡΧΕΙΟ ή στην κανονική είσοδο.\n"
-"Παράδειγμα: %s -i 'hello.*world' menu.h main.c\n"
-"\n"
-"Επιλογή κανονικής έκφρασης και μετάφραση:\n"
-#: src/grep.c:985
-#, fuzzy
+#: src/grep.c:993
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-strings ΣΧΗΜΑΤΙΣΜΟΣ είναι σύνολο αλφαριθμητικών\n"
-" διαχωρισμένων με χαρακτήρες αλλαγής γραμμής\n"
-" -G, --basic-regexp ΣΧΗΜΑΤΙΣΜΟΣ είναι μια βασική κανονική έκφραση\n"
# src/grep.c:603
# src/grep.c:868
-#: src/grep.c:990
+#: src/grep.c:998
+#, fuzzy
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -184,6 +175,13 @@ 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"
" -i, --ignore-case αγνόησε διαφορές πεζών/κεφαλαίων\n"
@@ -194,7 +192,8 @@ msgstr ""
# src/grep.c:615
# src/grep.c:880
-#: src/grep.c:997
+#: src/grep.c:1005
+#, fuzzy
msgid ""
"\n"
"Miscellaneous:\n"
@@ -206,16 +205,14 @@ 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:1005
+#: src/grep.c:1013
#, fuzzy
msgid ""
"\n"
@@ -234,10 +231,9 @@ msgid ""
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', 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"
+" --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"
" -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"
@@ -246,28 +242,26 @@ msgstr ""
"\n"
"Έλεγχος εξόδου:\n"
" -b, --byte-offset εμφάνιση σχετικής θέσης του byte με τις γραμμές\n"
-" εξόδου\n"
-" -n, --line-number εμφάνιση αριθμού γραμμής με τις γραμμές εξόδου\n"
+" εξόδου\n"
+" -n, --line-number εμφάνιση αριθμών γραμμής με τις γραμμές εξόδου\n"
" -H, --with-filename εμφάνιση ονόματος αρχείου με κάθε ταίριασμα\n"
" -h, --no-filename αποφυγή εμφάνισης του ονόματος του αρχείου στην\n"
-" αρχή της εξόδου\n"
+" αρχή της εξόδου\n"
" -q, --quiet, --silent αποφυγή εμφάνισης όλης της κανονικής εξόδου\n"
" -a, --text να μην αποφευχθεί η έξοδος δυαδικών δεδομένων\n"
" -d, --directories=ΕΝΕΡΓΕΙΑ τρόπος χρήσης των καταλόγων\n"
" Η ΕΝΕΡΓΕΙΑ είναι 'read', 'recurse' ή 'skip'.\n"
-" (Για ανάγνωση, αναδρομή και παράκαμψη "
-"αντίστοιχα).\n"
+" (Για ανάγνωση, αναδρομή και παράκαμψη αντίστοιχα).\n"
" -r, --recursive ισοδύναμο με --directories=recurse.\n"
-" -L, --files-without-match εμφάνιση μόνο των ονομάτων ΑΡΧΕΙΩΝ που δεν\n"
-" περιέχουν ταιριάσματα\n"
+" -L, --files-without-match εμφάνιση μόνο τα ονόματα ΑΡΧΕΙΩΝ που δεν\n"
+" περιέχουν ταιριάσματα\n"
" -l, --files-with-matches εμφάνιση μόνο τα ονόματα ΑΡΧΕΙΩΝ με ταιριάσματα\n"
" -c, --count εμφάνιση μόνο τον αριθμό των γραμμών με\n"
-" ταιριάσματα για κάθε ΑΡΧΕΙΟ\n"
-" -Z, --null εμφάνιση 0 byte μετά από το όνομα ΑΡΧΕΙΟΥ\n"
+" ταιριάσματα για κάθε ΑΡΧΕΙΟ\n"
# src/grep.c:633
# src/grep.c:902
-#: src/grep.c:1029
+#: src/grep.c:1037
#, fuzzy
msgid ""
"\n"
@@ -287,87 +281,83 @@ msgid ""
msgstr ""
"\n"
"Έλεγχος βάση του περιεχομένου:\n"
-" -B, --before-context=ΑΡΙΘΜΟΣ εμφάνιση ΑΡΙΘΜΟΣ γραμμών\n"
-" με ακολουθούμενο περιεχόμενο\n"
-" -A, --after-context=ΑΡΙΘΜΟΣ εμφάνιση ΑΡΙΘΜΟΣ γραμμών\n"
-" με προπορευόμενο περιεχόμενο\n"
+" -B, --before-context=ΑΡΙΘΜΟΣ εμφάνιση ΑΡΙΘΜΟΣ γραμμών με ακολουθούμενο\n"
+" περιεχόμενο\n"
+" -A, --after-context=ΑΡΙΘΜΟΣ εμφάνιση ΑΡΙΘΜΟΣ γραμμών με προπορευόμενο\n"
+" περιεχόμενο\n"
" -C, --context[=ΑΡΙΘΜΟΣ] εμφάνιση ΑΡΙΘΜΟΣ (εξ ορισμού 2) γραμμών με\n"
-" περιεχόμενο εξόδου εκτός κι αν αναιρεθεί με -A ή "
-"-B\n"
+" περιεχόμενο εξόδου\n"
+" εκτός κι αν αναιρεθεί με -A ή -B\n"
" -NUM το ίδιο με --context=ΑΡΙΘΜΟΣ\n"
-" -U, --binary να μην απαλείφονται χαρακτήρες CR στο τέλος\n"
-" γραμμής (MSDOS)\n"
-" -u, --unix-byte-offsets αναφορά σχετικών θέσεων σαν να μην υπήρχαν\n"
-" χαρακτήρες αλλαγής γραμμής (MSDOS)\n"
+" -U, --binary να μην απαλείφονται χαρακτήρες CR στο EOL (MSDOS)\n"
+" -u, --unix-byte-offsets αναφορά σχετικών θέσεων σα να μην υπήρχαν\n"
+" χαρακτήρες CR (MSDOS)\n"
"\n"
-"Το `egrep' σημαίνει `grep -E'. Το `fgrep' σημαίνει `grep -F'.\n"
-"Χωρίς ΑΡΧΕΙΟ ή όταν το ΑΡΧΕΙΟ είναι -, ανάγνωση από κανονική είσοδο.\n"
+"Αν δεν υπάρχει -[GEF], τότε η `egrep' θεωρεί -E, η `fgrep' -F αλλιώς -G.\n"
+"Χωρίς ΑΡΧΕΙΟ ή όταν το ΑΡΧΕΙΟ είναι -, ανάγνωση από στάνταρτ είσοδο.\n"
"Αν δίνονται λιγότερα από δύο ΑΡΧΕΙΑ, θεώρησε ότι δίνεται -h. Έξοδος με 0\n"
"όταν υπάρχει ταίριασμα, διαφορετικά με 1. Έξοδος με 2 στην περίπτωση\n"
-"σφαλμάτων.\n"
+"συντακτικών σφαλμάτων ή σφαλμάτων συστήματος.\n"
# src/grep.c:647
# src/grep.c:917
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Στείλτε αναφορές σφαλμάτων στο <bug-gnu-utils@gnu.org>.\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:829
# src/grep.c:1112
-#: src/grep.c:1054
+#: src/grep.c:1062
+#, fuzzy
msgid "conflicting matchers specified"
-msgstr "έχουν οριστεί σχηματισμοί ταιριάσματος που αλληλοσυγκρούονται"
+msgstr "το στοιχείο που πρόκειται να αναζητηθεί, έχει ήδη οριστεί"
# src/grep.c:1133
-#: src/grep.c:1347
+#: src/grep.c:1355
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:1422
#, fuzzy
msgid "invalid max count"
msgstr "μη τερματισμένος μετρητής επανάληψης"
-#: src/grep.c:1464
+#: src/grep.c:1472
msgid "unknown binary-files type"
msgstr ""
# src/grep.c:915
# src/grep.c:1219
-#: src/grep.c:1535
-#, c-format
+#: src/grep.c:1543
+#, fuzzy, c-format
msgid "%s (GNU grep) %s\n"
-msgstr "%s (GNU grep) %s\n"
+msgstr "grep (GNU grep) %s\n"
# src/grep.c:917
# src/grep.c:1221
-#: src/grep.c:1537
+#: src/grep.c:1545
#, fuzzy
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 1992-1997, Free Software Foundation, Inc.\n"
# src/grep.c:919
# src/grep.c:1223
-#: src/grep.c:1539
+#: src/grep.c:1547
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"
+"αντιγραφής. ΔΕΝ υπάρχει εγγύηση, ούτε ακόμα για ΧΡΗΣΙΜΟΤΗΤΑ ή ΚΑΤΑΛΛΗΛΟΤΗΤΑ\n"
+"ΓΙΑ ΕΝΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ.\n"
-#: src/search.c:606
+#: src/search.c:623
msgid "The -P option is not supported"
msgstr ""
-#: src/search.c:619
+#: src/search.c:636
msgid "The -P and -z options cannot be combined"
msgstr ""
@@ -470,74 +460,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:259
+#: lib/quotearg.c:265
msgid "`"
msgstr ""
-#: lib/quotearg.c:260
+#: lib/quotearg.c:266
msgid "'"
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/obstack.c:467
-# src/obstack.c:467
-#~ msgid "memory exhausted\n"
-#~ msgstr "η μνήμη εξαντλήθηκε\n"
-
-# src/grep.c:800 src/grep.c:805 src/grep.c:810
-# src/grep.c:1083 src/grep.c:1088 src/grep.c:1093
+#~ # src/grep.c:800 src/grep.c:805 src/grep.c:810
+#~ # src/grep.c:1083 src/grep.c:1088 src/grep.c:1093
#~ msgid "you may specify only one of -E, -F, or -G"
#~ msgstr "μπορείτε να ορίσετε μόνο ένα από τα-E, -F ή -G"
-# src/grep.c:1027 src/grep.c:1030
+#~ # src/obstack.c:467
+#~ # src/obstack.c:467
+#~ msgid "memory exhausted\n"
+#~ msgstr "η μνήμη εξαντλήθηκε\n"
+
+#~ # src/grep.c:1027 src/grep.c:1030
#~ msgid "(standard input)\n"
#~ msgstr "(κανονική είσοδος)\n"
diff --git a/po/eo.po b/po/eo.po
index 6840b3aa..d5751dcf 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,27 +5,27 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.4f\n"
-"POT-Creation-Date: 2001-07-30 10:50-0400\n"
-"PO-Revision-Date: 2000-02-16 12:03+00:00\n"
+"Project-Id-Version: GNU grep 2.5e\n"
+"POT-Creation-Date: 2001-03-07 00:02-0500\n"
+"PO-Revision-Date: 2001-05-13 14:30+01:00\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
"Language-Team: Esperanto <eo@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-3\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
msgid "Memory exhausted"
msgstr "Memoro elζerpita"
-#: 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
+#: 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
msgid "Unbalanced ["
msgstr "Senpara ["
-#: src/dfa.c:741
+#: src/dfa.c:738
msgid "Unfinished \\ escape"
msgstr "Nefinita \\-eskapo"
@@ -33,32 +33,32 @@ msgstr "Nefinita \\-eskapo"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {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
+#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
msgid "unfinished repeat count"
msgstr "nefinita ripetonombro"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
msgid "malformed repeat count"
msgstr "misformita ripetonombro"
-#: src/dfa.c:1239
+#: src/dfa.c:1232
msgid "Unbalanced ("
msgstr "Senpara ("
-#: src/dfa.c:1364
+#: src/dfa.c:1357
msgid "No syntax specified"
msgstr "Mankas sintakso"
-#: src/dfa.c:1372
+#: src/dfa.c:1365
msgid "Unbalanced )"
msgstr "Senpara )"
-#: src/dfa.c:2942
+#: src/dfa.c:2933
msgid "out of memory"
msgstr "memoro elζerpita"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: 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
msgid "memory exhausted"
msgstr "memoro elζerpita"
@@ -66,48 +66,48 @@ msgstr "memoro elζerpita"
msgid "invalid context length argument"
msgstr "nevalida argumento por kunteksto-longo"
-#: src/grep.c:458
+#: src/grep.c:466
msgid "input is too large to count"
-msgstr ""
+msgstr "enigo estas tro granda por nombrado"
-#: src/grep.c:531
+#: src/grep.c:539
msgid "writing output"
msgstr "skribas eligon"
-#: src/grep.c:804
+#: src/grep.c:812
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binara dosiero %s kongruas\n"
-#: src/grep.c:818
+#: src/grep.c:826
msgid "(standard input)"
msgstr "(normala enigo)"
-#: src/grep.c:923
-#, fuzzy, c-format
+#: src/grep.c:931
+#, c-format
msgid "warning: %s: %s\n"
-msgstr "%s: averto: %s: %s\n"
+msgstr "averto: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:932
msgid "recursive directory loop"
msgstr "rekursa dosieruja ciklo"
-#: src/grep.c:972
+#: src/grep.c:980
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uzado: %s [OPCIO]... ήABLONO [DOSIERO]...\n"
-#: src/grep.c:974
+#: src/grep.c:982
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Provu `%s --help' por pliaj informoj.\n"
-#: src/grep.c:979
+#: src/grep.c:987
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Uzado: %s [OPCIO]... ήABLONO [DOSIERO] ...\n"
-#: src/grep.c:980
+#: src/grep.c:988
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -120,8 +120,7 @@ msgstr ""
"\n"
"Elekto kaj interpreto de regulaj esprimoj:\n"
-#: src/grep.c:985
-#, fuzzy
+#: src/grep.c:993
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -129,11 +128,11 @@ msgid ""
" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
" -E, --extended-regexp ήABLONO estas etendita regula esprimo\n"
-" -F, --fixed-strings ήABLONO estas aro da ζenoj apartigitaj de "
-"linifinoj\n"
+" -F, --fixed-strings ήABLONO estas aro da ζenoj apartigitaj de linifinoj\n"
" -G, --basic-regexp ήABLONO estas simpla regula esprimo\n"
+" -P, --perl-regexp ήABLONO estas regula esprimo de Perl\n"
-#: src/grep.c:990
+#: src/grep.c:998
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -147,10 +146,9 @@ msgstr ""
" -i, --ignore-case ignori diferencojn de uskleco\n"
" -w, --word-regexp devigi al ήABLONO kongrui nur al tutaj vortoj\n"
" -x, --line-regexp devigi al ήABLONO kongrui nur al tutaj linioj\n"
-" -z, --null-data datenlinio finiψas per bitoko 0, ne per "
-"linifino\n"
+" -z, --null-data datenlinio finiψas per bitoko 0, ne per linifino\n"
-#: src/grep.c:997
+#: src/grep.c:1005
msgid ""
"\n"
"Miscellaneous:\n"
@@ -168,8 +166,7 @@ msgstr ""
" --help montri ζi tiun helpon kaj fini\n"
" --mmap uzi memoromapon por la enigo, se eble\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1013
msgid ""
"\n"
"Output control:\n"
@@ -187,10 +184,9 @@ msgid ""
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', 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"
+" --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"
" -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"
@@ -198,28 +194,29 @@ msgid ""
msgstr ""
"\n"
"Regado de la eligo:\n"
+" -m, --max-count==NOMBRO halti post NOMBRO da trafoj\n"
" -b, --byte-offset presi la bitoknumeron kun eligataj linioj\n"
" -n, --line-number presi la lininumeron kun eligataj linioj\n"
+" --line-buffered peli la eligon post ζiu linio\n"
" -H, --with-filename presi la dosiernomon por ζiu trafo\n"
" -h, --no-filename subpremi la prefiksan dosiernomon ζe eligo\n"
" -q, --quiet, --silent subpremi ζian normalan eligadon\n"
" --binary-files=SPECO supozi, ke binaraj dosieroj estas de SPECO\n"
-" SPECO estas 'binary', 'text', aύ "
-"'without-match'.\n"
+" SPECO estas 'binary', 'text', aύ 'without-match'\n"
" -a, --text same kiel --binary-files=text\n"
" -I same kiel --binary-files=without-match\n"
-" -d, --directories=AGO kiel trakti dosierujojn; AGO estas 'read' "
-"(legi),\n"
+" -d, --directories=AGO kiel trakti dosierujojn; AGO estas 'read' (legi),\n"
" 'recurse' (rekurse), aύ 'skip' (ignori).\n"
-" -r, --recursive same kiel --directories=recurse.\n"
+" -R, -r, --recursive same kiel --directories=recurse.\n"
+" --include=ήABLONO ekzameni dosierojn, kiuj kongruas kun ήABLONO\n"
+" --exclude=ήABLONO ignori dosierojn, kiuj kongruas kun ήABLONO\n"
+" --exclude-from=DOS ignori dosierojn, kiuj kongruas kun ώablono en DOS\n"
" -L, --files-without-match presi nur dosiernomojn sen trafo\n"
" -l, --files-with-matches presi nur dosiernomojn kun trafoj\n"
-" -c, --count presi nur nombron de kongruaj linioj en ζiu "
-"dosiero\n"
+" -c, --count presi nur nombron de kongruaj linioj en ζiu dosiero\n"
" -Z, --null presi la bitokon 0 post dosiernomo\n"
-#: src/grep.c:1029
-#, fuzzy
+#: src/grep.c:1037
msgid ""
"\n"
"Context control:\n"
@@ -238,57 +235,49 @@ msgid ""
msgstr ""
"\n"
"Regado de la kunteksto:\n"
-" -B, --before-context=NUM presi NUM liniojn da antaύa kunteksto\n"
-" -A, --after-context=NUM presi NUM liniojn da sekva kunteksto\n"
-" -C, --context[=NUM] presi NUM (implicite 2) liniojn da kunteksto,\n"
-" se ne specifita alie per -A aύ -B\n"
-" -NUM same kiel --context=NUM\n"
+" -B, --before-context=NOM presi NOM liniojn da antaύa kunteksto\n"
+" -A, --after-context=NOM presi NOM liniojn da posta kunteksto\n"
+" -C, --context=NOM presi NOM liniojn da kunteksto\n"
+" -NOM same kiel --context=NOM\n"
+" --color, --colour uzi markilojn por distingi la kongruan ζenon\n"
" -U, --binary ne forigi \\r-signojn ζe linifino (MSDOS)\n"
-" -u, --unix-byte-offsets doni bitoknumerojn, kvazaύ \\r-signoj mankus "
-"(MSDOS)\n"
+" -u, --unix-byte-offsets doni bitoknumerojn, kvazaύ \\r-signoj mankus (MSDOS)\n"
"\n"
-"`egrep' signifas `grep -E'. `fgrep' signifas `grep -F'.\n"
+"'egrep' signifas 'grep -E'. 'fgrep' signifas 'grep -F'.\n"
"Kiam DOSIERO mankas, aύ DOSIERO estas -, legi la normalan enigon. Se malpli\n"
-"ol du DOSIEROj estas donitaj, supozi -h. Finvaloro estas 0, se estis "
-"kongruo,\n"
+"ol du DOSIEROj estas donitaj, supozi -h. Finvaloro estas 0, se estis trafo,\n"
"1, se ne estis, kaj 2 ζe eraro.\n"
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Raportu cimojn al <bug-gnu-utils@prep.ai.mit.edu>.\n"
+#: src/grep.c:1052
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nRaportu cimojn al <bug-gnu-utils@prep.ai.mit.edu>.\n"
-#: src/grep.c:1054
+#: src/grep.c:1062
msgid "conflicting matchers specified"
msgstr "malkongruaj kompariloj estas indikitaj"
-#: src/grep.c:1347
+#: src/grep.c:1355
msgid "unknown directories method"
msgstr "nekonata dosieruja metodo"
-#: src/grep.c:1414
-#, fuzzy
+#: src/grep.c:1422
msgid "invalid max count"
-msgstr "nefinita ripetonombro"
+msgstr "nevalida maksimuma nombro"
-#: src/grep.c:1464
+#: src/grep.c:1472
msgid "unknown binary-files type"
msgstr "nekonata speco de binara dosiero"
-#: src/grep.c:1535
+#: src/grep.c:1543
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
-#, fuzzy
+#: src/grep.c:1545
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Kopirajto 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Kopirajto 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1547
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"
@@ -296,17 +285,17 @@ msgstr ""
"Ζi tiu estas libera programo; vidu la fonton por kopikondiζoj. Estas\n"
"NENIA GARANTIO, eζ ne pri KOMERCA KVALITO aύ ADEKVATECO POR DIFINITA CELO.\n"
-#: src/search.c:606
+#: src/search.c:623
msgid "The -P option is not supported"
-msgstr ""
+msgstr "La opcio -P ne estas disponata"
-#: src/search.c:619
+#: src/search.c:636
msgid "The -P and -z options cannot be combined"
-msgstr ""
+msgstr "Ne eblas kombini la opciojn -P kaj -z"
#: lib/error.c:117
msgid "Unknown system error"
-msgstr ""
+msgstr "Nekonata sistemeraro"
#: lib/getopt.c:675
#, c-format
@@ -381,171 +370,10 @@ msgstr "%s: opcio `-W %s' ne akceptas argumenton\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:259
+#: lib/quotearg.c:265
msgid "`"
-msgstr ""
+msgstr "'"
-#: lib/quotearg.c:260
+#: lib/quotearg.c:266
msgid "'"
-msgstr ""
-
-#~ msgid "option %s"
-#~ msgstr "opcio %s"
-
-#~ msgid " with arg %s"
-#~ msgstr " kun argumento %s"
-
-#~ msgid "digits occur in two different argv-elements.\n"
-#~ msgstr "ciferoj troviψas en du malsamaj argv-elementoj.\n"
-
-#~ msgid "option %c\n"
-#~ msgstr "opcio %c\n"
-
-#~ msgid "option a\n"
-#~ msgstr "opcio a\n"
-
-#~ msgid "option b\n"
-#~ msgstr "opcio b\n"
-
-#~ msgid "option c with value `%s'\n"
-#~ msgstr "opcio c kun valoro `%s'\n"
-
-#~ msgid "option d with value `%s'\n"
-#~ msgstr "opcio d kun valoro `%s'\n"
-
-#~ msgid "?? getopt returned character code 0%o ??\n"
-#~ msgstr "?? getopt liveris signokodon 0%o ??\n"
-
-#~ msgid "non-option ARGV-elements: "
-#~ msgstr "neopciaj ARGV-elementoj: "
-
-#~ msgid "memory exhausted\n"
-#~ msgstr "memoro elζerpita\n"
-
-#~ msgid "Regexp selection and interpretation:\n"
-#~ msgstr "Elektado kaj interpretado de regula esprimo:\n"
-
-#~ msgid ""
-#~ " -E, --extended-regexp PATTERN is an extended regular expression\n"
-#~ msgstr " -E, --extended-regexp ABLONO estas etendita regula esprimo\n"
-
-#~ msgid ""
-#~ " -F, --fixed-strings PATTERN is a fixed string separated by newlines\n"
-#~ msgstr ""
-#~ " -F, --fixed-strings ABLONO estas fiksita signoeno apartigita per "
-#~ "linifinoj\n"
-
-#~ msgid " -G, --basic-regexp PATTERN is a basic regular expression\n"
-#~ msgstr " -G, --basic-regexp ABLONO estas baza regula esprimo\n"
-
-#~ msgid " -e, --regexp=PATTERN use PATTERN as a regular expression\n"
-#~ msgstr " -e, --regexp=ABLONO uzu ABLONOn kiel regulan esprimon\n"
-
-#~ msgid " -f, --file=FILE obtain PATTERN from FILE\n"
-#~ msgstr " -f, --file=DOSIERO akiru ABLONOn de DOSIERO\n"
-
-#~ msgid " -i, --ignore-case ignore case distinctions\n"
-#~ msgstr " -i, --ingore-case malatentu usklecon\n"
-
-#~ msgid ""
-#~ " -w, --word-regexp force PATTERN to match only whole words\n"
-#~ msgstr ""
-#~ " -w, --word-regexp ABLONO kongruu nur kun kompletaj vortoj\n"
-
-#~ msgid ""
-#~ " -x, --line-regexp force PATTERN to match only whole lines\n"
-#~ msgstr ""
-#~ " -x, --line-regexp ABLONO kongruu nur kun kompletaj linioj\n"
-
-#~ msgid "Miscellaneous:\n"
-#~ msgstr "Diversaj:\n"
-
-#~ msgid " -s, --no-messages suppress error messages\n"
-#~ msgstr " -s, --no-messages silentigu erarajn mesaojn\n"
-
-#~ msgid " -v, --revert-match select non-matching lines\n"
-#~ msgstr " -v, --revert-match elektu malkongruajn liniojn\n"
-
-#~ msgid " -V, --version print version information and exit\n"
-#~ msgstr " -V, --version montru informon pri versio kaj haltu\n"
-
-#~ msgid " --help display this help and exit\n"
-#~ msgstr " --help montru i tiun helptekston kaj haltu\n"
-
-#~ msgid "Output control:\n"
-#~ msgstr "Regado de eligo:\n"
-
-#~ msgid ""
-#~ " -b, --byte-offset print the byte offset with output lines\n"
-#~ msgstr ""
-#~ " -b, --byte-offset montru la bajtan deovon e eligataj linioj\n"
-
-#~ msgid " -n, --line-number print line number with output lines\n"
-#~ msgstr " -n, --line-number montru lininumeron e eligataj linioj\n"
-
-#~ msgid " -H, --with-filename print the filename for each match\n"
-#~ msgstr " -H, --with-filename montru la dosiernomon por iu kongruao\n"
-
-#~ msgid ""
-#~ " -h, --no-filename suppress the prefixing filename on ouput\n"
-#~ msgstr " -h, --no-filename silentigu la dosiernomon e eligo\n"
-
-#~ msgid " -q, --quiet, --silent suppress all normal output\n"
-#~ msgstr " -q, --quiet, --silent silentigu iun normalan eligon\n"
-
-#~ msgid ""
-#~ " -L, --files-without-match only print FILE names containing no match\n"
-#~ msgstr " -L, --files-without-match montru nur DOSIERNOMOjn sen kongruaoj\n"
-
-#~ msgid ""
-#~ " -l, --files-with-matches only print FILE names containing matches\n"
-#~ msgstr ""
-#~ " -l, --files-with-matches montru nur DOSIERNOMOjn enhavantajn kongruaojn\n"
-
-#~ msgid ""
-#~ " -c, --count only print a count of matching lines per FILE\n"
-#~ msgstr ""
-#~ " -c, --count montru nur nombron de kongruaj linioj en "
-#~ "DOSIERO\n"
-
-#~ msgid "Context control:\n"
-#~ msgstr "Regado de kunteksto:\n"
-
-#~ msgid " -B, --before-context=NUM print NUM lines of leading context\n"
-#~ msgstr ""
-#~ " -B, --before-context=NOM montru NOMbron da linioj de antaa kunteksto\n"
-
-#~ msgid " -A, --after-context=NUM print NUM lines of trailing context\n"
-#~ msgstr ""
-#~ " -A, --after-context=NOM montru NOMbron da linioj de posta kunteksto\n"
-
-#~ msgid " -NUM same as both -B NUM and -A NUM\n"
-#~ msgstr " -NOM same kiel -B NOM kaj -A NOM kune\n"
-
-#~ msgid " -C, --context same as -2\n"
-#~ msgstr " -C, -context same kiel -2\n"
-
-#~ msgid " -U, --binary do not strip CR characters at EOL\n"
-#~ msgstr ""
-#~ " -U, --binary ne forigu aretrevenajn signojn e linifino\n"
-
-#~ msgid ""
-#~ " -u, --unix-byte-offsets report offsets as if CRs were not there\n"
-#~ msgstr ""
-#~ " -u, --unix-byte-offsets montru deovojn sen kalkuli aretrevenojn\n"
-
-#~ msgid ""
-#~ "There should be one and only one PATTERN, `-e PATTERN' or `-f FILE'.\n"
-#~ msgstr "Estu unu kaj sole unu ABLONO, `-e ABLONO' a `-f DOSIERO'.\n"
-
-#~ msgid "If call as `egrep', this implies -E and `fgrep' for -F.\n"
-#~ msgstr "Se vokata kiel `egrep', tio implicas -E kaj `fgrep' implicas -F.\n"
-
-#~ msgid "If no -[GEF], then -G is assumed.\n"
-#~ msgstr "Se neniu el -[GEF] estas uzata, -G estas supozata.\n"
-
-#~ msgid "you may specify only one of -E, -F, or -G"
-#~ msgstr "vi povas indiki nur unu el -E, -F, a -G"
-
-#~ msgid "(standard input)\n"
-#~ msgstr "(normala enigo)\n"
+msgstr "'"
diff --git a/po/es.po b/po/es.po
index e0ff05fd..4a3cea05 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,31 +1,31 @@
# Mensajes en espaρol para GNU grep.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
# Enrique Melero Gσmez <melero@iprolink.ch>, 1996.
-# Santiago Vila Doncel <sanvila@unex.es>, 1997, 1998, 1999, 2000.
+# Santiago Vila Doncel <sanvila@unex.es>, 1997, 1998, 1999, 2000, 2001.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.4f\n"
-"POT-Creation-Date: 2001-07-30 10:50-0400\n"
-"PO-Revision-Date: 2000-02-17 22:19+0100\n"
+"Project-Id-Version: GNU grep 2.5e\n"
+"POT-Creation-Date: 2001-03-07 00:02-0500\n"
+"PO-Revision-Date: 2001-06-09 15:44+0200\n"
"Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
"Language-Team: Spanish <es@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
msgid "Memory exhausted"
msgstr "Memoria agotada"
-#: 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
+#: 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
msgid "Unbalanced ["
msgstr "[ desemparejado"
-#: src/dfa.c:741
+#: src/dfa.c:738
msgid "Unfinished \\ escape"
msgstr "Secuencia de escape \\ sin terminar"
@@ -33,33 +33,33 @@ msgstr "Secuencia de escape \\ sin terminar"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {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
+#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
msgid "unfinished repeat count"
msgstr "contador de repeticiσn sin terminar"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
msgid "malformed repeat count"
msgstr "contador de repeticiσn errσneo"
-#: src/dfa.c:1239
+#: src/dfa.c:1232
msgid "Unbalanced ("
msgstr "( desemparejado"
-#: src/dfa.c:1364
+#: src/dfa.c:1357
msgid "No syntax specified"
msgstr "No se ha especificado ninguna sintaxis"
-#: src/dfa.c:1372
+#: src/dfa.c:1365
msgid "Unbalanced )"
msgstr ") desemparejado"
# FIXME. Comunicar al autor que esto es repeticiσn...
-#: src/dfa.c:2942
+#: src/dfa.c:2933
msgid "out of memory"
msgstr "memoria agotada"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: 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
msgid "memory exhausted"
msgstr "memoria agotada"
@@ -67,49 +67,49 @@ msgstr "memoria agotada"
msgid "invalid context length argument"
msgstr "longitud de contexto invαlida"
-#: src/grep.c:458
+#: src/grep.c:466
msgid "input is too large to count"
-msgstr ""
+msgstr "la entrada es demasiado grande para contar"
-#: src/grep.c:531
+#: src/grep.c:539
msgid "writing output"
msgstr "escribiendo el resultado"
-#: src/grep.c:804
+#: src/grep.c:812
#, c-format
msgid "Binary file %s matches\n"
msgstr "Coincidencia en el fichero binario %s\n"
-#: src/grep.c:818
+#: src/grep.c:826
msgid "(standard input)"
msgstr "(entrada estαndar)"
-#: src/grep.c:923
-#, fuzzy, c-format
+#: src/grep.c:931
+#, c-format
msgid "warning: %s: %s\n"
-msgstr "%s: atenciσn: %s: %s\n"
+msgstr "atenciσn: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:932
msgid "recursive directory loop"
msgstr "bucle de directorio recursivo"
-#: src/grep.c:972
+#: src/grep.c:980
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Modo de empleo: %s [OPCIΣN]... PATRΣN [FICHERO]...\n"
-#: src/grep.c:974
+#: src/grep.c:982
#, 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:979
+#: src/grep.c:987
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Modo de empleo: %s [OPCIΣN]... PATRΣN [FICHERO] ...\n"
-#: src/grep.c:980
+#: src/grep.c:988
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -122,8 +122,7 @@ msgstr ""
"\n"
"Selecciσn e interpretaciσn de Expreg:\n"
-#: src/grep.c:985
-#, fuzzy
+#: src/grep.c:993
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -134,8 +133,9 @@ msgstr ""
" -F, --fixed-strings PATRΣN es un conjunto de cadenas separadas por\n"
" caracteres de nueva lνnea\n"
" -G, --basic-regexp PATRΣN es una expresiσn regular bαsica\n"
+" -P, --perl-regexp PATRΣN es una expresiσn regular en Perl\n"
-#: src/grep.c:990
+#: src/grep.c:998
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -154,7 +154,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:997
+#: src/grep.c:1005
msgid ""
"\n"
"Miscellaneous:\n"
@@ -170,11 +170,9 @@ msgstr ""
" -v, --invert-match selecciona las lνneas que no coinciden\n"
" -V, --version muestra la versiσn y finaliza\n"
" --help muestra esta ayuda y finaliza\n"
-" --mmap utiliza entrada asignada en memoria si es "
-"posible\n"
+" --mmap utiliza entrada asignada en memoria si es posible\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1013
msgid ""
"\n"
"Output control:\n"
@@ -192,10 +190,9 @@ msgid ""
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', 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"
+" --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"
" -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"
@@ -203,34 +200,37 @@ msgid ""
msgstr ""
"\n"
"Control del resultado:\n"
+" -m, --max-count=NΪM se detiene despuιs de NΪM coincidencias\n"
" -b, --byte-offset muestra el desplazamiento en bytes junto\n"
" con las lνneas de salida\n"
" -n, --line-number muestra el nϊmero de lνnea junto con\n"
" las lνneas de salida\n"
+" --line-buffered descarga el resultado para cada lνnea\n"
" -H, --with-filename muestra el nombre del fichero para cada\n"
" coincidencia\n"
" -h, --no-filename suprime los nombres de los ficheros en\n"
" el resultado\n"
" -q, --quiet, --silent suprime todo el resultado normal\n"
" --binary-files=TIPO supone que los ficheros binarios son TIPO\n"
-" TIPO es `binary', `text', o `without-match'.\n"
+" TIPO es `binary', `text', o `without-match'\n"
" -a, --text equivalente a --binary-files=text\n"
" -I equivalente a --binary-files=without-match\n"
" -d, --directories=ACCIΣN especifica cσmo manejar los directorios\n"
-" ACCIΣN es 'read', 'recurse', o 'skip'.\n"
-" -r, --recursive equivalente a --directories=recurse.\n"
+" ACCIΣN es 'read', 'recurse', o 'skip'\n"
+" -R, -r, --recursive equivalente a --directories=recurse\n"
+" --include=PATRΣN examina los ficheros que encajan con PATRΣN\n"
+" --exclude=PATRΣN se salta los ficheros que encajan con PATRΣN\n"
+" --exclude-from=FICHERO se salta los ficheros que encajan con los patrones\n"
+" de FICHERO\n"
" -L, --files-without-match muestra solamente los nombres de FICHEROs\n"
" que no contienen ninguna coincidencia\n"
" -l, --files-with-matches muestra solamente los nombres de FICHEROs\n"
" que contienen alguna coincidencia\n"
-" -c, --count muestra solamente el total de lνneas que "
-"coinciden\n"
+" -c, --count muestra solamente el total de lνneas que coinciden\n"
" por cada FICHERO\n"
-" -Z, --null imprime un byte 0 despuιs del nombre del "
-"FICHERO\n"
+" -Z, --null imprime un byte 0 despuιs del nombre del FICHERO\n"
-#: src/grep.c:1029
-#, fuzzy
+#: src/grep.c:1037
msgid ""
"\n"
"Context control:\n"
@@ -251,9 +251,9 @@ msgstr ""
"Control del contexto:\n"
" -B, --before-context=NΪM muestra NΪM lνneas de contexto anterior\n"
" -A, --after-context=NΪM muestra NΪM lνneas de contexto posterior\n"
-" -C, --context[=NΪM] muestra NΪM lνneas (2 por omisiσn) de contexto\n"
-" a menos que se utilice -A o -B\n"
+" -C, --context=NΪM muestra NΪM lνneas de contexto\n"
" -NΪM lo mismo que --context=NΪM\n"
+" --color, --colour distingue con marcadores la cadena que encaja\n"
" -U, --binary no elimina los caracteres de retorno de carro\n"
" finales de lνnea (MSDOS)\n"
" -u, --unix-byte-offsets cuenta los desplazamientos como si no hubiera\n"
@@ -264,13 +264,9 @@ 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:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Comunicar `bugs' a <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:1052
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nComunicar `bugs' a <bug-gnu-utils@gnu.org>.\n"
# viendo los fuentes , hay varias opciones
# que hay sin documentar. O quizα es que getopt() lo he entendido mal
@@ -283,36 +279,34 @@ msgstr ""
#
# No me gusta nada lo de opciσn "a buscar".
# Se admiten sugerencias. sv
-#: src/grep.c:1054
+#: src/grep.c:1062
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:1347
+#: src/grep.c:1355
msgid "unknown directories method"
msgstr "mιtodo de directorios desconocido"
-#: src/grep.c:1414
-#, fuzzy
+#: src/grep.c:1422
msgid "invalid max count"
-msgstr "contador de repeticiσn sin terminar"
+msgstr "contador mαximo invαlido"
-#: src/grep.c:1464
+#: src/grep.c:1472
msgid "unknown binary-files type"
msgstr "tipo binary-files desconocido"
-#: src/grep.c:1535
+#: src/grep.c:1543
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
-#, fuzzy
+#: src/grep.c:1545
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1547
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"
@@ -321,17 +315,17 @@ msgstr ""
"No hay NINGUNA garantνa; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n"
"FIN DETERMINADO.\n"
-#: src/search.c:606
+#: src/search.c:623
msgid "The -P option is not supported"
-msgstr ""
+msgstr "La opciσn -P no estα admitida"
-#: src/search.c:619
+#: src/search.c:636
msgid "The -P and -z options cannot be combined"
-msgstr ""
+msgstr "Las opciones -P y -z no se pueden combinar"
#: lib/error.c:117
msgid "Unknown system error"
-msgstr ""
+msgstr "Error del sistema desconocido"
#: lib/getopt.c:675
#, c-format
@@ -406,13 +400,13 @@ msgstr "%s: la opciσn `-W %s' no admite ningϊn argumento\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:259
+#: lib/quotearg.c:265
msgid "`"
-msgstr ""
+msgstr "`"
-#: lib/quotearg.c:260
+#: lib/quotearg.c:266
msgid "'"
-msgstr ""
+msgstr "'"
#~ msgid "option %s"
#~ msgstr "opciσn %s"
@@ -444,17 +438,13 @@ msgstr ""
#~ msgid "non-option ARGV-elements: "
#~ msgstr "elementos de ARGV que no son opciones: "
-#~ msgid "memory exhausted\n"
-#~ msgstr "memoria agotada\n"
-
#~ msgid "you may specify only one of -E, -F, or -G"
#~ msgstr "sσlo se puede especificar una de las opciones -E, -F, o -G"
-# Prefiero dejarlo en solamente un patrσn
-# Pero entonces no queda claro que *debe haber uno*, y parece que
-# es uno como mαximo (siendo el mνnimo 0). sv
-#~ msgid ""
-#~ "There should be one and only one PATTERN, `-e PATTERN' or `-f FILE'.\n"
+#~ # Prefiero dejarlo en solamente un patrσn
+#~ # Pero entonces no queda claro que *debe haber uno*, y parece que
+#~ # es uno como mαximo (siendo el mνnimo 0). sv
+#~ msgid "There should be one and only one PATTERN, `-e PATTERN' or `-f FILE'.\n"
#~ msgstr "Debe haber un y solamente un PATRΣN, `-e PATRΣN', o `-f FICHERO'.\n"
#~ msgid "If no -[GEF], then -G is assumed.\n"
diff --git a/po/et.po b/po/et.po
index 9397d7a4..5bfb29c5 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4,27 +4,27 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.4f\n"
-"POT-Creation-Date: 2001-07-30 10:50-0400\n"
-"PO-Revision-Date: 2000-02-16 11:50+02:00\n"
+"Project-Id-Version: grep 2.5e\n"
+"POT-Creation-Date: 2001-03-07 00:02-0500\n"
+"PO-Revision-Date: 2001-05-13 11:12+02:00\n"
"Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
-"Language-Team: Estonian <linux-ee@eenet.ee>\n"
+"Language-Team: Estonian <et@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-15\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
msgid "Memory exhausted"
msgstr "Mδlu on otsas"
-#: 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
+#: 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
msgid "Unbalanced ["
msgstr "Balanseerimata ["
-#: src/dfa.c:741
+#: src/dfa.c:738
msgid "Unfinished \\ escape"
msgstr "Lυpetamata \\ paojada"
@@ -32,32 +32,32 @@ msgstr "Lυpetamata \\ paojada"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {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
+#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
msgid "unfinished repeat count"
msgstr "lυpetamata korduste arv"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
msgid "malformed repeat count"
msgstr "vigane korduste arv"
-#: src/dfa.c:1239
+#: src/dfa.c:1232
msgid "Unbalanced ("
msgstr "Balanseerimata ("
-#: src/dfa.c:1364
+#: src/dfa.c:1357
msgid "No syntax specified"
msgstr "Sόntaksit pole mδδratud"
-#: src/dfa.c:1372
+#: src/dfa.c:1365
msgid "Unbalanced )"
msgstr "Balanseerimata )"
-#: src/dfa.c:2942
+#: src/dfa.c:2933
msgid "out of memory"
msgstr "mδlu on otsas"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: 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
msgid "memory exhausted"
msgstr "mδlu on otsas"
@@ -65,48 +65,48 @@ msgstr "mδlu on otsas"
msgid "invalid context length argument"
msgstr "vigane konteksti pikkuse argument"
-#: src/grep.c:458
+#: src/grep.c:466
msgid "input is too large to count"
-msgstr ""
+msgstr "sisend on loendamiseks liiga suur"
-#: src/grep.c:531
+#: src/grep.c:539
msgid "writing output"
msgstr "kirjutan vδljundit"
-#: src/grep.c:804
+#: src/grep.c:812
#, c-format
msgid "Binary file %s matches\n"
msgstr "Kahendfail %s sobib\n"
-#: src/grep.c:818
+#: src/grep.c:826
msgid "(standard input)"
msgstr "(standardsisend)"
-#: src/grep.c:923
-#, fuzzy, c-format
+#: src/grep.c:931
+#, c-format
msgid "warning: %s: %s\n"
-msgstr "%s: hoiatus: %s: %s\n"
+msgstr "hoiatus: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:932
msgid "recursive directory loop"
msgstr "rekursiivne kataloogipuu tsόkkel"
-#: src/grep.c:972
+#: src/grep.c:980
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Kasuta: %s [VΥTI]... MUSTER [FAIL] ...\n"
-#: src/grep.c:974
+#: src/grep.c:982
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Lisainfo saamiseks proovige vυtit `%s --help'.\n"
-#: src/grep.c:979
+#: src/grep.c:987
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Kasuta: %s [VΥTI]... MUSTER [FAIL] ...\n"
-#: src/grep.c:980
+#: src/grep.c:988
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -119,8 +119,7 @@ msgstr ""
"\n"
"Regulaaravaldise valik ja interpreteerimine:\n"
-#: src/grep.c:985
-#, fuzzy
+#: src/grep.c:993
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -130,8 +129,9 @@ msgstr ""
" -E, --extended-regexp MUSTER on laiendatud regulaaravaldis\n"
" -F, --fixed-strings MUSTER on hulk reavahetustega eraldatud sυnesid\n"
" -G, --basic-regexp MUSTER on lihtne regulaaravaldis\n"
+" -P, --perl-regexp MUSTER on Perl regulaaravaldis\n"
-#: src/grep.c:990
+#: src/grep.c:998
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -147,7 +147,7 @@ msgstr ""
" -x, --line-regexp kasuta MUSTRIT ridade leidmiseks\n"
" -z, --null-data andmerida lυppeb baidil 0, mitte reavahetusel\n"
-#: src/grep.c:997
+#: src/grep.c:1005
msgid ""
"\n"
"Miscellaneous:\n"
@@ -165,8 +165,7 @@ msgstr ""
" --help esita see abiinfo ja lυpeta tφφ\n"
" --mmap kasuta kui vυimalik sisendi mδllu laadimist\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1013
msgid ""
"\n"
"Output control:\n"
@@ -184,10 +183,9 @@ msgid ""
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', 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"
+" --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"
" -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"
@@ -195,25 +193,30 @@ msgid ""
msgstr ""
"\n"
"Vδljundi kontroll:\n"
+" -m, --max-count=NUM lυpeta peale NUM leidu\n"
" -b, --byte-offset trόki baidi aadress vδljundreale\n"
" -n, --line-number trόki rea number vδljundreale\n"
+" --line-buffered vδljasta kδik peale iga rida\n"
" -H, --with-filename trόki iga leiu failinimi\n"
" -h, --no-filename keela vδljundis prefiks failinimi\n"
-" -q, --quiet, --silent keela kogu normaalne vδljund\n"
+" -q, --quiet, --silent keela kogu tavapδrane vδljund\n"
" --binary-files=TάάP eeldab kahendfailide TάάPi\n"
-" TάάP on 'binary', 'text' vυi 'without-match'.\n"
-" -a, --text sama kui --binary-files=text\n"
-" -I sama kui --binary-files=without-match\n"
+" TάάP on 'binary', 'text' vυi 'without-match'\n"
+" -a, --text sama, kui --binary-files=text\n"
+" -I sama, kui --binary-files=without-match\n"
" -d, --directories=TEGEVUS kuidas kδsitleda katalooge\n"
-" TEGEVUS on 'read', 'recurse' vυi 'skip'.\n"
-" -r, --recursive sama kui --directories=recurse.\n"
+" TEGEVUS on 'read', 'recurse' vυi 'skip'\n"
+" -R, -r, --recursive sama, kui --directories=recurse\n"
+" --include=MUSTER vaadeldakse mustrile MUSTER vastavaid faile\n"
+" --exclude=MUSTER mustrile MUSTER vastavad failid jδetakse vahele\n"
+" --exclude-from=FAIL mustrile failist FAIL vastavad failid\n"
+" jδetakse vahele\n"
" -L, --files-without-match trόki ainult failinimed, kus mustrit ei leitud\n"
" -l, --files-with-matches trόki ainult failinimed, kus muster leiti\n"
" -c, --count trόki ainult leitud ridade arv faili kaupa\n"
-" -Z, --null trόki peale filinime 0 bait\n"
+" -Z, --null trόki peale filinime bait 0\n"
-#: src/grep.c:1029
-#, fuzzy
+#: src/grep.c:1037
msgid ""
"\n"
"Context control:\n"
@@ -234,56 +237,48 @@ msgstr ""
"Konteksti kontroll:\n"
" -B, --before-context=NUM trόki NUM rida eelnevat konteksti\n"
" -A, --after-context=NUM trόki NUM rida jδrgnevat konteksti\n"
-" -C, --context[=NUM] trόki NUM (vaikimisi 2) rida vδljund konteksti\n"
-" kui ei ole kasutatud vυtmeid -A vυi -B\n"
-" -NUM sama kui --context=NUM\n"
+" -C, --context[=NUM] trόki NUM rida vδljund konteksti\n"
+" -NUM sama, kui --context=NUM\n"
+" --color, --colour kasuta otsitava sυne eristamiseks markereid\n"
" -U, --binary δra eemalda rea lυpust CR sόmboleid (MSDOS)\n"
-" -u, --unix-byte-offsets teata aadressid CR sόmboleid arvestamata "
-"(MSDOS)\n"
+" -u, --unix-byte-offsets teata aadressid CR sόmboleid arvestamata (MSDOS)\n"
"\n"
"`egrep' tδhendab `grep -E'. `fgrep' tδhendab `grep -F'.\n"
-"Kui FAIL pole antud vυi kui FAIL vδδrtus on -, loeb standardsisendit. Kui "
-"on\n"
-"antud vδhem, kui kaks faili, eeldatakse vυtit -h. Kui muster leitakse,\n"
-"lυpetab programm tφφ staatusega 0, kui ei leita, siis staatusega 1 ja\n"
-"kui oli mingi muu probleem, siis staatusega 2.\n"
+"Kui FAIL pole antud vυi kui FAIL vδδrtus on -, loeb standardsisendit. Kui on\n"
+"antud vδhem kui kaks faili, eeldatakse vυtit -h. Kui muster leitakse,\n"
+"lυpetab programm tφφ koodiga 0, kui ei leita, siis koodiga 1 ja\n"
+"kui oli mingi muu probleem, siis koodiga 2.\n"
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Teatage palun vigadest aadressil <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:1052
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nTeatage palun vigadest aadressil <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1054
+#: src/grep.c:1062
msgid "conflicting matchers specified"
msgstr "mδδrati konfliktsed otsijad"
-#: src/grep.c:1347
+#: src/grep.c:1355
msgid "unknown directories method"
msgstr "tundmatu kataloogide meetod"
-#: src/grep.c:1414
-#, fuzzy
+#: src/grep.c:1422
msgid "invalid max count"
-msgstr "lυpetamata korduste arv"
+msgstr "vigane maksimum"
-#: src/grep.c:1464
+#: src/grep.c:1472
msgid "unknown binary-files type"
msgstr "tundmatu kahendfailide tόόp"
-#: src/grep.c:1535
+#: src/grep.c:1543
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
-#, fuzzy
+#: src/grep.c:1545
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Autoriυigus 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Autoriυigus 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1547
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"
@@ -292,17 +287,17 @@ msgstr ""
"PUUDUB; ka mόόgiks vυi mingil eesmδrgil kasutamiseks, vastavalt seadustega\n"
"lubatud piiridele.\n"
-#: src/search.c:606
+#: src/search.c:623
msgid "The -P option is not supported"
-msgstr ""
+msgstr "Vυtit -P ei toetata"
-#: src/search.c:619
+#: src/search.c:636
msgid "The -P and -z options cannot be combined"
-msgstr ""
+msgstr "Vυtmeid -P ja -z ei saa koos kasutada"
#: lib/error.c:117
msgid "Unknown system error"
-msgstr ""
+msgstr "Tundmatu sόsteemi viga"
#: lib/getopt.c:675
#, c-format
@@ -377,10 +372,10 @@ msgstr "%s: vυti `-W %s' ei luba argumenti\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:259
+#: lib/quotearg.c:265
msgid "`"
-msgstr ""
+msgstr "`"
-#: lib/quotearg.c:260
+#: lib/quotearg.c:266
msgid "'"
-msgstr ""
+msgstr "'"
diff --git a/po/fr.po b/po/fr.po
index 6be634d3..cac3b2a4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,27 +4,27 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.4a\n"
-"POT-Creation-Date: 2001-07-30 10:50-0400\n"
-"PO-Revision-Date: 2000-01-31 12:45-0500\n"
+"Project-Id-Version: GNU grep 2.5e\n"
+"POT-Creation-Date: 2001-03-07 00:02-0500\n"
+"PO-Revision-Date: 2001-05-24 12:00-0500\n"
"Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
"Language-Team: French <traduc@traduc.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
msgid "Memory exhausted"
msgstr "Mιmoire ιpuisιe."
-#: 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
+#: 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
msgid "Unbalanced ["
msgstr "[ non pairι"
-#: src/dfa.c:741
+#: src/dfa.c:738
msgid "Unfinished \\ escape"
msgstr "sιquence d'ιchappement \\ non terminιe."
@@ -32,32 +32,32 @@ msgstr "sιquence d'ιchappement \\ non terminιe."
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
msgid "unfinished repeat count"
msgstr "dιcompte de rιpιtition non terminι."
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
msgid "malformed repeat count"
msgstr "dιcompte de rιpιtition mal formι."
-#: src/dfa.c:1239
+#: src/dfa.c:1232
msgid "Unbalanced ("
msgstr "( non pairι"
-#: src/dfa.c:1364
+#: src/dfa.c:1357
msgid "No syntax specified"
msgstr "Aucune syntaxe spιcifiι"
-#: src/dfa.c:1372
+#: src/dfa.c:1365
msgid "Unbalanced )"
msgstr ") non pairι"
-#: src/dfa.c:2942
+#: src/dfa.c:2933
msgid "out of memory"
msgstr "Mιmoire ιpuisιe."
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: 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
msgid "memory exhausted"
msgstr "Mιmoire ιpuisιe."
@@ -65,49 +65,48 @@ msgstr "Mιmoire ιpuisιe."
msgid "invalid context length argument"
msgstr "paramθtre de contexte de longueur invalide"
-#: src/grep.c:458
+#: src/grep.c:466
msgid "input is too large to count"
-msgstr ""
+msgstr "ce qui est en entrιe est trop grand pour κtre comptι"
-#: src/grep.c:531
+#: src/grep.c:539
msgid "writing output"
msgstr "Gιnιration du rιsultat."
-#: src/grep.c:804
+#: src/grep.c:812
#, c-format
msgid "Binary file %s matches\n"
msgstr "Fichier binaire %s concorde\n"
-#: src/grep.c:818
+#: src/grep.c:826
msgid "(standard input)"
msgstr "(entrιe standard)"
-#: src/grep.c:923
-#, fuzzy, c-format
+#: src/grep.c:931
msgid "warning: %s: %s\n"
-msgstr "%s: AVERTISSEMENT: %s: %s\n"
+msgstr "AVERTISSEMENT: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:932
msgid "recursive directory loop"
msgstr "boucle rιcursive sur le rιpertoire"
-#: src/grep.c:972
+#: src/grep.c:980
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Usage: %s [OPTION]... PATRON [FICHIER]...\n"
-#: src/grep.c:974
+#: src/grep.c:982
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
-#: src/grep.c:979
+#: src/grep.c:987
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Usage: %s [OPTION]... PATRON [FICHIER] ...\n"
-#: src/grep.c:980
-#, fuzzy, c-format
+#: src/grep.c:988
+#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"Example: %s -i 'hello world' menu.h main.c\n"
@@ -115,12 +114,11 @@ msgid ""
"Regexp selection and interpretation:\n"
msgstr ""
"Recherche du PATRON dans chaque FICHIER ou sur l'entrιe standard.\n"
+"Exemple: %s -i 'hello world' menu.h main.c\n"
"\n"
-"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:985
-#, fuzzy
+#: src/grep.c:993
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -128,11 +126,11 @@ msgid ""
" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
" -E, --extended-regexp PATRON est une expression reguliθre ιtendue\n"
-" -F, --fixed-regexp PATRON est une chaξne fixe sιparιe par des "
-"retour de chariot\n"
+" -F, --fixed-regexp PATRON est une chaξne fixe sιparιe par des retour de chariot\n"
" -G, --basic-regexp PATRON est une expression rιguliθre de base\n"
+" -P, --perl-regexp PATRON est une expression rιguliθre en Perl\n"
-#: src/grep.c:990
+#: src/grep.c:998
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -144,14 +142,12 @@ msgstr ""
" -e, --regexp=PATTERN utiliser le PATRON comme expression rιguliθre\n"
" -f, --file=FILE obtenir le PATRON du FICHIER\n"
" -i, --ignore-case ignorer la distrinction de la casse\n"
-" -w, --word-regexp forcer l'appariement du PATRON que sur des mots "
-"complets\n"
-" -x, --line-regexp forcer l'appariement du PATRON que sur des "
-"lignes entiθres\n"
+" -w, --word-regexp forcer l'appariement du PATRON que sur des mots complets\n"
+" -x, --line-regexp forcer l'appariement du PATRON que sur des lignes entiθres\n"
" -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:997
+#: src/grep.c:1005
msgid ""
"\n"
"Miscellaneous:\n"
@@ -167,11 +163,9 @@ msgstr ""
" -v, --revert-match sιlectionner les lignes sans concordances\n"
" -V, --version afficher le nom et la version du logiciel\n"
" --help afficher l'aide et quitter\n"
-" --mmap utiliser la table de mιmoire ΰ l'entrιe si "
-"possible\n"
+" --mmap utiliser la table de mιmoire ΰ l'entrιe si possible\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1013
msgid ""
"\n"
"Output control:\n"
@@ -189,10 +183,9 @@ msgid ""
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', 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"
+" --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"
" -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"
@@ -200,6 +193,7 @@ msgid ""
msgstr ""
"\n"
"Contrτle de sortie:\n"
+" -m, --max-count=N arrκter aprθs N concordances\n"
" -b, --byte-offset afficher les adresses relatives des\n"
" lignes traitιes\n"
" -n, --line-number afficher les numιros de lignes des\n"
@@ -209,13 +203,17 @@ msgstr ""
" -h, --no-filename supprimer le prιfixe du nom de fichier\n"
" sur la sortie\n"
" -q, --quiet, --silent supprimer tout affichage en sortie\n"
-" -a, --text ne pas supprimer la sortie binaire\n"
" --binary-files=TYPE assumer que les fichiers binaires sont de\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"
-" -r, --recursive ιquivalent ΰ --directories=recurse.\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"
+" --exclude-from=FICHIER fichiers dont le PATRON concorde dans le fichierseront escamotιs\n"
" -L, --files-without-match afficher seulement les noms des fichiers\n"
" ne contenant pas de concordance\n"
" -l, --files-with-matches afficher seulement les noms des fichiers\n"
@@ -224,8 +222,7 @@ msgstr ""
" concordantes par fichier\n"
" -Z, --null afficher l'octet ZΙRO aprθs le nom du fichier\n"
-#: src/grep.c:1029
-#, fuzzy
+#: src/grep.c:1037
msgid ""
"\n"
"Context control:\n"
@@ -249,6 +246,8 @@ msgstr ""
" -C, --context[=N] imprimer N lignes (2 par dιfaut) du contexte\n"
" ΰ moins que -A ou -B ne soit spιcifiι\n"
" -N identique ΰ --context=N\n"
+" --color, --colour utiliser des marqueurs pour distinguer les\n"
+" chaξnes concordantes\n"
" -U, --binary ne pas enlever les caractθres CR sur \n"
" les fins de lignes (MS-DOS)\n"
" -u, --unix-byte-offsets afficher les adresses relatives comme si\n"
@@ -260,63 +259,57 @@ 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:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Rapporter toutes anomalies ΰ <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:1052
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nRapporter toutes anomalies ΰ <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1054
+#: src/grep.c:1062
msgid "conflicting matchers specified"
msgstr "opιrateurs de concordance spιcifiιs en conflit"
-#: src/grep.c:1347
+#: src/grep.c:1355
msgid "unknown directories method"
msgstr "mιthode inconnue des rιpertoires"
-#: src/grep.c:1414
-#, fuzzy
+#: src/grep.c:1422
msgid "invalid max count"
-msgstr "dιcompte de rιpιtition non terminι."
+msgstr "dιcompte maximal invalide."
-#: src/grep.c:1464
+#: src/grep.c:1472
msgid "unknown binary-files type"
msgstr "type de fichier binaire inconnu"
# msgid "GNU grep version %s"
# msgstr "«grep» de GNU version %s"
-#: src/grep.c:1535
+#: src/grep.c:1543
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (grep de GNU) %s\n"
-#: src/grep.c:1537
-#, fuzzy
+#: src/grep.c:1545
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1547
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 ""
-"Ce logiciel est gratuit; voir les sources pour les conditions de\n"
+"Ce logiciel est libre; voir les sources pour les conditions de\n"
"reproduction. AUCUNE garantie n'est donnιe; tant pour des raisons\n"
"COMMERΗIALES que pour RΙPONDRE ΐ UN BESOIN PARTICULIER.\n"
-#: src/search.c:606
+#: src/search.c:623
msgid "The -P option is not supported"
-msgstr ""
+msgstr "L'option -P n'est pas supportιe."
-#: src/search.c:619
+#: src/search.c:636
msgid "The -P and -z options cannot be combined"
-msgstr ""
+msgstr "Les options -P et -z ne peuvent κtre combinιes."
#: lib/error.c:117
msgid "Unknown system error"
-msgstr ""
+msgstr "Erreur systθme inconnue"
#: lib/getopt.c:675
#, c-format
@@ -391,13 +384,13 @@ msgstr "%s: l'option `-W %s' ne permet pas de paramθtre.\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:259
+#: lib/quotearg.c:265
msgid "`"
-msgstr ""
+msgstr "`"
-#: lib/quotearg.c:260
+#: lib/quotearg.c:266
msgid "'"
-msgstr ""
+msgstr "'"
#~ msgid "option %s"
#~ msgstr "option %s"
@@ -441,20 +434,16 @@ msgstr ""
#~ msgid "Regexp selection and interpretation:\n"
#~ msgstr "Sιlection de l'EXP_RΙGULIΘRE et interprιtation:\n"
-#~ msgid ""
-#~ " -E, --extended-regexp PATTERN is an extended regular expression\n"
-#~ msgstr ""
-#~ " -E, --extended-regexp PATRON est une expression rιguliθre ιtendue\n"
+#~ msgid " -E, --extended-regexp PATTERN is an extended regular expression\n"
+#~ msgstr " -E, --extended-regexp PATRON est une expression rιguliθre ιtendue\n"
-#~ msgid ""
-#~ " -F, --fixed-strings PATTERN is a fixed string separated by newlines\n"
+#~ msgid " -F, --fixed-strings PATTERN is a fixed string separated by newlines\n"
#~ msgstr ""
#~ " -F, --fixed-strings PATRON est une chaξne de longueur fixe\n"
#~ " sιparιe par des sauts de ligne\n"
#~ msgid " -G, --basic-regexp PATTERN is a basic regular expression\n"
-#~ msgstr ""
-#~ " -G, --basic-regexp PATRON est une expression rιguliθre de base\n"
+#~ msgstr " -G, --basic-regexp PATRON est une expression rιguliθre de base\n"
#~ msgid " -e, --regexp=PATTERN use PATTERN as a regular expression\n"
#~ msgstr ""
@@ -467,14 +456,12 @@ msgstr ""
#~ msgid " -i, --ignore-case ignore case distinctions\n"
#~ msgstr " -i, --ignore-case ignorer la distinction de la casse\n"
-#~ msgid ""
-#~ " -w, --word-regexp force PATTERN to match only whole words\n"
+#~ msgid " -w, --word-regexp force PATTERN to match only whole words\n"
#~ msgstr ""
#~ " -w, --word-regexp forcer le PATRON ΰ ιtablir des\n"
#~ " concordances que pour des mots complets\n"
-#~ msgid ""
-#~ " -x, --line-regexp force PATTERN to match only whole lines\n"
+#~ msgid " -x, --line-regexp force PATTERN to match only whole lines\n"
#~ msgstr ""
#~ " -x, --line-regexp forcer le PATRON ΰ ιtablir des\n"
#~ " concordances que pour des lignes entiθres\n"
@@ -486,12 +473,10 @@ msgstr ""
#~ msgstr " -s, --no-messages supprimer les messages d'erreur\n"
#~ msgid " -v, --revert-match select non-matching lines\n"
-#~ msgstr ""
-#~ " -v, --revert-match sιlectionner les lignes sans concordance\n"
+#~ msgstr " -v, --revert-match sιlectionner les lignes sans concordance\n"
#~ msgid " -V, --version print version information and exit\n"
-#~ msgstr ""
-#~ " -V, --version afficher le nom et la version du logiciel\n"
+#~ msgstr " -V, --version afficher le nom et la version du logiciel\n"
#~ msgid " --help display this help and exit\n"
#~ msgstr " --help afficher l'aide et quitter\n"
@@ -499,8 +484,7 @@ msgstr ""
#~ msgid "Output control:\n"
#~ msgstr "Contrτle de sortie:\n"
-#~ msgid ""
-#~ " -b, --byte-offset print the byte offset with output lines\n"
+#~ msgid " -b, --byte-offset print the byte offset with output lines\n"
#~ msgstr ""
#~ " -b, --byte-offset afficher les adresses relatives avec\n"
#~ " les lignes traitιes\n"
@@ -515,8 +499,7 @@ msgstr ""
#~ " -H, --with-filename afficher le nom de fichier pour\n"
#~ " chaque concordance\n"
-#~ msgid ""
-#~ " -h, --no-filename suppress the prefixing filename on ouput\n"
+#~ msgid " -h, --no-filename suppress the prefixing filename on ouput\n"
#~ msgstr ""
#~ " -h, --no-filename supprimer le prιfixe du nom de fichier\n"
#~ " sur la sortie\n"
@@ -524,20 +507,17 @@ msgstr ""
#~ msgid " -q, --quiet, --silent suppress all normal output\n"
#~ msgstr " -q, --quiet, --silent supprimer tout affichage en sortie\n"
-#~ msgid ""
-#~ " -L, --files-without-match only print FILE names containing no match\n"
+#~ msgid " -L, --files-without-match only print FILE names containing no match\n"
#~ msgstr ""
#~ " -L, --files-without-match afficher seulement les noms des fichiers\n"
#~ " ne contenant pas de concordance\n"
-#~ msgid ""
-#~ " -l, --files-with-matches only print FILE names containing matches\n"
+#~ msgid " -l, --files-with-matches only print FILE names containing matches\n"
#~ msgstr ""
#~ " -l, --files-with-matches afficher seulement les noms des fichiers\n"
#~ " contenant des concordances\n"
-#~ msgid ""
-#~ " -c, --count only print a count of matching lines per FILE\n"
+#~ msgid " -c, --count only print a count of matching lines per FILE\n"
#~ msgstr ""
#~ " -c, --count afficher seulement le dιcompte des lignes\n"
#~ " concordantes par fichier\n"
@@ -546,8 +526,7 @@ msgstr ""
#~ msgstr "Contrτle du contexte:\n"
#~ msgid " -B, --before-context=NUM print NUM lines of leading context\n"
-#~ msgstr ""
-#~ " -B, --before-context=N imprimer N lignes du contexte d'en-tκte\n"
+#~ msgstr " -B, --before-context=N imprimer N lignes du contexte d'en-tκte\n"
#~ msgid " -A, --after-context=NUM print NUM lines of trailing context\n"
#~ msgstr " -A, --after-context=N imprimer N lignes du contexte finale\n"
@@ -559,23 +538,18 @@ msgstr ""
#~ msgstr " -C, --context identique ΰ -2\n"
#~ msgid " -U, --binary do not strip CR characters at EOL\n"
-#~ msgstr ""
-#~ " -U, --binary ne pas enlever les caractθres CR sur les fins de "
-#~ "lignes\n"
+#~ msgstr " -U, --binary ne pas enlever les caractθres CR sur les fins de lignes\n"
-#~ msgid ""
-#~ " -u, --unix-byte-offsets report offsets as if CRs were not there\n"
+#~ msgid " -u, --unix-byte-offsets report offsets as if CRs were not there\n"
#~ msgstr ""
#~ " -u, --unix-byte-offsets afficher les adresses relatives comme si\n"
#~ " aucun CR n'ιtait prιsent\n"
-#~ msgid ""
-#~ "There should be one and only one PATTERN, `-e PATTERN' or `-f FILE'.\n"
+#~ msgid "There should be one and only one PATTERN, `-e PATTERN' or `-f FILE'.\n"
#~ msgstr "Il ne devrait y avoir qu'un seul PATRON, -e PATRON ou -f FICHIER.\n"
#~ msgid "If call as `egrep', this implies -E and `fgrep' for -F.\n"
-#~ msgstr ""
-#~ "Si appelι via egrep, les options -E et `fgrep' pour -F sont implicites.\n"
+#~ msgstr "Si appelι via egrep, les options -E et `fgrep' pour -F sont implicites.\n"
#~ msgid "If no -[GEF], then -G is assumed.\n"
#~ msgstr ""
diff --git a/po/grep.pot b/po/grep.pot
index a5c64e5b..f78315c5 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-07-30 10:50-0400\n"
+"POT-Creation-Date: 2001-07-31 16:17-0400\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"
diff --git a/po/it.po b/po/it.po
index 535a3232..954ebf98 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,30 +1,30 @@
# traduzione di grep
-# Copyright (C) 1999 Free Software Foundation, Inc.
-# Marco d'Itri <md@linux.it>, 1999.
+# Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+# Marco d'Itri <md@linux.it>, 1999, 2001.
#
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.4a\n"
-"POT-Creation-Date: 2001-07-30 10:50-0400\n"
-"PO-Revision-Date: 2000-01-22 12:03+01:00\n"
+"Project-Id-Version: grep 2.5e\n"
+"POT-Creation-Date: 2001-03-07 00:02-0500\n"
+"PO-Revision-Date: 2001-05-13 12:25+02:00\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <it@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
msgid "Memory exhausted"
msgstr "Memoria esurita"
-#: 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
+#: 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
msgid "Unbalanced ["
msgstr "[ non bilanciata"
-#: src/dfa.c:741
+#: src/dfa.c:738
msgid "Unfinished \\ escape"
msgstr "escape \\ incompleto"
@@ -32,32 +32,32 @@ msgstr "escape \\ incompleto"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {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
+#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
msgid "unfinished repeat count"
-msgstr "conto di ripetizioni incompleto"
+msgstr "numero di ripetizioni incompleto"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
msgid "malformed repeat count"
-msgstr "conto di ripetizioni malformato"
+msgstr "numero di ripetizioni malformato"
-#: src/dfa.c:1239
+#: src/dfa.c:1232
msgid "Unbalanced ("
msgstr "( non bilanciata"
-#: src/dfa.c:1364
+#: src/dfa.c:1357
msgid "No syntax specified"
msgstr "Nessuna sintassi specificata"
-#: src/dfa.c:1372
+#: src/dfa.c:1365
msgid "Unbalanced )"
msgstr ") non bilanciata"
-#: src/dfa.c:2942
+#: src/dfa.c:2933
msgid "out of memory"
msgstr "memoria esaurita"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: 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
msgid "memory exhausted"
msgstr "memoria esaurita"
@@ -65,49 +65,49 @@ msgstr "memoria esaurita"
msgid "invalid context length argument"
msgstr "argomento della lunghezza del contesto non valido"
-#: src/grep.c:458
+#: src/grep.c:466
msgid "input is too large to count"
-msgstr ""
+msgstr "l'input θ troppo grande per essere contato"
-#: src/grep.c:531
+#: src/grep.c:539
msgid "writing output"
msgstr "scrittura dell'output"
-#: src/grep.c:804
+#: src/grep.c:812
#, c-format
msgid "Binary file %s matches\n"
msgstr "Il file binario %s corrisponde\n"
-#: src/grep.c:818
+#: src/grep.c:826
msgid "(standard input)"
msgstr "(standard input)"
-#: src/grep.c:923
-#, fuzzy, c-format
+#: src/grep.c:931
+#, c-format
msgid "warning: %s: %s\n"
-msgstr "%s: attenzione: %s: %s\n"
+msgstr "attenzione: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:932
msgid "recursive directory loop"
msgstr "loop ricorsivo di directory"
-#: src/grep.c:972
+#: src/grep.c:980
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uso: %s [OPZIONE]... MODELLO [FILE]...\n"
-#: src/grep.c:974
+#: src/grep.c:982
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Usare `%s --help' per ulteriori informazioni.\n"
-#: src/grep.c:979
+#: src/grep.c:987
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Uso: %s [OPZIONE]... MODELLO [FILE] ...\n"
-#: src/grep.c:980
-#, fuzzy, c-format
+#: src/grep.c:988
+#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"Example: %s -i 'hello world' menu.h main.c\n"
@@ -115,12 +115,11 @@ msgid ""
"Regexp selection and interpretation:\n"
msgstr ""
"Cerca il MODELLO in ogni FILE o nello standard input.\n"
-"Esempio: %s -i 'hello.*world' menu.h main.c\n"
+"Esempio: %s -i 'hello world' menu.h main.c\n"
"\n"
"Selezione ed interpretazione delle regexp:\n"
-#: src/grep.c:985
-#, fuzzy
+#: src/grep.c:993
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -131,8 +130,9 @@ msgstr ""
" -F, --fixed-strings il MODELLO θ un insieme di stringhe separate da\n"
" newline\n"
" -G, --basic-regexp il MODELLO θ una regular expression semplice\n"
+" -P, --perl-regexp il MODELLO θ una regular expression del perl\n"
-#: src/grep.c:990
+#: src/grep.c:998
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -144,14 +144,11 @@ msgstr ""
" -e, --regexp=MODELLO usa MODELLO come espressione regolare\n"
" -f, --file=FILE prende il MODELLO dal FILE\n"
" -i, --ignore-case ignora la distinzione tra maiuscole e minuscole\n"
-" -w, --word-regexp forza MODELLO a corrispondere solo a parole "
-"intere\n"
-" -x, --line-regexp forza MODELLO a corrispondere solo a righe "
-"intere\n"
-" -z, --null-data una riga di dati termina con \\0 invece che "
-"newline\n"
-
-#: src/grep.c:997
+" -w, --word-regexp forza MODELLO a corrispondere solo a parole intere\n"
+" -x, --line-regexp forza MODELLO a corrispondere solo a righe intere\n"
+" -z, --null-data una riga di dati termina con \\0 invece che newline\n"
+
+#: src/grep.c:1005
msgid ""
"\n"
"Miscellaneous:\n"
@@ -169,8 +166,7 @@ msgstr ""
" --help mostra questo aiuto ed esce\n"
" --mmap se possibile mappa in memoria l'input\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1013
msgid ""
"\n"
"Output control:\n"
@@ -188,10 +184,9 @@ msgid ""
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', 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"
+" --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"
" -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"
@@ -199,29 +194,29 @@ msgid ""
msgstr ""
"\n"
"Controllo dell'output:\n"
+" -m, --max-count=NUM si ferma dopo NUM corrispondenze\n"
" -b, --byte-offset stampa l'offset del byte con le righe di output\n"
-" -n, --line-number stampa il numero della riga con le righe di "
-"output\n"
+" -n, --line-number stampa il numero della riga con le righe di output\n"
+" --line-buffered fa il flush dell'output dopo ogni riga\n"
" -H, --with-filename stampa il nome del file per ogni corrispondenza\n"
" -h, --no-filename elimina il nome del file davanti all'output\n"
" -q, --quiet, --silent elimina tutto il normale output\n"
-" -a, --text equivalente a --binary-files=text\n"
-" --binary-files=TIPO suppone che i file binari siano di TIPO "
-"'binary',\n"
+" --binary-files=TIPO suppone che i file binari siano di TIPO 'binary',\n"
" 'text' oppure 'without-match'.\n"
-" -d, --directories=AZIONE come gestire le directory: AZIONE θ 'read' "
-"(legge),\n"
+" -a, --text equivalente a --binary-files=text\n"
+" -I equivalente a --binary-files=without-match\n"
+" -d, --directories=AZIONE come gestire le directory: AZIONE θ 'read' (legge),\n"
" 'recurse' (ricorsivo) o 'skip' (salta)\n"
" -r, --recursive equivalente a --directories=recurse\n"
+" --include=MODELLO esamina i file corrispondenti al MODELLO\n"
+" --exclude=MODELLO salta i file corrispondenti al MODELLO\n"
+" --exclude-from=FILE salta i file corrispondenti ai modelli nel FILE\n"
" -L, --files-without-match stampa solo i nomi dei FILE senza occorrenze\n"
-" -l, --files-with-matches stampa solo i nomi dei FILE contenenti "
-"occorrenze\n"
-" -c, --count stampa solo il conto delle righe occorrenti in ogni "
-"FILE\n"
+" -l, --files-with-matches stampa solo i nomi dei FILE contenenti occorrenze\n"
+" -c, --count stampa solo il conto delle righe occorrenti in ogni FILE\n"
" -Z, --null stampa il byte 0 dopo ogni nome di FILE\n"
-#: src/grep.c:1029
-#, fuzzy
+#: src/grep.c:1037
msgid ""
"\n"
"Context control:\n"
@@ -242,54 +237,47 @@ msgstr ""
"Controllo del contesto:\n"
" -B, --before-context=NUM stampa NUM righe di contesto precedente\n"
" -A, --after-context=NUM stampa NUM righe di contesto seguente\n"
-" -C, --context[=NUM] stampa NUM righe (2 predefinite) di contesto\n"
-" dell'output a meno che sia annullato da -A o -B\n"
+" -C, --context=NUM stampa NUM righe di contesto dell'output\n"
" -NUM come --context=NUM\n"
+" --color, --colour usa i colori per distinguere la stringa corrispond.\n"
" -U, --binary non rimuove i caratteri CR all'EOL (MSDOS)\n"
-" -u, --unix-byte-offsets segnala gli offset come se non ci fossero CR "
-"(MSDOS)\n"
+" -u, --unix-byte-offsets segnala gli offset come se non ci fossero CR (MSDOS)\n"
"\n"
"`egrep' significa `grep -E'. `fgrep'significa `grep -F'.\n"
"Se non c'θ un FILE, o il FILE θ -, legge lo standard input. Se sono stati\n"
-"specificati meno di due file presume -h. Esce con 0 se corrisponde,\n"
-"altrimenti con 1. Esce con 2 se ci sono problemi.\n"
+"specificati meno di due file presume -h. Esce con 0 se corrisponde, con 1 se\n"
+"non corrisponde o con 2 se ci sono problemi.\n"
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Segnalare i bug a <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:1052
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nSegnalare i bug a <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1054
+#: src/grep.c:1062
msgid "conflicting matchers specified"
msgstr "specificate corrispondenze in conflitto"
-#: src/grep.c:1347
+#: src/grep.c:1355
msgid "unknown directories method"
msgstr "metodo delle directory sconosciuto"
-#: src/grep.c:1414
-#, fuzzy
+#: src/grep.c:1422
msgid "invalid max count"
-msgstr "conto di ripetizioni incompleto"
+msgstr "numero massimo non valido"
-#: src/grep.c:1464
+#: src/grep.c:1472
msgid "unknown binary-files type"
msgstr "tipo di file binario sconosciuto"
-#: src/grep.c:1535
+#: src/grep.c:1543
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (grep GNU) %s\n"
-#: src/grep.c:1537
-#, fuzzy
+#: src/grep.c:1545
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1547
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"
@@ -297,22 +285,21 @@ msgstr ""
"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"
"\n"
-"Questo θ software libero; si veda il sorgente per le condizioni di "
-"copiatura.\n"
+"Questo θ software libero; si veda il sorgente per le condizioni di copiatura.\n"
"NON c'θ garanzia; neppure di COMMERCIABILITΐ o IDONEITΐ AD UN PARTICOLARE\n"
"SCOPO.\n"
-#: src/search.c:606
+#: src/search.c:623
msgid "The -P option is not supported"
-msgstr ""
+msgstr "L'opzione -P non θ gestita"
-#: src/search.c:619
+#: src/search.c:636
msgid "The -P and -z options cannot be combined"
-msgstr ""
+msgstr "Le opzioni -P e -z non possono essere combinate"
#: lib/error.c:117
msgid "Unknown system error"
-msgstr ""
+msgstr "Errore di sistema sconosciuto"
#: lib/getopt.c:675
#, c-format
@@ -387,43 +374,10 @@ msgstr "%s: l'opzione `-W %s' non accetta argomenti\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:259
+#: lib/quotearg.c:265
msgid "`"
-msgstr ""
+msgstr "`"
-#: lib/quotearg.c:260
+#: lib/quotearg.c:266
msgid "'"
-msgstr ""
-
-#~ msgid "option %s"
-#~ msgstr "opzione %s"
-
-#~ msgid " with arg %s"
-#~ msgstr " con arg %s"
-
-#~ msgid "digits occur in two different argv-elements.\n"
-#~ msgstr "compaiono cifre in due diversi elementi di argv.\n"
-
-#~ msgid "option %c\n"
-#~ msgstr "opzione %c\n"
-
-#~ msgid "option a\n"
-#~ msgstr "opzione a\n"
-
-#~ msgid "option b\n"
-#~ msgstr "opzione b\n"
-
-#~ msgid "option c with value `%s'\n"
-#~ msgstr "opzione c ha valore `%s'\n"
-
-#~ msgid "option d with value `%s'\n"
-#~ msgstr "opzione d ha valore `%s'\n"
-
-#~ msgid "?? getopt returned character code 0%o ??\n"
-#~ msgstr "?? getopt ha restituito il carattere codice 0%o ??\n"
-
-#~ msgid "non-option ARGV-elements: "
-#~ msgstr "elementi non-opzione di ARGV: "
-
-#~ msgid "memory exhausted\n"
-#~ msgstr "memoria esaurita\n"
+msgstr "'"
diff --git a/po/pl.po b/po/pl.po
index 319df493..92e4001c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,30 +1,30 @@
# Polish translation of the GNU grep messages
-# Copyright (C) 1995-1998, 1999 Free Software Foundation, Inc.
-# Rafa³ Maszkowski <rzm@icm.edu.pl>, 1996-1999.
+# Copyright (C) 1995-1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Rafa³ Maszkowski <rzm@icm.edu.pl>, 1996-2001.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.2f\n"
-"POT-Creation-Date: 2001-07-30 10:50-0400\n"
-"PO-Revision-Date: 1999-02-27 22:15+0200\n"
+"Project-Id-Version: GNU grep 2.5e\n"
+"POT-Creation-Date: 2001-03-07 00:02-0500\n"
+"PO-Revision-Date: 2001-06-04 21:45+0200\n"
"Last-Translator: Rafa³ Maszkowski <rzm@icm.edu.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
msgid "Memory exhausted"
msgstr "Pamiκζ wyczerpana"
-#: 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
+#: 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
msgid "Unbalanced ["
msgstr "[ nie do pary"
-#: src/dfa.c:741
+#: src/dfa.c:738
msgid "Unfinished \\ escape"
msgstr "Niedokoρczona sekwencja \\"
@@ -32,32 +32,32 @@ msgstr "Niedokoρczona sekwencja \\"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {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
+#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
msgid "unfinished repeat count"
msgstr "niedokoρczona liczba powtσrzeρ"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
msgid "malformed repeat count"
msgstr "Όle sformatowana liczba powtσrzeρ"
-#: src/dfa.c:1239
+#: src/dfa.c:1232
msgid "Unbalanced ("
msgstr "( nie do pary"
-#: src/dfa.c:1364
+#: src/dfa.c:1357
msgid "No syntax specified"
msgstr "Brak specyfikacji sk³adni"
-#: src/dfa.c:1372
+#: src/dfa.c:1365
msgid "Unbalanced )"
msgstr ") nie do pary"
-#: src/dfa.c:2942
+#: src/dfa.c:2933
msgid "out of memory"
msgstr "brak pamiκci"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: 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
msgid "memory exhausted"
msgstr "pamiκζ wyczerpana"
@@ -65,48 +65,48 @@ msgstr "pamiκζ wyczerpana"
msgid "invalid context length argument"
msgstr "b³κdny argument d³ugo¶ci kontekstowej"
-#: src/grep.c:458
+#: src/grep.c:466
msgid "input is too large to count"
-msgstr ""
+msgstr "danych wej¶ciowych jest zbyt duΏo do policzenia"
-#: src/grep.c:531
+#: src/grep.c:539
msgid "writing output"
msgstr "zapisujκ wyniki"
-#: src/grep.c:804
+#: src/grep.c:812
#, c-format
msgid "Binary file %s matches\n"
msgstr "Plik binarny %s pasuje do wzorca\n"
-#: src/grep.c:818
+#: src/grep.c:826
msgid "(standard input)"
msgstr "(standardowe wej¶cie)"
-#: src/grep.c:923
-#, fuzzy, c-format
+#: src/grep.c:931
+#, c-format
msgid "warning: %s: %s\n"
-msgstr "%s: uwaga: %s: %s\n"
+msgstr "uwaga: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:932
msgid "recursive directory loop"
msgstr "nieskoρczona pκtla przegl±dania katalogσw"
-#: src/grep.c:972
+#: src/grep.c:980
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "UΏycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
-#: src/grep.c:974
+#: src/grep.c:982
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Sprσbuj `%s --help' dla uzyskania informacji.\n"
-#: src/grep.c:979
+#: src/grep.c:987
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "UΏycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
-#: src/grep.c:980
+#: src/grep.c:988
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -114,17 +114,24 @@ msgid ""
"\n"
"Regexp selection and interpretation:\n"
msgstr ""
+"Szukanie WZORCA w kaΏdym pliku lub na standardowym wej¶ciu.\n"
+"Przyk³ad: %s -i 'hello world' menu.h main.c\n"
+"\n"
+"Wybσr i interpretacja wyraΏeρ regularnych:\n"
-#: src/grep.c:985
+#: src/grep.c:993
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 WZORZEC jest rozszerzonym wyr. regularnym\n"
+" -F, --fixed-strings WZORZEC napisy oddzielone przez zn. nowej linii\n"
+" -G, --basic-regexp WZORZEC jest podstawowym wyr. regularnym\n"
+" -P, --perl-regexp WZORZEC jest wyraΏeniem regularnym perla\n"
-#: src/grep.c:990
-#, fuzzy
+#: src/grep.c:998
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -133,20 +140,14 @@ 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 ""
-"Szukanie WZORCA w kaΏdym pliku lub na standardowym wej¶ciu.\n"
-"\n"
-"Interpretacja i wybσr wyrarΏeb regularnych:\n"
-" -E, --extended-regexp WZORZEC jest rozszerzonym wyr. regularnym\n"
-" -F, --fixed-strings WZORZEC napisy oddzielone przez zn. nowej linii\n"
-" -G, --basic-regexp WZORZEC jest podstawowym wyr. regularnym\n"
-" -e, --regexp=WZORZEC uΏyj WZORCA jako wyr. regularnego\n"
-" -f, --file=PLIK uΏyj WZORCA z PLIKU\n"
-" -i, --ignore-case zignoruj roΏnice miκdzy ma³ymi i duΏ. lit.\n"
-" -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:997
-#, fuzzy
+" -e, --regexp=WZORZEC uΏycie WZORCA jako wyraΏenia regularnego\n"
+" -f, --file=PLIK uΏycie wzorcσw z PLIKU\n"
+" -i, --ignore-case zignorowanie roΏnic miκdzy ma³ymi i wlk. lit.\n"
+" -w, --word-regexp dopasowanie WZORZEC tylko do pe³nych s³σw\n"
+" -x, --line-regexp dopasowanie WZORZEC tylko do ca³ych linii\n"
+" -z, --null-data linie s± zakoρczone bajtem 0, nie now± lini±\n"
+
+#: src/grep.c:1005
msgid ""
"\n"
"Miscellaneous:\n"
@@ -162,9 +163,9 @@ msgstr ""
" -v, --revert-match wybierz linie nie pasuj±ce\n"
" -V, --version wypisz informacjκ o wersji i zakoρcz\n"
" --help wy¶wietl tκ informacjκ i zakoρcz\n"
+" --mmap jeΏeli moΏliwe mapuj pliki w pamiκci\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1013
msgid ""
"\n"
"Output control:\n"
@@ -182,10 +183,9 @@ msgid ""
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', 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"
+" --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"
" -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"
@@ -193,23 +193,31 @@ msgid ""
msgstr ""
"\n"
"Sterowanie danymi wyj¶ciowymi:\n"
-" -b, --byte-offset wypisz pozycje bajtσw w wyniku\n"
-" -n, --line-number wypisuj numery linii w wyniku\n"
-" -H, --with-filename wypisz nazwκ pliku dla kaΏdej linii\n"
-" -h, --no-filename nie dopisuj nazwy pliku w liniach wyj¶ciowych\n"
-" -q, --quiet, --silent wy³±cz wypisywanie wyniku\n"
-" -a, --text nie wstrzymuj wyj¶ciowych danych binarnych\n"
-" -d, --directiories=AKCJA jak siκ obchodziζ z katalogami\n"
-" AKCJA to `read' (czytaj), `recurse' (przegl±daj\n"
-" rekurencyjnie) albo `skip' (pomiρ).\n"
-" -r, --recursive to samo co --directories=recurse .\n"
-" -L, --files-without-match wypisz tylko nazwy PLIKΣW bez trafieρ\n"
-" -l, --files-with-matches wypisz tylko nazwy PLIKΣW z trafieniami\n"
-" -c, --count wypisz tylko ilo¶ζ pasuj±cych linii w kaΏdym "
-"PLIKu\n"
-
-#: src/grep.c:1029
-#, fuzzy
+" -m, --max-count=ILE zatrzymanie po ILE dopasowaniach\n"
+" -b, --byte-offset wypisanie pozycji bajtσw w wyniku\n"
+" -n, --line-number wypisanie numerσw linii w wyniku\n"
+" --line-buffered oprσΏnienie buf. wyj. po kaΏdej linii\n"
+" -H, --with-filename wypisanie nazwy pliku dla kaΏdej linii\n"
+" -h, --no-filename bez nazwy pliku w liniach wyj¶ciowych\n"
+" -q, --quiet, --silent wy³±czenie wypisywanie wyniku\n"
+" --binary-files=TYP za³oΏenie, Ώe pliki binarne s± typu TYP\n"
+" TYP to 'binary', 'text' lub 'without-match'.\n"
+" -a, --text rσwnowaΏne --binary-files=text\n"
+" -I rσwnowaΏne --binary-files=without-match\n"
+" -d, --directories=AKCJA jak siκ obchodziζ z katalogami\n"
+" AKCJA to `read' (czytanie), `recurse'\n"
+" (przegl±danie rekurencujne) albo 'skip'\n"
+" (pominiκcie).\n"
+" -R, -r, --recursive rσwnowaΏne --directories=recurse .\n"
+" --include=WZORZEC przeszukiwane bκd± pliki pasuj±ce do WZORCA\n"
+" --exclude=WZORZEC pliki pasuj±ce do WZORCA bκd± pominiκte\n"
+" --exclude-from=PLIK pominiκcie plikσw pasuj±cych do WZORCΣW w PLIKU\n"
+" -L, --files-without-match wypisanie tylko nazw PLIKΣW bez trafieρ\n"
+" -l, --files-with-matches wypisanie tylko nazw PLIKΣW z trafieniami\n"
+" -c, --count wypisanie tylko ilo¶ci pasuj±cych linii w PLIKACH\n"
+" -Z, --null wypisanie bajtu 0 po kaΏdej nazwie PLIKU\n"
+
+#: src/grep.c:1037
msgid ""
"\n"
"Context control:\n"
@@ -228,27 +236,22 @@ msgid ""
msgstr ""
"\n"
"Sterowanie kontekstem:\n"
-" -B, --before-context=ILE wypisz ILE linii kontekstu przed\n"
-" -A, --after-context=ILE wypisz ILE linii kontekstu po\n"
-" -C, --context[=NUM] wypisz ILE (domy¶lnie 2) linii kontekstu, chyba\n"
-" Ώe zmienione przez opcjκ -A albo -B\n"
+" -B, --before-context=ILE wypisanie ILE linii kontekstu przed\n"
+" -A, --after-context=ILE wypisanie ILE linii kontekstu po\n"
+" -C, --context[=NUM] wypisanie ILE (domy¶lnie 2) linii kontekstu\n"
" -NUM to samo co --context=NUM\n"
-" -U, --binary nie usuwaj znakσw nowej linii na koρcu\n"
-" -u, --unix-byte-offsets podawaj pozycje tak jakby nie by³o CRσw (MSDOS)\n"
+" --color, --colour uΏycie znacznikσw pasuj±cych ci±gσw znakσw\n"
+" -U, --binary bez usuwania znakσw nowej linii na koρcu\n"
+" -u, --unix-byte-offsets podawanie pozycji tak jakby nie by³o CRσw (MSDOS)\n"
"\n"
-"Be opcji -[GEF] `egrep' zak³ada -E, `fgrep' -F, w przeciwnym razie -G.\n"
-"Bez PLIKu albo gdy PLIK to -, czytaj standadowe wej¶cie. JeΏeli podano\n"
-"mniej niΏ dwa PLIKi, zak³ada -h. Zakoρczenie z kodem 0 jeΏeli WZORZEC\n"
-"pasuje, z 1, jeΏeli nie, z 2, jeΏeli napotkano b³κdy syntaktyczne lub\n"
-"systemowe.\n"
+"`egrep' oznacza `grep -E'. `fgrep' oznacza `grep -F'.\n"
+"Bez PLIKu albo gdy PLIK to -, czytane jest standardowe wej¶cie. JeΏeli\n"
+"podano mniej niΏ dwa PLIKi, zak³ada -h. Zakoρczenie z kodem 0 jeΏeli\n"
+"WZORZEC pasuje, z 1, jeΏeli nie, z 2, jeΏeli s± problemy.\n"
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Raporty o b³κdach wysy³aj do bug-gnu-utils@gnu.org.\n"
+#: src/grep.c:1052
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nRaporty o b³κdach wysy³aj do bug-gnu-utils@gnu.org.\n"
# viendo los fuentes , hay varias opciones
# que hay sin documentar. O quiza es que getopt() lo he entendido mal
@@ -258,56 +261,51 @@ 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:1054
-#, fuzzy
+#: src/grep.c:1062
msgid "conflicting matchers specified"
-msgstr "wzorzec juΏ podany"
+msgstr "podane konfliktuj±ce wzorce"
-#: src/grep.c:1347
+#: src/grep.c:1355
msgid "unknown directories method"
msgstr "nieznany sposσb przegl±dania katalogσw"
-#: src/grep.c:1414
-#, fuzzy
+#: src/grep.c:1422
msgid "invalid max count"
-msgstr "niedokoρczona liczba powtσrzeρ"
+msgstr "b³κdna maksymalna liczba powtσrzeρ"
-#: src/grep.c:1464
+#: src/grep.c:1472
msgid "unknown binary-files type"
-msgstr ""
+msgstr "nieznany typ pliku binarnego"
-#: src/grep.c:1535
-#, fuzzy, c-format
+#: src/grep.c:1543
+#, c-format
msgid "%s (GNU grep) %s\n"
-msgstr "grep (GNU grep) %s\n"
+msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
-#, fuzzy
+#: src/grep.c:1545
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1997, Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1547
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 ""
-"Oprogramowanie darmowe. Warunki kopiowania zamieszczone s± w kodzie "
-"Όrσd³owym.\n"
-"Nie podlega Ώadnej gwarancji, nawet gwarancji przydatno¶ci do "
-"jakiegokolwiek\n"
+"Oprogramowanie darmowe. Warunki kopiowania zamieszczone s± w kodzie Όrσd³owym.\n"
+"Nie podlega Ώadnej gwarancji, nawet gwarancji przydatno¶ci do jakiegokolwiek\n"
"zastosowania lub sprzedaΏy.\n"
-#: src/search.c:606
+#: src/search.c:623
msgid "The -P option is not supported"
-msgstr ""
+msgstr "Opcja -P nie jest obs³ugiwana"
-#: src/search.c:619
+#: src/search.c:636
msgid "The -P and -z options cannot be combined"
-msgstr ""
+msgstr "Opcje -P i -z nie mog± wystκpowaζ razem"
#: lib/error.c:117
msgid "Unknown system error"
-msgstr ""
+msgstr "Nieznany b³±d systemowy"
#: lib/getopt.c:675
#, c-format
@@ -383,46 +381,11 @@ msgstr "%s: opcja `-W %s' nie moΏe mieζ argumentu\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:259
+#. ISO-8859-2 does not contain Polish left quotation mark
+#: lib/quotearg.c:265
msgid "`"
-msgstr ""
+msgstr "\""
-#: lib/quotearg.c:260
+#: lib/quotearg.c:266
msgid "'"
-msgstr ""
-
-#~ msgid "option %s"
-#~ msgstr "opcja %s"
-
-#~ msgid " with arg %s"
-#~ msgstr " z arg. %s"
-
-#~ msgid "digits occur in two different argv-elements.\n"
-#~ msgstr "cyfry wystκpuj± w dwσch rσΏnych elementach argv.\n"
-
-#~ msgid "option %c\n"
-#~ msgstr "opcja %c\n"
-
-#~ msgid "option a\n"
-#~ msgstr "opcja a\n"
-
-#~ msgid "option b\n"
-#~ msgstr "opcja b\n"
-
-#~ msgid "option c with value `%s'\n"
-#~ msgstr "opcja c o warto¶ci `%s'\n"
-
-#~ msgid "option d with value `%s'\n"
-#~ msgstr "opcja d o warto¶ci `%s'\n"
-
-#~ msgid "?? getopt returned character code 0%o ??\n"
-#~ msgstr "?? getopt zwrσci³ znak o kodzie 0%o ??\n"
-
-#~ msgid "non-option ARGV-elements: "
-#~ msgstr "elementy ARGV nie bκd±ce opcjami: "
-
-#~ msgid "you may specify only one of -E, -F, or -G"
-#~ msgstr "moΏesz podaζ tylko jedn± opcjκ z -E -F -G"
-
-#~ msgid "memory exhausted\n"
-#~ msgstr "pamiκζ wyczerpana\n"
+msgstr "\""
diff --git a/po/sl.po b/po/sl.po
index d1937e2d..e50f24b7 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,31 +2,31 @@
# 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.24 2001/07/31 18:18:28 alainm Exp $
+# $Id: sl.po,v 1.25 2001/07/31 20:27:57 alainm Exp $
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.4f\n"
-"POT-Creation-Date: 2001-07-30 10:50-0400\n"
-"PO-Revision-Date: 2000-02-15 20:11+01:00\n"
+"Project-Id-Version: GNU grep 2.5e\n"
+"POT-Creation-Date: 2001-03-07 00:02-0500\n"
+"PO-Revision-Date: 2001-06-08 13:22+02:00\n"
"Last-Translator: PrimoΎ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
"Language-Team: Slovenian <sl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
msgid "Memory exhausted"
msgstr "Pomnilnik porabljen"
-#: 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
+#: 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
msgid "Unbalanced ["
msgstr "Oklepaj [ brez zaklepaja"
-#: src/dfa.c:741
+#: src/dfa.c:738
msgid "Unfinished \\ escape"
msgstr "Nedokonθano ubeΎno zaporedje \\"
@@ -34,32 +34,32 @@ msgstr "Nedokonθano ubeΎno zaporedje \\"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {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
+#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
msgid "unfinished repeat count"
msgstr "nedokonθano Ήtevilo ponovitev"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
msgid "malformed repeat count"
msgstr "slabo doloθeno Ήtevilo ponovitev"
-#: src/dfa.c:1239
+#: src/dfa.c:1232
msgid "Unbalanced ("
msgstr "Oklepaj ( brez zaklepaja"
-#: src/dfa.c:1364
+#: src/dfa.c:1357
msgid "No syntax specified"
msgstr "Skladnja ni podana"
-#: src/dfa.c:1372
+#: src/dfa.c:1365
msgid "Unbalanced )"
msgstr "Zaklepaj ) brez oklepaja"
-#: src/dfa.c:2942
+#: src/dfa.c:2933
msgid "out of memory"
msgstr "zmanjkalo pomnilnika"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: 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
msgid "memory exhausted"
msgstr "pomnilnik porabljen"
@@ -67,48 +67,48 @@ msgstr "pomnilnik porabljen"
msgid "invalid context length argument"
msgstr "velikost konteksta ni veljavna"
-#: src/grep.c:458
+#: src/grep.c:466
msgid "input is too large to count"
-msgstr ""
+msgstr "vhod je prevelik, da bi ga mogli preΉteti"
-#: src/grep.c:531
+#: src/grep.c:539
msgid "writing output"
msgstr "pisanje rezultatov"
-#: src/grep.c:804
+#: src/grep.c:812
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binarna datoteka %s ustreza\n"
-#: src/grep.c:818
+#: src/grep.c:826
msgid "(standard input)"
msgstr "(standardni vhod)"
-#: src/grep.c:923
-#, fuzzy, c-format
+#: src/grep.c:931
+#, c-format
msgid "warning: %s: %s\n"
-msgstr "%s: pozor: %s: %s\n"
+msgstr "pozor: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:932
msgid "recursive directory loop"
msgstr "rekurzivna zanka imenikov"
-#: src/grep.c:972
+#: src/grep.c:980
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uporaba: %s [IZBIRA]... VZOREC [DATOTEKA]...\n"
-#: src/grep.c:974
+#: src/grep.c:982
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Poskusite ,%s --help` za dodatna pojasnila.\n"
-#: src/grep.c:979
+#: src/grep.c:987
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Uporaba: %s [IZBIRA]... VZOREC [DATOTEKA] ...\n"
-#: src/grep.c:980
+#: src/grep.c:988
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -121,8 +121,7 @@ msgstr ""
"\n"
"Izbira in tolmaθenje regularnih izrazov:\n"
-#: src/grep.c:985
-#, fuzzy
+#: src/grep.c:993
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -132,8 +131,9 @@ msgstr ""
" -E, --extended-regexp VZOREC je razΉirjeni regularni izraz\n"
" -F, --fixed-strings VZOREC je mnoΎica nizov, vsak v svoji vrstici\n"
" -G, --basic-regexp VZOREC je osnovni regularni izraz\n"
+" -P, --perl-regexp VZOREC je regularni izraz z razΉiritvami perla\n"
-#: src/grep.c:990
+#: src/grep.c:998
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -150,7 +150,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:997
+#: src/grep.c:1005
msgid ""
"\n"
"Miscellaneous:\n"
@@ -168,8 +168,7 @@ msgstr ""
" --help ta pomoθ\n"
" --mmap θe je moΎno, uporabi pomnilniΉko preslikan vhod\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1013
msgid ""
"\n"
"Output control:\n"
@@ -187,10 +186,9 @@ msgid ""
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', 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"
+" --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"
" -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"
@@ -198,28 +196,30 @@ msgid ""
msgstr ""
"\n"
"Nadzor izhoda:\n"
+" -m, --max-count=©TEVILO odnehamo, ko je doseΎeno ©TEVILO ujemanj\n"
" -b, --byte-offset z izpisom odmika (v zlogih)\n"
" -n, --line-number z izpisom zaporedne Ήtevilke vrstice\n"
+" --line-buffered izhodni medpomnilnik izpraznimo vsako vrstico\n"
" -H, --with-filename z izpisom imena datoteke\n"
" -h, --no-filename brez izpisa imena datoteke\n"
" -q, --quiet, --silent brez vsega obiθajnega izpisa\n"
" --binary-type=TIP privzemi izbrani TIP binarne datoteke\n"
-" TIP je lahko ,binary`, ,text` ali "
-",without-match`\n"
+" TIP je lahko ,binary`, ,text` ali ,without-match`\n"
" -a, --text isto kot --binary-type=text\n"
" -I isto kot --binary-type=without-match\n"
" -d, --directories=AKCIJA kako obravnavamo imenike\n"
" AKCIJA je lahko ,read`, ,recurse` ali ,skip`\n"
-" -r, --recursive isto kot --directories=recurse\n"
-" -L, --files-without-match le imena tistih DATOTEK, kjer VZORCA nismo "
-"naΉli\n"
+" -R, -r, --recursive isto kot --directories=recurse\n"
+" --include=VZOREC preiΉθemo le datoteke, ki ustrezajo VZORCU\n"
+" --exclude=VZOREC izpustimo datoteke, ki ustrezajo VZORCU\n"
+" --exclude-from=DATOTEKA izpustimo datoteke, ki ustrezajo vzorcu v DATOTEKI\n"
+" -L, --files-without-match le imena tistih DATOTEK, kjer VZORCA nismo naΉli\n"
" -l, --files-with-matches le imena tistih DATOTEK, kjer smo VZOREC naΉli\n"
" -c, --count le Ήtevilo vrstic, v katerih se v DATOTEKI\n"
" pojavi VZOREC\n"
" -Z, --null izpiΉi znak NUL za imenom DATOTEKE\n"
-#: src/grep.c:1029
-#, fuzzy
+#: src/grep.c:1037
msgid ""
"\n"
"Context control:\n"
@@ -240,81 +240,71 @@ msgstr ""
"Nadzor nad kontekstom:\n"
" -B, --before-context=©T ©T vrstic konteksta pred vrstico z VZORCEM\n"
" -A, --after-context=©T ©T vrstic konteksta za vrstico z VZORCEM\n"
-" -C, --context[=©T] ©T (privzeto 2) vrstic konteksta, razen θe ni\n"
-" drugaθe doloθeno z -A ali -B\n"
+" -C, --context[=©T] ©T vrstic konteksta pred in za vrstico z VZORCEM\n"
" -©T isto kot --context=©T\n"
+" --color, --colour ujemajoθe nize barvno oznaθimo\n"
" -U, --binary ne poreΎemo znakov CR na koncu vrstic (MS-DOS)\n"
" -u, --unix-byte-offsets v odmikih ne Ήtejemo znakov CR (MS-DOS)\n"
"\n"
"Ukaz ,egrep` pomeni isto kot ,grep -E`, ,fgrep` pa isto kot ,grep -F`.\n"
-"Θe DATOTEKA ni podana ali pa je -, beremo s standardnega vhoda. Θe sta "
-"podani\n"
-"manj kot dve DATOTEKI, privzamemo izbiro -h. Izhodna koda je niθ, θe smo "
-"VZOREC\n"
-"naΉli, ena θe ga nismo. Izhodna koda 2 pomeni skladenjsko ali sistemsko "
-"napako.\n"
-
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Morebitne napake v programu sporoθite na <bug-gnu-utils@gnu.org>.\n"
+"Θe DATOTEKA ni podana ali pa je -, beremo s standardnega vhoda. Θe sta podani\n"
+"manj kot dve DATOTEKI, privzamemo izbiro -h. Izhodna koda je niθ, θe smo VZOREC\n"
+"naΉli, ena θe ga nismo. Izhodna koda 2 pomeni skladenjsko ali sistemsko napako.\n"
+
+#: src/grep.c:1052
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nMorebitne napake v programu sporoθite na <bug-gnu-utils@gnu.org>.\n"
# Sporoθilo se pojavi pri nedokumentirani izbiri -X
# grep.c:622 ->
# opt = getopt(argc, argv, "0123456789A:B:CEFGVX:bce:f:hiLlnqsvwxy"
# grep --help ->
# usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
-#: src/grep.c:1054
+#: src/grep.c:1062
msgid "conflicting matchers specified"
msgstr "podana navodila si nasprotujejo"
-#: src/grep.c:1347
+#: src/grep.c:1355
msgid "unknown directories method"
msgstr "neznana metoda imenikov"
-#: src/grep.c:1414
-#, fuzzy
+#: src/grep.c:1422
msgid "invalid max count"
-msgstr "nedokonθano Ήtevilo ponovitev"
+msgstr "neveljavno najveθje Ήtevilo"
-#: src/grep.c:1464
+#: src/grep.c:1472
msgid "unknown binary-files type"
msgstr "neznan tip binarne datoteke"
-#: src/grep.c:1535
+#: src/grep.c:1543
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
-#, fuzzy
+#: src/grep.c:1545
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1547
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 ""
-"To je prost program; pogoji, pod katerimi ga lahko uporabljate, "
-"razmnoΎujete\n"
+"To je prost program; pogoji, pod katerimi ga lahko uporabljate, razmnoΎujete\n"
"in razΉirjate so navedeni v izvorni kodi. Za program ni NOBENEGA jamstva,\n"
"niti jamstev USTREZNOSTI ZA PRODAJO ali PRIMERNOSTI ZA UPORABO.\n"
-#: src/search.c:606
+#: src/search.c:623
msgid "The -P option is not supported"
-msgstr ""
+msgstr "Izbira -P ni podprta"
-#: src/search.c:619
+#: src/search.c:636
msgid "The -P and -z options cannot be combined"
-msgstr ""
+msgstr "Izbiri -P in -z se med seboj izkljuθujeta"
#: lib/error.c:117
msgid "Unknown system error"
-msgstr ""
+msgstr "Neznana sistemska napaka"
#: lib/getopt.c:675
#, c-format
@@ -389,13 +379,13 @@ msgstr "%s: izbira ,-W %s` ne dovoljuje argumenta\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:259
+#: lib/quotearg.c:265
msgid "`"
-msgstr ""
+msgstr ","
-#: lib/quotearg.c:260
+#: lib/quotearg.c:266
msgid "'"
-msgstr ""
+msgstr "`"
#~ msgid "option %s"
#~ msgstr "izbira %s"