summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorAlain Magloire <alainm@rcsm.ee.mcgill.ca>1999-02-10 05:49:50 +0000
committerAlain Magloire <alainm@rcsm.ee.mcgill.ca>1999-02-10 05:49:50 +0000
commit1df65bd83a87cdb49e49b4e897e27eb73c2cf23a (patch)
tree975a7d81844ac14c0d8173eda31ab484a6de36d0 /po
parent2fae5c2a7405d566c860a493740417118724e20b (diff)
downloadgrep-1df65bd83a87cdb49e49b4e897e27eb73c2cf23a.tar.gz
update
from iro. * grep-2.2f beta release. * m4/{djgpp,envsep,glibc,regex,dosfile,isc-posix}.m4 : New files to aid configuration and unload configure.in. * m4/Makefile.am : updated. Patch forwarded by Ben Elliston.
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog5
-rw-r--r--po/de.po122
-rw-r--r--po/el.po459
-rw-r--r--po/es.po121
-rw-r--r--po/fr.po155
-rw-r--r--po/ko.po356
-rw-r--r--po/nl.po297
-rw-r--r--po/no.po119
-rw-r--r--po/pl.po119
-rw-r--r--po/ru.po211
-rw-r--r--po/sl.po299
-rw-r--r--po/sv.po113
12 files changed, 859 insertions, 1517 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 7d2a22d8..0873b634 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,2 +1,7 @@
+1999-02-10 Alain Magloire
+
+ * update from ftp.iro.umontreal.
+
+---------
* got a basic set of *.po from Franc,ois Pinard
ftp.iro.umontreal.ca
diff --git a/po/de.po b/po/de.po
index d10aaa72..2fb2f401 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1998-11-09 00:40-0500\n"
+"POT-Creation-Date: 1998-04-26 19:31-0400\n"
"PO-Revision-Date: 1998-08-02 22:34 MET DST\n"
"Last-Translator: Martin von Löwis <martin@mira.isdn.cs.tu-berlin.de>\n"
"Language-Team: German <de@li.org>\n"
@@ -13,11 +13,11 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:766
+#: src/dfa.c:147 src/dfa.c:159 src/dfa.c:172
msgid "Memory exhausted"
msgstr "Virtueller Speicher erschöpft."
-#: src/dfa.c:452
+#: src/dfa.c:444
msgid "Unfinished \\ escape"
msgstr "Unbeendete \\-Escape-Sequenz."
@@ -26,34 +26,34 @@ msgstr "Unbeendete \\-Escape-Sequenz."
#. {M,} - minimum count, maximum is infinity
#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
+#: src/dfa.c:556 src/dfa.c:562 src/dfa.c:573 src/dfa.c:584
msgid "unfinished repeat count"
msgstr "Unbeendeter Wiederholungszähler."
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+#: src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
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: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:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
+#: src/dfa.c:690 src/dfa.c:703 src/dfa.c:704
msgid "Unbalanced ["
msgstr "Öffnende [ ohne schließende."
-#: src/dfa.c:849
+#: src/dfa.c:841
msgid "Unbalanced ("
msgstr "Öffnende ( ohne schließende."
-#: src/dfa.c:970
+#: src/dfa.c:962
msgid "No syntax specified"
msgstr "Keine Syntax angegeben."
-#: src/dfa.c:978
+#: src/dfa.c:970
msgid "Unbalanced )"
msgstr "Schließende ) ohne öffnende."
-#: src/dfa.c:1998
+#: src/dfa.c:1990
msgid "out of memory"
msgstr "Speicher ist alle."
@@ -162,45 +162,36 @@ msgstr "?? getopt ergab Zeichen 0%o ??\n"
msgid "non-option ARGV-elements: "
msgstr "Nicht-Options-ARGV-Elemente: "
-#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
+#: src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "Virtueller Speicher erschöpft."
-#: src/grep.c:324
+#: src/grep.c:293
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: Warnung: %s: %s\n"
-#: src/grep.c:429 src/grep.c:1222
+#: src/grep.c:392 src/grep.c:1034
msgid "writing output"
msgstr "schreibe Ausgabe"
-#: src/grep.c:655
-#, c-format
-msgid "Binary file %s matches\n"
-msgstr ""
-
-#: src/grep.c:670
-msgid "(standard input)"
-msgstr "(Standardeingabe)"
-
-#: src/grep.c:800
+#: src/grep.c:597
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI]...\n"
-#: src/grep.c:801
+#: src/grep.c:598
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "»%s --help« gibt Ihnen mehr Informationen.\n"
-#: src/grep.c:805
+#: src/grep.c:602
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI] ...\n"
-#: src/grep.c:806
+#: src/grep.c:603
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -228,7 +219,7 @@ msgstr ""
" -w, --word-regexp MUSTER paßt nur auf ganze Wörter.\n"
" -x, --line-regexp MUSTER paßt nur auf ganze Zeilen.\n"
-#: src/grep.c:818
+#: src/grep.c:615
msgid ""
"\n"
"Miscellaneous:\n"
@@ -244,8 +235,7 @@ msgstr ""
" -V, --version Versionnummer ausgeben und beenden.\n"
" --help Diese Hilfe ausgeben und beenden.\n"
-#: src/grep.c:825
-#, fuzzy
+#: src/grep.c:622
msgid ""
"\n"
"Output control:\n"
@@ -254,10 +244,6 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
-" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'.\n"
-" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -272,19 +258,16 @@ msgstr ""
" -L, --files-without-match Nur Namen von Dateien ausgeben, die keine\n"
" Übereinstimmung enthalten.\n"
" -l, --files-with-matches Nur Dateinamen mit Übereinstimmungen ausgeben.\n"
-" -c, --count Nur Zahl der passenden Zeilen pro Datei "
-"ausgeben.\n"
+" -c, --count Nur Zahl der passenden Zeilen pro Datei ausgeben.\n"
-#: src/grep.c:840
-#, fuzzy
+#: src/grep.c:633
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"
-" -NUM same as --contex=NUM\n"
+" -NUM same as both -B NUM and -A NUM\n"
+" -C, --context same as -2\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"
@@ -295,73 +278,60 @@ msgid ""
msgstr ""
"\n"
"Kontextkontrolle:\n"
-" -B, --before-context=ZAHL ZAHL Zeilen von vorausgehendem Kontext "
-"anzeigen.\n"
+" -B, --before-context=ZAHL ZAHL Zeilen von vorausgehendem Kontext anzeigen.\n"
" -A, --after-context=ZAHL ZAHL Zeilen von folgendem Kontext anzeigen.\n"
" -ZAHL Wie -B ZAHL und -A ZAHL.\n"
" -C, --context Wie -2.\n"
" -U, --binary CR-Zeichen am Zeilenende belassen (MSDOS).\n"
-" -u, --unix-byte-offsets Offsets ausgeben, als fehlten CR-Zeichen "
-"(MSDOS).\n"
+" -u, --unix-byte-offsets Offsets ausgeben, als fehlten CR-Zeichen (MSDOS).\n"
"\n"
"Wenn -[GEF] fehlt, verwendet »egrep« -E, »fgrep« -F, ansonsten -G.\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"
-#: src/grep.c:855
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Fehlerberichte bitte an <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:647
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nFehlerberichte bitte an <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:998 src/grep.c:1005
+#: src/grep.c:785 src/grep.c:792
msgid "invalid context length argument"
msgstr "Ungültige Kontextlänge."
-#: src/grep.c:1014
-#, fuzzy
-msgid "infalid context length argument"
-msgstr "Ungültige Kontextlänge."
-
-#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
+#: src/grep.c:800 src/grep.c:805 src/grep.c:810
msgid "you may specify only one of -E, -F, or -G"
msgstr "Es darf nur eines von -E, -F oder -G angegeben werden."
-#: src/grep.c:1050
+#: src/grep.c:829
msgid "matcher already specified"
msgstr "Vergleicher ist bereits festgelegt."
-#: src/grep.c:1071
-msgid "unknown directories method"
-msgstr ""
-
-#: src/grep.c:1157
+#: src/grep.c:915
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1159
-msgid ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-msgstr ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+#: src/grep.c:917
+msgid "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1161
+#: src/grep.c:919
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-"Dies ist freie Software; in den Quellen befinden sich die "
-"Lizenzbedingungen.\n"
+"Dies ist freie Software; in den Quellen befinden sich die Lizenzbedingungen.\n"
"Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n"
"VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK.\n"
+#: src/grep.c:964 src/grep.c:1015
+msgid "(standard input)"
+msgstr "(Standardeingabe)"
+
+#: src/grep.c:1027 src/grep.c:1030
+msgid "(standard input)\n"
+msgstr "(Standardeingabe)\n"
+
#: src/obstack.c:467
msgid "memory exhausted\n"
msgstr "Virtueller Speicher erschöpft.\n"
-
-#~ msgid "(standard input)\n"
-#~ msgstr "(Standardeingabe)\n"
diff --git a/po/el.po b/po/el.po
index b06c44e5..1d8219e6 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,244 +1,345 @@
-# Greek messages for GNU grep-2.2.
-# Copyright (C) 1998 Free Software Foundation, Inc.
-# Simos KSenitellis <simos@teiath.gr>, 1998.
-#
+# Greek messages for GNU grep-2.2e.
+# Copyright (C) 1998 Free Software Foundation, Inc.
+# Simos KSenitellis <S.Xenitellis@rhbnc.ac.uk>, 1998.
+#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1998-11-09 00:40-0500\n"
-"PO-Revision-Date: 1998-05-02 16:38+0200\n"
-"Last-Translator: Simos KSenitellis <simos@teiath.gr>\n"
-"Language-Team: Greek <simos@teiath.gr>\n"
+"Project-Id-Version: GNU grep 2.2e\n"
+"POT-Creation-Date: 1998-12-02 00:30-0500\n"
+"PO-Revision-Date: 1998-12-25 21:11+0000\n"
+"Last-Translator: Simos KSenitellis <S.Xenitellis@rhbnc.ac.uk>\n"
+"Language-Team: Greek <S.Xenitellis@rhbnc.ac.uk>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-7\n"
"Content-Transfer-Encoding: 8-bit\n"
-# src/dfa.c:147 src/dfa.c:159 src/dfa.c:172
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:766
+#
+# 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
+# File: src/dfa.c, line: 155
+# File: src/dfa.c, line: 167
+# File: src/dfa.c, line: 180
+# File: src/grep.c, line: 827
msgid "Memory exhausted"
msgstr "Ç ìíÞìç åîáíôëÞèçêå"
-# src/dfa.c:444
-#: src/dfa.c:452
+#
+# src/dfa.c:444
+# src/dfa.c:452
+# 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: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:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
msgid "unfinished repeat count"
msgstr "ìç ôåñìáôéóìÝíïò ìåôñçôÞò åðáíÜëçøçò"
-# src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+#
+# src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
+# src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+# File: src/dfa.c, line: 577
+# File: src/dfa.c, line: 591
+# File: src/dfa.c, line: 595
msgid "malformed repeat count"
msgstr "êáêïó÷çìáôéóìÝíïò ìåôñçôÞò åðáíÜëçøçò"
-# src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
-# src/dfa.c:690 src/dfa.c:703 src/dfa.c:704
-#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
-#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
+#
+# src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
+# src/dfa.c:690 src/dfa.c:703 src/dfa.c:704
+# src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
+# src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
+# 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:841
+# src/dfa.c:849
+# File: src/dfa.c, line: 849
msgid "Unbalanced ("
msgstr "Ìç éóïññïðçìÝíï ("
-# src/dfa.c:962
-#: src/dfa.c:970
+#
+# src/dfa.c:962
+# src/dfa.c:970
+# File: src/dfa.c, line: 970
msgid "No syntax specified"
msgstr "Äåí ïñßóôçêå óõíôáêôéêü"
-# src/dfa.c:970
-#: src/dfa.c:978
+#
+# src/dfa.c:970
+# src/dfa.c:978
+# File: src/dfa.c, line: 978
msgid "Unbalanced )"
msgstr "Ìç éóïññïðçìÝíï )"
-# src/dfa.c:1990
-#: src/dfa.c:1998
+#
+# src/dfa.c:1990
+# src/dfa.c:1998
+# File: src/dfa.c, line: 1998
msgid "out of memory"
msgstr "åîáíôëÞèçêå ç ìíÞìç"
-# src/getopt.c:628
-#: 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# src/getopt1.c:180
+# File: src/getopt1.c, line: 180
msgid "non-option ARGV-elements: "
msgstr "ARGV-óôïé÷åßá ðïõ äåí åßíáé åðéëïãÝò: "
-# src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
-# src/kwset.c:190
-#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
-#: src/kwset.c:190
+#
+# src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
+# src/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
+# File: src/grep.c, line: 164
+# File: src/grep.c, line: 181
+# File: src/grep.c, line: 283
+# File: src/grep.c, line: 338
+# File: src/kwset.c, line: 184
+# File: src/kwset.c, line: 190
msgid "memory exhausted"
msgstr "ç ìíÞìç åîáíôëÞèçêå"
-# src/grep.c:293
-#: src/grep.c:324
+#
+# src/grep.c:293
+# src/grep.c:366
+# File: src/grep.c, line: 366
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: ðñïåéäïðïßçóç: %s: %s\n"
-# src/grep.c:392 src/grep.c:1034
-#: src/grep.c:429 src/grep.c:1222
+#
+# src/grep.c:392 src/grep.c:1034
+# src/grep.c:487 src/grep.c:1284
+# File: src/grep.c, line: 487
+# File: src/grep.c, line: 1284
msgid "writing output"
msgstr "åããñáöÞ áðïôåëÝóìáôïò"
-#: src/grep.c:655
+#
+# src/grep.c:715
+# File: src/grep.c, line: 715
#, c-format
msgid "Binary file %s matches\n"
-msgstr ""
+msgstr "Äõáäéêü áñ÷åßï %s ôáéñéÜóìáôá\n"
-# src/grep.c:964 src/grep.c:1015
-#: src/grep.c:670
+#
+# src/grep.c:964 src/grep.c:1015
+# src/grep.c:730
+# File: src/grep.c, line: 730
msgid "(standard input)"
msgstr "(óôÜíôáñô åßóïäïò)"
-# src/grep.c:597
-#: src/grep.c:800
+#
+# src/grep.c:597
+# src/grep.c:862
+# File: src/grep.c, line: 862
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... Ó×ÇÌÁÔÉÓÌÏÓ [ÁÑ×ÅÉÏ]...\n"
-# src/grep.c:598
-#: src/grep.c:801
+#
+# src/grep.c:598
+# src/grep.c:863
+# File: src/grep.c, line: 863
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n"
-# src/grep.c:602
-#: src/grep.c:805
+#
+# src/grep.c:602
+# src/grep.c:867
+# File: src/grep.c, line: 867
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... Ó×ÇÌÁÔÉÓÌÏÓ [ÁÑ×ÅÉÏ] ...\n"
-# src/grep.c:603
-#: src/grep.c:806
+#
+# src/grep.c:603
+# src/grep.c:868
+# File: src/grep.c, line: 868
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -255,22 +356,19 @@ msgstr ""
"ÁíáæÞôçóç ãéá Ó×ÇÌÁÔÉÓÌÏ óå êÜèå ÁÑ×ÅÉÏ Þ óôç óôÜíôáñô åßóïäï.\n"
"\n"
"ÅðéëïãÝò Þ regexp êáé åîÞãçóç:\n"
-" -E, --extended-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé ìéá åêôåôáìÝíç êáíïíéêÞ "
-"Ýêöñáóç\n"
-" -F, --fixed-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé óôáôéêü áëöáñéèìçôéêü "
-"äéá÷ùñéæüìåíï ìå ÷áñáêôÞñåò áëëáãÞò ãñáììÞò\n"
+" -E, --extended-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé ìéá åêôåôáìÝíç êáíïíéêÞ Ýêöñáóç\n"
+" -F, --fixed-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé óôáôéêü áëöáñéèìçôéêü äéá÷ùñéæüìåíï ìå ÷áñáêôÞñåò áëëáãÞò ãñáììÞò\n"
" -G, --basic-regexp Ó×ÇÌÁÔÉÓÌÏÓ åßíáé áðëÞ êáíïíéêÞ Ýêöñáóç\n"
" -e, --regexp=Ó×ÇÌÁÔÉÓÌÏÓ ÷ñÞóç Ó×ÇÌÁÔÉÓÌÏÕ ãéá êáíïíéêÞ Ýêöñáóç\n"
" -f, --file=ÁÑ×ÅÉÏ ëÞøç Ó×ÇÌÁÔÉÓÌÏÕ áðü ôï áñ÷åßï ÁÑ×ÅÉÏ\n"
-" -i, --ignore-case áãíüçóå äéáöïñÝò ðåæþí/êåöáëáßùí ignore case "
-"distinctions\n"
-" -w, --word-regexp åðéâïëÞ ôïõ Ó×ÇÌÁÔÉÓÌÏÕ íá ôáéñéÜæåé ìüíï "
-"ïëüêëçñåò ëÝîåéò\n"
-" -x, --line-regexp åðéâïëÞ ôïõ force PATTERN íá ôáéñéÜæåé ìüíï "
-"ïëüêëçñåò ãñáììÝò\n"
-
-# src/grep.c:615
-#: src/grep.c:818
+" -i, --ignore-case áãíüçóå äéáöïñÝò ðåæþí/êåöáëáßùí ignore case distinctions\n"
+" -w, --word-regexp åðéâïëÞ ôïõ Ó×ÇÌÁÔÉÓÌÏÕ íá ôáéñéÜæåé ìüíï ïëüêëçñåò ëÝîåéò\n"
+" -x, --line-regexp åðéâïëÞ ôïõ force PATTERN íá ôáéñéÜæåé ìüíï ïëüêëçñåò ãñáììÝò\n"
+
+#
+# src/grep.c:615
+# src/grep.c:880
+# File: src/grep.c, line: 880
msgid ""
"\n"
"Miscellaneous:\n"
@@ -286,9 +384,10 @@ msgstr ""
" -V, --version åìöÜíéóçò ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
" --help åìöÜíéóçò áõôÞò ôçò âïÞèåéáò êáé Ýîïäïò\n"
-# src/grep.c:622
-#: src/grep.c:825
-#, fuzzy
+#
+# src/grep.c:622
+# src/grep.c:887
+# File: src/grep.c, line: 887
msgid ""
"\n"
"Output control:\n"
@@ -307,23 +406,24 @@ msgid ""
msgstr ""
"\n"
"¸ëåã÷ïò åîüäïõ:\n"
-" -b, --byte-offset åìöÜíéóç ó÷åôéêÞò èÝóçò ôïõ byte ìå ôéò "
-"áíôßóôïé÷åò ãñáììÝò\n"
-" -n, --line-number åìöÜíéóç áñéèìþí ãñáììÞò ôùí áíôßóôïé÷ùí "
-"ãñáììþí\n"
+" -b, --byte-offset åìöÜíéóç ó÷åôéêÞò èÝóçò ôïõ byte ìå ôéò ãñáììÝò åîüäïõ\n"
+" -n, --line-number åìöÜíéóç áñéèìþí ãñáììÞò ìå ôéò ãñáììÝò åîüäïõ\n"
" -H, --with-filename åìöÜíéóç ïíüìáôïò áñ÷åßïõ ìå êÜèå ôáßñéáóìá\n"
-" -h, --no-filename áðïöõãÞ åìöÜíéóçò ôïõ ïíüìáôïò ôïõ áñ÷åßïõ óôçí "
-"áñ÷Þ ôçò åîüäïõ\n"
+" -h, --no-filename áðïöõãÞ åìöÜíéóçò ôïõ ïíüìáôïò ôïõ áñ÷åßïõ óôçí áñ÷Þ ôçò åîüäïõ\n"
" -q, --quiet, --silent áðïöõãÞ åìöÜíéóçò üëçò ôçò êáíïíéêÞò åîüäïõ\n"
-" -L, --files-without-match åìöÜíéóç ìüíï ôá ïíüìáôá ÁÑ×ÅÉÙÍ ðïõ äåí "
-"ðåñéÝ÷ïõí ôáéñéÜóìáôá\n"
+" -a, --text íá ìçí áðïöåõ÷èåß ç Ýîïäïò äõáäéêþí äåäïìÝíùí\n"
+" -d, --directories=ÅÍÅÑÃÅÉÁ ôñüðïò ÷ñÞóçò ôùí êáôáëüãùí\n"
+" Ç ÅÍÅÑÃÅÉÁ åßíáé 'read', 'recurse' Þ 'skip'.\n"
+" (Ãéá áíÜãíùóç, áíáäñïìÞ êáé ðáñÜêáìøç áíôßóôïé÷á).\n"
+" -r, --recursive éóïäýíáìï ìå --directories=recurse.\n"
+" -L, --files-without-match åìöÜíéóç ìüíï ôá ïíüìáôá ÁÑ×ÅÉÙÍ ðïõ äåí ðåñéÝ÷ïõí ôáéñéÜóìáôá\n"
" -l, --files-with-matches åìöÜíéóç ìüíï ôá ïíüìáôá ÁÑ×ÅÉÙÍ ìå ôáéñéÜóìáôá\n"
-" -c, --count åìöÜíéóç ìüíï ôï óõíïëéêü áñéèìü ôùí ãñáììþí ìå "
-"ôáéñéÜóìáôá ãéá êÜèå ÁÑ×ÅÉÏ\n"
+" -c, --count åìöÜíéóç ìüíï ôïí áñéèìü ôùí ãñáììþí ìå ôáéñéÜóìáôá ãéá êÜèå ÁÑ×ÅÉÏ\n"
-# src/grep.c:633
-#: src/grep.c:840
-#, fuzzy
+#
+# src/grep.c:633
+# src/grep.c:902
+# File: src/grep.c, line: 902
msgid ""
"\n"
"Context control:\n"
@@ -342,87 +442,98 @@ msgid ""
msgstr ""
"\n"
"¸ëåã÷ïò âÜóç ôïõ ðåñéå÷ïìÝíïõ:\n"
-" -B, --before-context=ÁÑÉÈÌÏÓ åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí ìå áêïëïõèïýìåíï "
-"ðåñéå÷üìåíï\n"
-" -A, --after-context=ÁÑÉÈÌÏÓ åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí ìå ðñïðïñåõüìåíï "
-"ðåñéå÷üìåíï\n"
-" -NUM ôï ßäéï ìå -B ÁÑÉÈÌÏÓ êáé -A ÁÑÉÈÌÏÓ\n"
-" -C, --context ôï ßäéï ìå -2\n"
-" -U, --binary íá ìçí áðáëåßöïíôáé ÷áñáêôÞñåò CR óôï EOL "
-"(MSDOS)\n"
-" -u, --unix-byte-offsets áíáöïñÜ ó÷åôéêþí èÝóåùí óáí íá ìçí õðÞñ÷áí "
-"÷áñáêôÞñåò CR (MSDOS)\n"
+" -B, --before-context=ÁÑÉÈÌÏÓ åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí ìå áêïëïõèïýìåíï ðåñéå÷üìåíï\n"
+" -A, --after-context=ÁÑÉÈÌÏÓ åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí ìå ðñïðïñåõüìåíï ðåñéå÷üìåíï\n"
+" -C, --context[=ÁÑÉÈÌÏÓ] åìöÜíéóç ÁÑÉÈÌÏÓ (åî ïñéóìïý 2) ãñáììþí ìå ðåñéå÷üìåíï åîüäïõ\n"
+" åêôüò êé áí áíáéñåèåß ìå -A Þ -B\n"
+" -NUM ôï ßäéï ìå --context=ÁÑÉÈÌÏÓ\n"
+" -U, --binary íá ìçí áðáëåßöïíôáé ÷áñáêôÞñåò CR óôï EOL (MSDOS)\n"
+" -u, --unix-byte-offsets áíáöïñÜ ó÷åôéêþí èÝóåùí óáí íá ìçí õðÞñ÷áí ÷áñáêôÞñåò CR (MSDOS)\n"
"\n"
"Áí äåí õðÜñ÷åé -[GEF], ôüôå ç `egrep' èåùñåß -E, ç `fgrep' -F áëëéþò -G.\n"
"×ùñßò ÁÑ×ÅÉÏ Þ üôáí ôï ÁÑ×ÅÉÏ åßíáé -, áíÜãíùóç áðü óôÜíôáñô åßóïäï.\n"
-"Áí äßíïíôáé ëéãüôåñá áðü äýï ÁÑ×ÅÉÁ, èåþñçóå üôé äßíåôáé -h. ¸îïäïò ìå 0 "
-"üôáí õðÜñ÷åé ôáßñéáóìá,\n"
-"äéáöïñåôéêÜ ìå 1. ¸îïäïò ìå 2 óôç ðåñßðôùóç óõíôáêôéêþí óöáëìÜôùí Þ "
-"óöáëìÜôùí óõóôÞìáôïò.\n"
-
-# src/grep.c:647
-#: src/grep.c:855
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
-
-# src/grep.c:785 src/grep.c:792
-#: src/grep.c:998 src/grep.c:1005
+"Áí äßíïíôáé ëéãüôåñá áðü äýï ÁÑ×ÅÉÁ, èåþñçóå üôé äßíåôáé -h. ¸îïäïò ìå 0 üôáí õðÜñ÷åé ôáßñéáóìá,\n"
+"äéáöïñåôéêÜ ìå 1. ¸îïäïò ìå 2 óôçí ðåñßðôùóç óõíôáêôéêþí óöáëìÜôùí Þ óöáëìÜôùí óõóôÞìáôïò.\n"
+
+#
+# src/grep.c:647
+# src/grep.c:917
+# File: src/grep.c, line: 917
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nÓôåßëôå áíáöïñÝò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
+
+#
+# src/grep.c:785 src/grep.c:792
+# src/grep.c:1060 src/grep.c:1067 src/grep.c:1076
+# File: src/grep.c, line: 1060
+# File: src/grep.c, line: 1067
+# File: src/grep.c, line: 1076
msgid "invalid context length argument"
msgstr "ìç Ýãêõñï üñéóìá ìÞêïõò ðåñéå÷ïìÝíïõ"
-# src/grep.c:785 src/grep.c:792
-#: src/grep.c:1014
-#, fuzzy
-msgid "infalid context length argument"
-msgstr "ìç Ýãêõñï üñéóìá ìÞêïõò ðåñéå÷ïìÝíïõ"
-
-# src/grep.c:800 src/grep.c:805 src/grep.c:810
-#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
+#
+# 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: 1083
+# File: src/grep.c, line: 1088
+# File: src/grep.c, line: 1093
msgid "you may specify only one of -E, -F, or -G"
msgstr "ìðïñåßôå íá ïñßóåôå ìüíï Ýíá áðü ôá-E, -F Þ -G"
-# src/grep.c:829
-#: src/grep.c:1050
+#
+# src/grep.c:829
+# src/grep.c:1112
+# File: src/grep.c, line: 1112
msgid "matcher already specified"
msgstr "ôï óôïé÷åßï ðïõ ðñüêåéôáé íá áíáæçôçèåß, Ý÷åé Þäç ïñéóôåß"
-#: src/grep.c:1071
+#
+# src/grep.c:1133
+# File: src/grep.c, line: 1133
msgid "unknown directories method"
-msgstr ""
+msgstr "Üãíùóôç ìÝèïäïò êáôáëüãùí"
-# src/grep.c:915
-#: src/grep.c:1157
+#
+# src/grep.c:915
+# src/grep.c:1219
+# File: src/grep.c, line: 1219
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-# src/grep.c:917
-#: src/grep.c:1159
-msgid ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-msgstr ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-
-# src/grep.c:919
-#: src/grep.c:1161
+#
+# src/grep.c:917
+# src/grep.c:1221
+# File: src/grep.c, line: 1221
+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
+# File: src/grep.c, line: 1223
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-"Áõôü åßíáé åëåýèåñï ëïãéóìéêü· äåßôå ôï ðçãáßï êþäéêá ãéá ôéò óõíèÞêåò "
-"áíôéãñáöÞò.\n"
+"Áõôü åßíáé åëåýèåñï ëïãéóìéêü· äåßôå ôï ðçãáßï êþäéêá ãéá ôéò óõíèÞêåò áíôéãñáöÞò.\n"
"ÄÅÍ õðÜñ÷åé åããýçóç· ïýôå áêüìá ãéá ×ÑÇÓÉÌÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ\n"
"ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n"
-# src/obstack.c:467
-#: 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:1027 src/grep.c:1030
+#~ #
+#~ # src/grep.c:785 src/grep.c:792
+#~ #, fuzzy
+#~ msgid "infalid context length argument"
+#~ msgstr "ìç Ýãêõñï üñéóìá ìÞêïõò ðåñéå÷ïìÝíïõ"
+
+#~ #
+#~ # 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 e9031855..1c582c2e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,20 +1,20 @@
# Mensajes en español para GNU grep.
# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
# Enrique Melero Gómez <melero@iprolink.ch>, 1996.
-# Santiago Vila Doncel <sanvila@unex.es>, 1997, 1998.
+# Santiago Vila Doncel <sanvila@unex.es>, 1997, 1998, 1999.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1998-11-09 00:40-0500\n"
-"PO-Revision-Date: 1998-08-01 18:38+0200\n"
+"Project-Id-Version: GNU grep 2.2f\n"
+"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"PO-Revision-Date: 1999-02-09 00:04+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:766
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
msgid "Memory exhausted"
msgstr "Memoria agotada"
@@ -162,46 +162,50 @@ msgstr "?? getopt ha devuelto el carácter código 0%o ??\n"
msgid "non-option ARGV-elements: "
msgstr "elementos de ARGV que no son opciones: "
-#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 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 "memoria agotada"
-#: src/grep.c:324
+#: src/grep.c:372 src/grep.c:843
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: atención: %s: %s\n"
-#: src/grep.c:429 src/grep.c:1222
+#: src/grep.c:497 src/grep.c:1318
msgid "writing output"
msgstr "escribiendo el resultado"
-#: src/grep.c:655
+#: src/grep.c:726
#, c-format
msgid "Binary file %s matches\n"
-msgstr ""
+msgstr "Coincidencia en el fichero binario %s\n"
-#: src/grep.c:670
+#: src/grep.c:742
msgid "(standard input)"
msgstr "(entrada estándar)"
-#: src/grep.c:800
+#: src/grep.c:844
+msgid "recursive directory loop"
+msgstr "bucle de directorio recursivo"
+
+#: src/grep.c:895
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Modo de empleo: %s [OPCIÓN]... PATRÓN [FICHERO]...\n"
-#: src/grep.c:801
+#: src/grep.c:896
#, 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:805
+#: src/grep.c:900
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Modo de empleo: %s [OPCIÓN]... PATRÓN [FICHERO] ...\n"
-#: src/grep.c:806
+#: src/grep.c:901
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -230,7 +234,7 @@ msgstr ""
" -x, --line-regexp obliga a que PATRÓN coincida solamente\n"
" con líneas completas\n"
-#: src/grep.c:818
+#: src/grep.c:913
msgid ""
"\n"
"Miscellaneous:\n"
@@ -246,8 +250,7 @@ msgstr ""
" -V, --version muestra la versión y finaliza\n"
" --help muestra esta ayuda y finaliza\n"
-#: src/grep.c:825
-#, fuzzy
+#: src/grep.c:920
msgid ""
"\n"
"Output control:\n"
@@ -275,16 +278,18 @@ 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"
+" -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"
" -L, --files-without-match muestra solamente los nombres de FICHEROs\n"
" que no contienen ninguna coincidencia\n"
" -l, --files-with-matches muestra solamente los nombres de FICHEROs\n"
" que contienen alguna coincidencia\n"
-" -c, --count muestra solamente el total de líneas que "
-"coinciden\n"
+" -c, --count muestra solamente el total de líneas que coinciden\n"
" por cada FICHERO\n"
-#: src/grep.c:840
-#, fuzzy
+#: src/grep.c:935
msgid ""
"\n"
"Context control:\n"
@@ -292,7 +297,7 @@ msgid ""
" -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"
-" -NUM same as --contex=NUM\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"
@@ -305,40 +310,29 @@ msgstr ""
"Control del contexto:\n"
" -B, --before-context=NÚM muestra NÚM líneas de contexto anterior\n"
" -A, --after-context=NÚM muestra NÚM líneas de contexto posterior\n"
-" -NÚM lo mismo que -B NÚM y -A NÚM al mismo tiempo\n"
-" -C, --context lo mismo que -2\n"
+" -C, --context[=NÚM] muestra NÚM líneas (2 por omisión) de contexto\n"
+" a menos que se utilice -A o -B\n"
+" -NÚM lo mismo que --context=NÚM\n"
" -U, --binary no elimina los caracteres de retorno de carro\n"
" finales de línea (MSDOS)\n"
" -u, --unix-byte-offsets cuenta los desplazamientos como si no hubiera\n"
" 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"
+"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"
+"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"
-#: src/grep.c:855
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Comunicar `bugs' a <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:950
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nComunicar `bugs' a <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:998 src/grep.c:1005
+#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
msgid "invalid context length argument"
msgstr "longitud de contexto inválida"
-#: src/grep.c:1014
-#, fuzzy
-msgid "infalid context length argument"
-msgstr "longitud de contexto inválida"
-
-#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
+#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
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"
@@ -353,26 +347,26 @@ msgstr "sólo se puede especificar una de las opciones -E, -F, o -G"
#
# No me gusta nada lo de opción "a buscar".
# Se admiten sugerencias. sv
-#: src/grep.c:1050
+#: src/grep.c:1145
msgid "matcher already specified"
msgstr "la expresión a buscar ya fue especificada"
-#: src/grep.c:1071
+# Nota: Se refiere a la opción --directories=ACCIÓN cuando ACCIÓN
+# no es `read', `recurse' o `skip'.
+#: src/grep.c:1166
msgid "unknown directories method"
-msgstr ""
+msgstr "método de directorios desconocido"
-#: src/grep.c:1157
+#: src/grep.c:1252
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1159
-msgid ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-msgstr ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+#: src/grep.c: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:1161
+#: 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"
@@ -388,20 +382,19 @@ msgstr "memoria agotada\n"
#~ msgid "(standard input)\n"
#~ msgstr "(salida estándar)\n"
-# FIXME: El original está mal.
-# Ahora mismo no me acuerdo de por qué escribí esto así que
-# no lo borro de momento. sv
+#~ # 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"
-# Prefiero dejarlo en solamente un patrón
-# Pero entonces no queda claro que *debe haber uno*, y parece que
-# es uno como máximo (siendo el mínimo 0). sv
-#~ msgid ""
-#~ "There should be one and only one PATTERN, `-e PATTERN' or `-f FILE'.\n"
+#~ # Prefiero dejarlo en solamente un patrón
+#~ # Pero entonces no queda claro que *debe haber uno*, y parece que
+#~ # es uno como máximo (siendo el mínimo 0). sv
+#~ msgid "There should be one and only one PATTERN, `-e PATTERN' or `-f FILE'.\n"
#~ msgstr "Debe haber un y solamente un PATRÓN, `-e PATRÓN', o `-f FICHERO'.\n"
-# No es muy claro el original que digamos... sv
+#~ # 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"
diff --git a/po/fr.po b/po/fr.po
index c44f0c33..18476e9e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,16 +4,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1998-11-09 00:40-0500\n"
-"PO-Revision-Date: 1998-09-04 10:26-0500\n"
+"Project-Id-Version: GNU grep 2.2f\n"
+"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"PO-Revision-Date: 1999-02-08 14:30-0500\n"
"Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
"Language-Team: French <fr@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:766
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
msgid "Memory exhausted"
msgstr "Mémoire épuisée."
@@ -160,45 +160,49 @@ 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:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 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 "Mémoire épuisée."
-#: src/grep.c:324
+#: src/grep.c:372 src/grep.c:843
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: AVERTISSEMENT: %s: %s\n"
-#: src/grep.c:429 src/grep.c:1222
+#: src/grep.c:497 src/grep.c:1318
msgid "writing output"
msgstr "Génération du résultat."
-#: src/grep.c:655
+#: src/grep.c:726
#, c-format
msgid "Binary file %s matches\n"
-msgstr ""
+msgstr "Fichier binaire %s concorde\n"
-#: src/grep.c:670
+#: src/grep.c:742
msgid "(standard input)"
msgstr "(entrée standard)"
-#: src/grep.c:800
+#: src/grep.c:844
+msgid "recursive directory loop"
+msgstr "boucle récursive sur le répertoire"
+
+#: src/grep.c:895
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Usage: %s [OPTION]... PATRON [FICHIER]...\n"
-#: src/grep.c:801
+#: src/grep.c:896
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
-#: src/grep.c:805
+#: src/grep.c:900
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Usage: %s [OPTION]... PATRON [FICHIER] ...\n"
-#: src/grep.c:806
+#: src/grep.c:901
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -216,18 +220,15 @@ msgstr ""
"\n"
"Sélection et interprétation de l'expression régulière:\n"
" -E, --extended-regexp PATRON est une expression regulière étendue\n"
-" -F, --fixed-regexp PATRON est une chaîne fixe séparée par des "
-"retour de chariot\n"
+" -F, --fixed-regexp PATRON est une chaîne fixe séparée par des retour de chariot\n"
" -G, --basic-regexp PATRON est une expression régulière de base\n"
" -e, --regexp=PATTERN utiliser le PATRON comme expression régulière\n"
" -f, --file=FILE obtenir le PATRON du FICHIER\n"
" -i, --ignore-case ignorer la distrinction de la casse\n"
-" -w, --word-regexp forcer l'appariement du PATRON que sur des mots "
-"complets\n"
-" -x, --line-regexp forcer l'appariement du PATRON que sur des "
-"lignes entières\n"
+" -w, --word-regexp forcer l'appariement du PATRON que sur des mots complets\n"
+" -x, --line-regexp forcer l'appariement du PATRON que sur des lignes entières\n"
-#: src/grep.c:818
+#: src/grep.c:913
msgid ""
"\n"
"Miscellaneous:\n"
@@ -243,8 +244,7 @@ msgstr ""
" -V, --version afficher le nom et la version du logiciel\n"
" --help afficher l'aide et quitter\n"
-#: src/grep.c:825
-#, fuzzy
+#: src/grep.c:920
msgid ""
"\n"
"Output control:\n"
@@ -272,6 +272,11 @@ msgstr ""
" -h, --no-filename supprimer le préfixe du nom de fichier\n"
" sur la sortie\n"
" -q, --quiet, --silent supprimer tout affichage en sortie\n"
+" -a, --text ne pas supprimer la sortie binaire\n"
+" -d, --directories=ACTION traiter les répertoires selon l'ACTION\n"
+" 'read' (lecture), 'recurse' (récursivité),\n"
+" ou 'skip' (escamotage).\n"
+" -r, --recursive équivalent à --directories=recurse.\n"
" -L, --files-without-match afficher seulement les noms des fichiers\n"
" ne contenant pas de concordance\n"
" -l, --files-with-matches afficher seulement les noms des fichiers\n"
@@ -279,8 +284,7 @@ msgstr ""
" -c, --count afficher seulement le décompte des lignes\n"
" concordantes par fichier\n"
-#: src/grep.c:840
-#, fuzzy
+#: src/grep.c:935
msgid ""
"\n"
"Context control:\n"
@@ -288,7 +292,7 @@ msgid ""
" -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"
-" -NUM same as --contex=NUM\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"
@@ -301,10 +305,11 @@ msgstr ""
"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"
+" à moins que -A ou -B ne soit spécifié\n"
" -NUM identique à -B NUM et -A NUM\n"
-" -C, --context identique à -2\n"
-" -U, --binary ne pas enlever les caractères CR sur les fins de "
-"lignes (MS-DOS)\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"
@@ -315,49 +320,38 @@ msgstr ""
"est implicite. Termine avec 0 s'il y a concordance avec 1 si aucune.\n"
"Termine avec 2 s'il y a des erreurs de syntaxe ou du système.\n"
-#: src/grep.c:855
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Rapporter toutes anomalies à <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:950
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nRapporter toutes anomalies à <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:998 src/grep.c:1005
+#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
msgid "invalid context length argument"
msgstr "paramètre de contexte de longueur invalide"
-#: src/grep.c:1014
-#, fuzzy
-msgid "infalid context length argument"
-msgstr "paramètre de contexte de longueur invalide"
-
-#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
+#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
msgid "you may specify only one of -E, -F, or -G"
msgstr "Un seul des paramètres suivants peut être spécifié -E, -F ou -G"
-#: src/grep.c:1050
+#: src/grep.c:1145
msgid "matcher already specified"
msgstr "L'opérateur de concordance a déjà été spécifié."
-#: src/grep.c:1071
+#: src/grep.c:1166
msgid "unknown directories method"
-msgstr ""
+msgstr "méthode inconnue des répertoires"
# msgid "GNU grep version %s"
# msgstr "«grep» de GNU version %s"
-#: src/grep.c:1157
+#: src/grep.c:1252
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep de GNU %s\n"
-#: src/grep.c:1159
-msgid ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-msgstr ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+#: src/grep.c: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:1161
+#: 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"
@@ -376,20 +370,16 @@ msgstr "Mémoire épuisée.\n"
#~ msgid "Regexp selection and interpretation:\n"
#~ msgstr "Sélection de l'EXP_RÉGULIÈRE et interprétation:\n"
-#~ msgid ""
-#~ " -E, --extended-regexp PATTERN is an extended regular expression\n"
-#~ msgstr ""
-#~ " -E, --extended-regexp PATRON est une expression régulière étendue\n"
+#~ msgid " -E, --extended-regexp PATTERN is an extended regular expression\n"
+#~ msgstr " -E, --extended-regexp PATRON est une expression régulière étendue\n"
-#~ msgid ""
-#~ " -F, --fixed-strings PATTERN is a fixed string separated by newlines\n"
+#~ msgid " -F, --fixed-strings PATTERN is a fixed string separated by newlines\n"
#~ msgstr ""
#~ " -F, --fixed-strings PATRON est une chaîne de longueur fixe\n"
#~ " séparée par des sauts de ligne\n"
#~ msgid " -G, --basic-regexp PATTERN is a basic regular expression\n"
-#~ msgstr ""
-#~ " -G, --basic-regexp PATRON est une expression régulière de base\n"
+#~ msgstr " -G, --basic-regexp PATRON est une expression régulière de base\n"
#~ msgid " -e, --regexp=PATTERN use PATTERN as a regular expression\n"
#~ msgstr ""
@@ -402,14 +392,12 @@ msgstr "Mémoire épuisée.\n"
#~ msgid " -i, --ignore-case ignore case distinctions\n"
#~ msgstr " -i, --ignore-case ignorer la distinction de la casse\n"
-#~ msgid ""
-#~ " -w, --word-regexp force PATTERN to match only whole words\n"
+#~ msgid " -w, --word-regexp force PATTERN to match only whole words\n"
#~ msgstr ""
#~ " -w, --word-regexp forcer le PATRON à établir des\n"
#~ " concordances que pour des mots complets\n"
-#~ msgid ""
-#~ " -x, --line-regexp force PATTERN to match only whole lines\n"
+#~ msgid " -x, --line-regexp force PATTERN to match only whole lines\n"
#~ msgstr ""
#~ " -x, --line-regexp forcer le PATRON à établir des\n"
#~ " concordances que pour des lignes entières\n"
@@ -421,12 +409,10 @@ msgstr "Mémoire épuisée.\n"
#~ msgstr " -s, --no-messages supprimer les messages d'erreur\n"
#~ msgid " -v, --revert-match select non-matching lines\n"
-#~ msgstr ""
-#~ " -v, --revert-match sélectionner les lignes sans concordance\n"
+#~ msgstr " -v, --revert-match sélectionner les lignes sans concordance\n"
#~ msgid " -V, --version print version information and exit\n"
-#~ msgstr ""
-#~ " -V, --version afficher le nom et la version du logiciel\n"
+#~ msgstr " -V, --version afficher le nom et la version du logiciel\n"
#~ msgid " --help display this help and exit\n"
#~ msgstr " --help afficher l'aide et quitter\n"
@@ -434,8 +420,7 @@ msgstr "Mémoire épuisée.\n"
#~ msgid "Output control:\n"
#~ msgstr "Contrôle de sortie:\n"
-#~ msgid ""
-#~ " -b, --byte-offset print the byte offset with output lines\n"
+#~ msgid " -b, --byte-offset print the byte offset with output lines\n"
#~ msgstr ""
#~ " -b, --byte-offset afficher les adresses relatives avec\n"
#~ " les lignes traitées\n"
@@ -450,8 +435,7 @@ msgstr "Mémoire épuisée.\n"
#~ " -H, --with-filename afficher le nom de fichier pour\n"
#~ " chaque concordance\n"
-#~ msgid ""
-#~ " -h, --no-filename suppress the prefixing filename on ouput\n"
+#~ msgid " -h, --no-filename suppress the prefixing filename on ouput\n"
#~ msgstr ""
#~ " -h, --no-filename supprimer le préfixe du nom de fichier\n"
#~ " sur la sortie\n"
@@ -459,20 +443,17 @@ msgstr "Mémoire épuisée.\n"
#~ msgid " -q, --quiet, --silent suppress all normal output\n"
#~ msgstr " -q, --quiet, --silent supprimer tout affichage en sortie\n"
-#~ msgid ""
-#~ " -L, --files-without-match only print FILE names containing no match\n"
+#~ msgid " -L, --files-without-match only print FILE names containing no match\n"
#~ msgstr ""
#~ " -L, --files-without-match afficher seulement les noms des fichiers\n"
#~ " ne contenant pas de concordance\n"
-#~ msgid ""
-#~ " -l, --files-with-matches only print FILE names containing matches\n"
+#~ msgid " -l, --files-with-matches only print FILE names containing matches\n"
#~ msgstr ""
#~ " -l, --files-with-matches afficher seulement les noms des fichiers\n"
#~ " contenant des concordances\n"
-#~ msgid ""
-#~ " -c, --count only print a count of matching lines per FILE\n"
+#~ msgid " -c, --count only print a count of matching lines per FILE\n"
#~ msgstr ""
#~ " -c, --count afficher seulement le décompte des lignes\n"
#~ " concordantes par fichier\n"
@@ -481,8 +462,7 @@ msgstr "Mémoire épuisée.\n"
#~ msgstr "Contrôle du contexte:\n"
#~ msgid " -B, --before-context=NUM print NUM lines of leading context\n"
-#~ msgstr ""
-#~ " -B, --before-context=N imprimer N lignes du contexte d'en-tête\n"
+#~ msgstr " -B, --before-context=N imprimer N lignes du contexte d'en-tête\n"
#~ msgid " -A, --after-context=NUM print NUM lines of trailing context\n"
#~ msgstr " -A, --after-context=N imprimer N lignes du contexte finale\n"
@@ -494,23 +474,18 @@ msgstr "Mémoire épuisée.\n"
#~ msgstr " -C, --context identique à -2\n"
#~ msgid " -U, --binary do not strip CR characters at EOL\n"
-#~ msgstr ""
-#~ " -U, --binary ne pas enlever les caractères CR sur les fins de "
-#~ "lignes\n"
+#~ msgstr " -U, --binary ne pas enlever les caractères CR sur les fins de lignes\n"
-#~ msgid ""
-#~ " -u, --unix-byte-offsets report offsets as if CRs were not there\n"
+#~ msgid " -u, --unix-byte-offsets report offsets as if CRs were not there\n"
#~ msgstr ""
#~ " -u, --unix-byte-offsets afficher les adresses relatives comme si\n"
#~ " aucun CR n'était présent\n"
-#~ msgid ""
-#~ "There should be one and only one PATTERN, `-e PATTERN' or `-f FILE'.\n"
+#~ msgid "There should be one and only one PATTERN, `-e PATTERN' or `-f FILE'.\n"
#~ msgstr "Il ne devrait y avoir qu'un seul PATRON, -e PATRON ou -f FICHIER.\n"
#~ msgid "If call as `egrep', this implies -E and `fgrep' for -F.\n"
-#~ msgstr ""
-#~ "Si appelé via egrep, les options -E et `fgrep' pour -F sont implicites.\n"
+#~ msgstr "Si appelé via egrep, les options -E et `fgrep' pour -F sont implicites.\n"
#~ msgid "If no -[GEF], then -G is assumed.\n"
#~ msgstr ""
diff --git a/po/ko.po b/po/ko.po
index d5a10b36..a969178c 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.0f\n"
-"POT-Creation-Date: 1998-11-09 00:40-0500\n"
+"POT-Creation-Date: 1997-09-01 20:51-0300\n"
"PO-Revision-Date: 1997-09-03 11:19+0900\n"
"Last-Translator: Bang Jun-Young <bangjy@geocities.com>\n"
"Language-Team: Korean <ko@li.org>\n"
@@ -13,11 +13,11 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-KR\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:766
+#: src/dfa.c:147 src/dfa.c:159 src/dfa.c:172
msgid "Memory exhausted"
msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
-#: src/dfa.c:452
+#: src/dfa.c:441
msgid "Unfinished \\ escape"
msgstr "¿Ï°áµÇÁö ¾ÊÀº \\ À̽ºÄÉÀÌÇÁ"
@@ -26,32 +26,32 @@ msgstr "¿Ï°áµÇÁö ¾ÊÀº \\ À̽ºÄÉÀÌÇÁ"
#. {M,} - minimum count, maximum is infinity
#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
+#: src/dfa.c:553 src/dfa.c:559 src/dfa.c:570 src/dfa.c:581
msgid "unfinished repeat count"
msgstr "¿Ï°áµÇÁö ¾ÊÀº ¹Ýº¹ ȸ¼ö"
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+#: src/dfa.c:566 src/dfa.c:580 src/dfa.c:584
msgid "malformed repeat count"
msgstr "À߸ø ÁÖ¾îÁø ¹Ýº¹ ȸ¼ö"
-#: 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:650 src/dfa.c:653 src/dfa.c:680 src/dfa.c:684 src/dfa.c:685
+#: src/dfa.c:688 src/dfa.c:701 src/dfa.c:702
msgid "Unbalanced ["
msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â ["
-#: src/dfa.c:849
+#: src/dfa.c:839
msgid "Unbalanced ("
msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â ("
-#: src/dfa.c:970
+#: src/dfa.c:960
msgid "No syntax specified"
msgstr "¹®¹ýÀÌ ÁöÁ¤µÇÁö ¾Ê¾ÒÀ½"
-#: src/dfa.c:978
+#: src/dfa.c:968
msgid "Unbalanced )"
msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â )"
-#: src/dfa.c:1998
+#: src/dfa.c:1988
msgid "out of memory"
msgstr "¸Þ¸ð¸® ºÎÁ·"
@@ -160,262 +160,210 @@ msgstr "?? getopt°¡ ¹®ÀÚ ÄÚµå 0%o¸¦ µ¹·ÁÁÖ¾ú½À´Ï´Ù ??\n"
msgid "non-option ARGV-elements: "
msgstr "ºñ¿É¼Ç ARGV ¿ø¼Ò: "
-#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
+#: src/grep.c:140 src/grep.c:157 src/grep.c:200 src/grep.c:241 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
-#: src/grep.c:324
+#: src/grep.c:266
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: °æ°í: %s: %s\n"
-#: src/grep.c:429 src/grep.c:1222
+#: src/grep.c:364 src/grep.c:990
msgid "writing output"
msgstr "Ãâ·ÂÀ» ±â·ÏÇÏ°í ÀÖ½À´Ï´Ù"
-#: src/grep.c:655
-#, c-format
-msgid "Binary file %s matches\n"
-msgstr ""
-
-#: src/grep.c:670
-msgid "(standard input)"
-msgstr "(Ç¥ÁØ ÀÔ·Â)"
-
-#: src/grep.c:800
+#: src/grep.c:569
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "»ç¿ë¹ý: %s [¿É¼Ç]... ÆÐÅÏ [ÆÄÀÏ]...\n"
-#: src/grep.c:801
+#: src/grep.c:570
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ.\n"
-#: src/grep.c:805
+#: src/grep.c:574
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "»ç¿ë¹ý: %s [¿É¼Ç]... ÆÐÅÏ [ÆÄÀÏ] ...\n"
-#: src/grep.c:806
-msgid ""
-"Search for PATTERN in each FILE or standard input.\n"
-"\n"
-"Regexp selection and interpretation:\n"
-" -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"
-" -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"
-msgstr ""
+#: src/grep.c:576
+msgid "Regexp selection and interpretation:\n"
+msgstr "Á¤±Ô½Ä ¼±Åðú Çؼ®:\n"
-#: src/grep.c:818
-msgid ""
-"\n"
-"Miscellaneous:\n"
-" -s, --no-messages suppress error messages\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:825
-msgid ""
-"\n"
-"Output control:\n"
-" -b, --byte-offset print the byte offset with output lines\n"
-" -n, --line-number print line number with output lines\n"
-" -H, --with-filename print the filename for each match\n"
-" -h, --no-filename suppress the prefixing filename on output\n"
-" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
-" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'.\n"
-" -r, --recursive equivalent to --directories=recurse.\n"
-" -L, --files-without-match only print FILE names containing no match\n"
-" -l, --files-with-matches only print FILE names containing matches\n"
-" -c, --count only print a count of matching lines per FILE\n"
-msgstr ""
+#: src/grep.c:577
+msgid " -E, --extended-regexp PATTERN is an extended regular expression\n"
+msgstr " -E, --extended-regexp ÆÐÅÏÀº È®Àå Á¤±Ô½ÄÀÌ µË´Ï´Ù\n"
-#: src/grep.c:840
+#: src/grep.c:578
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"
-" -NUM same as --contex=NUM\n"
-" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
-" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
-"\n"
-"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"
+" -F, --fixed-strings PATTERN is a fixed string separated by newlines\n"
msgstr ""
+" -F, --fixed-strings ÆÐÅÏÀº ÁÙ¹Ù²Þ ¹®ÀÚ·Î ºÐ¸®µÈ °íÁ¤ ¹®ÀÚ¿­ÀÌ µË´Ï´Ù\n"
-#: src/grep.c:855
-#, fuzzy
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr "¹®Á¦Á¡Àº <bug0gnu-utils@prep.ai.mit.edu>·Î º¸°íÇØ ÁֽʽÿÀ.\n"
-
-#: src/grep.c:998 src/grep.c:1005
-msgid "invalid context length argument"
-msgstr ""
+#: src/grep.c:579
+msgid " -G, --basic-regexp PATTERN is a basic regular expression\n"
+msgstr " -G, --basic-regexp ÆÐÅÏÀº ±âº» Á¤±Ô½ÄÀÌ µË´Ï´Ù\n"
-#: src/grep.c:1014
-msgid "infalid context length argument"
-msgstr ""
+#: src/grep.c:580
+msgid " -e, --regexp=PATTERN use PATTERN as a regular expression\n"
+msgstr " -e, --regexp=ÆÐÅÏ ÆÐÅÏÀ» Á¤±Ô½ÄÀ¸·Î »ç¿ëÇÕ´Ï´Ù\n"
-#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
-msgid "you may specify only one of -E, -F, or -G"
-msgstr "-E, -F, -G Áß¿¡¼­ Çϳª¸¸ ÁöÁ¤ÇÒ ¼ö ÀÖ½À´Ï´Ù"
+#: src/grep.c:581
+msgid " -f, --file=FILE obtain PATTERN from FILE\n"
+msgstr " -f, --file=ÆÄÀÏ ÆÐÅÏÀ» ÆÄÀÏ¿¡¼­ °¡Á®¿É´Ï´Ù\n"
-#: src/grep.c:1050
-msgid "matcher already specified"
-msgstr "¦ÀÌ ÀÌ¹Ì ÁöÁ¤µÇ¾úÀ½"
+#: src/grep.c:582
+msgid " -i, --ignore-case ignore case distinctions\n"
+msgstr " -i, --ignore-case ´ë¼Ò¹®ÀÚ ±¸º°À» ¹«½ÃÇÕ´Ï´Ù\n"
-#: src/grep.c:1071
-msgid "unknown directories method"
-msgstr ""
+#: src/grep.c:583
+msgid " -w, --word-regexp force PATTERN to match only whole words\n"
+msgstr " -w, --word-regexp ÆÐÅÏÀ» Àüü ´Ü¾î¿Í ÀÏÄ¡ÇÏ´Â °ÍÀ¸·Î¸¸ Á¦ÇÑÇÕ´Ï´Ù\n"
-#: src/grep.c:1157
-#, c-format
-msgid "grep (GNU grep) %s\n"
-msgstr "grep (GNU grep) %s\n"
+#: src/grep.c:584
+msgid " -x, --line-regexp force PATTERN to match only whole lines\n"
+msgstr " -x, --line-regexp ÆÐÅÏÀ» Àüü Çà°ú ÀÏÄ¡ÇÏ´Â °ÍÀ¸·Î¸¸ Á¦ÇÑÇÕ´Ï´Ù\n"
-#: src/grep.c:1159
-msgid ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-msgstr ""
-"ÀúÀÛ±Ç (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+#: src/grep.c:586
+msgid "Miscellaneous:\n"
+msgstr "±âŸ:\n"
-#: src/grep.c:1161
-msgid ""
-"This is free software; see the source for copying conditions. There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-msgstr ""
-"ÀÌ ÇÁ·Î±×·¥Àº °ø°³ ¼ÒÇÁÆ®¿þ¾îÀÔ´Ï´Ù. º¹»ç¿¡ °üÇÑ Á¶°ÇÀº ¼Ò½º¸¦ "
-"ÂüÁ¶ÇϽʽÿÀ.\n"
-"»óÇ°¼ºÀ̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿©, ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n"
+#: src/grep.c:587
+msgid " -s, --no-messages suppress error messages\n"
+msgstr " -s, --no-messages ¿À·ù ¸Þ½ÃÁö¸¦ Ç¥½ÃÇÏÁö ¾Ê½À´Ï´Ù\n"
-#: src/obstack.c:467
-msgid "memory exhausted\n"
-msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²\n"
+#: src/grep.c:588
+msgid " -v, --revert-match select non-matching lines\n"
+msgstr " -v, --revert-match ÀÏÄ¡ÇÏÁö ¾Ê´Â ÇàµéÀ» ¼±ÅÃÇÕ´Ï´Ù\n"
-#~ msgid "(standard input)\n"
-#~ msgstr "(Ç¥ÁØ ÀÔ·Â)\n"
+#: src/grep.c:589
+msgid " -V, --version print version information and exit\n"
+msgstr " -V, --version ¹öÀü Á¤º¸¸¦ Ç¥½ÃÇÏ°í Á¾·áÇÕ´Ï´Ù\n"
-#~ msgid "Regexp selection and interpretation:\n"
-#~ msgstr "Á¤±Ô½Ä ¼±Åðú Çؼ®:\n"
+#: src/grep.c:590
+msgid " --help display this help and exit\n"
+msgstr " --help ÀÌ µµ¿ò¸»À» Ç¥½ÃÇÏ°í Á¾·áÇÕ´Ï´Ù\n"
-#~ msgid ""
-#~ " -E, --extended-regexp PATTERN is an extended regular expression\n"
-#~ msgstr " -E, --extended-regexp ÆÐÅÏÀº È®Àå Á¤±Ô½ÄÀÌ µË´Ï´Ù\n"
+#: src/grep.c:592
+msgid "Output control:\n"
+msgstr "Ãâ·Â Á¦¾î:\n"
-#~ msgid ""
-#~ " -F, --fixed-strings PATTERN is a fixed string separated by newlines\n"
-#~ msgstr ""
-#~ " -F, --fixed-strings ÆÐÅÏÀº ÁÙ¹Ù²Þ ¹®ÀÚ·Î ºÐ¸®µÈ °íÁ¤ ¹®ÀÚ¿­ÀÌ "
-#~ "µË´Ï´Ù\n"
+#: src/grep.c:593
+msgid " -b, --byte-offset print the byte offset with output lines\n"
+msgstr " -b, --byte-offset Ãâ·ÂµÇ´Â Çà¿¡ ¹ÙÀÌÆ® ¿ÀÇÁ¼ÂÀ» Ç¥½ÃÇÕ´Ï´Ù\n"
-#~ msgid " -G, --basic-regexp PATTERN is a basic regular expression\n"
-#~ msgstr " -G, --basic-regexp ÆÐÅÏÀº ±âº» Á¤±Ô½ÄÀÌ µË´Ï´Ù\n"
+#: src/grep.c:594
+msgid " -n, --line-number print line number with output lines\n"
+msgstr " -n, --line-number Ãâ·ÂµÇ´Â Çà¿¡ Çà¹øÈ£¸¦ Ç¥½ÃÇÕ´Ï´Ù\n"
-#~ msgid " -e, --regexp=PATTERN use PATTERN as a regular expression\n"
-#~ msgstr " -e, --regexp=ÆÐÅÏ ÆÐÅÏÀ» Á¤±Ô½ÄÀ¸·Î »ç¿ëÇÕ´Ï´Ù\n"
+#: src/grep.c:595
+msgid " -H, --with-filename print the filename for each match\n"
+msgstr " -H, --with-filename °¢°¢ÀÇ ÀÏÄ¡ °á°ú¿¡ ´ëÇØ ÆÄÀϸíÀ» Ç¥½ÃÇÕ´Ï´Ù\n"
-#~ msgid " -f, --file=FILE obtain PATTERN from FILE\n"
-#~ msgstr " -f, --file=ÆÄÀÏ ÆÐÅÏÀ» ÆÄÀÏ¿¡¼­ °¡Á®¿É´Ï´Ù\n"
+#: src/grep.c:596
+msgid " -h, --no-filename suppress the prefixing filename on ouput\n"
+msgstr ""
-#~ msgid " -i, --ignore-case ignore case distinctions\n"
-#~ msgstr " -i, --ignore-case ´ë¼Ò¹®ÀÚ ±¸º°À» ¹«½ÃÇÕ´Ï´Ù\n"
+#: src/grep.c:597
+msgid " -q, --quiet, --silent suppress all normal output\n"
+msgstr " -q, --quiet, --silent ÀϹÝÀûÀÎ ¸ðµç Ãâ·ÂÀ» Ç¥½ÃÇÏÁö ¾Ê½À´Ï´Ù\n"
-#~ msgid ""
-#~ " -w, --word-regexp force PATTERN to match only whole words\n"
-#~ msgstr ""
-#~ " -w, --word-regexp ÆÐÅÏÀ» Àüü ´Ü¾î¿Í ÀÏÄ¡ÇÏ´Â °ÍÀ¸·Î¸¸ Á¦ÇÑÇÕ´Ï´Ù\n"
+#: src/grep.c:598
+msgid " -L, --files-without-match only print FILE names containing no match\n"
+msgstr " -L, --files-without-match ÀÏÄ¡ °á°ú°¡ ¾ø´Â ÆÄÀÏ À̸§¸¸ Ç¥½ÃÇÕ´Ï´Ù\n"
-#~ msgid ""
-#~ " -x, --line-regexp force PATTERN to match only whole lines\n"
-#~ msgstr ""
-#~ " -x, --line-regexp ÆÐÅÏÀ» Àüü Çà°ú ÀÏÄ¡ÇÏ´Â °ÍÀ¸·Î¸¸ Á¦ÇÑÇÕ´Ï´Ù\n"
+#: src/grep.c:599
+msgid " -l, --files-with-matches only print FILE names containing matches\n"
+msgstr " -l, --files-with-matches ÀÏÄ¡ °á°ú°¡ Æ÷ÇÔµÈ ÆÄÀÏ À̸§¸¸ Ç¥½ÃÇÕ´Ï´Ù\n"
-#~ msgid "Miscellaneous:\n"
-#~ msgstr "±âŸ:\n"
+#: src/grep.c:600
+msgid ""
+" -c, --count only print a count of matching lines per FILE\n"
+msgstr ""
+" -c, --count ÆÄÀÏ´ç ÀÏÄ¡ÇÏ´Â ÇàÀÇ °³¼ö¸¸À» Ç¥½ÃÇÕ´Ï´Ù\n"
-#~ msgid " -s, --no-messages suppress error messages\n"
-#~ msgstr " -s, --no-messages ¿À·ù ¸Þ½ÃÁö¸¦ Ç¥½ÃÇÏÁö ¾Ê½À´Ï´Ù\n"
+#: src/grep.c:602
+msgid "Context control:\n"
+msgstr "¹®¸Æ Á¦¾î:\n"
-#~ msgid " -v, --revert-match select non-matching lines\n"
-#~ msgstr " -v, --revert-match ÀÏÄ¡ÇÏÁö ¾Ê´Â ÇàµéÀ» ¼±ÅÃÇÕ´Ï´Ù\n"
+#: src/grep.c:603
+msgid " -B, --before-context=NUM print NUM lines of leading context\n"
+msgstr ""
-#~ msgid " -V, --version print version information and exit\n"
-#~ msgstr " -V, --version ¹öÀü Á¤º¸¸¦ Ç¥½ÃÇÏ°í Á¾·áÇÕ´Ï´Ù\n"
+#: src/grep.c:604
+msgid " -A, --after-context=NUM print NUM lines of trailing context\n"
+msgstr ""
-#~ msgid " --help display this help and exit\n"
-#~ msgstr " --help ÀÌ µµ¿ò¸»À» Ç¥½ÃÇÏ°í Á¾·áÇÕ´Ï´Ù\n"
+#: src/grep.c:605
+msgid " -NUM same as both -B NUM and -A NUM\n"
+msgstr " -¼ýÀÚ -B ¼ýÀÚ³ª -A ¼ýÀÚ¿Í °°À½\n"
-#~ msgid "Output control:\n"
-#~ msgstr "Ãâ·Â Á¦¾î:\n"
+#: src/grep.c:606
+msgid " -C, --context same as -2\n"
+msgstr " -C, --context -2¿Í °°À½\n"
-#~ msgid ""
-#~ " -b, --byte-offset print the byte offset with output lines\n"
-#~ msgstr ""
-#~ " -b, --byte-offset Ãâ·ÂµÇ´Â Çà¿¡ ¹ÙÀÌÆ® ¿ÀÇÁ¼ÂÀ» Ç¥½ÃÇÕ´Ï´Ù\n"
+#: src/grep.c:608
+msgid " -U, --binary do not strip CR characters at EOL\n"
+msgstr " -U, --binary ÇೡÀÇ CR ¹®ÀÚ¸¦ À߶ó³»Áö ¾Ê½À´Ï´Ù\n"
-#~ msgid " -n, --line-number print line number with output lines\n"
-#~ msgstr " -n, --line-number Ãâ·ÂµÇ´Â Çà¿¡ Çà¹øÈ£¸¦ Ç¥½ÃÇÕ´Ï´Ù\n"
+#: src/grep.c:609
+msgid " -u, --unix-byte-offsets report offsets as if CRs were not there\n"
+msgstr " -u, --unix-byte-offsets CRÀ» Á¦¿ÜÇÏ°í ¿ÀÇÁ¼ÂÀ» »êÃâÇÕ´Ï´Ù\n"
-#~ msgid " -H, --with-filename print the filename for each match\n"
-#~ msgstr ""
-#~ " -H, --with-filename °¢°¢ÀÇ ÀÏÄ¡ °á°ú¿¡ ´ëÇØ ÆÄÀϸíÀ» Ç¥½ÃÇÕ´Ï´Ù\n"
+#: src/grep.c:612
+msgid "There should be one and only one PATTERN, `-e PATTERN' or `-f FILE'.\n"
+msgstr ""
-#~ msgid " -q, --quiet, --silent suppress all normal output\n"
-#~ msgstr ""
-#~ " -q, --quiet, --silent ÀϹÝÀûÀÎ ¸ðµç Ãâ·ÂÀ» Ç¥½ÃÇÏÁö ¾Ê½À´Ï´Ù\n"
+#: src/grep.c:613
+msgid "If call as `egrep', this implies -E and `fgrep' for -F.\n"
+msgstr "`egrep'À¸·Î È£ÃâµÇ¸é -E·Î °¡Á¤µÇ°í `fgrep'ÀÏ ¶§¿¡´Â -F°¡ °¡Á¤µË´Ï´Ù.\n"
-#~ msgid ""
-#~ " -L, --files-without-match only print FILE names containing no match\n"
-#~ msgstr ""
-#~ " -L, --files-without-match ÀÏÄ¡ °á°ú°¡ ¾ø´Â ÆÄÀÏ À̸§¸¸ Ç¥½ÃÇÕ´Ï´Ù\n"
+#: src/grep.c:614
+msgid "If no -[GEF], then -G is assumed.\n"
+msgstr "-[GEF]°¡ ÁÖ¾îÁöÁö ¾ÊÀ¸¸é -G·Î °¡Á¤ÇÕ´Ï´Ù.\n"
-#~ msgid ""
-#~ " -l, --files-with-matches only print FILE names containing matches\n"
-#~ msgstr ""
-#~ " -l, --files-with-matches ÀÏÄ¡ °á°ú°¡ Æ÷ÇÔµÈ ÆÄÀÏ À̸§¸¸ Ç¥½ÃÇÕ´Ï´Ù\n"
+#: src/grep.c:616
+msgid "Report bugs to <bug-gnu-utils@prep.ai.mit.edu>.\n"
+msgstr "¹®Á¦Á¡Àº <bug0gnu-utils@prep.ai.mit.edu>·Î º¸°íÇØ ÁֽʽÿÀ.\n"
-#~ msgid ""
-#~ " -c, --count only print a count of matching lines per FILE\n"
-#~ msgstr ""
-#~ " -c, --count ÆÄÀÏ´ç ÀÏÄ¡ÇÏ´Â ÇàÀÇ °³¼ö¸¸À» Ç¥½ÃÇÕ´Ï´Ù\n"
+#: src/grep.c:764 src/grep.c:769 src/grep.c:774
+msgid "you may specify only one of -E, -F, or -G"
+msgstr "-E, -F, -G Áß¿¡¼­ Çϳª¸¸ ÁöÁ¤ÇÒ ¼ö ÀÖ½À´Ï´Ù"
-#~ msgid "Context control:\n"
-#~ msgstr "¹®¸Æ Á¦¾î:\n"
+#: src/grep.c:790
+msgid "matcher already specified"
+msgstr "¦ÀÌ ÀÌ¹Ì ÁöÁ¤µÇ¾úÀ½"
-#~ msgid " -NUM same as both -B NUM and -A NUM\n"
-#~ msgstr " -¼ýÀÚ -B ¼ýÀÚ³ª -A ¼ýÀÚ¿Í °°À½\n"
+#: src/grep.c:881
+#, c-format
+msgid "grep (GNU grep) %s\n"
+msgstr "grep (GNU grep) %s\n"
-#~ msgid " -C, --context same as -2\n"
-#~ msgstr " -C, --context -2¿Í °°À½\n"
+#: src/grep.c:883
+msgid ""
+"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+msgstr ""
+"ÀúÀÛ±Ç (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#~ msgid " -U, --binary do not strip CR characters at EOL\n"
-#~ msgstr " -U, --binary ÇೡÀÇ CR ¹®ÀÚ¸¦ À߶ó³»Áö ¾Ê½À´Ï´Ù\n"
+#: src/grep.c:885
+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"
-#~ msgid ""
-#~ " -u, --unix-byte-offsets report offsets as if CRs were not there\n"
-#~ msgstr " -u, --unix-byte-offsets CRÀ» Á¦¿ÜÇÏ°í ¿ÀÇÁ¼ÂÀ» »êÃâÇÕ´Ï´Ù\n"
+#: src/grep.c:948 src/grep.c:971
+msgid "(standard input)"
+msgstr "(Ç¥ÁØ ÀÔ·Â)"
-#~ msgid "If call as `egrep', this implies -E and `fgrep' for -F.\n"
-#~ msgstr ""
-#~ "`egrep'À¸·Î È£ÃâµÇ¸é -E·Î °¡Á¤µÇ°í `fgrep'ÀÏ ¶§¿¡´Â -F°¡ °¡Á¤µË´Ï´Ù.\n"
+#: src/grep.c:983 src/grep.c:986
+msgid "(standard input)\n"
+msgstr "(Ç¥ÁØ ÀÔ·Â)\n"
-#~ msgid "If no -[GEF], then -G is assumed.\n"
-#~ msgstr "-[GEF]°¡ ÁÖ¾îÁöÁö ¾ÊÀ¸¸é -G·Î °¡Á¤ÇÕ´Ï´Ù.\n"
+#: src/obstack.c:467
+msgid "memory exhausted\n"
+msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²\n"
diff --git a/po/nl.po b/po/nl.po
index 63e9bbb6..90ca257c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,6 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.0\n"
-"POT-Creation-Date: 1998-11-09 00:40-0500\n"
"PO-Revision-Date: 1996-08-18 11:24 EDT\n"
"Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
"Language-Team: Dutch <nl@li.org>\n"
@@ -13,268 +12,23 @@ 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:766
-#, fuzzy
-msgid "Memory exhausted"
-msgstr "geen geheugen meer beschikbaar"
-
-#: 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:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
-msgid "unfinished repeat count"
-msgstr ""
-
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
-msgid "malformed repeat count"
-msgstr ""
-
-#: 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:849
-msgid "Unbalanced ("
-msgstr ""
-
-#: src/dfa.c:970
-msgid "No syntax specified"
-msgstr ""
-
-#: src/dfa.c:978
-msgid "Unbalanced )"
-msgstr ""
-
-#: src/dfa.c:1998
-msgid "out of memory"
-msgstr ""
-
-#: src/getopt.c:628
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:652
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:657
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:674 src/getopt.c:847
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: src/getopt.c:703
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: src/getopt.c:707
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:736
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#. 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 ""
-
-#: src/getopt.c:813
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:831
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr ""
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr ""
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr ""
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr ""
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr ""
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr ""
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr ""
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr ""
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr ""
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr ""
-
-#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
-#: src/kwset.c:190
+#: grep.c:148 grep.c:165 grep.c:222 grep.c:263 kwset.c:197 kwset.c:203 search.c:130
msgid "memory exhausted"
msgstr "geen geheugen meer beschikbaar"
-#: src/grep.c:324
-#, c-format
+#: grep.c:288
msgid "%s: warning: %s: %s\n"
msgstr "%s: let op: %s: %s\n"
-#: src/grep.c:429 src/grep.c:1222
+#: grep.c:372
msgid "writing output"
msgstr "schrijven van uitvoer"
-#: src/grep.c:655
-#, c-format
-msgid "Binary file %s matches\n"
-msgstr ""
-
-#: src/grep.c:670
-msgid "(standard input)"
-msgstr "(standaardinvoer)"
-
-#: src/grep.c:800
-#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
-msgstr ""
-
-#: src/grep.c:801
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr ""
+#: grep.c:566
+msgid "GNU grep version 2.0"
+msgstr "(FIXME) GNU grep version 2.0"
-#: src/grep.c:805
-#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr ""
-
-#: src/grep.c:806
-msgid ""
-"Search for PATTERN in each FILE or standard input.\n"
-"\n"
-"Regexp selection and interpretation:\n"
-" -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"
-" -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"
-msgstr ""
-
-#: src/grep.c:818
-msgid ""
-"\n"
-"Miscellaneous:\n"
-" -s, --no-messages suppress error messages\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:825
-msgid ""
-"\n"
-"Output control:\n"
-" -b, --byte-offset print the byte offset with output lines\n"
-" -n, --line-number print line number with output lines\n"
-" -H, --with-filename print the filename for each match\n"
-" -h, --no-filename suppress the prefixing filename on output\n"
-" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
-" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'.\n"
-" -r, --recursive equivalent to --directories=recurse.\n"
-" -L, --files-without-match only print FILE names containing no match\n"
-" -l, --files-with-matches only print FILE names containing matches\n"
-" -c, --count only print a count of matching lines per FILE\n"
-msgstr ""
-
-#: src/grep.c:840
-msgid ""
-"\n"
-"Context control:\n"
-" -B, --before-context=NUM print NUM lines of leading context\n"
-" -A, --after-context=NUM print NUM lines of trailing context\n"
-" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
-" -NUM same as --contex=NUM\n"
-" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
-" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
-"\n"
-"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:855
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-
-#: src/grep.c:998 src/grep.c:1005
-msgid "invalid context length argument"
-msgstr ""
-
-#: src/grep.c:1014
-msgid "infalid context length argument"
-msgstr ""
-
-#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
+#: grep.c:654 grep.c:659 grep.c:664
msgid "you may specify only one of -E, -F, or -G"
msgstr "alleen de volgende opties zijn toegestaan: -E, -F, of -G"
@@ -286,37 +40,14 @@ msgstr "alleen de volgende opties zijn toegestaan: -E, -F, of -G"
# grep --help ->
# usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
# La opcisn -X es a la que corresponde esta lmnea.
-#: src/grep.c:1050
+#: grep.c:672
msgid "matcher already specified"
msgstr "overeenkomer (matcher FIXME) al gespecificeerd"
-#: src/grep.c:1071
-msgid "unknown directories method"
-msgstr ""
-
-#: src/grep.c:1157
-#, c-format
-msgid "grep (GNU grep) %s\n"
-msgstr ""
-
-#: src/grep.c:1159
-msgid ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-msgstr ""
-
-#: src/grep.c:1161
-msgid ""
-"This is free software; see the source for copying conditions. There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-msgstr ""
-
-#: src/obstack.c:467
-#, fuzzy
-msgid "memory exhausted\n"
-msgstr "geen geheugen meer beschikbaar"
-
-#~ msgid "(standard input)\n"
-#~ msgstr "(standaardinvoer)\n"
+#: grep.c:788 grep.c:811
+msgid "(standard input)"
+msgstr "(standaardinvoer)"
-#~ msgid "GNU grep version 2.0"
-#~ msgstr "(FIXME) GNU grep version 2.0"
+#: grep.c:819 grep.c:822
+msgid "(standard input)\n"
+msgstr "(standaardinvoer)\n"
diff --git a/po/no.po b/po/no.po
index 699eb53b..82bd1bb5 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1998-11-09 00:40-0500\n"
+"POT-Creation-Date: 1998-04-26 19:31-0400\n"
"PO-Revision-Date: 1998-08-01 13:45+0200\n"
"Last-Translator: Eivind Tagseth <eivindt@multinet.no>\n"
"Language-Team: Norwegian <no@li.org>\n"
@@ -15,11 +15,11 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:766
+#: src/dfa.c:147 src/dfa.c:159 src/dfa.c:172
msgid "Memory exhausted"
msgstr "Minnet oppbrukt"
-#: src/dfa.c:452
+#: src/dfa.c:444
msgid "Unfinished \\ escape"
msgstr "Uferdig \\-beskyttelse"
@@ -28,32 +28,32 @@ msgstr "Uferdig \\-beskyttelse"
#. {M,} - minimum count, maximum is infinity
#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
+#: src/dfa.c:556 src/dfa.c:562 src/dfa.c:573 src/dfa.c:584
msgid "unfinished repeat count"
msgstr "uferdig gjentagelsesantall"
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+#: src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
msgid "malformed repeat count"
msgstr "feilaktig gjentagelsesantall"
-#: 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:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
+#: src/dfa.c:690 src/dfa.c:703 src/dfa.c:704
msgid "Unbalanced ["
msgstr "Ubalansert ["
-#: src/dfa.c:849
+#: src/dfa.c:841
msgid "Unbalanced ("
msgstr "Ubalansert ("
-#: src/dfa.c:970
+#: src/dfa.c:962
msgid "No syntax specified"
msgstr "Ingen syntaks spesifisert"
-#: src/dfa.c:978
+#: src/dfa.c:970
msgid "Unbalanced )"
msgstr "Ubalansert )"
-#: src/dfa.c:1998
+#: src/dfa.c:1990
msgid "out of memory"
msgstr "tomt for minne"
@@ -162,45 +162,36 @@ msgstr "?? getopt returnerte tegnverdien 0%o ??\n"
msgid "non-option ARGV-elements: "
msgstr "ARGV-elementer som ikke er flagg: "
-#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
+#: src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "minnet oppbrukt"
-#: src/grep.c:324
+#: src/grep.c:293
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: advarsel: %s: %s\n"
-#: src/grep.c:429 src/grep.c:1222
+#: src/grep.c:392 src/grep.c:1034
msgid "writing output"
msgstr "skriver utdata"
-#: src/grep.c:655
-#, c-format
-msgid "Binary file %s matches\n"
-msgstr ""
-
-#: src/grep.c:670
-msgid "(standard input)"
-msgstr "(standard inn)"
-
-#: src/grep.c:800
+#: src/grep.c:597
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Bruk: %s [FLAGG]... MØNSTER [FIL]...\n"
-#: src/grep.c:801
+#: src/grep.c:598
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv «%s --help» for mer informasjon.\n"
-#: src/grep.c:805
+#: src/grep.c:602
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Bruk: %s [FLAGG]... MØNSTER [FIL] ...\n"
-#: src/grep.c:806
+#: src/grep.c:603
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -218,17 +209,15 @@ msgstr ""
"\n"
"Regexp valg og fortolkning:\n"
" -E, --extended-regexp MØNSTER er et utvidet regulært uttrykk\n"
-" -F, --fixed-regexp MØNSTER er en fast streng separert med "
-"linjeskift\n"
+" -F, --fixed-regexp MØNSTER er en fast streng separert med linjeskift\n"
" -G, --basic-regexp MØNSTER er et grunnleggende regulært uttrykk\n"
" -e, --regexp=MØNSTER bruk MØNSTER som et regulært uttrykk\n"
" -f, --file=FIL hent MØNSTER fra FIL\n"
-" -i, --ignore-case se bort ifra forskjellen på store og små "
-"bokstaver\n"
+" -i, --ignore-case se bort ifra forskjellen på store og små bokstaver\n"
" -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:818
+#: src/grep.c:615
msgid ""
"\n"
"Miscellaneous:\n"
@@ -244,8 +233,7 @@ msgstr ""
" -V, --version vis versioninformasjon og avslutt\n"
" --help vis denne helpeteksten og avslutt\n"
-#: src/grep.c:825
-#, fuzzy
+#: src/grep.c:622
msgid ""
"\n"
"Output control:\n"
@@ -254,10 +242,6 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
-" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'.\n"
-" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -273,20 +257,17 @@ msgstr ""
" inneholder treff\n"
" -l, --files-with-matches skriv bare ut navnene på FILene som inneholder\n"
" treff\n"
-" -c, --count skriv bare ut antall linjer som inneholder "
-"treff\n"
+" -c, --count skriv bare ut antall linjer som inneholder treff\n"
" per FIL\n"
-#: src/grep.c:840
-#, fuzzy
+#: src/grep.c:633
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"
-" -NUM same as --contex=NUM\n"
+" -NUM same as both -B NUM and -A NUM\n"
+" -C, --context same as -2\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -305,47 +286,32 @@ msgstr ""
" -u, --unix-byte-offsets rapporter posisjoner som om CRene ikke var der\n"
" (MSDOS)\n"
-#: src/grep.c:855
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Rapportér feil til <bug-gnu-utils@prep.ai.mit.edu>.\n"
+#: src/grep.c:647
+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:998 src/grep.c:1005
+#: src/grep.c:785 src/grep.c:792
msgid "invalid context length argument"
msgstr "ugyldig kontekstlengde"
-#: src/grep.c:1014
-#, fuzzy
-msgid "infalid context length argument"
-msgstr "ugyldig kontekstlengde"
-
-#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
+#: src/grep.c:800 src/grep.c:805 src/grep.c:810
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:1050
+#: src/grep.c:829
msgid "matcher already specified"
msgstr "søkeuttrykk er allerede spesifisert"
-#: src/grep.c:1071
-msgid "unknown directories method"
-msgstr ""
-
-#: src/grep.c:1157
+#: src/grep.c:915
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1159
-msgid ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-msgstr ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+#: src/grep.c:917
+msgid "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1161
+#: src/grep.c:919
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"
@@ -354,9 +320,14 @@ msgstr ""
"er INGEN garanti, ikke en gang for SALGBARHET eller EGNETHET FOR NOEN \n"
"SPESIELL OPPGAVE.\n"
+#: src/grep.c:964 src/grep.c:1015
+msgid "(standard input)"
+msgstr "(standard inn)"
+
+#: src/grep.c:1027 src/grep.c:1030
+msgid "(standard input)\n"
+msgstr "(standard inn)\n"
+
#: src/obstack.c:467
msgid "memory exhausted\n"
msgstr "minnet oppbrukt\n"
-
-#~ msgid "(standard input)\n"
-#~ msgstr "(standard inn)\n"
diff --git a/po/pl.po b/po/pl.po
index a2be2a64..957fdc59 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1998-11-09 00:40-0500\n"
+"POT-Creation-Date: 1998-04-26 19:31-0400\n"
"PO-Revision-Date: 1998-08-05 14:08+0200\n"
"Last-Translator: Rafa³ Maszkowski <rzm@icm.edu.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -13,11 +13,11 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:766
+#: src/dfa.c:147 src/dfa.c:159 src/dfa.c:172
msgid "Memory exhausted"
msgstr "Pamiêæ wyczerpana"
-#: src/dfa.c:452
+#: src/dfa.c:444
msgid "Unfinished \\ escape"
msgstr "Niedokoñczona sekwencja \\"
@@ -26,32 +26,32 @@ msgstr "Niedokoñczona sekwencja \\"
#. {M,} - minimum count, maximum is infinity
#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
+#: src/dfa.c:556 src/dfa.c:562 src/dfa.c:573 src/dfa.c:584
msgid "unfinished repeat count"
msgstr "niedokoñczona liczba powtórzeñ"
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+#: src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
msgid "malformed repeat count"
msgstr "¼le sformatowana liczba powtórzeñ"
-#: 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:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
+#: src/dfa.c:690 src/dfa.c:703 src/dfa.c:704
msgid "Unbalanced ["
msgstr "[ nie do pary"
-#: src/dfa.c:849
+#: src/dfa.c:841
msgid "Unbalanced ("
msgstr "( nie do pary"
-#: src/dfa.c:970
+#: src/dfa.c:962
msgid "No syntax specified"
msgstr "Brak specyfikacji sk³adni"
-#: src/dfa.c:978
+#: src/dfa.c:970
msgid "Unbalanced )"
msgstr ") nie do pary"
-#: src/dfa.c:1998
+#: src/dfa.c:1990
msgid "out of memory"
msgstr "brak pamiêci"
@@ -161,45 +161,36 @@ 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:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
+#: src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "pamiêæ wyczerpana"
-#: src/grep.c:324
+#: src/grep.c:293
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: uwaga: %s: %s\n"
-#: src/grep.c:429 src/grep.c:1222
+#: src/grep.c:392 src/grep.c:1034
msgid "writing output"
msgstr "zapisujê wyniki"
-#: src/grep.c:655
-#, c-format
-msgid "Binary file %s matches\n"
-msgstr ""
-
-#: src/grep.c:670
-msgid "(standard input)"
-msgstr "(standardowe wej¶cie)"
-
-#: src/grep.c:800
+#: src/grep.c:597
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "U¿ycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
-#: src/grep.c:801
+#: src/grep.c:598
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Spróbuj `%s --help' dla uzyskania informacji.\n"
-#: src/grep.c:805
+#: src/grep.c:602
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "U¿ycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
-#: src/grep.c:806
+#: src/grep.c:603
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -225,7 +216,7 @@ msgstr ""
" -w, --word-regexp dopasuj WZORZEC tylko do pe³nych s³ów\n"
" -x, --line-regexp dopasuj WZORZEC tylko do ca³ych linii\n"
-#: src/grep.c:818
+#: src/grep.c:615
msgid ""
"\n"
"Miscellaneous:\n"
@@ -241,8 +232,7 @@ msgstr ""
" -V, --version wypisz informacjê o wersji i zakoñcz\n"
" --help wy¶wietl tê informacjê i zakoñcz\n"
-#: src/grep.c:825
-#, fuzzy
+#: src/grep.c:622
msgid ""
"\n"
"Output control:\n"
@@ -251,10 +241,6 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
-" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'.\n"
-" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -268,19 +254,16 @@ msgstr ""
" -q, --quiet, --silent wy³±cz wypisywanie wyniku\n"
" -L, --files-without-match wypisz tylko nazwy PLIKÓW bez trafieñ\n"
" -l, --files-with-matches wypisz tylko nazwy PLIKÓW z trafieniami\n"
-" -c, --count wypisz tylko ilo¶æ pasuj±cych linii w ka¿dym "
-"PLIKu\n"
+" -c, --count wypisz tylko ilo¶æ pasuj±cych linii w ka¿dym PLIKu\n"
-#: src/grep.c:840
-#, fuzzy
+#: src/grep.c:633
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"
-" -NUM same as --contex=NUM\n"
+" -NUM same as both -B NUM and -A NUM\n"
+" -C, --context same as -2\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -304,24 +287,15 @@ msgstr ""
"pasuje, z 1, je¿eli nie, z 2, je¿eli napotkano b³êdy syntaktyczne lub\n"
"systemowe.\n"
-#: src/grep.c:855
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Raporty o b³êdach wysy³aj do bug-gnu-utils@gnu.org.\n"
+#: src/grep.c:647
+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:998 src/grep.c:1005
+#: src/grep.c:785 src/grep.c:792
msgid "invalid context length argument"
msgstr "b³êdny argument d³ugo¶ci kontekstowej"
-#: src/grep.c:1014
-#, fuzzy
-msgid "infalid context length argument"
-msgstr "b³êdny argument d³ugo¶ci kontekstowej"
-
-#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
+#: src/grep.c:800 src/grep.c:805 src/grep.c:810
msgid "you may specify only one of -E, -F, or -G"
msgstr "mo¿esz podaæ tylko jedn± opcjê z -E -F -G"
@@ -333,39 +307,36 @@ msgstr "mo¿esz podaæ tylko jedn± opcjê z -E -F -G"
# grep --help ->
# usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
# La opción -X es a la que corresponde esta línea.
-#: src/grep.c:1050
+#: src/grep.c:829
msgid "matcher already specified"
msgstr "wzorzec ju¿ podany"
-#: src/grep.c:1071
-msgid "unknown directories method"
-msgstr ""
-
-#: src/grep.c:1157
+#: src/grep.c:915
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1159
-msgid ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-msgstr ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+#: src/grep.c:917
+msgid "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1161
+#: src/grep.c:919
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-"Oprogramowanie darmowe. Warunki kopiowania zamieszczone s± w kodzie "
-"¼ród³owym.\n"
-"Nie podlega ¿adnej gwarancji, nawet gwarancji przydatno¶ci do "
-"jakiegokolwiek\n"
+"Oprogramowanie darmowe. Warunki kopiowania zamieszczone s± w kodzie ¼ród³owym.\n"
+"Nie podlega ¿adnej gwarancji, nawet gwarancji przydatno¶ci do jakiegokolwiek\n"
"zastosowania lub sprzeda¿y.\n"
+#: src/grep.c:964 src/grep.c:1015
+msgid "(standard input)"
+msgstr "(standardowe wej¶cie)"
+
+#: src/grep.c:1027 src/grep.c:1030
+msgid "(standard input)\n"
+msgstr "(standardowe wyj¶cie)\n"
+
#: src/obstack.c:467
msgid "memory exhausted\n"
msgstr "pamiêæ wyczerpana\n"
-
-#~ msgid "(standard input)\n"
-#~ msgstr "(standardowe wyj¶cie)\n"
diff --git a/po/ru.po b/po/ru.po
index 1934f048..08295ddd 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.1.1b\n"
-"POT-Creation-Date: 1998-11-09 00:40-0500\n"
+"POT-Creation-Date: 1998-03-26 23:45-0500\n"
"PO-Revision-Date: 1998-05-23 15:26\n"
"Last-Translator: Denis Y. Pershin <dyp@siblug.org>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -14,11 +14,11 @@ msgstr ""
"Content-Transfer-Encoding: 8-bit\n"
#
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:766
+#: src/dfa.c:147 src/dfa.c:159 src/dfa.c:172
msgid "Memory exhausted"
msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
-#: src/dfa.c:452
+#: src/dfa.c:444
msgid "Unfinished \\ escape"
msgstr "îÅÚÁ×ÅÒÛÅÎÎÁÑ \\ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
@@ -27,32 +27,32 @@ msgstr "îÅÚÁ×ÅÒÛÅÎÎÁÑ \\ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
#. {M,} - minimum count, maximum is infinity
#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
+#: src/dfa.c:556 src/dfa.c:562 src/dfa.c:573 src/dfa.c:584
msgid "unfinished repeat count"
msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÐÏ×ÔÏÒÅÎÉÊ"
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+#: src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
msgid "malformed repeat count"
msgstr "ÎÅËÏÒÒÅËÔÎÏ ÕËÁÚÁÎÏ ËÏÌÉÞÅÓÔ×Ï ÐÏ×ÔÏÒÅÎÉÊ"
-#: 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:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
+#: src/dfa.c:690 src/dfa.c:703 src/dfa.c:704
msgid "Unbalanced ["
msgstr "îÅÓÂÁÌÁÎÓÉÒÏ×ÁÎÎÁÑ ["
-#: src/dfa.c:849
+#: src/dfa.c:841
msgid "Unbalanced ("
msgstr "îÅÓÂÁÌÁÎÓÉÒÏ×ÁÎÎÁÑ ("
-#: src/dfa.c:970
+#: src/dfa.c:962
msgid "No syntax specified"
msgstr "îÅ ÕËÁÚÁÎÏ ÓÉÎÔÁËÓÉÓÁ"
-#: src/dfa.c:978
+#: src/dfa.c:970
msgid "Unbalanced )"
msgstr "îÅÓÂÁÌÁÎÓÉÒÏ×ÁÎÎÁÑ )"
-#: src/dfa.c:1998
+#: src/dfa.c:1990
msgid "out of memory"
msgstr "ÚÁËÏÎÞÉÌÁÓØ ÐÁÍÑÔØ"
@@ -161,45 +161,36 @@ msgstr "?? gotopt ×ÅÒÎÕÌ ÓÉÍ×ÏÌ Ó ËÏÄÏÍ 0%o ??\n"
msgid "non-option ARGV-elements: "
msgstr "ARGV-ÜÌÅÍÅÎÔÙ - ÎÅ ÏÐÃÉÉ: "
-#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
+#: src/grep.c:143 src/grep.c:160 src/grep.c:203 src/grep.c:244 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
-#: src/grep.c:324
+#: src/grep.c:274
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s: %s\n"
-#: src/grep.c:429 src/grep.c:1222
+#: src/grep.c:373 src/grep.c:1044
msgid "writing output"
msgstr "ÚÁÐÉÓÙ×ÁÀ ×ÙÈÏÄÎÙÅ ÄÁÎÎÙÅ"
-#: src/grep.c:655
-#, c-format
-msgid "Binary file %s matches\n"
-msgstr ""
-
-#: src/grep.c:670
-msgid "(standard input)"
-msgstr "(ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ)"
-
-#: src/grep.c:800
+#: src/grep.c:578
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [OPTION]... PATTERN [FILE]...\n"
-#: src/grep.c:801
+#: src/grep.c:579
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
-#: src/grep.c:805
+#: src/grep.c:583
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [OPTION]... PATTERN [FILE] ...\n"
-#: src/grep.c:806
+#: src/grep.c:584
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -226,7 +217,7 @@ msgstr ""
" -w, --word-regexp PATTERN ÄÏÌÖÅÎ ÐÏÄÈÏÄÉÔØ ËÏ ×ÓÅÍÕ ÓÌÏ×Õ\n"
" -x, --line-regexp PATTERN ÄÏÌÖÅÎ ÐÏÄÈÏÄÉÔØ ËÏ ×ÓÅÊ ÓÔÒÏËÅ\n"
-#: src/grep.c:818
+#: src/grep.c:596
msgid ""
"\n"
"Miscellaneous:\n"
@@ -242,8 +233,7 @@ msgstr ""
" -V, --version ÎÁÐÅÞÁÔÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
" --help ÐÏËÁÚÁÔØ ÐÏÍÏÝØ É ×ÙÊÔÉ\n"
-#: src/grep.c:825
-#, fuzzy
+#: src/grep.c:603
msgid ""
"\n"
"Output control:\n"
@@ -252,39 +242,30 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
-" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'.\n"
-" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
msgstr ""
"\n"
"õÐÒÁ×ÌÅÎÉÅ ×Ù×ÏÄÏÍ:\n"
-" -b, --byte-offset ÐÅÞÁÔÁÔØ ×ÍÅÓÔÅ Ó ×ÙÈÏÄÎÙÍÉ ÓÔÒÏÞËÁÍÉ ÓÍÅÝÅÎÉÅ "
-"×\n"
+" -b, --byte-offset ÐÅÞÁÔÁÔØ ×ÍÅÓÔÅ Ó ×ÙÈÏÄÎÙÍÉ ÓÔÒÏÞËÁÍÉ ÓÍÅÝÅÎÉÅ ×\n"
" ÂÁÊÔÁÈ\n"
-" -n, --line-number ÐÅÞÁÔÁÔØ ÎÏÍÅÒ ÓÔÒÏËÉ ×ÍÅÓÔÅ Ó ×ÙÈÏÄÎÙÍÉ "
-"ÓÔÒÏÞËÁÍÉ\n"
+" -n, --line-number ÐÅÞÁÔÁÔØ ÎÏÍÅÒ ÓÔÒÏËÉ ×ÍÅÓÔÅ Ó ×ÙÈÏÄÎÙÍÉ ÓÔÒÏÞËÁÍÉ\n"
" -H, --with-filename ÐÅÞÁÔÁÔØ ÉÍÑ ÆÁÊÌÁ ÄÌÑ ËÁÖÄÏÇÏ ÓÏ×ÐÁÄÅÎÉÑ\n"
" -h, --no-filename ÐÏÄÁ×ÉÔØ ×Ù×ÏÄ ÉÍÅÎÉ ÆÁÊÌÁ ÎÁ ×ÙÈÏÄÅ\n"
" -q, --quiet, --silent ÐÏÄÁ×ÉÔØ ×ÅÓØ ÏÂÙÞÎÙÊ ×Ù×ÏÄ\n"
" -L, --files-without-match ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÉÍÅÎÁ ÆÁÊÌÏ× ÂÅÚ ÓÏ×ÐÁÄÅÎÉÊ\n"
" -l, --files-with-matches ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÉÍÅÎÁ ÆÁÊÌÏ× Ó ÓÏ×ÐÁÄÅÎÉÑÍÉ\n"
-" -c, --count ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ËÏÌÉÞÅÓÔ×Ï ÓÏ×ÐÁÄÁÀÝÉÈ ÓÔÒÏË ÎÁ "
-"ÆÁÊÌ\n"
+" -c, --count ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ËÏÌÉÞÅÓÔ×Ï ÓÏ×ÐÁÄÁÀÝÉÈ ÓÔÒÏË ÎÁ ÆÁÊÌ\n"
-#: src/grep.c:840
-#, fuzzy
+#: src/grep.c:614
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"
-" -NUM same as --contex=NUM\n"
+" -NUM same as both -B NUM and -A NUM\n"
+" -C, --context same as -2\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"
@@ -302,53 +283,81 @@ msgstr ""
" -U, --binary ÎÅ ÕÄÁÌÑÔØ ÓÉ×ÏÌÙ CR × ËÏÎÃÅ ÓÔÒÏËÉ (MSDOS)\n"
" -u, --unix-byte-offsets ×ÙÄÁ×ÁÔØ ÓÍÅÝÅÎÉÅ, ËÁË-ÂÕÄÔÏ ÎÅÔ CR-Ï× (MSDOS)\n"
"\n"
-"åÓÌÉ ÎÅ ÕËÁÚÁÎÏ -[GEF], ÔÏÇÄÁ `egrep' ÐÒÅÄÐÏÌÁÇÁÅÔ -E, `fgrep' -F, ÉÎÁÞÅ "
-"-G.\n"
-"ëÏÇÄÁ ÎÅÔ FILE'Á, ÉÌÉ ËÏÇÄÁ FILE ÜÔÏ -, ÞÉÔÁÅÔ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ. åÓÌÉ "
-"ÚÁÄÁÎÏ\n"
-"ÍÅÎØÛÅ, ÞÅÍ Ä×Á ÆÁÊÌÁ, ÐÒÅÄÐÏÌÁÇÁÅÔ -h. ÷ÙÈÏÄÉÔ Ó 0 ÅÓÌÉ ÎÁÊÄÅÎÙ "
-"ÓÏ×ÐÁÄÅÎÉÑ,\n"
+"åÓÌÉ ÎÅ ÕËÁÚÁÎÏ -[GEF], ÔÏÇÄÁ `egrep' ÐÒÅÄÐÏÌÁÇÁÅÔ -E, `fgrep' -F, ÉÎÁÞÅ -G.\n"
+"ëÏÇÄÁ ÎÅÔ FILE'Á, ÉÌÉ ËÏÇÄÁ FILE ÜÔÏ -, ÞÉÔÁÅÔ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ. åÓÌÉ ÚÁÄÁÎÏ\n"
+"ÍÅÎØÛÅ, ÞÅÍ Ä×Á ÆÁÊÌÁ, ÐÒÅÄÐÏÌÁÇÁÅÔ -h. ÷ÙÈÏÄÉÔ Ó 0 ÅÓÌÉ ÎÁÊÄÅÎÙ ÓÏ×ÐÁÄÅÎÉÑ,\n"
"Ó 1, ÅÓÌÉ ÎÅÔ. ÷ÙÈÏÄÉÔ Ó 2, ÅÓÌÉ ÅÓÔØ ÓÉÎÔÁËÓÉÞÅÓËÉÏ ÉÌÉ ÓÉÓÔÅÍÎÙÅ ÏÛÉÂËÉ.\n"
-#: src/grep.c:855
+#: src/grep.c:646
msgid ""
"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
+"In REGEXPs, most characters stand for themselves, save for all the\n"
+"following cases:\n"
"\n"
-"ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ <bug-gnu-utils@gnu.org>.\n"
-
-#: src/grep.c:998 src/grep.c:1005
-msgid "invalid context length argument"
+" ^ empty string at beginning of line\n"
+" $ empty string at end of line\n"
+" \\< empty string at beginning of word\n"
+" \\> empty string at end of word\n"
+" \\b empty string at edge of word\n"
+" \\B empty string not at edge of word\n"
+" . match any character\n"
+" \\w same as [[:alnum:]]\n"
+" \\W same as [^[:alnum:]]\n"
+" [RANGE...] accept character in any of RANGEs\n"
+" [^RANGE...] accept character in none of RANGEs\n"
+" \\NUM match text matched by NUM'th parenthesized\n"
+" previous expression (counting from 1)\n"
+"\n"
+"Each RANGE is one of [:CLASS:], CHAR1-CHAR2 or CHAR. CLASS is one of\n"
+"the words alnum, alpha, cntrl, digit, graph, lower, print, punct,\n"
+"space, upper or xdigit. In a list of RANGEs, place ] first, - last\n"
+"and ^ anywhere but first.\n"
msgstr ""
+"\n"
+"÷ ÒÅÇÕÌÑÒÎÙÈ ×ÙÒÁÖÅÎÉÑÈ ÂÏÌØÛÉÎÓÔ×Ï ÓÉÍ×ÏÌÏ× ÏÚÎÁÞÁÀÔ ÓÁÍÉÈ ÓÅÂÑ, ÚÁ\n"
+"ÉÓËÌÀÞÅÎÉÅÍ ÓÌÅÄÕÀÝÉÈ ÓÌÕÞÁÅ×:\n"
+"\n"
+" ^ ÐÕÓÔÁÑ ÓÔÒÏËÁ × ÎÁÞÁÌÅ ÓÔÒÏËÉ\n"
+" $ ÐÕÓÔÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÓÔÒÏËÉ\n"
+" \\< ÐÕÓÔÁÑ ÓÔÒÏËÁ × ÎÁÞÁÌÅ ÓÌÏ×Áe\n"
+" \\> ÐÕÓÔÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÓÌÏ×Á\n"
+" \\b ÐÕÓÔÁÑ ÓÔÒÏËÁ ÐÏ ËÒÁÑÍ ÓÌÏ×Á\n"
+" \\B ÐÕÓÔÁÑ ÓÔÒÏËÁ ÎÅ ÐÏ ËÒÁÑÍ ÓÌÏ×Á\n"
+" . ÓÏ×ÐÁÄÅÎÉÅ Ó ÌÀÂÙÍ ÉÚ ÓÉÍ×ÏÌÏ×:\n"
+" \\w ÔÁËÉÍ ÖÅ, ËÁË [[:alnum:]]\n"
+" \\W ÔÁËÉÍ ÖÅ, ËÁË [^[:alnum:]]\n"
+" [RANGE...] ÄÏÐÕÓËÁÅÔÓÑ ÌÀÂÏÊ ÓÉÍ×ÏÌ ÉÚ ÐÒÏÍÅÖÕÔËÏ×\n"
+" [^RANGE...] ÄÏÐÕÓËÁÅÔÓÑ ÌÀÂÏÊ ÓÉÍ×ÏÌ ÎÅ ÉÚ ÐÒÏÍÅÖÕÔËÏ×\n"
+" \\NUM ÔÅËÓÔ, ÓÏ×ÐÁÄÁÅÔ Ó NUM ÓËÏÂÏË\n"
+" ÐÒÅÄÙÄÕÝÅÅ ×ÙÒÁÖÅÎÉÅ (ÎÁÞÉÎÁÑ Ó 1)\n"
+"\n"
+"ëÁÖÄÙÊ RANGE(ÐÒÏÍÅÖÕÔÏË) ÐÒÉÎÁÄÌÅÖÉÔ Ë ÏÄÎÏÍÕ ÉÚ [:CLASS:], CHAR1-CHAR2\n"
+"ÉÌÉ CHAR. CLASS ÏÄÉÎÏ ÉÚ ÓÌÏ× alnum, alpha, cntrl, digit, graph, lower,\n"
+"print, punct, space, upper ÉÌÉ xdigit. ÷ ÓÐÉÓËÅ ÐÒÏÍÅÖÕÔËÏ× ÐÏÍÅÝÁÊÔÅ\n"
+"] ÐÅÒ×ÙÍ, - ÐÏÓÌÅÄÎÉÍ É ^ ×ÅÚÄÅ, ËÒÏÍÅ ÐÅÒ×ÏÇÏ.\n"
-#: src/grep.c:1014
-msgid "infalid context length argument"
-msgstr ""
+#: src/grep.c:669
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
+#: src/grep.c:818 src/grep.c:823 src/grep.c:828
msgid "you may specify only one of -E, -F, or -G"
msgstr "×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÔÏÌØËÏ ÏÄÎÕ ÉÚ -E, -F ÉÌÉ -G"
-#: src/grep.c:1050
+#: src/grep.c:847
msgid "matcher already specified"
msgstr "ÏÂÒÁÚÅÃ ÕÖÅ ÚÁÄÁÎ"
-#: src/grep.c:1071
-msgid "unknown directories method"
-msgstr ""
-
-#: src/grep.c:1157
+#: src/grep.c:933
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr ""
-#: src/grep.c:1159
-msgid ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+#: src/grep.c:935
+msgid "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
msgstr ""
-#: src/grep.c:1161
+#: src/grep.c:937
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,57 +366,15 @@ msgstr ""
"ÔÅËÓÔÙ ÄÌÑ ÕÓÌÏ×ÉÊ ËÏÐÉÒÏ×ÁÎÉÑ. îå ÄÁÅÔÓÑ ÎÉËÁËÏÊ ÇÁÒÁÎÔÉÉ, ÄÁÖÅ Ï\n"
"ðïäèïäéíïóôé äìñ ïðòåäåìåîîùè ãåìåê.\n"
+#: src/grep.c:1002 src/grep.c:1025
+msgid "(standard input)"
+msgstr "(ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ)"
+
+#: src/grep.c:1037 src/grep.c:1040
+msgid "(standard input)\n"
+msgstr "(ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ)\n"
+
#
#: src/obstack.c:467
msgid "memory exhausted\n"
msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n"
-
-#~ msgid "(standard input)\n"
-#~ msgstr "(ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ)\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "In REGEXPs, most characters stand for themselves, save for all the\n"
-#~ "following cases:\n"
-#~ "\n"
-#~ " ^ empty string at beginning of line\n"
-#~ " $ empty string at end of line\n"
-#~ " \\< empty string at beginning of word\n"
-#~ " \\> empty string at end of word\n"
-#~ " \\b empty string at edge of word\n"
-#~ " \\B empty string not at edge of word\n"
-#~ " . match any character\n"
-#~ " \\w same as [[:alnum:]]\n"
-#~ " \\W same as [^[:alnum:]]\n"
-#~ " [RANGE...] accept character in any of RANGEs\n"
-#~ " [^RANGE...] accept character in none of RANGEs\n"
-#~ " \\NUM match text matched by NUM'th parenthesized\n"
-#~ " previous expression (counting from 1)\n"
-#~ "\n"
-#~ "Each RANGE is one of [:CLASS:], CHAR1-CHAR2 or CHAR. CLASS is one of\n"
-#~ "the words alnum, alpha, cntrl, digit, graph, lower, print, punct,\n"
-#~ "space, upper or xdigit. In a list of RANGEs, place ] first, - last\n"
-#~ "and ^ anywhere but first.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "÷ ÒÅÇÕÌÑÒÎÙÈ ×ÙÒÁÖÅÎÉÑÈ ÂÏÌØÛÉÎÓÔ×Ï ÓÉÍ×ÏÌÏ× ÏÚÎÁÞÁÀÔ ÓÁÍÉÈ ÓÅÂÑ, ÚÁ\n"
-#~ "ÉÓËÌÀÞÅÎÉÅÍ ÓÌÅÄÕÀÝÉÈ ÓÌÕÞÁÅ×:\n"
-#~ "\n"
-#~ " ^ ÐÕÓÔÁÑ ÓÔÒÏËÁ × ÎÁÞÁÌÅ ÓÔÒÏËÉ\n"
-#~ " $ ÐÕÓÔÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÓÔÒÏËÉ\n"
-#~ " \\< ÐÕÓÔÁÑ ÓÔÒÏËÁ × ÎÁÞÁÌÅ ÓÌÏ×Áe\n"
-#~ " \\> ÐÕÓÔÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÓÌÏ×Á\n"
-#~ " \\b ÐÕÓÔÁÑ ÓÔÒÏËÁ ÐÏ ËÒÁÑÍ ÓÌÏ×Á\n"
-#~ " \\B ÐÕÓÔÁÑ ÓÔÒÏËÁ ÎÅ ÐÏ ËÒÁÑÍ ÓÌÏ×Á\n"
-#~ " . ÓÏ×ÐÁÄÅÎÉÅ Ó ÌÀÂÙÍ ÉÚ ÓÉÍ×ÏÌÏ×:\n"
-#~ " \\w ÔÁËÉÍ ÖÅ, ËÁË [[:alnum:]]\n"
-#~ " \\W ÔÁËÉÍ ÖÅ, ËÁË [^[:alnum:]]\n"
-#~ " [RANGE...] ÄÏÐÕÓËÁÅÔÓÑ ÌÀÂÏÊ ÓÉÍ×ÏÌ ÉÚ ÐÒÏÍÅÖÕÔËÏ×\n"
-#~ " [^RANGE...] ÄÏÐÕÓËÁÅÔÓÑ ÌÀÂÏÊ ÓÉÍ×ÏÌ ÎÅ ÉÚ ÐÒÏÍÅÖÕÔËÏ×\n"
-#~ " \\NUM ÔÅËÓÔ, ÓÏ×ÐÁÄÁÅÔ Ó NUM ÓËÏÂÏË\n"
-#~ " ÐÒÅÄÙÄÕÝÅÅ ×ÙÒÁÖÅÎÉÅ (ÎÁÞÉÎÁÑ Ó 1)\n"
-#~ "\n"
-#~ "ëÁÖÄÙÊ RANGE(ÐÒÏÍÅÖÕÔÏË) ÐÒÉÎÁÄÌÅÖÉÔ Ë ÏÄÎÏÍÕ ÉÚ [:CLASS:], CHAR1-CHAR2\n"
-#~ "ÉÌÉ CHAR. CLASS ÏÄÉÎÏ ÉÚ ÓÌÏ× alnum, alpha, cntrl, digit, graph, lower,\n"
-#~ "print, punct, space, upper ÉÌÉ xdigit. ÷ ÓÐÉÓËÅ ÐÒÏÍÅÖÕÔËÏ× ÐÏÍÅÝÁÊÔÅ\n"
-#~ "] ÐÅÒ×ÙÍ, - ÐÏÓÌÅÄÎÉÍ É ^ ×ÅÚÄÅ, ËÒÏÍÅ ÐÅÒ×ÏÇÏ.\n"
diff --git a/po/sl.po b/po/sl.po
index 6ea438ab..5750e154 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,12 +2,11 @@
# Copyright (C) 1996 Free Software Foundation, Inc.
# Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 1996.
#
-# $Header: /sources/grep/grep/po/sl.po,v 1.4 1998/11/09 06:04:22 alainm Exp $
+# $Header: /sources/grep/grep/po/sl.po,v 1.5 1999/02/10 05:49:53 alainm Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.0\n"
-"POT-Creation-Date: 1998-11-09 00:40-0500\n"
"PO-Revision-Date: 1996-05-28 21:15\n"
"Last-Translator: Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -15,268 +14,23 @@ 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:766
-#, fuzzy
-msgid "Memory exhausted"
-msgstr "pomnilnik porabljen"
-
-#: 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:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
-msgid "unfinished repeat count"
-msgstr ""
-
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
-msgid "malformed repeat count"
-msgstr ""
-
-#: 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:849
-msgid "Unbalanced ("
-msgstr ""
-
-#: src/dfa.c:970
-msgid "No syntax specified"
-msgstr ""
-
-#: src/dfa.c:978
-msgid "Unbalanced )"
-msgstr ""
-
-#: src/dfa.c:1998
-msgid "out of memory"
-msgstr ""
-
-#: src/getopt.c:628
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:652
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:657
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:674 src/getopt.c:847
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: src/getopt.c:703
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: src/getopt.c:707
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: src/getopt.c:733
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:736
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#. 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 ""
-
-#: src/getopt.c:813
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:831
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt1.c:132
-#, c-format
-msgid "option %s"
-msgstr ""
-
-#: src/getopt1.c:134
-#, c-format
-msgid " with arg %s"
-msgstr ""
-
-#: src/getopt1.c:149
-msgid "digits occur in two different argv-elements.\n"
-msgstr ""
-
-#: src/getopt1.c:151
-#, c-format
-msgid "option %c\n"
-msgstr ""
-
-#: src/getopt1.c:155
-msgid "option a\n"
-msgstr ""
-
-#: src/getopt1.c:159
-msgid "option b\n"
-msgstr ""
-
-#: src/getopt1.c:163
-#, c-format
-msgid "option c with value `%s'\n"
-msgstr ""
-
-#: src/getopt1.c:167
-#, c-format
-msgid "option d with value `%s'\n"
-msgstr ""
-
-#: src/getopt1.c:174
-#, c-format
-msgid "?? getopt returned character code 0%o ??\n"
-msgstr ""
-
-#: src/getopt1.c:180
-msgid "non-option ARGV-elements: "
-msgstr ""
-
-#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
-#: src/kwset.c:190
+#: grep.c:148 grep.c:165 grep.c:222 grep.c:263 kwset.c:197 kwset.c:203 search.c:130
msgid "memory exhausted"
msgstr "pomnilnik porabljen"
-#: src/grep.c:324
-#, c-format
+#: grep.c:288
msgid "%s: warning: %s: %s\n"
msgstr "%s: pozor: %s: %s\n"
-#: src/grep.c:429 src/grep.c:1222
+#: grep.c:372
msgid "writing output"
msgstr "pisanje rezultatov"
-#: src/grep.c:655
-#, c-format
-msgid "Binary file %s matches\n"
-msgstr ""
-
-#: src/grep.c:670
-msgid "(standard input)"
-msgstr "(standardni vhod)"
-
-#: src/grep.c:800
-#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
-msgstr ""
-
-#: src/grep.c:801
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr ""
+#: grep.c:566
+msgid "GNU grep version 2.0"
+msgstr "GNU grep verzija 2.0"
-#: src/grep.c:805
-#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr ""
-
-#: src/grep.c:806
-msgid ""
-"Search for PATTERN in each FILE or standard input.\n"
-"\n"
-"Regexp selection and interpretation:\n"
-" -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"
-" -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"
-msgstr ""
-
-#: src/grep.c:818
-msgid ""
-"\n"
-"Miscellaneous:\n"
-" -s, --no-messages suppress error messages\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:825
-msgid ""
-"\n"
-"Output control:\n"
-" -b, --byte-offset print the byte offset with output lines\n"
-" -n, --line-number print line number with output lines\n"
-" -H, --with-filename print the filename for each match\n"
-" -h, --no-filename suppress the prefixing filename on output\n"
-" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
-" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'.\n"
-" -r, --recursive equivalent to --directories=recurse.\n"
-" -L, --files-without-match only print FILE names containing no match\n"
-" -l, --files-with-matches only print FILE names containing matches\n"
-" -c, --count only print a count of matching lines per FILE\n"
-msgstr ""
-
-#: src/grep.c:840
-msgid ""
-"\n"
-"Context control:\n"
-" -B, --before-context=NUM print NUM lines of leading context\n"
-" -A, --after-context=NUM print NUM lines of trailing context\n"
-" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
-" unless overriden by -A or -B\n"
-" -NUM same as --contex=NUM\n"
-" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
-" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
-"\n"
-"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:855
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-
-#: src/grep.c:998 src/grep.c:1005
-msgid "invalid context length argument"
-msgstr ""
-
-#: src/grep.c:1014
-msgid "infalid context length argument"
-msgstr ""
-
-#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
+#: grep.c:654 grep.c:659 grep.c:664
msgid "you may specify only one of -E, -F, or -G"
msgstr "izberete lahko samo eno od izbir: -E, -F ali -G"
@@ -285,37 +39,14 @@ msgstr "izberete lahko samo eno od izbir: -E, -F ali -G"
# opt = getopt(argc, argv, "0123456789A:B:CEFGVX:bce:f:hiLlnqsvwxy"
# grep --help ->
# usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
-#: src/grep.c:1050
+#: grep.c:672
msgid "matcher already specified"
msgstr "vzorec ¾e doloèen"
-#: src/grep.c:1071
-msgid "unknown directories method"
-msgstr ""
-
-#: src/grep.c:1157
-#, c-format
-msgid "grep (GNU grep) %s\n"
-msgstr ""
-
-#: src/grep.c:1159
-msgid ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-msgstr ""
-
-#: src/grep.c:1161
-msgid ""
-"This is free software; see the source for copying conditions. There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-msgstr ""
-
-#: src/obstack.c:467
-#, fuzzy
-msgid "memory exhausted\n"
-msgstr "pomnilnik porabljen"
-
-#~ msgid "(standard input)\n"
-#~ msgstr "(standardni vhod)\n"
+#: grep.c:788 grep.c:811
+msgid "(standard input)"
+msgstr "(standardni vhod)"
-#~ msgid "GNU grep version 2.0"
-#~ msgstr "GNU grep verzija 2.0"
+#: grep.c:819 grep.c:822
+msgid "(standard input)\n"
+msgstr "(standardni vhod)\n"
diff --git a/po/sv.po b/po/sv.po
index 6e58e781..b01ca5b5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1998-11-09 00:40-0500\n"
+"POT-Creation-Date: 1998-04-26 19:31-0400\n"
"PO-Revision-Date: 1998-08-31 16:02-0200\n"
"Last-Translator: Daniel Bergstrom <daniel@bergstrom.net>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -14,11 +14,11 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:766
+#: src/dfa.c:147 src/dfa.c:159 src/dfa.c:172
msgid "Memory exhausted"
msgstr "Minnet slut"
-#: src/dfa.c:452
+#: src/dfa.c:444
msgid "Unfinished \\ escape"
msgstr "Oavslutad \\-sekvens"
@@ -27,32 +27,32 @@ msgstr "Oavslutad \\-sekvens"
#. {M,} - minimum count, maximum is infinity
#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
+#: src/dfa.c:556 src/dfa.c:562 src/dfa.c:573 src/dfa.c:584
msgid "unfinished repeat count"
msgstr "oavslutad repetitionsräknare"
-#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+#: src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
msgid "malformed repeat count"
msgstr "felformaterad repetionsräknare"
-#: 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:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
+#: src/dfa.c:690 src/dfa.c:703 src/dfa.c:704
msgid "Unbalanced ["
msgstr "Obalanserad ["
-#: src/dfa.c:849
+#: src/dfa.c:841
msgid "Unbalanced ("
msgstr "Obalanserad ("
-#: src/dfa.c:970
+#: src/dfa.c:962
msgid "No syntax specified"
msgstr "Ingen specifierad syntax"
-#: src/dfa.c:978
+#: src/dfa.c:970
msgid "Unbalanced )"
msgstr "Obalanserad )"
-#: src/dfa.c:1998
+#: src/dfa.c:1990
msgid "out of memory"
msgstr "minnet slut"
@@ -161,45 +161,36 @@ msgstr "?? getopt returnerade teckenkod 0%o ??\n"
msgid "non-option ARGV-elements: "
msgstr "ARGV-element är inte flaggor: "
-#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
+#: src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "minnet slut"
-#: src/grep.c:324
+#: src/grep.c:293
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: varning: %s: %s\n"
-#: src/grep.c:429 src/grep.c:1222
+#: src/grep.c:392 src/grep.c:1034
msgid "writing output"
msgstr "skriver utdata"
-#: src/grep.c:655
-#, c-format
-msgid "Binary file %s matches\n"
-msgstr ""
-
-#: src/grep.c:670
-msgid "(standard input)"
-msgstr "(standard in)"
-
-#: src/grep.c:800
+#: src/grep.c:597
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Användning: %s [FLAGGA]... MÖNSTER [FIL]...\n"
-#: src/grep.c:801
+#: src/grep.c:598
#, 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:805
+#: src/grep.c:602
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Användning: %s [FLAGGA]... MÖNSTER [FIL]...\n"
-#: src/grep.c:806
+#: src/grep.c:603
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -217,8 +208,7 @@ msgstr ""
"\n"
"Val och tolkning av reguljära uttryck:\n"
" -E, --extended-regexp MÖNSTER är ett utökat reguljärt uttryck\n"
-" -F, --fixed-regexp MÖNSTER är en fixerad sträng separerad med "
-"nyrad\n"
+" -F, --fixed-regexp MÖNSTER är en fixerad sträng separerad med nyrad\n"
" -G, --basic-regexp MÖNSTER är ett enkelt reguljärt uttryck\n"
" -e, --regexp=MÖNSTER använd MÖNSTER som ett reguljärt uttryck\n"
" -f, --file=FIL hämta MÖNSTER från FIL\n"
@@ -226,7 +216,7 @@ msgstr ""
" -w, --word-regexp tvinga MÖNSTER att endast matcha hela ord\n"
" -x, --line-regexp tvinga MÖNSTER att endast matcha hela rader\n"
-#: src/grep.c:818
+#: src/grep.c:615
msgid ""
"\n"
"Miscellaneous:\n"
@@ -242,8 +232,7 @@ msgstr ""
" -V, --version visa versionsinformation och avsluta\n"
" --help visa detta hjälpmeddelande och avsluta\n"
-#: src/grep.c:825
-#, fuzzy
+#: src/grep.c:622
msgid ""
"\n"
"Output control:\n"
@@ -252,10 +241,6 @@ msgid ""
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" -a, --text do not suppress binary output\n"
-" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'.\n"
-" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -269,19 +254,16 @@ msgstr ""
" -q, --quiet, --silent undvik all normal utskrift\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"
+" -c, --count skriv för varje FIL bara ut antal träffade rader\n"
-#: src/grep.c:840
-#, fuzzy
+#: src/grep.c:633
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"
-" -NUM same as --contex=NUM\n"
+" -NUM same as both -B NUM and -A NUM\n"
+" -C, --context same as -2\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -305,48 +287,30 @@ msgstr ""
"två FILer är angivna, sätts flaggan -h. Programmet returnerar 0 om något\n"
"matchar, 1 om inget matchade och 2 vid syntaxfel eller systemrelaterade fel\n"
-#: src/grep.c:855
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:647
+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:998 src/grep.c:1005
+#: src/grep.c:785 src/grep.c:792
msgid "invalid context length argument"
msgstr "ogiltigt argument till -A, -B eller -C"
-#: src/grep.c:1014
-#, fuzzy
-msgid "infalid context length argument"
-msgstr "ogiltigt argument till -A, -B eller -C"
-
-#: src/grep.c:1021 src/grep.c:1026 src/grep.c:1031
-msgid "you may specify only one of -E, -F, or -G"
-msgstr ""
-
-#: src/grep.c:1050
msgid "matcher already specified"
msgstr "söksträng redan specificerad"
-#: src/grep.c:1071
-msgid "unknown directories method"
-msgstr ""
-
-#: src/grep.c:1157
+#: src/grep.c:915
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1159
-msgid ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-msgstr ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+#: src/grep.c:917
+msgid "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1161
+#: src/grep.c:919
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"
@@ -355,9 +319,14 @@ msgstr ""
"finns INGEN garanti, inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT\n"
"SPECIELLT ÄNDAMÅL.\n"
+#: src/grep.c:964 src/grep.c:1015
+msgid "(standard input)"
+msgstr "(standard in)"
+
+#: src/grep.c:1027 src/grep.c:1030
+msgid "(standard input)\n"
+msgstr "(standard in)\n"
+
#: src/obstack.c:467
msgid "memory exhausted\n"
msgstr "minnet slut\n"
-
-#~ msgid "(standard input)\n"
-#~ msgstr "(standard in)\n"