summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorAlain Magloire <alainm@rcsm.ee.mcgill.ca>2000-02-26 03:46:03 +0000
committerAlain Magloire <alainm@rcsm.ee.mcgill.ca>2000-02-26 03:46:03 +0000
commit4cf2ad2e7acc162c184fbfc0995cde35517954c3 (patch)
tree66ef9fd24b9d7a78404cc69cfc8802de4fba2b1b /po
parent0fb1168d3d8f44598a88b0f643de894ab65d1c4f (diff)
downloadgrep-4cf2ad2e7acc162c184fbfc0995cde35517954c3.tar.gz
Modified Files:
ChangeLog configure.in po/de.po po/el.po po/es.po po/fr.po po/ko.po po/nl.po po/no.po po/pl.po po/pt_BR.po po/ru.po po/sl.po po/sv.po updates. * po/*.po: update of the PO files.
Diffstat (limited to 'po')
-rw-r--r--po/de.po191
-rw-r--r--po/el.po253
-rw-r--r--po/es.po269
-rw-r--r--po/fr.po92
-rw-r--r--po/ko.po97
-rw-r--r--po/nl.po97
-rw-r--r--po/no.po99
-rw-r--r--po/pl.po104
-rw-r--r--po/pt_BR.po90
-rw-r--r--po/ru.po104
-rw-r--r--po/sl.po274
-rw-r--r--po/sv.po225
12 files changed, 892 insertions, 1003 deletions
diff --git a/po/de.po b/po/de.po
index d16ebdcf..a0a32306 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,23 +1,23 @@
# German messages for GNU grep
-# Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
-# Martin von Löwis <martin@mira.isdn.cs.tu-berlin.de>, 1997, 1998, 1999
+# Copyright (C) 1997-99, 2000 Free Software Foundation, Inc.
+# Martin von Löwis <martin@mira.isdn.cs.tu-berlin.de>, 1997-99, 2000
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.3f\n"
-"POT-Creation-Date: 1999-10-05 22:33-0400\n"
-"PO-Revision-Date: 1999-10-10 15:32+02:00\n"
+"Project-Id-Version: GNU grep 2.4f\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
+"PO-Revision-Date: 2000-02-15 20:48+01:00\n"
"Last-Translator: Martin von Löwis <martin@mira.isdn.cs.tu-berlin.de>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "Virtueller Speicher erschöpft."
-#: src/dfa.c:457
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr "Unbeendete \\-Escape-Sequenz."
@@ -25,18 +25,18 @@ msgstr "Unbeendete \\-Escape-Sequenz."
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "Unbeendeter Wiederholungszähler."
-#: src/dfa.c:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr "Unförmiger Wiederholungszähler."
# Is this message used only for [ without matching ],
# or for ] without [ as well?
-#: src/dfa.c:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
-#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
msgid "Unbalanced ["
msgstr "Öffnende [ ohne schließende."
@@ -44,138 +44,87 @@ msgstr "Öffnende [ ohne schließende."
msgid "Unbalanced ("
msgstr "Öffnende ( ohne schließende."
-#: src/dfa.c:1007
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr "Keine Syntax angegeben."
-#: src/dfa.c:1015
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr "Schließende ) ohne öffnende."
-#: src/dfa.c:2036
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "Speicher ist alle."
-#: src/getopt.c:628
+#: src/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: Die Option »%s« ist mehrdeutig.\n"
-#: src/getopt.c:652
+#: src/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: Die Option »%s« erlaubt keinen Parameter.\n"
-#: src/getopt.c:657
+#: src/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: Die Option »%c%s« erlaubt keinen Parameter.\n"
-#: src/getopt.c:674 src/getopt.c:847
+#: src/getopt.c:723 src/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: Die Option »%s« verlangt einen Parameter.\n"
#. --option
-#: src/getopt.c:703
+#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: Nicht erkannte Option »--%s«\n"
#. +option or -option
-#: src/getopt.c:707
+#: src/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: Nicht erkannte Option »%c%s«.\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
+#: src/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: Ungültige Option -- %c.\n"
-#: src/getopt.c:736
+#: src/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: Ungültige Option -- %c.\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
+#: src/getopt.c:815 src/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: Option verlangt einen Parameter -- %c.\n"
-#: src/getopt.c:813
+#: src/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: Option »-W %s« ist zweideutig.\n"
-#: src/getopt.c:831
+#: src/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: Option »-W %s« erlaubt keinen Parameter.\n"
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr "Option %s"
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr "mit Argument %s."
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr "In zwei verschiedenen argv-Elementen tauchen Ziffern auf.\n"
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr "Option %c\n"
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr "Option a\n"
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr "Option b\n"
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr "Option c mit Wert »%s«\n"
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr "Option s mit Wert »%s«\n"
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr "?? getopt ergab Zeichen 0%o ??\n"
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr "Nicht-Options-ARGV-Elemente: "
-
-#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
-#: src/kwset.c:190
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
msgid "memory exhausted"
msgstr "Virtueller Speicher erschöpft."
-#: src/grep.c:418 src/grep.c:883
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: Warnung: %s: %s\n"
-
-#: src/grep.c:543 src/grep.c:1429
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "schreibe Ausgabe"
-#: src/grep.c:775
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr "Übereinstimmungen in Binärdatei %s.\n"
@@ -184,47 +133,55 @@ msgstr "Übereinstimmungen in Binärdatei %s.\n"
msgid "(standard input)"
msgstr "(Standardeingabe)"
-#: src/grep.c:884
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: Warnung: %s: %s\n"
+
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr "Rekursive Verzeichnisschleife."
-#: src/grep.c:935
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI]...\n"
-#: src/grep.c:936
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "»%s --help« gibt Ihnen mehr Informationen.\n"
-#: src/grep.c:940
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI] ...\n"
-#: src/grep.c:941
+#: src/grep.c:944
+#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
msgstr ""
"Suche nach MUSTER in jeder DATEI oder der Standardeingabe.\n"
+"Beispiel: %s -i 'Hallo Welt' menu.h main.c\n"
"\n"
"Auswahl und Interpretation regulärer Ausdrücke:\n"
-#: src/grep.c:945
+#: src/grep.c:949
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
msgstr ""
" -E, --extended-regexp MUSTER ist ein erweiterter regulärer Ausdruck.\n"
-" -F, --fixed-regexp MUSTER ist eine feste Zeichenkette\n"
-" getrennt durch Leerzeichen.\n"
+" -F, --fixed-strings MUSTER ist eine Menge Newline-getrennter \n"
+" Zeichenketten.\n"
" -G, --basic-regexp MUSTER ist ein regulärer Standardausdruck.\n"
-#: src/grep.c:949
+#: src/grep.c:953
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -241,7 +198,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:956
+#: src/grep.c:960
msgid ""
"\n"
"Miscellaneous:\n"
@@ -249,6 +206,7 @@ msgid ""
" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
"Verschiedenes:\n"
@@ -256,8 +214,9 @@ msgstr ""
" -v, --revert-match Nicht-passende Zeilen anzeigen.\n"
" -V, --version Versionnummer ausgeben und beenden.\n"
" --help Diese Hilfe ausgeben und beenden.\n"
+" --mmap Wenn möglich, Eingabe in den Speicher mappen.\n"
-#: src/grep.c:963
+#: src/grep.c:968
msgid ""
"\n"
"Output control:\n"
@@ -266,7 +225,10 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
@@ -282,7 +244,10 @@ msgstr ""
" -H, --with-filename Dateiname bei jeder Übereinstimmung anzeigen.\n"
" -h, --no-filename Anzeige des Dateinamens unterdrücken.\n"
" -q, --quiet, --silent Alle normalen Ausgaben unterdrücken.\n"
-" -a, --text Binärausgaben nicht unterdrücken.\n"
+" --binary-files=TYP Binärdateien als TYP annehmen. TYP kann \n"
+" »binary«, »text« oder »without-match« sein.\n"
+" -a, --text Entspricht --binary-files=text.\n"
+" -I Entspricht --binary-files=without-match.\n"
" -d, --directories=AKTION Verarbeitung von Verzeichnissen festlegen.\n"
" AKTION ist 'read', 'recurse', oder 'skip'.\n"
" -r, --recursive Äquivalent zu --directories=recurse.\n"
@@ -292,22 +257,22 @@ msgstr ""
" -c, --count Nur Zahl der passenden Zeilen pro Datei ausgeben.\n"
" -Z, --null Null-Byte nach jedem Dateinamen ausgeben.\n"
-#: src/grep.c:979
+#: src/grep.c:987
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
msgstr ""
"\n"
"Kontextkontrolle:\n"
@@ -322,34 +287,38 @@ msgstr ""
"»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 Syntax- oder Systemfehlern.\n"
+"Übereinstimmungen, 1 ohne, 2 bei Problemen.\n"
-#: src/grep.c:994
+#: src/grep.c:1002
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nFehlerberichte bitte an <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1005
+#: src/grep.c:1012
msgid "conflicting matchers specified"
msgstr "Festgelegte Vergleicher widersprechen einander."
-#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
msgid "invalid context length argument"
msgstr "Ungültige Kontextlänge."
-#: src/grep.c:1271
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr "Unbekannte Methode für Verzeichnisse."
-#: src/grep.c:1366
+#: src/grep.c:1358
+msgid "unknown binary-files type"
+msgstr "Unbekannter Typ für »--binary-files«."
+
+#: src/grep.c:1378
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1368
-msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+#: src/grep.c:1380
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
-#: src/grep.c:1370
+#: src/grep.c:1382
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -357,7 +326,3 @@ msgstr ""
"Dies ist freie Software; in den Quellen befinden sich die Lizenzbedingungen.\n"
"Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n"
"VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK.\n"
-
-#: src/obstack.c:467
-msgid "memory exhausted\n"
-msgstr "Virtueller Speicher erschöpft.\n"
diff --git a/po/el.po b/po/el.po
index 0da239e9..eb39bc2c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,12 +1,12 @@
-# Greek messages for GNU grep-2.3f.
-# Copyright (C) 1998 Free Software Foundation, Inc.
-# Simos Xenitellis <S.Xenitellis@rhbnc.ac.uk>, 1998.
+# Greek messages for GNU grep-2.2f.
+# Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+# Simos Xenitellis <S.Xenitellis@rhbnc.ac.uk>, 1998, 1999, 2000.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.3f\n"
-"POT-Creation-Date: 1999-10-05 22:33-0400\n"
-"PO-Revision-Date: 1999-10-17 20:15+0000\n"
+"Project-Id-Version: GNU grep 2.2f\n"
+"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"PO-Revision-Date: 2000-02-16 00:35+0000\n"
"Last-Translator: Simos Xenitellis <S.Xenitellis@rhbnc.ac.uk>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
"MIME-Version: 1.0\n"
@@ -15,29 +15,38 @@ 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:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
+# File: src/dfa.c, line: 155
+# File: src/dfa.c, line: 167
+# File: src/dfa.c, line: 180
+# File: src/grep.c, line: 858
msgid "Memory exhausted"
msgstr "Ç ìíÞìç åîáíôëÞèçêå"
# src/dfa.c:444
# src/dfa.c:452
-#: src/dfa.c:457
+# File: src/dfa.c, line: 452
msgid "Unfinished \\ escape"
msgstr "Ìç ôåñìáôéóìÝíïò ÷áñáêôÞñáò äéáöõãÞò \\"
# src/dfa.c:556 src/dfa.c:562 src/dfa.c:573 src/dfa.c:584
# src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
+# File: src/dfa.c, line: 564
+# File: src/dfa.c, line: 570
+# File: src/dfa.c, line: 581
+# File: src/dfa.c, line: 592
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
+#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
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:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
+# File: src/dfa.c, line: 577
+# File: src/dfa.c, line: 591
+# File: src/dfa.c, line: 595
msgid "malformed repeat count"
msgstr "êáêïó÷çìáôéóìÝíïò ìåôñçôÞò åðáíÜëçøçò"
@@ -45,179 +54,187 @@ 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:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
-#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
+# File: src/dfa.c, line: 660
+# File: src/dfa.c, line: 663
+# File: src/dfa.c, line: 690
+# File: src/dfa.c, line: 694
+# File: src/dfa.c, line: 695
+# File: src/dfa.c, line: 698
+# File: src/dfa.c, line: 711
+# File: src/dfa.c, line: 712
msgid "Unbalanced ["
msgstr "Ìç éóóïñïðçìÝíï ["
# src/dfa.c:841
# src/dfa.c:849
-#: src/dfa.c:886
+# File: src/dfa.c, line: 849
msgid "Unbalanced ("
msgstr "Ìç éóïññïðçìÝíï ("
# src/dfa.c:962
# src/dfa.c:970
-#: src/dfa.c:1007
+# File: src/dfa.c, line: 970
msgid "No syntax specified"
msgstr "Äåí ïñßóôçêå óõíôáêôéêü"
# src/dfa.c:970
# src/dfa.c:978
-#: src/dfa.c:1015
+# File: src/dfa.c, line: 978
msgid "Unbalanced )"
msgstr "Ìç éóïññïðçìÝíï )"
# src/dfa.c:1990
# src/dfa.c:1998
-#: src/dfa.c:2036
+# File: src/dfa.c, line: 1998
msgid "out of memory"
msgstr "åîáíôëÞèçêå ç ìíÞìç"
# src/getopt.c:628
# src/getopt.c:628
-#: src/getopt.c:628
+# File: src/getopt.c, line: 628
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: ç åðéëïãÞ `%s' åßíáé äéöïñïýìåíç\n"
# src/getopt.c:652
# src/getopt.c:652
-#: src/getopt.c:652
+# File: src/getopt.c, line: 652
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: ç åðéëïãÞ `--%s' äåí åðéôñÝðåé ïñßóìáôá\n"
# src/getopt.c:657
# src/getopt.c:657
-#: src/getopt.c:657
+# File: src/getopt.c, line: 657
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: ç åðéëïãÞ `%c%s' äåí åðéôñÝðåé ïñßóìáôá\n"
# src/getopt.c:674 src/getopt.c:847
# src/getopt.c:674 src/getopt.c:847
-#: src/getopt.c:674 src/getopt.c:847
+# File: src/getopt.c, line: 674
+# File: src/getopt.c, line: 847
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: ç åðéëïãÞ `%s' áðáéôåß üñéóìá\n"
# src/getopt.c:703
# src/getopt.c:703
+# File: src/getopt.c, line: 703
#. --option
-#: src/getopt.c:703
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: ìç áíáãíùñßóéìç åðéëïãÞ `--%s'\n"
# src/getopt.c:707
# src/getopt.c:707
+# File: src/getopt.c, line: 707
#. +option or -option
-#: src/getopt.c:707
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: ìç áíáãíùñßóéìç åðéëïãÞ `%c%s'\n"
# src/getopt.c:733
# src/getopt.c:733
+# File: src/getopt.c, line: 733
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: ìç áðïäåêôÞ åðéëïãÞ -- %c\n"
# src/getopt.c:736
# src/getopt.c:736
-#: src/getopt.c:736
+# File: src/getopt.c, line: 736
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: ìç Ýãêõñç åðéëïãÞ -- %c\n"
# src/getopt.c:766 src/getopt.c:896
# src/getopt.c:766 src/getopt.c:896
+# File: src/getopt.c, line: 766
+# File: src/getopt.c, line: 896
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: ç åðéëïãÞ áðáéôåß Ýíá üñéóìá -- %c\n"
# src/getopt.c:813
# src/getopt.c:813
-#: src/getopt.c:813
+# File: src/getopt.c, line: 813
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: ç åðéëïãÞ `-W %s' åßíáé äéöïñïýìåíç\n"
# src/getopt.c:831
# src/getopt.c:831
-#: src/getopt.c:831
+# File: src/getopt.c, line: 831
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: ç åðéëïãÞ `-W %s' äåí äÝ÷åôáé ïñßóìáôá\n"
# src/getopt1.c:132
# src/getopt1.c:132
-#: src/getopt1.c:132
+# File: src/getopt1.c, line: 132
#, c-format
msgid "option %s"
msgstr "åðéëïãÞ %s"
# src/getopt1.c:134
# src/getopt1.c:134
-#: src/getopt1.c:134
+# File: src/getopt1.c, line: 134
#, c-format
msgid " with arg %s"
msgstr " ìå üñéóìá %s"
# src/getopt1.c:149
# src/getopt1.c:149
-#: src/getopt1.c:149
+# File: src/getopt1.c, line: 149
msgid "digits occur in two different argv-elements.\n"
msgstr "õðÜñ÷ïõí øçößá óå äýï äéáöïñåôéêÜ argv-óôïé÷åßá.\n"
# src/getopt1.c:151
# src/getopt1.c:151
-#: src/getopt1.c:151
+# File: src/getopt1.c, line: 151
#, c-format
msgid "option %c\n"
msgstr "åðéëïãÞ %c\n"
# src/getopt1.c:155
# src/getopt1.c:155
-#: src/getopt1.c:155
+# File: src/getopt1.c, line: 155
msgid "option a\n"
msgstr "åðéëïãÞ á\n"
# src/getopt1.c:159
# src/getopt1.c:159
-#: src/getopt1.c:159
+# File: src/getopt1.c, line: 159
msgid "option b\n"
msgstr "åðéëïãÞ â\n"
# src/getopt1.c:163
# src/getopt1.c:163
-#: src/getopt1.c:163
+# File: src/getopt1.c, line: 163
#, c-format
msgid "option c with value `%s'\n"
msgstr "åðéëïãÞ ã ìå ôéìÞ `%s'\n"
# src/getopt1.c:167
# src/getopt1.c:167
-#: src/getopt1.c:167
+# File: src/getopt1.c, line: 167
#, c-format
msgid "option d with value `%s'\n"
msgstr "åðéëïãÞ ä ìå ôéìÞ `%s'\n"
# src/getopt1.c:174
# src/getopt1.c:174
-#: src/getopt1.c:174
+# File: src/getopt1.c, line: 174
#, c-format
msgid "?? getopt returned character code 0%o ??\n"
msgstr "?? ç getopt åðÝóôñåøå áëöáâçôéêü êùäéêü 0%o ??\n"
# src/getopt1.c:180
# src/getopt1.c:180
-#: src/getopt1.c:180
+# File: src/getopt1.c, line: 180
msgid "non-option ARGV-elements: "
msgstr "ARGV-óôïé÷åßá ðïõ äåí åßíáé åðéëïãÝò: "
@@ -225,121 +242,120 @@ msgstr "ARGV-óôïé÷åßá ðïõ äåí åßíáé åðéëïãÝò: "
# src/kwset.c:190
# src/grep.c:164 src/grep.c:181 src/grep.c:283 src/grep.c:338 src/kwset.c:184
# src/kwset.c:190
-#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
-#: src/kwset.c:190
+# File: src/grep.c, line: 169
+# File: src/grep.c, line: 186
+# File: src/grep.c, line: 288
+# File: src/grep.c, line: 344
+# File: src/kwset.c, line: 184
+# File: src/kwset.c, line: 190
msgid "memory exhausted"
msgstr "ç ìíÞìç åîáíôëÞèçêå"
# src/grep.c:293
# src/grep.c:366
-#: src/grep.c:418 src/grep.c:883
+# File: src/grep.c, line: 372
+# File: src/grep.c, line: 843
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: ðñïåéäïðïßçóç: %s: %s\n"
# src/grep.c:392 src/grep.c:1034
# src/grep.c:487 src/grep.c:1284
-#: src/grep.c:543 src/grep.c:1429
+# File: src/grep.c, line: 497
+# File: src/grep.c, line: 1318
msgid "writing output"
msgstr "åããñáöÞ áðïôåëÝóìáôïò"
# src/grep.c:715
-#: src/grep.c:775
+# File: src/grep.c, line: 726
#, 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:791
+# File: src/grep.c, line: 742
msgid "(standard input)"
msgstr "(óôÜíôáñô åßóïäïò)"
# src/grep.c:844
-#: src/grep.c:884
+# File: src/grep.c, line: 844
msgid "recursive directory loop"
msgstr "áíáäñïìéêÞ áëëçëïäéáäï÷Þ êáôáëüãùí"
# src/grep.c:597
# src/grep.c:862
-#: src/grep.c:935
+# File: src/grep.c, line: 895
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... Ó×ÇÌÁÔÉÓÌÏÓ [ÁÑ×ÅÉÏ]...\n"
# src/grep.c:598
# src/grep.c:863
-#: src/grep.c:936
+# File: src/grep.c, line: 896
#, 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:940
+# File: src/grep.c, line: 900
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... Ó×ÇÌÁÔÉÓÌÏÓ [ÁÑ×ÅÉÏ] ...\n"
-#: src/grep.c:941
+# src/grep.c:603
+# src/grep.c:868
+# File: src/grep.c, line: 901
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
"Regexp selection and interpretation:\n"
-msgstr ""
-"ÁíáæÞôçóç Ó×ÇÌÁÔÉÓÌÏÕ óå êÜèå ÁÑ×ÅÉÏ Þ óôçí êáíïíéêÞ åßóïäï.\n"
-"\n"
-"ÅðéëïãÞ êáíïíéêÞò Ýêöñáóçò êáé ìåôÜöñáóç:\n"
-
-#: src/grep.c:945
-msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
-msgstr ""
-" -E, --extended-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé ìéá åêôåôáìÝíç êáíïíéêÞ Ýêöñáóç\n"
-" -F, --fixed-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé áëöáñéèìçôéêü ïñéóìÝíïõ ìåãÝèïõò\n"
-" äéá÷ùñéóìÝíïõ ìå ÷áñáêôÞñåò áëëáãÞò ãñáììÞò\n"
-" -G, --basic-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé ìéá âáóéêÞ êáíïíéêÞ Ýêöñáóç\n"
-
-# src/grep.c:603
-# src/grep.c:868
-#: src/grep.c:949
-msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
-" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
+"ÁíáæÞôçóç ãéá Ó×ÇÌÁÔÉÓÌÏ óå êÜèå ÁÑ×ÅÉÏ Þ óôç óôÜíôáñô åßóïäï.\n"
+"\n"
+"ÅðéëïãÝò Þ regexp êáé åîÞãçóç:\n"
+" -E, --extended-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé ìéá åêôåôáìÝíç êáíïíéêÞ Ýêöñáóç\n"
+" -F, --fixed-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé óôáôéêü áëöáñéèìçôéêü äéá÷ùñé-\n"
+" æüìåíï ìå ÷áñáêôÞñåò áëëáãÞò ãñáììÞò\n"
+" -G, --basic-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé áðëÞ êáíïíéêÞ Ýêöñáóç\n"
" -e, --regexp=Ó×ÇÌÁÔÉÓÌÏÓ ÷ñÞóç Ó×ÇÌÁÔÉÓÌÏÕ ãéá êáíïíéêÞ Ýêöñáóç\n"
" -f, --file=ÁÑ×ÅÉÏ ëÞøç Ó×ÇÌÁÔÉÓÌÏÕ áðü ôï áñ÷åßï ÁÑ×ÅÉÏ\n"
" -i, --ignore-case áãíüçóå äéáöïñÝò ðåæþí/êåöáëáßùí\n"
-" -w, --word-regexp åðéâïëÞ ôïõ Ó×ÇÌÁÔÉÓÌÏÕ íá ôáéñéÜæåé ìüíï ïëüêëçñåò ëÝîåéò\n"
-" -x, --line-regexp åðéâïëÞ ôïõ Ó×ÇÌÁÔÉÓÌÏÕ íá ôáéñéÜæåé ìüíï ïëüêëçñåò ãñáììÝò\n"
+" -w, --word-regexp åðéâïëÞ ôïõ Ó×ÇÌÁÔÉÓÌÏÕ íá ôáéñéÜæåé ìüíï\n"
+" ïëüêëçñåò ëÝîåéò\n"
+" -x, --line-regexp åðéâïëÞ ôïõ Ó×ÇÌÁÔÉÓÌÏÕ íá ôáéñéÜæåé ìüíï\n"
+" ïëüêëçñåò ãñáììÝò\n"
# src/grep.c:615
# src/grep.c:880
-#: src/grep.c:956
+# File: src/grep.c, line: 913
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --invert-match select non-matching lines\n"
+" -v, --revert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
msgstr ""
"\n"
"ËïéðÜ:\n"
-" -s, --no-messages áðïöõãÞ åìöÜíéóçò ìçíõìÜôùí óöáëìÜôùí\n"
+" -s, --no-messages áðïöõãÞ åìöÜíéóçò ìõíçìÜôùí óöáëìÜôùí\n"
" -v, --revert-match åðéëïãÞ ãñáììþí ðïõ äåí ôáéñéÜæïõí\n"
" -V, --version åìöÜíéóçò ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
" --help åìöÜíéóçò áõôÞò ôçò âïÞèåéáò êáé Ýîïäïò\n"
# src/grep.c:622
# src/grep.c:887
-#: src/grep.c:963
+# File: src/grep.c, line: 920
msgid ""
"\n"
"Output control:\n"
@@ -355,32 +371,30 @@ msgid ""
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
-" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
"¸ëåã÷ïò åîüäïõ:\n"
" -b, --byte-offset åìöÜíéóç ó÷åôéêÞò èÝóçò ôïõ byte ìå ôéò ãñáììÝò\n"
-" åîüäïõ\n"
-" -n, --line-number åìöÜíéóç áñéèìïý ãñáììÞò ìå ôéò ãñáììÝò åîüäïõ\n"
+" åîüäïõ\n"
+" -n, --line-number åìöÜíéóç áñéèìþí ãñáììÞò ìå ôéò ãñáììÝò åîüäïõ\n"
" -H, --with-filename åìöÜíéóç ïíüìáôïò áñ÷åßïõ ìå êÜèå ôáßñéáóìá\n"
" -h, --no-filename áðïöõãÞ åìöÜíéóçò ôïõ ïíüìáôïò ôïõ áñ÷åßïõ óôçí\n"
-" áñ÷Þ ôçò åîüäïõ\n"
+" áñ÷Þ ôçò åîüäïõ\n"
" -q, --quiet, --silent áðïöõãÞ åìöÜíéóçò üëçò ôçò êáíïíéêÞò åîüäïõ\n"
" -a, --text íá ìçí áðïöåõ÷èåß ç Ýîïäïò äõáäéêþí äåäïìÝíùí\n"
" -d, --directories=ÅÍÅÑÃÅÉÁ ôñüðïò ÷ñÞóçò ôùí êáôáëüãùí\n"
" Ç ÅÍÅÑÃÅÉÁ åßíáé 'read', 'recurse' Þ 'skip'.\n"
" (Ãéá áíÜãíùóç, áíáäñïìÞ êáé ðáñÜêáìøç áíôßóôïé÷á).\n"
" -r, --recursive éóïäýíáìï ìå --directories=recurse.\n"
-" -L, --files-without-match åìöÜíéóç ìüíï ôùí ïíïìÜôùí ÁÑ×ÅÉÙÍ ðïõ äåí\n"
-" ðåñéÝ÷ïõí ôáéñéÜóìáôá\n"
+" -L, --files-without-match åìöÜíéóç ìüíï ôá ïíüìáôá ÁÑ×ÅÉÙÍ ðïõ äåí\n"
+" ðåñéÝ÷ïõí ôáéñéÜóìáôá\n"
" -l, --files-with-matches åìöÜíéóç ìüíï ôá ïíüìáôá ÁÑ×ÅÉÙÍ ìå ôáéñéÜóìáôá\n"
" -c, --count åìöÜíéóç ìüíï ôïí áñéèìü ôùí ãñáììþí ìå\n"
-" ôáéñéÜóìáôá ãéá êÜèå ÁÑ×ÅÉÏ\n"
-" -Z, --null åìöÜíéóç 0 byte ìåôÜ áðü ôï üíïìá ÁÑ×ÅÉÏÕ\n"
+" ôáéñéÜóìáôá ãéá êÜèå ÁÑ×ÅÉÏ\n"
# src/grep.c:633
# src/grep.c:902
-#: src/grep.c:979
+# File: src/grep.c, line: 935
msgid ""
"\n"
"Context control:\n"
@@ -392,89 +406,94 @@ msgid ""
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
"With no FILE, or when FILE is -, read standard input. If less than\n"
"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
"Exit with 2 if syntax errors or system errors.\n"
msgstr ""
"\n"
"¸ëåã÷ïò âÜóç ôïõ ðåñéå÷ïìÝíïõ:\n"
-" -B, --before-context=ÁÑÉÈÌÏÓ åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí\n"
-" ìå áêïëïõèïýìåíï ðåñéå÷üìåíï\n"
-" -A, --after-context=ÁÑÉÈÌÏÓ åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí\n"
-" ìå ðñïðïñåõüìåíï ðåñéå÷üìåíï\n"
-" -C, --context[=ÁÑÉÈÌÏÓ] åìöÜíéóç ÁÑÉÈÌÏÓ (åî ïñéóìïý 2)\n"
-" ãñáììþí ìå ðåñéå÷üìåíï åîüäïõ\n"
+" -B, --before-context=ÁÑÉÈÌÏÓ åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí ìå áêïëïõèïýìåíï\n"
+" ðåñéå÷üìåíï\n"
+" -A, --after-context=ÁÑÉÈÌÏÓ åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí ìå ðñïðïñåõüìåíï\n"
+" ðåñéå÷üìåíï\n"
+" -C, --context[=ÁÑÉÈÌÏÓ] åìöÜíéóç ÁÑÉÈÌÏÓ (åî ïñéóìïý 2) ãñáììþí ìå\n"
+" ðåñéå÷üìåíï åîüäïõ\n"
" åêôüò êé áí áíáéñåèåß ìå -A Þ -B\n"
" -NUM ôï ßäéï ìå --context=ÁÑÉÈÌÏÓ\n"
" -U, --binary íá ìçí áðáëåßöïíôáé ÷áñáêôÞñåò CR óôï EOL (MSDOS)\n"
-" -u, --unix-byte-offsets áíáöïñÜ ó÷åôéêþí èÝóåùí óáí íá ìçí õðÞñ÷áí\n"
-" ÷áñáêôÞñåò áëëáãÞò ãñáììÞò (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"
# src/grep.c:647
# src/grep.c:917
-#: src/grep.c:994
+# File: src/grep.c, line: 950
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:1005
-msgid "conflicting matchers specified"
-msgstr "Ý÷ïõí ïñéóôåß ó÷çìáôéóìïß ôáéñéÜóìáôïò ðïõ áëëçëïóõãêñïýïíôáé"
-
# src/grep.c:785 src/grep.c:792
# src/grep.c:1060 src/grep.c:1067 src/grep.c:1076
-#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
+# File: src/grep.c, line: 1093
+# File: src/grep.c, line: 1100
+# File: src/grep.c, line: 1109
msgid "invalid context length argument"
msgstr "ìç Ýãêõñï üñéóìá ìÞêïõò ðåñéå÷ïìÝíïõ"
+# src/grep.c:800 src/grep.c:805 src/grep.c:810
+# src/grep.c:1083 src/grep.c:1088 src/grep.c:1093
+# File: src/grep.c, line: 1116
+# File: src/grep.c, line: 1121
+# File: src/grep.c, line: 1126
+msgid "you may specify only one of -E, -F, or -G"
+msgstr "ìðïñåßôå íá ïñßóåôå ìüíï Ýíá áðü ôá-E, -F Þ -G"
+
+# src/grep.c:829
+# src/grep.c:1112
+# File: src/grep.c, line: 1145
+msgid "matcher already specified"
+msgstr "ôï óôïé÷åßï ðïõ ðñüêåéôáé íá áíáæçôçèåß, Ý÷åé Þäç ïñéóôåß"
+
# src/grep.c:1133
-#: src/grep.c:1271
+# File: src/grep.c, line: 1166
msgid "unknown directories method"
msgstr "Üãíùóôç ìÝèïäïò êáôáëüãùí"
# src/grep.c:915
# src/grep.c:1219
-#: src/grep.c:1366
+# File: src/grep.c, line: 1252
#, c-format
-msgid "%s (GNU grep) %s\n"
-msgstr "%s (GNU grep) %s\n"
+msgid "grep (GNU grep) %s\n"
+msgstr "grep (GNU grep) %s\n"
# src/grep.c:917
# src/grep.c:1221
-#: src/grep.c:1368
-msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+# File: src/grep.c, line: 1254
+msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 1992-1997, Free Software Foundation, Inc.\n"
# src/grep.c:919
# src/grep.c:1223
-#: src/grep.c:1370
+# File: src/grep.c, line: 1256
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/obstack.c:467
# src/obstack.c:467
-#: src/obstack.c:467
+# File: src/obstack.c, line: 467
msgid "memory exhausted\n"
msgstr "ç ìíÞìç åîáíôëÞèçêå\n"
-#~ # src/grep.c:800 src/grep.c:805 src/grep.c:810
-#~ # src/grep.c:1083 src/grep.c:1088 src/grep.c:1093
-#~ msgid "you may specify only one of -E, -F, or -G"
-#~ msgstr "ìðïñåßôå íá ïñßóåôå ìüíï Ýíá áðü ôá-E, -F Þ -G"
-
#~ # src/grep.c:1027 src/grep.c:1030
#~ msgid "(standard input)\n"
#~ msgstr "(êáíïíéêÞ åßóïäïò)\n"
diff --git a/po/es.po b/po/es.po
index ce7be38b..7f666844 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,24 +1,24 @@
# Mensajes en español para GNU grep.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
# Enrique Melero Gómez <melero@iprolink.ch>, 1996.
-# Santiago Vila Doncel <sanvila@unex.es>, 1997, 1998, 1999.
+# Santiago Vila Doncel <sanvila@unex.es>, 1997, 1998, 1999, 2000.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.2f\n"
-"POT-Creation-Date: 1999-10-05 22:33-0400\n"
-"PO-Revision-Date: 1999-02-09 00:04+0100\n"
+"Project-Id-Version: GNU grep 2.4f\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
+"PO-Revision-Date: 2000-02-17 22:19+0100\n"
"Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
"Language-Team: Spanish <es@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "Memoria agotada"
-#: src/dfa.c:457
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr "Secuencia de escape \\ sin terminar"
@@ -26,16 +26,16 @@ msgstr "Secuencia de escape \\ sin terminar"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "contador de repetición sin terminar"
-#: src/dfa.c:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr "contador de repetición erróneo"
-#: src/dfa.c:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
-#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
msgid "Unbalanced ["
msgstr "[ desemparejado"
@@ -43,139 +43,88 @@ msgstr "[ desemparejado"
msgid "Unbalanced ("
msgstr "( desemparejado"
-#: src/dfa.c:1007
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr "No se ha especificado ninguna sintaxis"
-#: src/dfa.c:1015
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr ") desemparejado"
# FIXME. Comunicar al autor que esto es repetición...
-#: src/dfa.c:2036
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "memoria agotada"
-#: src/getopt.c:628
+#: src/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: la opción `%s' es ambigua\n"
-#: src/getopt.c:652
+#: src/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: la opción `--%s' no admite ningún argumento\n"
-#: src/getopt.c:657
+#: src/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: la opción `%c%s' no admite ningún argumento\n"
-#: src/getopt.c:674 src/getopt.c:847
+#: src/getopt.c:723 src/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: la opción `%s' requiere un argumento\n"
#. --option
-#: src/getopt.c:703
+#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: opción no reconocida `--%s'\n"
#. +option or -option
-#: src/getopt.c:707
+#: src/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: opción no reconocida `%c%s'\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
+#: src/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: opción ilegal -- %c\n"
-#: src/getopt.c:736
+#: src/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: opción inválida -- %c\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
+#: src/getopt.c:815 src/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: la opción requiere un argumento -- %c\n"
-#: src/getopt.c:813
+#: src/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: la opción `-W %s' es ambigua\n"
-#: src/getopt.c:831
+#: src/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: la opción `-W %s' no admite ningún argumento\n"
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr "opción %s"
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr " con argumento %s"
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr "aparecen dígitos en dos elementos de argv diferentes.\n"
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr "opción %c\n"
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr "opción a\n"
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr "opción b\n"
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr "la opción c tiene el valor `%s'\n"
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr "la opción d tiene el valor `%s'\n"
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr "?? getopt ha devuelto el carácter código 0%o ??\n"
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr "elementos de ARGV que no son opciones: "
-
-#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
-#: src/kwset.c:190
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
msgid "memory exhausted"
msgstr "memoria agotada"
-#: src/grep.c:418 src/grep.c:883
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: atención: %s: %s\n"
-
-#: src/grep.c:543 src/grep.c:1429
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "escribiendo el resultado"
-#: src/grep.c:775
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr "Coincidencia en el fichero binario %s\n"
@@ -184,42 +133,56 @@ msgstr "Coincidencia en el fichero binario %s\n"
msgid "(standard input)"
msgstr "(entrada estándar)"
-#: src/grep.c:884
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: atención: %s: %s\n"
+
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr "bucle de directorio recursivo"
-#: src/grep.c:935
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Modo de empleo: %s [OPCIÓN]... PATRÓN [FICHERO]...\n"
-#: src/grep.c:936
+#: src/grep.c:939
#, 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:940
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Modo de empleo: %s [OPCIÓN]... PATRÓN [FICHERO] ...\n"
-#: src/grep.c:941
+#: src/grep.c:944
+#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
msgstr ""
+"Busca PATRÓN en cada FICHERO o en la entrada estándar.\n"
+"Ejemplo: %s -i 'hello world' menu.h main.c\n"
+"\n"
+"Selección e interpretación de Expreg:\n"
-#: src/grep.c:945
+#: src/grep.c:949
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
msgstr ""
+" -E, --extended-regexp PATRÓN es una expresión regular extendida\n"
+" -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"
-#: src/grep.c:949
-#, fuzzy
+#: src/grep.c:953
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -228,13 +191,6 @@ 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 ""
-"Busca PATRÓN en cada FICHERO o en la entrada estándar.\n"
-"\n"
-"Selección e interpretación de Expreg:\n"
-" -E, --extended-regexp PATRÓN es una expresión regular extendida\n"
-" -F, --fixed-strings PATRÓN es una cadena fija separada por\n"
-" caracteres de nueva línea\n"
-" -G, --basic-regexp PATRÓN es una expresión regular básica\n"
" -e, --regexp=PATRÓN utiliza PATRÓN como expresión regular\n"
" -f, --file=FICHERO obtiene PATRÓN de FICHERO\n"
" -i, --ignore-case considera iguales mayúsculas y minúsculas\n"
@@ -242,9 +198,10 @@ msgstr ""
" con palabras completas\n"
" -x, --line-regexp obliga a que PATRÓN coincida solamente\n"
" con líneas completas\n"
+" -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:956
-#, fuzzy
+#: src/grep.c:960
msgid ""
"\n"
"Miscellaneous:\n"
@@ -252,16 +209,17 @@ msgid ""
" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
"Variadas:\n"
" -s, --no-messages suprime los mensajes de error\n"
-" -v, --revert-match selecciona las líneas que no coinciden\n"
+" -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"
-#: src/grep.c:963
-#, fuzzy
+#: src/grep.c:968
msgid ""
"\n"
"Output control:\n"
@@ -270,7 +228,10 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
@@ -290,7 +251,10 @@ msgstr ""
" -h, --no-filename suprime los nombres de los ficheros en\n"
" el resultado\n"
" -q, --quiet, --silent suprime todo el resultado normal\n"
-" -a, --text no suprime el resultado binario\n"
+" --binary-files=TIPO supone que los ficheros binarios son TIPO\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"
@@ -300,24 +264,24 @@ msgstr ""
" que contienen alguna coincidencia\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"
-#: src/grep.c:979
-#, fuzzy
+#: src/grep.c:987
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
msgstr ""
"\n"
"Control del contexto:\n"
@@ -331,13 +295,12 @@ msgstr ""
" -u, --unix-byte-offsets cuenta los desplazamientos como si no hubiera\n"
" retornos de carro (MSDOS)\n"
"\n"
-"Si no se especifica ninguna de las opciones -[GEF], entonces `egrep' supone -E,\n"
-"`fgrep' supone -F, y en caso contrario -G. Si no se especifica ningún FICHERO,\n"
-"o cuando es -, lee la entrada estándar. Si se dan menos de dos FICHEROs, se\n"
-"supone -h. La salida es 0 si hay coincidencias, 1 si no las hay. La salida es\n"
-"2 si hay errores de sintaxis o del sistema.\n"
+"`egrep' significa `grep -E'. `fgrep' significa `grep -F'.\n"
+"Si no se especifica ningún FICHERO, o cuando es -, lee la entrada estándar.\n"
+"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:994
+#: src/grep.c:1002
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nComunicar `bugs' a <bug-gnu-utils@gnu.org>.\n"
@@ -352,32 +315,34 @@ msgstr "\nComunicar `bugs' a <bug-gnu-utils@gnu.org>.\n"
#
# No me gusta nada lo de opción "a buscar".
# Se admiten sugerencias. sv
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1012
msgid "conflicting matchers specified"
-msgstr "la expresión a buscar ya fue especificada"
+msgstr "se han especificado expresiones conflictivas"
-#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
msgid "invalid context length argument"
msgstr "longitud de contexto inválida"
# Nota: Se refiere a la opción --directories=ACCIÓN cuando ACCIÓN
# no es `read', `recurse' o `skip'.
-#: src/grep.c:1271
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr "método de directorios desconocido"
-#: src/grep.c:1366
-#, fuzzy, c-format
+#: src/grep.c:1358
+msgid "unknown binary-files type"
+msgstr "tipo binary-files desconocido"
+
+#: src/grep.c:1378
+#, c-format
msgid "%s (GNU grep) %s\n"
-msgstr "grep (GNU grep) %s\n"
+msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1368
-#, fuzzy
-msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+#: src/grep.c:1380
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
-#: src/grep.c:1370
+#: src/grep.c:1382
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -386,21 +351,41 @@ msgstr ""
"No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n"
"FIN DETERMINADO.\n"
-#: src/obstack.c:467
-msgid "memory exhausted\n"
-msgstr "memoria agotada\n"
+#~ msgid "option %s"
+#~ msgstr "opción %s"
-#~ 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"
+#~ msgid " with arg %s"
+#~ msgstr " con argumento %s"
+
+#~ msgid "digits occur in two different argv-elements.\n"
+#~ msgstr "aparecen dígitos en dos elementos de argv diferentes.\n"
+
+#~ msgid "option %c\n"
+#~ msgstr "opción %c\n"
+
+#~ msgid "option a\n"
+#~ msgstr "opción a\n"
+
+#~ msgid "option b\n"
+#~ msgstr "opción b\n"
+
+#~ msgid "option c with value `%s'\n"
+#~ msgstr "la opción c tiene el valor `%s'\n"
-#~ msgid "(standard input)\n"
-#~ msgstr "(salida estándar)\n"
+#~ msgid "option d with value `%s'\n"
+#~ msgstr "la opción d tiene el valor `%s'\n"
-#~ # FIXME: El original está mal.
-#~ # Ahora mismo no me acuerdo de por qué escribí esto así que
-#~ # no lo borro de momento. sv
-#~ msgid " -f, --file=FILE obtain PATTERN from FILE\n"
-#~ msgstr " -f, --file=FICHERO obtiene PATRÓN de FICHERO\n"
+#~ msgid "?? getopt returned character code 0%o ??\n"
+#~ msgstr "?? getopt ha devuelto el carácter código 0%o ??\n"
+
+#~ msgid "non-option ARGV-elements: "
+#~ msgstr "elementos de ARGV que no son opciones: "
+
+#~ 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
@@ -408,9 +393,5 @@ msgstr "memoria agotada\n"
#~ 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"
-#~ # No es muy claro el original que digamos... sv
-#~ msgid "If call as `egrep', this implies -E and `fgrep' for -F.\n"
-#~ msgstr "Si se llama como `egrep', esto implica -E y `fgrep' para -F.\n"
-
#~ msgid "If no -[GEF], then -G is assumed.\n"
#~ msgstr "Si no se especifica ninguna de las opciones -[GEF], se supone -G.\n"
diff --git a/po/fr.po b/po/fr.po
index f0d2782b..5fe165f2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,16 +4,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.3f\n"
-"POT-Creation-Date: 1999-10-05 22:33-0400\n"
-"PO-Revision-Date: 1999-10-13 08:10-0500\n"
+"Project-Id-Version: GNU grep 2.4a\n"
+"POT-Creation-Date: 2000-01-16 21:06-0500\n"
+"PO-Revision-Date: 2000-01-31 12:45-0500\n"
"Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
"Language-Team: French <traduc@traduc.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:936
msgid "Memory exhausted"
msgstr "Mémoire épuisée."
@@ -159,69 +159,72 @@ msgstr "?? getopt() a retourné le code de caractère 0%o ??\n"
msgid "non-option ARGV-elements: "
msgstr "Des élément ARGV qui ne sont pas des options: "
-#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
+#: src/grep.c:190 src/grep.c:207 src/grep.c:307 src/grep.c:415 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "Mémoire épuisée."
-#: src/grep.c:418 src/grep.c:883
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: AVERTISSEMENT: %s: %s\n"
-
-#: src/grep.c:543 src/grep.c:1429
+#: src/grep.c:572 src/grep.c:1481
msgid "writing output"
msgstr "Génération du résultat."
-#: src/grep.c:775
+#: src/grep.c:807
#, c-format
msgid "Binary file %s matches\n"
msgstr "Fichier binaire %s concorde\n"
-#: src/grep.c:791
+#: src/grep.c:823
msgid "(standard input)"
msgstr "(entrée standard)"
-#: src/grep.c:884
+#: src/grep.c:921
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: AVERTISSEMENT: %s: %s\n"
+
+#: src/grep.c:922
msgid "recursive directory loop"
msgstr "boucle récursive sur le répertoire"
-#: src/grep.c:935
+#: src/grep.c:973
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Usage: %s [OPTION]... PATRON [FICHIER]...\n"
-#: src/grep.c:936
+#: src/grep.c:974
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
-#: src/grep.c:940
+#: src/grep.c:978
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Usage: %s [OPTION]... PATRON [FICHIER] ...\n"
-#: src/grep.c:941
+#: src/grep.c:979
+#, 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 ""
"Recherche du PATRON dans chaque FICHIER ou sur l'entrée standard.\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:945
+#: src/grep.c:984
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
msgstr ""
" -E, --extended-regexp 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"
" -G, --basic-regexp PATRON est une expression régulière de base\n"
-#: src/grep.c:949
+#: src/grep.c:988
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -238,7 +241,7 @@ msgstr ""
" -z, --null-data terminer la ligne de données par ZÉRO et\n"
" non pas par un retour de chariot\n"
-#: src/grep.c:956
+#: src/grep.c:995
msgid ""
"\n"
"Miscellaneous:\n"
@@ -246,6 +249,7 @@ msgid ""
" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
"Divers:\n"
@@ -253,8 +257,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"
-#: src/grep.c:963
+#: src/grep.c:1003
msgid ""
"\n"
"Output control:\n"
@@ -263,7 +268,9 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
+" -a, --text equivalent to --binary-files=text\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
@@ -284,6 +291,8 @@ msgstr ""
" 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"
" -d, --directories=ACTION traiter les répertoires selon l'ACTION\n"
" 'read' (lecture), 'recurse' (récursivité),\n"
" ou 'skip' (escamotage).\n"
@@ -296,70 +305,73 @@ msgstr ""
" concordantes par fichier\n"
" -Z, --null afficher l'octet ZÉRO après le nom du fichier\n"
-#: src/grep.c:979
+#: src/grep.c:1021
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
msgstr ""
"\n"
"Contrôle du contexte:\n"
" -B, --before-context=N imprimer N lignes du contexte d'en-tête\n"
" -A, --after-context=N imprimer N lignes du contexte finale\n"
-" -C, --context imprimer N lignes (2 par défaut) du contexte\n"
+" -C, --context[=N] imprimer N lignes (2 par défaut) du contexte\n"
" à moins que -A ou -B ne soit spécifié\n"
-" -NUM identique à -B NUM et -A NUM\n"
+" -N identique à --context=N\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"
" aucun CR n'était présent (MS-DOS)\n"
"\n"
"`egrep' est équivalent à `grep -E'. `fgrep' est équivalent à `grep -F'.\n"
-"Si aucune des options -[GEF] n'est utilisée, alors `egrep' assume\n"
-"l'option -E, `fgrep' l'option -F autrement l'option -G.\n"
"Sans FICHIER, ou si - est utilisé comme nom de FICHIER, la lecture\n"
"se fait de l'entrée standard. S'il y a moins de 2 FICHIERS, l'option -h\n"
"est implicite. Termine avec 0 s'il y a concordance avec 1 si aucune.\n"
"Termine avec 2 s'il y a des erreurs de syntaxe ou de système.\n"
-#: src/grep.c:994
+#: src/grep.c:1036
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nRapporter toutes anomalies à <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1005
+#: src/grep.c:1047
msgid "conflicting matchers specified"
msgstr "opérateurs de concordance spécifiés en conflit"
-#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
+#: src/grep.c:1246 src/grep.c:1253 src/grep.c:1262
msgid "invalid context length argument"
msgstr "paramètre de contexte de longueur invalide"
-#: src/grep.c:1271
+#: src/grep.c:1313
msgid "unknown directories method"
msgstr "méthode inconnue des répertoires"
+#: src/grep.c:1398
+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:1366
+#: src/grep.c:1418
+#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (grep de GNU) %s\n"
-#: src/grep.c:1368
+#: src/grep.c:1420
msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
msgstr "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
-#: src/grep.c:1370
+#: src/grep.c:1422
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/ko.po b/po/ko.po
index 4342a127..98cbfc22 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.0f\n"
-"POT-Creation-Date: 1999-10-05 22:33-0400\n"
+"POT-Creation-Date: 1999-02-03 13:09-0500\n"
"PO-Revision-Date: 1997-09-03 11:19+0900\n"
"Last-Translator: Bang Jun-Young <bangjy@geocities.com>\n"
"Language-Team: Korean <ko@li.org>\n"
@@ -13,44 +13,45 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-KR\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
msgid "Memory exhausted"
msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
-#: src/dfa.c:457
+#: src/dfa.c:452
msgid "Unfinished \\ escape"
msgstr "¿Ï°áµÇÁö ¾ÊÀº \\ À̽ºÄÉÀÌÇÁ"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
+#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
+#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
msgid "unfinished repeat count"
msgstr "¿Ï°áµÇÁö ¾ÊÀº ¹Ýº¹ ȸ¼ö"
-#: src/dfa.c:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
msgid "malformed repeat count"
msgstr "À߸ø ÁÖ¾îÁø ¹Ýº¹ ȸ¼ö"
-#: src/dfa.c:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
-#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
+#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
+#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
msgid "Unbalanced ["
msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â ["
-#: src/dfa.c:886
+#: src/dfa.c:849
msgid "Unbalanced ("
msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â ("
-#: src/dfa.c:1007
+#: src/dfa.c:970
msgid "No syntax specified"
msgstr "¹®¹ýÀÌ ÁöÁ¤µÇÁö ¾Ê¾ÒÀ½"
-#: src/dfa.c:1015
+#: src/dfa.c:978
msgid "Unbalanced )"
msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â )"
-#: src/dfa.c:2036
+#: src/dfa.c:1998
msgid "out of memory"
msgstr "¸Þ¸ð¸® ºÎÁ·"
@@ -159,83 +160,74 @@ msgstr "?? getopt°¡ ¹®ÀÚ ÄÚµå 0%o¸¦ µ¹·ÁÁÖ¾ú½À´Ï´Ù ??\n"
msgid "non-option ARGV-elements: "
msgstr "ºñ¿É¼Ç ARGV ¿ø¼Ò: "
-#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
+#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
-#: src/grep.c:418 src/grep.c:883
+#: src/grep.c:372 src/grep.c:843
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: °æ°í: %s: %s\n"
-#: src/grep.c:543 src/grep.c:1429
+#: src/grep.c:497 src/grep.c:1318
msgid "writing output"
msgstr "Ãâ·ÂÀ» ±â·ÏÇÏ°í ÀÖ½À´Ï´Ù"
-#: src/grep.c:775
+#: src/grep.c:726
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:791
+#: src/grep.c:742
msgid "(standard input)"
msgstr "(Ç¥ÁØ ÀÔ·Â)"
-#: src/grep.c:884
+#: src/grep.c:844
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:935
+#: src/grep.c:895
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "»ç¿ë¹ý: %s [¿É¼Ç]... ÆÐÅÏ [ÆÄÀÏ]...\n"
-#: src/grep.c:936
+#: src/grep.c:896
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ.\n"
-#: src/grep.c:940
+#: src/grep.c:900
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "»ç¿ë¹ý: %s [¿É¼Ç]... ÆÐÅÏ [ÆÄÀÏ] ...\n"
-#: src/grep.c:941
+#: src/grep.c:901
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
"Regexp selection and interpretation:\n"
-msgstr ""
-
-#: src/grep.c:945
-msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
-msgstr ""
-
-#: src/grep.c:949
-msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
-" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
-#: src/grep.c:956
+#: src/grep.c:913
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --invert-match select non-matching lines\n"
+" -v, --revert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
msgstr ""
-#: src/grep.c:963
+#: src/grep.c:920
msgid ""
"\n"
"Output control:\n"
@@ -251,10 +243,9 @@ msgid ""
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
-" -Z, --null print 0 byte after FILE name\n"
msgstr ""
-#: src/grep.c:979
+#: src/grep.c:935
msgid ""
"\n"
"Context control:\n"
@@ -266,41 +257,44 @@ msgid ""
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
"With no FILE, or when FILE is -, read standard input. If less than\n"
"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
"Exit with 2 if syntax errors or system errors.\n"
msgstr ""
-#: src/grep.c:994
+#: src/grep.c:950
#, fuzzy
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "¹®Á¦Á¡Àº <bug0gnu-utils@prep.ai.mit.edu>·Î º¸°íÇØ ÁֽʽÿÀ.\n"
-#: src/grep.c:1005
-#, fuzzy
-msgid "conflicting matchers specified"
-msgstr "¦ÀÌ ÀÌ¹Ì ÁöÁ¤µÇ¾úÀ½"
-
-#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
+#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
msgid "invalid context length argument"
msgstr ""
-#: src/grep.c:1271
+#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+msgid "you may specify only one of -E, -F, or -G"
+msgstr "-E, -F, -G Áß¿¡¼­ Çϳª¸¸ ÁöÁ¤ÇÒ ¼ö ÀÖ½À´Ï´Ù"
+
+#: src/grep.c:1145
+msgid "matcher already specified"
+msgstr "¦ÀÌ ÀÌ¹Ì ÁöÁ¤µÇ¾úÀ½"
+
+#: src/grep.c:1166
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1366
-#, fuzzy, c-format
-msgid "%s (GNU grep) %s\n"
+#: src/grep.c:1252
+#, c-format
+msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1368
+#: src/grep.c:1254
#, fuzzy
-msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
msgstr "ÀúÀÛ±Ç (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1370
+#: src/grep.c:1256
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"
@@ -312,9 +306,6 @@ msgstr ""
msgid "memory exhausted\n"
msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²\n"
-#~ msgid "you may specify only one of -E, -F, or -G"
-#~ msgstr "-E, -F, -G Áß¿¡¼­ Çϳª¸¸ ÁöÁ¤ÇÒ ¼ö ÀÖ½À´Ï´Ù"
-
#~ msgid "Regexp selection and interpretation:\n"
#~ msgstr "Á¤±Ô½Ä ¼±Åðú Çؼ®:\n"
diff --git a/po/nl.po b/po/nl.po
index d922211e..343b1fba 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.0\n"
-"POT-Creation-Date: 1999-10-05 22:33-0400\n"
+"POT-Creation-Date: 1999-02-03 13:09-0500\n"
"PO-Revision-Date: 1996-08-18 11:24 EDT\n"
"Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
"Language-Team: Dutch <nl@li.org>\n"
@@ -13,45 +13,46 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
#, fuzzy
msgid "Memory exhausted"
msgstr "geen geheugen meer beschikbaar"
-#: src/dfa.c:457
+#: src/dfa.c:452
msgid "Unfinished \\ escape"
msgstr ""
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
+#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
+#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
msgid "unfinished repeat count"
msgstr ""
-#: src/dfa.c:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
msgid "malformed repeat count"
msgstr ""
-#: src/dfa.c:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
-#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
+#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
+#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
msgid "Unbalanced ["
msgstr ""
-#: src/dfa.c:886
+#: src/dfa.c:849
msgid "Unbalanced ("
msgstr ""
-#: src/dfa.c:1007
+#: src/dfa.c:970
msgid "No syntax specified"
msgstr ""
-#: src/dfa.c:1015
+#: src/dfa.c:978
msgid "Unbalanced )"
msgstr ""
-#: src/dfa.c:2036
+#: src/dfa.c:1998
msgid "out of memory"
msgstr ""
@@ -160,83 +161,74 @@ msgstr ""
msgid "non-option ARGV-elements: "
msgstr ""
-#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
+#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "geen geheugen meer beschikbaar"
-#: src/grep.c:418 src/grep.c:883
+#: src/grep.c:372 src/grep.c:843
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: let op: %s: %s\n"
-#: src/grep.c:543 src/grep.c:1429
+#: src/grep.c:497 src/grep.c:1318
msgid "writing output"
msgstr "schrijven van uitvoer"
-#: src/grep.c:775
+#: src/grep.c:726
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:791
+#: src/grep.c:742
msgid "(standard input)"
msgstr "(standaardinvoer)"
-#: src/grep.c:884
+#: src/grep.c:844
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:935
+#: src/grep.c:895
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr ""
-#: src/grep.c:936
+#: src/grep.c:896
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: src/grep.c:940
+#: src/grep.c:900
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr ""
-#: src/grep.c:941
+#: src/grep.c:901
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
"Regexp selection and interpretation:\n"
-msgstr ""
-
-#: src/grep.c:945
-msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
-msgstr ""
-
-#: src/grep.c:949
-msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
-" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
-#: src/grep.c:956
+#: src/grep.c:913
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --invert-match select non-matching lines\n"
+" -v, --revert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
msgstr ""
-#: src/grep.c:963
+#: src/grep.c:920
msgid ""
"\n"
"Output control:\n"
@@ -252,10 +244,9 @@ msgid ""
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
-" -Z, --null print 0 byte after FILE name\n"
msgstr ""
-#: src/grep.c:979
+#: src/grep.c:935
msgid ""
"\n"
"Context control:\n"
@@ -267,16 +258,24 @@ msgid ""
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
"With no FILE, or when FILE is -, read standard input. If less than\n"
"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
"Exit with 2 if syntax errors or system errors.\n"
msgstr ""
-#: src/grep.c:994
+#: src/grep.c:950
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
+#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+msgid "invalid context length argument"
+msgstr ""
+
+#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+msgid "you may specify only one of -E, -F, or -G"
+msgstr "alleen de volgende opties zijn toegestaan: -E, -F, of -G"
+
# viendo los fuentes , hay varias opciones
# que hay sin documentar. O quiza es que getopt() lo he entendido mal
# Son las opciones X ( requiere argumento ) , switchs -c, -b, -L e -y
@@ -285,29 +284,24 @@ msgstr ""
# grep --help ->
# usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
# La opcisn -X es a la que corresponde esta lmnea.
-#: src/grep.c:1005
-#, fuzzy
-msgid "conflicting matchers specified"
+#: src/grep.c:1145
+msgid "matcher already specified"
msgstr "overeenkomer (matcher FIXME) al gespecificeerd"
-#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
-msgid "invalid context length argument"
-msgstr ""
-
-#: src/grep.c:1271
+#: src/grep.c:1166
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1366
+#: src/grep.c:1252
#, c-format
-msgid "%s (GNU grep) %s\n"
+msgid "grep (GNU grep) %s\n"
msgstr ""
-#: src/grep.c:1368
-msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+#: src/grep.c:1254
+msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
msgstr ""
-#: src/grep.c:1370
+#: src/grep.c:1256
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"
@@ -318,9 +312,6 @@ msgstr ""
msgid "memory exhausted\n"
msgstr "geen geheugen meer beschikbaar"
-#~ msgid "you may specify only one of -E, -F, or -G"
-#~ msgstr "alleen de volgende opties zijn toegestaan: -E, -F, of -G"
-
#~ msgid "GNU grep version 2.0"
#~ msgstr "(FIXME) GNU grep version 2.0"
diff --git a/po/no.po b/po/no.po
index 53bc052d..793a9b82 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1999-10-05 22:33-0400\n"
+"POT-Creation-Date: 1999-02-03 13:09-0500\n"
"PO-Revision-Date: 1998-08-01 13:45+0200\n"
"Last-Translator: Eivind Tagseth <eivindt@multinet.no>\n"
"Language-Team: Norwegian <no@li.org>\n"
@@ -15,44 +15,45 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
msgid "Memory exhausted"
msgstr "Minnet oppbrukt"
-#: src/dfa.c:457
+#: src/dfa.c:452
msgid "Unfinished \\ escape"
msgstr "Uferdig \\-beskyttelse"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
+#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
+#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
msgid "unfinished repeat count"
msgstr "uferdig gjentagelsesantall"
-#: src/dfa.c:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
msgid "malformed repeat count"
msgstr "feilaktig gjentagelsesantall"
-#: src/dfa.c:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
-#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
+#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
+#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
msgid "Unbalanced ["
msgstr "Ubalansert ["
-#: src/dfa.c:886
+#: src/dfa.c:849
msgid "Unbalanced ("
msgstr "Ubalansert ("
-#: src/dfa.c:1007
+#: src/dfa.c:970
msgid "No syntax specified"
msgstr "Ingen syntaks spesifisert"
-#: src/dfa.c:1015
+#: src/dfa.c:978
msgid "Unbalanced )"
msgstr "Ubalansert )"
-#: src/dfa.c:2036
+#: src/dfa.c:1998
msgid "out of memory"
msgstr "tomt for minne"
@@ -161,71 +162,61 @@ msgstr "?? getopt returnerte tegnverdien 0%o ??\n"
msgid "non-option ARGV-elements: "
msgstr "ARGV-elementer som ikke er flagg: "
-#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
+#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "minnet oppbrukt"
-#: src/grep.c:418 src/grep.c:883
+#: src/grep.c:372 src/grep.c:843
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: advarsel: %s: %s\n"
-#: src/grep.c:543 src/grep.c:1429
+#: src/grep.c:497 src/grep.c:1318
msgid "writing output"
msgstr "skriver utdata"
-#: src/grep.c:775
+#: src/grep.c:726
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:791
+#: src/grep.c:742
msgid "(standard input)"
msgstr "(standard inn)"
-#: src/grep.c:884
+#: src/grep.c:844
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:935
+#: src/grep.c:895
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Bruk: %s [FLAGG]... MØNSTER [FIL]...\n"
-#: src/grep.c:936
+#: src/grep.c:896
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv «%s --help» for mer informasjon.\n"
-#: src/grep.c:940
+#: src/grep.c:900
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Bruk: %s [FLAGG]... MØNSTER [FIL] ...\n"
-#: src/grep.c:941
+#: src/grep.c:901
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
"Regexp selection and interpretation:\n"
-msgstr ""
-
-#: src/grep.c:945
-msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
-msgstr ""
-
-#: src/grep.c:949
-#, fuzzy
-msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
-" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
"Søk etter MØNSTER i hver FIL eller standard inn.\n"
"\n"
@@ -239,13 +230,12 @@ msgstr ""
" -w, --word-regexp MØNSTER må stemme overens med hele ord\n"
" -x, --line-regexp MØNSTER må stemme overens med hele linjer\n"
-#: src/grep.c:956
-#, fuzzy
+#: src/grep.c:913
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --invert-match select non-matching lines\n"
+" -v, --revert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
msgstr ""
@@ -256,7 +246,7 @@ msgstr ""
" -V, --version vis versioninformasjon og avslutt\n"
" --help vis denne helpeteksten og avslutt\n"
-#: src/grep.c:963
+#: src/grep.c:920
#, fuzzy
msgid ""
"\n"
@@ -273,7 +263,6 @@ msgid ""
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
-" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
"Ut-kontroll:\n"
@@ -289,7 +278,7 @@ msgstr ""
" -c, --count skriv bare ut antall linjer som inneholder treff\n"
" per FIL\n"
-#: src/grep.c:979
+#: src/grep.c:935
#, fuzzy
msgid ""
"\n"
@@ -302,7 +291,7 @@ msgid ""
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
"With no FILE, or when FILE is -, read standard input. If less than\n"
"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
"Exit with 2 if syntax errors or system errors.\n"
@@ -317,34 +306,37 @@ msgstr ""
" -u, --unix-byte-offsets rapporter posisjoner som om CRene ikke var der\n"
" (MSDOS)\n"
-#: src/grep.c:994
+#: src/grep.c:950
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nRapportér feil til <bug-gnu-utils@prep.ai.mit.edu>.\n"
-#: src/grep.c:1005
-#, fuzzy
-msgid "conflicting matchers specified"
-msgstr "søkeuttrykk er allerede spesifisert"
-
-#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
+#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
msgid "invalid context length argument"
msgstr "ugyldig kontekstlengde"
-#: src/grep.c:1271
+#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+msgid "you may specify only one of -E, -F, or -G"
+msgstr "du kan bare spesifisere en av -E, -F eller -G"
+
+#: src/grep.c:1145
+msgid "matcher already specified"
+msgstr "søkeuttrykk er allerede spesifisert"
+
+#: src/grep.c:1166
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1366
-#, fuzzy, c-format
-msgid "%s (GNU grep) %s\n"
+#: src/grep.c:1252
+#, c-format
+msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1368
+#: src/grep.c:1254
#, fuzzy
-msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
msgstr "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1370
+#: src/grep.c:1256
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -357,8 +349,5 @@ msgstr ""
msgid "memory exhausted\n"
msgstr "minnet oppbrukt\n"
-#~ msgid "you may specify only one of -E, -F, or -G"
-#~ msgstr "du kan bare spesifisere en av -E, -F eller -G"
-
#~ msgid "(standard input)\n"
#~ msgstr "(standard inn)\n"
diff --git a/po/pl.po b/po/pl.po
index f473c666..b8b3178f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.2f\n"
-"POT-Creation-Date: 1999-10-05 22:33-0400\n"
+"POT-Creation-Date: 1999-02-03 13:09-0500\n"
"PO-Revision-Date: 1999-02-27 22:15+0200\n"
"Last-Translator: Rafa³ Maszkowski <rzm@icm.edu.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -13,44 +13,45 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
msgid "Memory exhausted"
msgstr "Pamiêæ wyczerpana"
-#: src/dfa.c:457
+#: src/dfa.c:452
msgid "Unfinished \\ escape"
msgstr "Niedokoñczona sekwencja \\"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
+#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
+#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
msgid "unfinished repeat count"
msgstr "niedokoñczona liczba powtórzeñ"
-#: src/dfa.c:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
msgid "malformed repeat count"
msgstr "¼le sformatowana liczba powtórzeñ"
-#: src/dfa.c:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
-#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
+#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
+#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
msgid "Unbalanced ["
msgstr "[ nie do pary"
-#: src/dfa.c:886
+#: src/dfa.c:849
msgid "Unbalanced ("
msgstr "( nie do pary"
-#: src/dfa.c:1007
+#: src/dfa.c:970
msgid "No syntax specified"
msgstr "Brak specyfikacji sk³adni"
-#: src/dfa.c:1015
+#: src/dfa.c:978
msgid "Unbalanced )"
msgstr ") nie do pary"
-#: src/dfa.c:2036
+#: src/dfa.c:1998
msgid "out of memory"
msgstr "brak pamiêci"
@@ -160,71 +161,61 @@ msgstr "?? getopt zwróci³ znak o kodzie 0%o ??\n"
msgid "non-option ARGV-elements: "
msgstr "elementy ARGV nie bêd±ce opcjami: "
-#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
+#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "pamiêæ wyczerpana"
-#: src/grep.c:418 src/grep.c:883
+#: src/grep.c:372 src/grep.c:843
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: uwaga: %s: %s\n"
-#: src/grep.c:543 src/grep.c:1429
+#: src/grep.c:497 src/grep.c:1318
msgid "writing output"
msgstr "zapisujê wyniki"
-#: src/grep.c:775
+#: src/grep.c:726
#, c-format
msgid "Binary file %s matches\n"
msgstr "Plik binarny %s pasuje do wzorca\n"
-#: src/grep.c:791
+#: src/grep.c:742
msgid "(standard input)"
msgstr "(standardowe wej¶cie)"
-#: src/grep.c:884
+#: src/grep.c:844
msgid "recursive directory loop"
msgstr "nieskoñczona pêtla przegl±dania katalogów"
-#: src/grep.c:935
+#: src/grep.c:895
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "U¿ycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
-#: src/grep.c:936
+#: src/grep.c:896
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Spróbuj `%s --help' dla uzyskania informacji.\n"
-#: src/grep.c:940
+#: src/grep.c:900
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "U¿ycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
-#: src/grep.c:941
+#: src/grep.c:901
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
"Regexp selection and interpretation:\n"
-msgstr ""
-
-#: src/grep.c:945
-msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
-msgstr ""
-
-#: src/grep.c:949
-#, fuzzy
-msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
-" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
"Szukanie WZORCA w ka¿dym pliku lub na standardowym wej¶ciu.\n"
"\n"
@@ -238,13 +229,12 @@ msgstr ""
" -w, --word-regexp dopasuj WZORZEC tylko do pe³nych s³ów\n"
" -x, --line-regexp dopasuj WZORZEC tylko do ca³ych linii\n"
-#: src/grep.c:956
-#, fuzzy
+#: src/grep.c:913
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --invert-match select non-matching lines\n"
+" -v, --revert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
msgstr ""
@@ -255,8 +245,7 @@ msgstr ""
" -V, --version wypisz informacjê o wersji i zakoñcz\n"
" --help wy¶wietl tê informacjê i zakoñcz\n"
-#: src/grep.c:963
-#, fuzzy
+#: src/grep.c:920
msgid ""
"\n"
"Output control:\n"
@@ -272,7 +261,6 @@ msgid ""
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
-" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
"Sterowanie danymi wyj¶ciowymi:\n"
@@ -290,8 +278,7 @@ msgstr ""
" -l, --files-with-matches wypisz tylko nazwy PLIKÓW z trafieniami\n"
" -c, --count wypisz tylko ilo¶æ pasuj±cych linii w ka¿dym PLIKu\n"
-#: src/grep.c:979
-#, fuzzy
+#: src/grep.c:935
msgid ""
"\n"
"Context control:\n"
@@ -303,7 +290,7 @@ msgid ""
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
"With no FILE, or when FILE is -, read standard input. If less than\n"
"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
"Exit with 2 if syntax errors or system errors.\n"
@@ -324,10 +311,18 @@ msgstr ""
"pasuje, z 1, je¿eli nie, z 2, je¿eli napotkano b³êdy syntaktyczne lub\n"
"systemowe.\n"
-#: src/grep.c:994
+#: src/grep.c:950
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nRaporty o b³êdach wysy³aj do bug-gnu-utils@gnu.org.\n"
+#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+msgid "invalid context length argument"
+msgstr "b³êdny argument d³ugo¶ci kontekstowej"
+
+#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+msgid "you may specify only one of -E, -F, or -G"
+msgstr "mo¿esz podaæ tylko jedn± opcjê z -E -F -G"
+
# viendo los fuentes , hay varias opciones
# que hay sin documentar. O quiza es que getopt() lo he entendido mal
# Son las opciones X ( requiere argumento ) , switchs -c, -b, -L e -y
@@ -336,30 +331,24 @@ msgstr "\nRaporty o b³êdach wysy³aj do bug-gnu-utils@gnu.org.\n"
# 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:1005
-#, fuzzy
-msgid "conflicting matchers specified"
+#: src/grep.c:1145
+msgid "matcher already specified"
msgstr "wzorzec ju¿ podany"
-#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
-msgid "invalid context length argument"
-msgstr "b³êdny argument d³ugo¶ci kontekstowej"
-
-#: src/grep.c:1271
+#: src/grep.c:1166
msgid "unknown directories method"
msgstr "nieznany sposób przegl±dania katalogów"
-#: src/grep.c:1366
-#, fuzzy, c-format
-msgid "%s (GNU grep) %s\n"
+#: src/grep.c:1252
+#, c-format
+msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1368
-#, fuzzy
-msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+#: src/grep.c:1254
+msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
msgstr "Copyright (C) 1988, 1992-1997, Free Software Foundation, Inc.\n"
-#: src/grep.c:1370
+#: src/grep.c:1256
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"
@@ -371,6 +360,3 @@ msgstr ""
#: src/obstack.c:467
msgid "memory exhausted\n"
msgstr "pamiêæ wyczerpana\n"
-
-#~ msgid "you may specify only one of -E, -F, or -G"
-#~ msgstr "mo¿esz podaæ tylko jedn± opcjê z -E -F -G"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4e2d598d..ccb15dc0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,16 +5,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.3f\n"
-"POT-Creation-Date: 1999-10-05 22:33-0400\n"
-"PO-Revision-Date: 1999-10-07 11:39-03:00\n"
+"Project-Id-Version: GNU grep 2.4a\n"
+"POT-Creation-Date: 2000-01-16 21:06-0500\n"
+"PO-Revision-Date: 2000-01-21 22:08-02:00\n"
"Last-Translator: Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>\n"
"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:936
msgid "Memory exhausted"
msgstr "Memória esgotada"
@@ -160,69 +160,72 @@ msgstr "?? getopt retornou caracter código 0%o ??\n"
msgid "non-option ARGV-elements: "
msgstr "elementos ARGV que não são opções: "
-#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
+#: src/grep.c:190 src/grep.c:207 src/grep.c:307 src/grep.c:415 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "memória esgotada"
-#: src/grep.c:418 src/grep.c:883
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: aviso: %s: %s\n"
-
-#: src/grep.c:543 src/grep.c:1429
+#: src/grep.c:572 src/grep.c:1481
msgid "writing output"
msgstr "escrevendo saída"
-#: src/grep.c:775
+#: src/grep.c:807
#, c-format
msgid "Binary file %s matches\n"
msgstr "Arquivo binário %s casa com o padrão\n"
-#: src/grep.c:791
+#: src/grep.c:823
msgid "(standard input)"
msgstr "(entrada padrão)"
-#: src/grep.c:884
+#: src/grep.c:921
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: aviso: %s: %s\n"
+
+#: src/grep.c:922
msgid "recursive directory loop"
msgstr "loop de diretório recursivo"
-#: src/grep.c:935
+#: src/grep.c:973
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uso: %s [opção]... padrão [arquivo]...\n"
-#: src/grep.c:936
+#: src/grep.c:974
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Tente `%s --help' para mais informações.\n"
-#: src/grep.c:940
+#: src/grep.c:978
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Uso: %s [opção]... padrão [arquivo]...\n"
-#: src/grep.c:941
+#: src/grep.c:979
+#, 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 ""
"Procura por PADRÃO em cada ARQUIVO ou entrada padrão.\n"
+"Exemplo: %s -i 'hello.*world' menu.h main.c\n"
"\n"
"Seleção de expressão regular e interpretação:\n"
-#: src/grep.c:945
+#: src/grep.c:984
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
msgstr ""
" -E, --extended-regexp PADRÃO é um expressão regular extendida\n"
-" -F, --fixed-regexp PADRÃO é uma cadeia fixa separada por nova linha\n"
+" -F, --fixed-strings PADRÃO é uma cadeia fixa separada por nova linha\n"
" -G, --basic-regexp PADRÃO é um expressão regular básica\n"
-#: src/grep.c:949
+#: src/grep.c:988
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -238,7 +241,7 @@ msgstr ""
" -x, --line-regexp força PADRÃO encontrar apenas linhas inteiras\n"
" -z, --null-data uma linha de dados acaba com 0 bytes, não nova linha\n"
-#: src/grep.c:956
+#: src/grep.c:995
msgid ""
"\n"
"Miscellaneous:\n"
@@ -246,6 +249,7 @@ msgid ""
" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
"Miscelânea:\n"
@@ -253,8 +257,9 @@ msgstr ""
" -v, --revert-match seleciona somente linhas não coincidentes\n"
" -V, --version mostra informações sobre versão e sai\n"
" --help exibe esta ajuda e sai\n"
+" --mmap usa entrada de memória mapeada se possível\n"
-#: src/grep.c:963
+#: src/grep.c:1003
msgid ""
"\n"
"Output control:\n"
@@ -263,7 +268,9 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
+" -a, --text equivalent to --binary-files=text\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
@@ -281,6 +288,8 @@ msgstr ""
" -h, --no-filename inibe o nome de arquivo na saída\n"
" -q, --quiet, --silent inibe todas as saídas normais\n"
" -a, --text não suprima saída de arquivos binários\n"
+" --binary-files=TIPO assume que arquivos binários são TIPO\n"
+" TIPO é 'binary'. 'text', ou 'without-match'.\n"
" -d, --directories=AÇÃO como tratar diretórios\n"
" AÇÃO pode ser: 'read' (ler), 'recurse' (recursivo),\n"
" ou 'skip' (não considerar).\n"
@@ -292,22 +301,22 @@ msgstr ""
" -c, --count exibe o número de padrões encontrados por arquivo\n"
" -Z, --null mostra 0 bytes depois do nome do ARQUIVO\n"
-#: src/grep.c:979
+#: src/grep.c:1021
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
msgstr ""
"\n"
"Controle de contexto:\n"
@@ -322,41 +331,42 @@ msgstr ""
" CRs (MSDOS)\n"
"\n"
"`egrep' é o mesmo que `grep -E', `fgrep' é `grep -F'.\n"
-"\n"
-"Se não especificadas as opções -[GEF], então o `egrep' assume -E e o `fgrep'\n"
-"assume -F; a opção -G é assumida noutros casos.\n"
"Se não informado o ARQUIVO, ou se ARQUIVO é -, lê da entrada padrão.\n"
"Se menos que dois arquivos forem especificados, assume-se -h.\n"
"Retorna 0 se encontra o padrão, 1 se não encontra.\n"
"Retorna 2 se houver erro de sintaxe ou erros do sistema.\n"
-#: src/grep.c:994
+#: src/grep.c:1036
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nInforme problemas para <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1005
+#: src/grep.c:1047
msgid "conflicting matchers specified"
msgstr "padrões de procura especificados conflitam"
-#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
+#: src/grep.c:1246 src/grep.c:1253 src/grep.c:1262
msgid "invalid context length argument"
msgstr "argumento tamanho do contexto inválido"
-#: src/grep.c:1271
+#: src/grep.c:1313
msgid "unknown directories method"
msgstr "método desconhecido de diretórios"
+#: src/grep.c:1398
+msgid "unknown binary-files type"
+msgstr "tipo de arquivo binário desconhecido"
+
# msgstr "la expresión a buscar ya fue especificada"
-#: src/grep.c:1366
+#: src/grep.c:1418
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1368
+#: src/grep.c:1420
msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
msgstr "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
-#: src/grep.c:1370
+#: src/grep.c:1422
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/ru.po b/po/ru.po
index 11570374..34e9b4bb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.2f\n"
-"POT-Creation-Date: 1999-10-05 22:33-0400\n"
+"POT-Creation-Date: 1999-02-03 13:09-0500\n"
"PO-Revision-Date: 1999-04-15 15:26\n"
"Last-Translator: Denis Y. Pershin <dyp@siblug.org>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -13,44 +13,46 @@ msgstr ""
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
+#
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
msgid "Memory exhausted"
msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
-#: src/dfa.c:457
+#: src/dfa.c:452
msgid "Unfinished \\ escape"
msgstr "îÅÚÁ×ÅÒÛÅÎÎÁÑ \\ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
+#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
+#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
msgid "unfinished repeat count"
msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÐÏ×ÔÏÒÅÎÉÊ"
-#: src/dfa.c:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
msgid "malformed repeat count"
msgstr "ÎÅËÏÒÒÅËÔÎÏ ÕËÁÚÁÎÏ ËÏÌÉÞÅÓÔ×Ï ÐÏ×ÔÏÒÅÎÉÊ"
-#: src/dfa.c:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
-#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
+#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
+#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
msgid "Unbalanced ["
msgstr "îÅÓÂÁÌÁÎÓÉÒÏ×ÁÎÎÁÑ ["
-#: src/dfa.c:886
+#: src/dfa.c:849
msgid "Unbalanced ("
msgstr "îÅÓÂÁÌÁÎÓÉÒÏ×ÁÎÎÁÑ ("
-#: src/dfa.c:1007
+#: src/dfa.c:970
msgid "No syntax specified"
msgstr "îÅ ÕËÁÚÁÎÏ ÓÉÎÔÁËÓÉÓÁ"
-#: src/dfa.c:1015
+#: src/dfa.c:978
msgid "Unbalanced )"
msgstr "îÅÓÂÁÌÁÎÓÉÒÏ×ÁÎÎÁÑ )"
-#: src/dfa.c:2036
+#: src/dfa.c:1998
msgid "out of memory"
msgstr "ÚÁËÏÎÞÉÌÁÓØ ÐÁÍÑÔØ"
@@ -159,71 +161,61 @@ msgstr "?? gotopt ×ÅÒÎÕÌ ÓÉÍ×ÏÌ Ó ËÏÄÏÍ 0%o ??\n"
msgid "non-option ARGV-elements: "
msgstr "ARGV-ÜÌÅÍÅÎÔÙ - ÎÅ ÏÐÃÉÉ: "
-#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
+#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
-#: src/grep.c:418 src/grep.c:883
+#: src/grep.c:372 src/grep.c:843
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s: %s\n"
-#: src/grep.c:543 src/grep.c:1429
+#: src/grep.c:497 src/grep.c:1318
msgid "writing output"
msgstr "ÚÁÐÉÓÙ×ÁÀ ×ÙÈÏÄÎÙÅ ÄÁÎÎÙÅ"
-#: src/grep.c:775
+#: src/grep.c:726
#, c-format
msgid "Binary file %s matches\n"
msgstr "âÉÎÁÒÎÙÊ ÆÁÊÌ %s ÓÏ×ÐÁÄÁÅÔ\n"
-#: src/grep.c:791
+#: src/grep.c:742
msgid "(standard input)"
msgstr "(ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ)"
-#: src/grep.c:884
+#: src/grep.c:844
msgid "recursive directory loop"
msgstr "ËÁÔÁÌÏÇÉ ÚÁÃÉËÌÅÎÙ"
-#: src/grep.c:935
+#: src/grep.c:895
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [OPTION]... PATTERN [FILE]...\n"
-#: src/grep.c:936
+#: src/grep.c:896
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
-#: src/grep.c:940
+#: src/grep.c:900
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [OPTION]... PATTERN [FILE] ...\n"
-#: src/grep.c:941
+#: src/grep.c:901
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
"Regexp selection and interpretation:\n"
-msgstr ""
-
-#: src/grep.c:945
-msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
-msgstr ""
-
-#: src/grep.c:949
-#, fuzzy
-msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
-" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
"éÝÅÔ PATTERN × ËÁÖÄÏÍ FILE'Å ÉÌÉ ÓÔÁÎÄÁÒÔÎÏÍ ××ÏÄÅ.\n"
"\n"
@@ -238,13 +230,12 @@ msgstr ""
" -w, --word-regexp PATTERN ÄÏÌÖÅÎ ÐÏÄÈÏÄÉÔØ ËÏ ×ÓÅÍÕ ÓÌÏ×Õ\n"
" -x, --line-regexp PATTERN ÄÏÌÖÅÎ ÐÏÄÈÏÄÉÔØ ËÏ ×ÓÅÊ ÓÔÒÏËÅ\n"
-#: src/grep.c:956
-#, fuzzy
+#: src/grep.c:913
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --invert-match select non-matching lines\n"
+" -v, --revert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
msgstr ""
@@ -255,8 +246,7 @@ msgstr ""
" -V, --version ÎÁÐÅÞÁÔÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
" --help ÐÏËÁÚÁÔØ ÐÏÍÏÝØ É ×ÙÊÔÉ\n"
-#: src/grep.c:963
-#, fuzzy
+#: src/grep.c:920
msgid ""
"\n"
"Output control:\n"
@@ -272,7 +262,6 @@ msgid ""
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
-" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
"õÐÒÁ×ÌÅÎÉÅ ×Ù×ÏÄÏÍ:\n"
@@ -291,8 +280,7 @@ msgstr ""
" -l, --files-with-matches ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÉÍÅÎÁ ÆÁÊÌÏ× Ó ÓÏ×ÐÁÄÅÎÉÑÍÉ\n"
" -c, --count ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ËÏÌÉÞÅÓÔ×Ï ÓÏ×ÐÁÄÁÀÝÉÈ ÓÔÒÏË ÎÁ ÆÁÊÌ\n"
-#: src/grep.c:979
-#, fuzzy
+#: src/grep.c:935
msgid ""
"\n"
"Context control:\n"
@@ -304,7 +292,7 @@ msgid ""
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
"With no FILE, or when FILE is -, read standard input. If less than\n"
"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
"Exit with 2 if syntax errors or system errors.\n"
@@ -324,34 +312,36 @@ msgstr ""
"ÍÅÎØÛÅ, ÞÅÍ Ä×Á ÆÁÊÌÁ, ÐÒÅÄÐÏÌÁÇÁÅÔ -h. ÷ÙÈÏÄÉÔ Ó 0 ÅÓÌÉ ÎÁÊÄÅÎÙ ÓÏ×ÐÁÄÅÎÉÑ,\n"
"Ó 1, ÅÓÌÉ ÎÅÔ. ÷ÙÈÏÄÉÔ Ó 2, ÅÓÌÉ ÅÓÔØ ÓÉÎÔÁËÓÉÞÅÓËÉÏ ÉÌÉ ÓÉÓÔÅÍÎÙÅ ÏÛÉÂËÉ.\n"
-#: src/grep.c:994
+#: src/grep.c:950
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1005
-#, fuzzy
-msgid "conflicting matchers specified"
-msgstr "ÏÂÒÁÚÅÃ ÕÖÅ ÚÁÄÁÎ"
-
-#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
+#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
msgid "invalid context length argument"
msgstr "ÎÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÉÎÙ ËÏÎÔÅËÓÔÁ"
-#: src/grep.c:1271
+#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+msgid "you may specify only one of -E, -F, or -G"
+msgstr "×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÔÏÌØËÏ ÏÄÎÕ ÉÚ -E, -F ÉÌÉ -G"
+
+#: src/grep.c:1145
+msgid "matcher already specified"
+msgstr "ÏÂÒÁÚÅÃ ÕÖÅ ÚÁÄÁÎ"
+
+#: src/grep.c:1166
msgid "unknown directories method"
msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÍÅÔÏÄ ÄÌÑ ËÁÔÁÌÏÇÏ×"
-#: src/grep.c:1366
-#, fuzzy, c-format
-msgid "%s (GNU grep) %s\n"
+#: src/grep.c:1252
+#, c-format
+msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1368
-#, fuzzy
-msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+#: src/grep.c:1254
+msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
msgstr "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
-#: src/grep.c:1370
+#: src/grep.c:1256
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"
@@ -360,13 +350,11 @@ msgstr ""
"ÔÅËÓÔÙ ÄÌÑ ÕÓÌÏ×ÉÊ ËÏÐÉÒÏ×ÁÎÉÑ. îå ÄÁÅÔÓÑ ÎÉËÁËÏÊ ÇÁÒÁÎÔÉÉ, ÄÁÖÅ Ï\n"
"ðïäèïäéíïóôé äìñ ïðòåäåìåîîùè ãåìåê.\n"
+#
#: src/obstack.c:467
msgid "memory exhausted\n"
msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n"
-#~ msgid "you may specify only one of -E, -F, or -G"
-#~ msgstr "×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÔÏÌØËÏ ÏÄÎÕ ÉÚ -E, -F ÉÌÉ -G"
-
#~ msgid ""
#~ "\n"
#~ "In REGEXPs, most characters stand for themselves, save for all the\n"
diff --git a/po/sl.po b/po/sl.po
index 2a0c8bec..850ea171 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,42 +1,42 @@
-# -*- mode: po; -*- Slovenian message catalogues for grep, egrep, fgrep
-# Copyright (C) 1996 Free Software Foundation, Inc.
-# Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 1996, 1999.
+# -*- mode: po; coding: iso-latin-2 -*- Slovenian message catalogue for grep
+# 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.13 1999/12/02 05:06:10 alainm Exp $
+# $Id: sl.po,v 1.14 2000/02/26 03:46:03 alainm Exp $
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.2f\n"
-"POT-Creation-Date: 1999-10-05 22:33-0400\n"
-"PO-Revision-Date: 1999-04-23 21:11\n"
-"Last-Translator: Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
+"Project-Id-Version: GNU grep 2.4f\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
+"PO-Revision-Date: 2000-02-15 20:11+01:00\n"
+"Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
"Language-Team: Slovenian <sl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "Pomnilnik porabljen"
-#: src/dfa.c:457
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
-msgstr "Nedokonèana ube¾na sekvenca \\"
+msgstr "Nedokonèano ube¾no zaporedje \\"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "nedokonèano ¹tevilo ponovitev"
-#: src/dfa.c:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
-msgstr "slabo oblikovano ¹tevilo ponovitev"
+msgstr "slabo doloèeno ¹tevilo ponovitev"
-#: src/dfa.c:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
-#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
msgid "Unbalanced ["
msgstr "Oklepaj [ brez zaklepaja"
@@ -44,138 +44,87 @@ msgstr "Oklepaj [ brez zaklepaja"
msgid "Unbalanced ("
msgstr "Oklepaj ( brez zaklepaja"
-#: src/dfa.c:1007
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr "Skladnja ni podana"
-#: src/dfa.c:1015
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr "Zaklepaj ) brez oklepaja"
-#: src/dfa.c:2036
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "zmanjkalo pomnilnika"
-#: src/getopt.c:628
+#: src/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: izbira ,%s` je dvoumna\n"
-#: src/getopt.c:652
+#: src/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: izbira ,--%s` ne dovoljuje argumenta\n"
-#: src/getopt.c:657
+#: src/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: izbira ,%c%s` ne dovoljuje argumenta\n"
-#: src/getopt.c:674 src/getopt.c:847
+#: src/getopt.c:723 src/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: izbira ,%s` zahteva argument\n"
#. --option
-#: src/getopt.c:703
+#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: neprepoznana izbira ,--%s`\n"
#. +option or -option
-#: src/getopt.c:707
+#: src/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: neprepoznana izbira ,%c%s`\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
+#: src/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: nedovoljena izbira -- %c\n"
-#: src/getopt.c:736
+#: src/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: neveljavna izbira -- %c\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
+#: src/getopt.c:815 src/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: izbira zahteva argument -- %c\n"
-#: src/getopt.c:813
+#: src/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: izbira ,-W %s` je dvoumna\n"
-#: src/getopt.c:831
+#: src/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: izbira ,-W %s` ne dovoljuje argumenta\n"
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr "izbira %s"
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr " z argumentom %s"
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr "¹tevke nastopajo pri dveh elementih ARGV.\n"
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr "izbira %c\n"
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr "izbira a\n"
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr "izbira b\n"
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr "izbira c z vrednostjo ,%s`\n"
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr "izbira d z vrednostjo ,%s`\n"
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr "?? funkcija getopt vrnila kodo znaka 0%o ??\n"
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr "neizbirni elementi ARGV: "
-
-#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
-#: src/kwset.c:190
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
msgid "memory exhausted"
msgstr "pomnilnik porabljen"
-#: src/grep.c:418 src/grep.c:883
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: pozor: %s: %s\n"
-
-#: src/grep.c:543 src/grep.c:1429
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "pisanje rezultatov"
-#: src/grep.c:775
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binarna datoteka %s ustreza\n"
@@ -184,41 +133,54 @@ msgstr "Binarna datoteka %s ustreza\n"
msgid "(standard input)"
msgstr "(standardni vhod)"
-#: src/grep.c:884
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: pozor: %s: %s\n"
+
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr "rekurzivna zanka imenikov"
-#: src/grep.c:935
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uporaba: %s [IZBIRA]... VZOREC [DATOTEKA]...\n"
-#: src/grep.c:936
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Poskusite ,%s --help` za dodatna pojasnila.\n"
-#: src/grep.c:940
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "Uporaba: %s [IZBIRA]... VZOREC [DATOTEKA]...\n"
+msgstr "Uporaba: %s [IZBIRA]... VZOREC [DATOTEKA] ...\n"
-#: src/grep.c:941
+#: src/grep.c:944
+#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
msgstr ""
+"V DATOTEKI ali na standardnem vhodu i¹èemo VZOREC.\n"
+"Primer: %s -i 'hello.*world' menu.h main.c\n"
+"\n"
+"Izbira in tolmaèenje regularnih izrazov:\n"
-#: src/grep.c:945
+#: src/grep.c:949
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
msgstr ""
+" -E, --extended-regexp 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"
-#: src/grep.c:949
-#, fuzzy
+#: src/grep.c:953
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -227,20 +189,15 @@ 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 ""
-"VZOREC i¹èemo v vsaki od navedenih DATOTEK ali na standardnem vhodu.\n"
-"\n"
-"Izbira in tolmaèenje regularnih izrazov:\n"
-" -E, --extended-regexp VZOREC je raz¹irjeni regularni izraz\n"
-" -F, --fixed-regexp VZOREC je fiksni regularni izraz, loèen z newline\n"
-" -G, --basic-regexp VZOREC je osnovni regularni izraz\n"
" -e, --regexp=VZOREC uporabimo VZOREC kot regularni izraz\n"
" -f, --file=DATOTEKA VZOREC preberemo s podane DATOTEKE\n"
" -i, --ignore-case ne razlikujemo med velikimi in malimi èrkami\n"
" -w, --word-regexp iskanje uspe¹no le, èe je VZOREC cela beseda\n"
" -x, --line-regexp iskanje uspe¹no le, èe je VZOREC cela vrstica\n"
+" -z, --null-data vrstica podatkov je konèana z znakom NUL, ne z\n"
+" znakom za skok v novo vrstico\n"
-#: src/grep.c:956
-#, fuzzy
+#: src/grep.c:960
msgid ""
"\n"
"Miscellaneous:\n"
@@ -248,16 +205,17 @@ msgid ""
" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
"Razno:\n"
" -s, --no-messages brez sporoèil o napakah\n"
-" -v, --revert-match komplement: vrstice, kjer ni VZORCA\n"
+" -v, --invert-match komplement: vrstice, kjer ni VZORCA\n"
" -V, --version verzija programa\n"
" --help ta pomoè\n"
+" --mmap èe je mo¾no, uporabi pomnilni¹ko preslikan vhod\n"
-#: src/grep.c:963
-#, fuzzy
+#: src/grep.c:968
msgid ""
"\n"
"Output control:\n"
@@ -266,7 +224,10 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
@@ -282,32 +243,35 @@ msgstr ""
" -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"
-" -a, --text dovolimo binarni izhod\n"
+" --binary-type=TIP privzemi izbrani TIP binarne datoteke\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"
+" -r, --recursive isto kot --directories=recurse\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"
+" pojavi VZOREC\n"
+" -Z, --null izpi¹i znak NUL za imenom DATOTEKE\n"
-#: src/grep.c:979
-#, fuzzy
+#: src/grep.c:987
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
msgstr ""
"\n"
"Nadzor nad kontekstom:\n"
@@ -319,13 +283,12 @@ msgstr ""
" -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"
-"Èe ni podana nobena od izbir -[GEF], potem ,egrep` privzame -E, ,fgrep` -F,\n"
-"ostalo pa -G. Èe DATOTEKA ni podana ali pa je -, beremo s standardnega vhoda.\n"
-"Èe sta podani manj kot dve DATOTEKI, privzamemo izbiro -h. Izhodna koda je\n"
-"niè, èe smo VZOREC na¹li, ena èe ga nismo. Izhodna koda 2 pomeni skladenjsko\n"
-"ali sistemsko napako.\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:994
+#: src/grep.c:1002
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "\nMorebitne napake v programu sporoèite na <bug-gnu-utils@gnu.org>.\n"
@@ -334,41 +297,72 @@ msgstr "\nMorebitne napake v programu sporoèite na <bug-gnu-utils@gnu.org>.\n"
# opt = getopt(argc, argv, "0123456789A:B:CEFGVX:bce:f:hiLlnqsvwxy"
# grep --help ->
# usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1012
msgid "conflicting matchers specified"
-msgstr "vzorec ¾e doloèen"
+msgstr "podana navodila si nasprotujejo"
-#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
msgid "invalid context length argument"
msgstr "velikost konteksta ni veljavna"
-#: src/grep.c:1271
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr "neznana metoda imenikov"
-#: src/grep.c:1366
-#, fuzzy, c-format
+#: src/grep.c:1358
+msgid "unknown binary-files type"
+msgstr "neznan tip binarne datoteke"
+
+#: src/grep.c:1378
+#, c-format
msgid "%s (GNU grep) %s\n"
-msgstr "grep (GNU grep) %s\n"
+msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1368
-#, fuzzy
-msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+#: src/grep.c:1380
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
-#: src/grep.c:1370
+#: src/grep.c:1382
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-"To je prost program; pogoji, pod katerimi ga lahko razmno¾ujete in\n"
-"raz¹irjate so navedeni v izvorni kodi. Za program ni NOBENEGA jamstva,\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/obstack.c:467
-msgid "memory exhausted\n"
-msgstr "pomnilnik porabljen\n"
+#~ msgid "option %s"
+#~ msgstr "izbira %s"
+
+#~ msgid " with arg %s"
+#~ msgstr " z argumentom %s"
+
+#~ msgid "digits occur in two different argv-elements.\n"
+#~ msgstr "¹tevke nastopajo pri dveh elementih ARGV.\n"
+
+#~ msgid "option %c\n"
+#~ msgstr "izbira %c\n"
+
+#~ msgid "option a\n"
+#~ msgstr "izbira a\n"
+
+#~ msgid "option b\n"
+#~ msgstr "izbira b\n"
+
+#~ msgid "option c with value `%s'\n"
+#~ msgstr "izbira c z vrednostjo ,%s`\n"
+
+#~ msgid "option d with value `%s'\n"
+#~ msgstr "izbira d z vrednostjo ,%s`\n"
+
+#~ msgid "?? getopt returned character code 0%o ??\n"
+#~ msgstr "?? funkcija getopt vrnila kodo znaka 0%o ??\n"
+
+#~ msgid "non-option ARGV-elements: "
+#~ msgstr "neizbirni elementi ARGV: "
+
+#~ msgid "memory exhausted\n"
+#~ msgstr "pomnilnik porabljen\n"
#~ msgid "you may specify only one of -E, -F, or -G"
#~ msgstr "izberete lahko samo eno od izbir: -E, -F ali -G"
diff --git a/po/sv.po b/po/sv.po
index 618561cb..e1f01c02 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,25 +1,25 @@
-# Swedish messages for GNU Grep version 2.3f
+# Swedish messages for GNU Grep version 2.4f
# Copyright (C) 1996 Free Software Foundation, Inc.
# Thomas Olsson <cid95tho@student1.lu.se>, 1996.
-# Daniel Bergström <daniel@bergstrom.net>, 1998, 1999
-# $Revision: 1.7 $
+# Daniel Resare <daniel@resare.com>, 1998-2000
+# $Id: sv.po,v 1.8 2000/02/26 03:46:03 alainm Exp $
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.3f\n"
-"POT-Creation-Date: 1999-10-05 22:33-0400\n"
-"PO-Revision-Date: 1999-10-19 10:46+02:00\n"
-"Last-Translator: Daniel Bergström <daniel@bergstrom.net>\n"
+"Project-Id-Version: GNU grep 2.4f\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
+"PO-Revision-Date: 2000-02-16 08:48+01:00\n"
+"Last-Translator: Daniel Resare <daniel@resare.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "Minnet slut"
-#: src/dfa.c:457
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr "Oavslutad \\-sekvens"
@@ -27,16 +27,16 @@ msgstr "Oavslutad \\-sekvens"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "oavslutad repetitionsräknare"
-#: src/dfa.c:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr "felformaterad repetionsräknare"
-#: src/dfa.c:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
-#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
msgid "Unbalanced ["
msgstr "Obalanserad ["
@@ -44,138 +44,87 @@ msgstr "Obalanserad ["
msgid "Unbalanced ("
msgstr "Obalanserad ("
-#: src/dfa.c:1007
+#: src/dfa.c:1000
msgid "No syntax specified"
-msgstr "Ingen specifierad syntax"
+msgstr "Ingen specificerad syntax"
-#: src/dfa.c:1015
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr "Obalanserad )"
-#: src/dfa.c:2036
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "minnet slut"
-#: src/getopt.c:628
+#: src/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: flaggan \"%s\" är tvetydig\n"
-#: src/getopt.c:652
+#: src/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: flaggan \"%s\" tar inget argument\n"
-#: src/getopt.c:657
+#: src/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: flaggan \"%c%s\" tar inget argument\n"
-#: src/getopt.c:674 src/getopt.c:847
+#: src/getopt.c:723 src/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: flaggan \"%s\" behöver ett argument\n"
#. --option
-#: src/getopt.c:703
+#: src/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: okänd flagga \"--%s\"\n"
#. +option or -option
-#: src/getopt.c:707
+#: src/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: okänd flagga \"%c%s\"\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
+#: src/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: otillåten flagga -- %c\n"
-#: src/getopt.c:736
+#: src/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: otillåten flagga -- %c\n"
#. 1003.2 specifies the format of this message.
-#: src/getopt.c:766 src/getopt.c:896
+#: src/getopt.c:815 src/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: flagga behöver ett argument -- %c\n"
-#: src/getopt.c:813
+#: src/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
-#: src/getopt.c:831
+#: src/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: flaggan \"-W %s\" tillåter inget argument\n"
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr "flagga %s"
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr " med argument %s"
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr "siffror förekommer i två olika argv-element.\n"
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr "flagga %c\n"
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr "flagga a\n"
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr "flagga b\n"
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr "flagga c med värde \"%s\"\n"
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr "flagga d med värde \"%s\"\n"
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr "?? getopt returnerade teckenkod 0%o ??\n"
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr "ARGV-element är inte flaggor: "
-
-#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
-#: src/kwset.c:190
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
msgid "memory exhausted"
msgstr "minnet slut"
-#: src/grep.c:418 src/grep.c:883
-#, c-format
-msgid "%s: warning: %s: %s\n"
-msgstr "%s: varning: %s: %s\n"
-
-#: src/grep.c:543 src/grep.c:1429
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "skriver utdata"
-#: src/grep.c:775
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binär fil %s matchar\n"
@@ -184,46 +133,54 @@ msgstr "Binär fil %s matchar\n"
msgid "(standard input)"
msgstr "(standard in)"
-#: src/grep.c:884
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: varning: %s: %s\n"
+
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr "rekursiv katalogloop"
-#: src/grep.c:935
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Användning: %s [FLAGGA]... MÖNSTER [FIL]...\n"
-#: src/grep.c:936
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Försök med \"%s --help\" för mer information\n"
-#: src/grep.c:940
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Användning: %s [FLAGGA]... MÖNSTER [FIL]...\n"
-#: src/grep.c:941
+#: src/grep.c:944
+#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
msgstr ""
"Sök efter MÖNSTER i varje FIL eller standard in.\n"
+"Exempel: %s -i 'hello world' menu.h main.c\n"
"\n"
-"Val och tolkning av reguljära utrryck:\n"
+"Val och tolkning av reguljära uttryck:\n"
-#: src/grep.c:945
+#: src/grep.c:949
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
msgstr ""
" -E, --extended-regexp MÖNSTER är ett utökat reguljärt uttryck\n"
-" -F, --fixed-regexp MÖNSTER är en fix sträng separerad med nyrad\n"
+" -F, --fixed-strings MÖNSTER är ett antal strängar separerade med nyrad\n"
" -G, --basic-regexp MÖNSTER är ett enkelt reguljärt uttryck\n"
-#: src/grep.c:949
+#: src/grep.c:953
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -237,10 +194,10 @@ msgstr ""
" -i, --ignore-case skilj ej på gemener och versaler\n"
" -w, --word-regexp tvinga MÖNSTER att endast matcha hela ord\n"
" -x, --line-regexp tvinga MÖNSTER att endast matcha hela rader\n"
-" -z, --null-data en rad indata begränsas av en 0-byte, inte\n"
+" -z, --null-data en rad indata begränsas av en nolltecken, inte\n"
" av ett nyrad-tecken\n"
-#: src/grep.c:956
+#: src/grep.c:960
msgid ""
"\n"
"Miscellaneous:\n"
@@ -248,6 +205,7 @@ msgid ""
" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
"Diverse:\n"
@@ -255,8 +213,10 @@ msgstr ""
" -v, --invert-match välj rader utan träffar\n"
" -V, --version visa versionsinformation och avsluta\n"
" --help visa detta hjälpmeddelande och avsluta\n"
+" --mmap använd om möjligt minesmappning vid\n"
+" läsning av indata.\n"
-#: src/grep.c:963
+#: src/grep.c:968
msgid ""
"\n"
"Output control:\n"
@@ -265,7 +225,10 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'.\n"
" -r, --recursive equivalent to --directories=recurse.\n"
@@ -281,76 +244,83 @@ msgstr ""
" -H, --with-filename skriv filnamn vid varje träff\n"
" -h, --no-filename skriv inte filnamn vid varje visad rad\n"
" -q, --quiet, --silent undvik all normal utskrift\n"
-" -a, --text skriv även ut binära filer\n"
-" -d, --directories=ACTION hur kataloger skall hanteras\n"
-" ACTION är 'read', 'recursive' eller 'skip'.\n"
-" -r, --recursive motsvarar --directories=recursive\n"
+" --binary-files=TYP antag att binära filer är av TYP\n"
+" TYP är \"binary\", \"text\" eller \"without-match\"\n"
+" -a, --text motsvarar --binary-files=text\n"
+" -I motsvarar --binary-files=without-match\n"
+" -d, --directories=ÅTGÄRD hur kataloger skall hanteras\n"
+" ÅTGÄRD är \"read\", \"recurse\" eller \"skip\".\n"
+" -r, --recursive motsvarar --directories=recurse\n"
" -L, --files-without-match skriv bara ut FILnamn utan träffar\n"
" -l, --files-with-matches skriv bara ut FILnamn med träffar\n"
" -c, --count skriv för varje FIL bara ut antal träffade rader\n"
" -Z, --null skriv 0-byte efter FILnamn\n"
-#: src/grep.c:979
+#: src/grep.c:987
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
-"Exit with 2 if syntax errors or system errors.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
msgstr ""
"\n"
"Kontroll av sammanhang:\n"
-" -B, --before-context=NUM skriv NUM rader före träffad rad\n"
-" -A, --after-context=NUM skriv NUM rader efter träffad rad\n"
-" -C, --context[=NUM] skriv NUM (i normalfallet 2) rader runt träffad\n"
-" rad, om inte -A eller -B angivits\n"
-" -NUM motsvarar --context=NUM\n"
-" -U, --binary ta inte bort CR-tecken vid radslut (MSDOS)\n"
-" -u, --unix-byte-offsets skriv offset som om CR-tecken inte förekommit\n"
+" -B, --before-context=ANTAL skriv ANTAL rader före träffad rad\n"
+" -A, --after-context=ANTAL skriv ANTAL rader efter träffad rad\n"
+" -C, --context[=ANTAL] skriv ANTAL (i normalfallet 2) rader runt\n"
+" träffad rad, om inte -A eller -B angivits\n"
+" -ANTAL motsvarar --context=ANTAL\n"
+" -U, --binary ta inte bort CR-tecken vid radslut (MSDOS)\n"
+" -u, --unix-byte-offsets skriv offset som om CR-tecken inte förekommit\n"
"\n"
"\"egrep\" betyder \"grep -E\". \"fgrep\" betyder \"grep -F\".\n"
"Utan FIL, eller om FIL är -, läser programmet från standard in. Om färre än\n"
"två FILer är angivna, sätts flaggan -h. Programmet returnerar 0 om något\n"
"matchar, 1 om inget matchade och 2 vid syntaxfel eller systemrelaterade fel\n"
-#: src/grep.c:994
+#: src/grep.c:1002
msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Rapportera buggar till <bug-gnu-utils@gnu.org>.\n"
"Skicka anmärkningar på översättningar till <sv@li.org>\n"
-#: src/grep.c:1005
+#: src/grep.c:1012
msgid "conflicting matchers specified"
-msgstr "motstridiga söksträngar specifierade"
+msgstr "motstridiga söksträngar specificerade"
-#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
msgid "invalid context length argument"
msgstr "ogiltigt argument till -A, -B eller -C"
-#: src/grep.c:1271
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr "okänd metod gällande kataloger"
-#: src/grep.c:1366
+#: src/grep.c:1358
+msgid "unknown binary-files type"
+msgstr "okänd binärfiltyp"
+
+#: src/grep.c:1378
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1368
-msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+#: src/grep.c:1380
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
-#: src/grep.c:1370
+#: src/grep.c:1382
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -358,10 +328,3 @@ msgstr ""
"Detta program är fri programvara, se källkoden för kopieringsvilkor. Det\n"
"finns INGEN garanti, inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT\n"
"SPECIELLT ÄNDAMÅL.\n"
-
-#: src/obstack.c:467
-msgid "memory exhausted\n"
-msgstr "minnet slut\n"
-
-msgid "(standard input)\n"
-msgstr "(standard in)\n"