summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorsimonb <simonb@NetBSD.org>1999-02-20 11:17:58 +0000
committersimonb <simonb@NetBSD.org>1999-02-20 11:17:58 +0000
commit5eed3256fef185d234bec6f2543fb4ebc94dd4e6 (patch)
tree7d77c0e30670aafea22806f782e855faca16e34b /gnu
parentcc6252b08bed099900fee954efabc89458925a1b (diff)
Import GNU grep 2.3
Diffstat (limited to 'gnu')
-rw-r--r--gnu/dist/grep/ChangeLog42
-rw-r--r--gnu/dist/grep/Makefile.am2
-rw-r--r--gnu/dist/grep/Makefile.in2
-rw-r--r--gnu/dist/grep/PATCHES-AC11
-rw-r--r--gnu/dist/grep/aclocal.m4128
-rwxr-xr-xgnu/dist/grep/configure142
-rw-r--r--gnu/dist/grep/configure.in6
-rw-r--r--gnu/dist/grep/doc/Makefile.in6
-rw-r--r--gnu/dist/grep/doc/stamp-vti6
-rw-r--r--gnu/dist/grep/doc/version.texi6
-rw-r--r--gnu/dist/grep/po/ChangeLog5
-rw-r--r--gnu/dist/grep/po/cat-id-tbl.c2
-rw-r--r--gnu/dist/grep/po/de.gmobin6040 -> 6040 bytes
-rw-r--r--gnu/dist/grep/po/de.po52
-rw-r--r--gnu/dist/grep/po/el.gmobin6070 -> 9801 bytes
-rw-r--r--gnu/dist/grep/po/el.po316
-rw-r--r--gnu/dist/grep/po/es.gmobin6042 -> 9983 bytes
-rw-r--r--gnu/dist/grep/po/es.po80
-rw-r--r--gnu/dist/grep/po/fr.gmobin6080 -> 10069 bytes
-rw-r--r--gnu/dist/grep/po/fr.po79
-rw-r--r--gnu/dist/grep/po/grep.pot48
-rw-r--r--gnu/dist/grep/po/ko.gmobin3700 -> 3700 bytes
-rw-r--r--gnu/dist/grep/po/ko.po54
-rw-r--r--gnu/dist/grep/po/nl.gmobin819 -> 819 bytes
-rw-r--r--gnu/dist/grep/po/nl.po54
-rw-r--r--gnu/dist/grep/po/no.gmobin5670 -> 5670 bytes
-rw-r--r--gnu/dist/grep/po/no.po52
-rw-r--r--gnu/dist/grep/po/pl.gmobin5748 -> 5748 bytes
-rw-r--r--gnu/dist/grep/po/pl.po52
-rw-r--r--gnu/dist/grep/po/ru.gmobin5688 -> 5688 bytes
-rw-r--r--gnu/dist/grep/po/ru.po54
-rw-r--r--gnu/dist/grep/po/sl.gmobin779 -> 779 bytes
-rw-r--r--gnu/dist/grep/po/sl.po56
-rw-r--r--gnu/dist/grep/po/sv.gmobin5622 -> 5622 bytes
-rw-r--r--gnu/dist/grep/po/sv.po52
-rw-r--r--gnu/dist/grep/src/dosbuf.c11
-rw-r--r--gnu/dist/grep/src/egrepmat.c4
-rw-r--r--gnu/dist/grep/src/fgrepmat.c4
-rw-r--r--gnu/dist/grep/src/grepmat.c4
-rw-r--r--gnu/dist/grep/src/vms_fab.c4
40 files changed, 745 insertions, 589 deletions
diff --git a/gnu/dist/grep/ChangeLog b/gnu/dist/grep/ChangeLog
index ff77c36671c..9996fe5c3df 100644
--- a/gnu/dist/grep/ChangeLog
+++ b/gnu/dist/grep/ChangeLog
@@ -1,3 +1,45 @@
+1999-02-14 Alain Magloire
+
+ * m4/gettext.m4 : Guard [] with changequote.
+ From Elie Zaretskii.
+
+ * djgpp/config.bat : Makefile.in.in --> Makefile.in-in
+ From Elie Zaretskii.
+
+ * src/dosbuf: k&r function parameter.
+
+ * release of 2.3.
+
+1999-02-10 Alain Magloire
+
+ * bootstrap/{Makefile{try,am},REAMDE} : skeleton
+ provided for system lacking the tools to autoconfigure.
+
+ * src/{e,f,}grepmat.c: added guard [HAVE_CONFIG_H]
+
+1999-02-10 Alain Magloire
+
+ * PATCHES-AC, PATCHES-AM: updated.
+
+ * m4/regex.m4 : updated.
+
+1999-02-05 Eli Zaretskii
+
+ * m4/gettext.m4 : Support DOS-style D:/foo/bar absolute file
+ names.
+
+ * aclocal.m4 (DJGPP) : Use $DJ_GPP instead, since changing the
+ latter prevents GCC from finding headers and libraries.
+
+ * djgpp/config.bat: Make building from another directory work
+
+ * djgpp/config.sed: Remove redundant command wich edited path
+ separator: now done by configure.
+
+ * src/grep.c [O_BINARY]: Add prototype for undossify_input.
+
+ * doc/grep.texi (Introduction): Typo fixed.
+
1999-02-03 Alain Magloire
* grep-2.2f beta release.
diff --git a/gnu/dist/grep/Makefile.am b/gnu/dist/grep/Makefile.am
index 59bbf263079..271c44cf235 100644
--- a/gnu/dist/grep/Makefile.am
+++ b/gnu/dist/grep/Makefile.am
@@ -2,6 +2,6 @@
AUTOMAKE_OPTIONS = no-dependencies
ACLOCAL_AMFLAGS = --acdir=m4
-SUBDIRS = intl po doc src tests djgpp m4 vms
+SUBDIRS = intl po doc src tests djgpp m4 vms bootstrap
EXTRA_DIST = TODO README PATCHES-AC
diff --git a/gnu/dist/grep/Makefile.in b/gnu/dist/grep/Makefile.in
index c10ac6e0aca..f7b9e00f2d4 100644
--- a/gnu/dist/grep/Makefile.in
+++ b/gnu/dist/grep/Makefile.in
@@ -91,7 +91,7 @@ l = @l@
AUTOMAKE_OPTIONS = no-dependencies
ACLOCAL_AMFLAGS = --acdir=m4
-SUBDIRS = intl po doc src tests djgpp m4 vms
+SUBDIRS = intl po doc src tests djgpp m4 vms bootstrap
EXTRA_DIST = TODO README PATCHES-AC
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/gnu/dist/grep/PATCHES-AC b/gnu/dist/grep/PATCHES-AC
index b8c6c124c35..766899d1263 100644
--- a/gnu/dist/grep/PATCHES-AC
+++ b/gnu/dist/grep/PATCHES-AC
@@ -53,7 +53,7 @@
diff -ur ../autoconf-2.13.orig/acgeneral.m4 ./acgeneral.m4
--- ../autoconf-2.13.orig/acgeneral.m4 Tue Jan 5 08:27:37 1999
-+++ ./acgeneral.m4 Wed Jan 27 22:50:54 1999
++++ ./acgeneral.m4 Tue Feb 9 22:27:34 1999
@@ -636,6 +636,9 @@
esac
done
@@ -150,6 +150,15 @@ diff -ur ../autoconf-2.13.orig/acgeneral.m4 ./acgeneral.m4
sed -e "$ac_comsub
s%@configure_input@%$configure_input%g
s%@srcdir@%$srcdir%g
+@@ -2359,7 +2367,7 @@
+ echo creating $ac_file
+
+ rm -f conftest.frag conftest.in conftest.out
+- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
++ ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%g" -e "s%^%$ac_given_srcdir/%"`
+ cat $ac_file_inputs > conftest.in
+
+ EOF
@@ -2483,7 +2491,7 @@
case "$srcdir" in
diff --git a/gnu/dist/grep/aclocal.m4 b/gnu/dist/grep/aclocal.m4
index bff6ce2d72d..c1083d43fe9 100644
--- a/gnu/dist/grep/aclocal.m4
+++ b/gnu/dist/grep/aclocal.m4
@@ -482,11 +482,13 @@ strdup __argz_count __argz_stringify __argz_next])
dnl be included in po/Makefile.
test -d po || mkdir po
if test "x$srcdir" != "x."; then
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+ changequote(, )dnl
+ if test "x`echo $srcdir | sed -e 's@^[A-z]:@@' -e 's@/.*@@'`" = "x"; then
posrcprefix="$srcdir/"
else
posrcprefix="../$srcdir/"
fi
+ changequote([, ])dnl
else
posrcprefix="../"
fi
@@ -608,7 +610,7 @@ AC_REQUIRE([AC_MINGW32])
AC_REQUIRE([AC_DJGPP])
AC_MSG_CHECKING([for environ variable separator])
AC_CACHE_VAL(ac_cv_sep,
-[if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$DJGPP" = yes ; then
+[if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$DJ_GPP" = yes ; then
ac_cv_sep=yes
else
ac_cv_sep=no
@@ -618,72 +620,82 @@ test x"$ac_cv_sep" = xyes && SEP=";"
AC_MSG_RESULT(${SEP})
AC_SUBST(SEP)])
-dnl Check for DJGPP. we use DJ_GPP a the variable
+dnl Check for DJGPP. we use DJ_GPP as the variable
dnl EXEEXXT
AC_DEFUN(AC_DJGPP,
[AC_CACHE_CHECK(for DJGPP environment, ac_cv_djgpp,
[AC_TRY_COMPILE(,[ return __DJGPP__;],
ac_cv_djgpp=yes, ac_cv_djgpp=no)
rm -f conftest*])
-DJGPP=
-test "$ac_cv_djgpp" = yes && DJGPP=yes])
-
-dnl Even packages that don't use regex.c can use this macro.
-dnl Of course, for them it doesn't do anything.
-dnl Derived from code in GNU fileutils ;-).
-
-AC_DEFUN(AM_INCLUDED_REGEX,
-[AC_REQUIRE([AM_GLIBC])
-AC_CACHE_CHECK([whether compiling regex.c], ac_cv_included_regex,
-[
-# By default, don't use the included regex.c on systems with glibc 2
-if test x"$ac_cv_glibc" = xyes ; then
- default=no
-else
- default=yes
-fi
+DJ_GPP=
+test "$ac_cv_djgpp" = yes && DJ_GPP=yes])
+
+#serial 5
+
+dnl Initially derived from code in GNU grep.
+dnl Mostly written by Jim Meyering.
+
+dnl Usage: jm_INCLUDED_REGEX([lib/regex.c])
+dnl
+AC_DEFUN(jm_INCLUDED_REGEX,
+ [
+ dnl Even packages that don't use regex.c can use this macro.
+ dnl Of course, for them it doesn't do anything.
+
+ # Assume we'll default to using the included regex.c.
+ ac_use_included_regex=yes
+
+ # However, if the system regex support is good enough that it passes the
+ # the following run test, then default to *not* using the included regex.c.
+ # If cross compiling, assume the test would fail and use the included
+ # regex.c. The failing regular expression is from `Spencer ere test #75'
+ # in grep-2.3.
+ AC_CACHE_CHECK([for working re_compile_pattern],
+ jm_cv_func_working_re_compile_pattern,
+ AC_TRY_RUN(
+ changequote(<<, >>)dnl
+ <<
+#include <stdio.h>
+#include <regex.h>
+ int
+ main ()
+ {
+ static struct re_pattern_buffer regex;
+ const char *s;
+ re_set_syntax (RE_SYNTAX_POSIX_EGREP);
+ /* Add this third left square bracket, [, to balance the
+ three right ones below. Otherwise autoconf-2.14 chokes. */
+ s = re_compile_pattern ("a[[:]:]]b\n", 9, &regex);
+ /* This should fail with _Invalid character class name_ error. */
+ exit (s ? 0 : 1);
+ }
+ >>,
+ changequote([, ])dnl
+
+ jm_cv_func_working_re_compile_pattern=yes,
+ jm_cv_func_working_re_compile_pattern=no,
+ dnl When crosscompiling, assume it's broken.
+ jm_cv_func_working_re_compile_pattern=no))
+ if test $jm_cv_func_working_re_compile_pattern = yes; then
+ ac_use_included_regex=no
+ fi
+
+ test -n "$1" || AC_MSG_ERROR([missing argument])
+ syscmd([test -f $1])
+ ifelse(sysval, 0,
+ [
+
AC_ARG_WITH(included-regex,
[ --without-included-regex don't compile regex; this is the default on
systems with version 2 of the GNU C library
(use with caution on other system)],
- ac_cv_included_regex=$withval,
- ac_cv_included_regex=$default)
-if test x"$ac_cv_included_regex" = xyes; then
- LIBOBJS="$LIBOBJS regex.${ac_objext}"
-fi
-AC_SUBST(LIBOBJS)dnl
-])])
-
-dnl From Gordon Matzigkeit.
-dnl Test for the GNU C Library.
-dnl FIXME: this should migrate into libit.
-
-AC_DEFUN(AM_GLIBC,
- [
- AC_CACHE_CHECK(whether we are using the GNU C Library,
- ac_cv_gnu_library,
- [AC_EGREP_CPP([Thanks for using GNU],
- [
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- Thanks for using GNU
-#endif
- ],
- ac_cv_gnu_library=yes,
- ac_cv_gnu_library=no)
- ]
- )
- AC_CACHE_CHECK(for version 2 of the GNU C Library,
- ac_cv_glibc,
- [AC_EGREP_CPP([Thanks for using GNU too],
- [
-#include <features.h>
-#ifdef __GLIBC__
- Thanks for using GNU too
-#endif
- ],
- ac_cv_glibc=yes, ac_cv_glibc=no)
- ]
+ jm_with_regex=$withval,
+ jm_with_regex=$ac_use_included_regex)
+ if test "$jm_with_regex" = yes; then
+ AC_SUBST(LIBOBJS)
+ LIBOBJS="$LIBOBJS regex.$ac_objext"
+ fi
+ ],
)
]
)
diff --git a/gnu/dist/grep/configure b/gnu/dist/grep/configure
index 4ccee783d6a..5468ed7df94 100755
--- a/gnu/dist/grep/configure
+++ b/gnu/dist/grep/configure
@@ -710,7 +710,7 @@ fi
PACKAGE=grep
-VERSION=2.2f
+VERSION=2.3
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -3840,12 +3840,12 @@ fi
test -d po || mkdir po
if test "x$srcdir" != "x."; then
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+ if test "x`echo $srcdir | sed -e 's@^[A-z]:@@' -e 's@/.*@@'`" = "x"; then
posrcprefix="$srcdir/"
else
posrcprefix="../$srcdir/"
fi
- else
+ else
posrcprefix="../"
fi
rm -f po/POTFILES
@@ -3969,8 +3969,8 @@ rm -f conftest*
fi
echo "$ac_t""$ac_cv_djgpp" 1>&6
-DJGPP=
-test "$ac_cv_djgpp" = yes && DJGPP=yes
+DJ_GPP=
+test "$ac_cv_djgpp" = yes && DJ_GPP=yes
@@ -3979,7 +3979,7 @@ echo "configure:3979: checking for environ variable separator" >&5
if eval "test \"`echo '$''{'ac_cv_sep'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$DJGPP" = yes ; then
+ if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$DJ_GPP" = yes ; then
ac_cv_sep=yes
else
ac_cv_sep=no
@@ -4050,96 +4050,82 @@ ac_objext=$ac_cv_objext
- echo $ac_n "checking whether we are using the GNU C Library""... $ac_c" 1>&6
-echo "configure:4055: checking whether we are using the GNU C Library" >&5
-if eval "test \"`echo '$''{'ac_cv_gnu_library'+set}'`\" = set"; then
+
+ # Assume we'll default to using the included regex.c.
+ ac_use_included_regex=yes
+
+ # However, if the system regex support is good enough that it passes the
+ # the following run test, then default to *not* using the included regex.c.
+ # If cross compiling, assume the test would fail and use the included
+ # regex.c. The failing regular expression is from `Spencer ere test #75'
+ # in grep-2.3.
+ echo $ac_n "checking for working re_compile_pattern""... $ac_c" 1>&6
+echo "configure:4064: checking for working re_compile_pattern" >&5
+if eval "test \"`echo '$''{'jm_cv_func_working_re_compile_pattern'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext <<EOF
-#line 4060 "configure"
-#include "confdefs.h"
-
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- Thanks for using GNU
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "Thanks for using GNU" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_gnu_library=yes
-else
- rm -rf conftest*
- ac_cv_gnu_library=no
-fi
-rm -f conftest*
-
-
-
-fi
-
-echo "$ac_t""$ac_cv_gnu_library" 1>&6
- echo $ac_n "checking for version 2 of the GNU C Library""... $ac_c" 1>&6
-echo "configure:4085: checking for version 2 of the GNU C Library" >&5
-if eval "test \"`echo '$''{'ac_cv_glibc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ if test "$cross_compiling" = yes; then
+ jm_cv_func_working_re_compile_pattern=no
else
cat > conftest.$ac_ext <<EOF
-#line 4090 "configure"
+#line 4072 "configure"
#include "confdefs.h"
-
-#include <features.h>
-#ifdef __GLIBC__
- Thanks for using GNU too
-#endif
+
+#include <stdio.h>
+#include <regex.h>
+ int
+ main ()
+ {
+ static struct re_pattern_buffer regex;
+ const char *s;
+ re_set_syntax (RE_SYNTAX_POSIX_EGREP);
+ /* Add this third left square bracket, , to balance the
+ three right ones below. Otherwise autoconf-2.14 chokes. */
+ s = re_compile_pattern ("a[[:]:]b\n", 9, &regex);
+ /* This should fail with _Invalid character class name_ error. */
+ exit (s ? 0 : 1);
+ }
EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "Thanks for using GNU too" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_glibc=yes
+if { (eval echo configure:4091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+
+ jm_cv_func_working_re_compile_pattern=yes
else
- rm -rf conftest*
- ac_cv_glibc=no
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ jm_cv_func_working_re_compile_pattern=no
+fi
+rm -fr conftest*
fi
-rm -f conftest*
-
-
fi
-echo "$ac_t""$ac_cv_glibc" 1>&6
-
+echo "$ac_t""$jm_cv_func_working_re_compile_pattern" 1>&6
+ if test $jm_cv_func_working_re_compile_pattern = yes; then
+ ac_use_included_regex=no
+ fi
+ test -n "src/regex.c" || { echo "configure: error: missing argument" 1>&2; exit 1; }
+
+
-echo $ac_n "checking whether compiling regex.c""... $ac_c" 1>&6
-echo "configure:4118: checking whether compiling regex.c" >&5
-if eval "test \"`echo '$''{'ac_cv_included_regex'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
-# By default, don't use the included regex.c on systems with glibc 2
-if test x"$ac_cv_glibc" = xyes ; then
- default=no
-else
- default=yes
-fi
# Check whether --with-included-regex or --without-included-regex was given.
if test "${with_included_regex+set}" = set; then
withval="$with_included_regex"
- ac_cv_included_regex=$withval
+ jm_with_regex=$withval
else
- ac_cv_included_regex=$default
+ jm_with_regex=$ac_use_included_regex
fi
-if test x"$ac_cv_included_regex" = xyes; then
- LIBOBJS="$LIBOBJS regex.${ac_objext}"
-fi
-
-fi
+ if test "$jm_with_regex" = yes; then
+
+ LIBOBJS="$LIBOBJS regex.$ac_objext"
+ fi
+
+
-echo "$ac_t""$ac_cv_included_regex" 1>&6
trap '' 1 2 15
cat > confcache <<\EOF
@@ -4242,7 +4228,7 @@ done
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr `echo "Makefile src/Makefile tests/Makefile po/Makefile.in intl/Makefile doc/Makefile m4/Makefile djgpp/Makefile vms/Makefile config.h:config.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile src/Makefile tests/Makefile po/Makefile.in intl/Makefile doc/Makefile m4/Makefile djgpp/Makefile vms/Makefile bootstrap/Makefile config.h:config.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -4356,7 +4342,7 @@ EOF
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile tests/Makefile po/Makefile.in intl/Makefile doc/Makefile m4/Makefile djgpp/Makefile vms/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile tests/Makefile po/Makefile.in intl/Makefile doc/Makefile m4/Makefile djgpp/Makefile vms/Makefile bootstrap/Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -4453,7 +4439,7 @@ for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
echo creating $ac_file
rm -f conftest.frag conftest.in conftest.out
- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+ ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%g" -e "s%^%$ac_given_srcdir/%"`
cat $ac_file_inputs > conftest.in
EOF
diff --git a/gnu/dist/grep/configure.in b/gnu/dist/grep/configure.in
index 6279efe0ddb..6aad8b542c9 100644
--- a/gnu/dist/grep/configure.in
+++ b/gnu/dist/grep/configure.in
@@ -8,7 +8,7 @@ AC_DEFINE(GREP)
AC_PREREQ(2.13)
dnl Automake stuff.
-AM_INIT_AUTOMAKE(grep, 2.2f)
+AM_INIT_AUTOMAKE(grep, 2.3)
AM_CONFIG_HEADER(config.h:config.hin)
dnl Checks for programs.
@@ -75,6 +75,6 @@ AC_OBJEXT
dnl some folks ask for this, that's fine by me
dnl hope they know what they're doing ...
dnl if glibc2 regex is not included
-AM_INCLUDED_REGEX
+jm_INCLUDED_REGEX(src/regex.c)
-AC_OUTPUT(Makefile src/Makefile tests/Makefile po/Makefile.in intl/Makefile doc/Makefile m4/Makefile djgpp/Makefile vms/Makefile, [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile; echo timestamp > stamp-h])
+AC_OUTPUT(Makefile src/Makefile tests/Makefile po/Makefile.in intl/Makefile doc/Makefile m4/Makefile djgpp/Makefile vms/Makefile bootstrap/Makefile, [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile; echo timestamp > stamp-h])
diff --git a/gnu/dist/grep/doc/Makefile.in b/gnu/dist/grep/doc/Makefile.in
index e5b74de2673..77103148a74 100644
--- a/gnu/dist/grep/doc/Makefile.in
+++ b/gnu/dist/grep/doc/Makefile.in
@@ -164,7 +164,7 @@ DVIPS = dvips
&& $(MAKEINFO) `echo $< | sed 's,.*/,,'`
.texi.dvi:
- TEXINPUTS=.$(sep)$$TEXINPUTS \
+ TEXINPUTS=".$(sep)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
.texi:
@@ -183,7 +183,7 @@ DVIPS = dvips
&& $(MAKEINFO) `echo $< | sed 's,.*/,,'`
.texinfo.dvi:
- TEXINPUTS=.$(sep)$$TEXINPUTS \
+ TEXINPUTS=".$(sep)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
.txi.info:
@@ -192,7 +192,7 @@ DVIPS = dvips
&& $(MAKEINFO) `echo $< | sed 's,.*/,,'`
.txi.dvi:
- TEXINPUTS=.$(sep)$$TEXINPUTS \
+ TEXINPUTS=".$(sep)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
.txi:
diff --git a/gnu/dist/grep/doc/stamp-vti b/gnu/dist/grep/doc/stamp-vti
index 341dba1f795..ace04912de6 100644
--- a/gnu/dist/grep/doc/stamp-vti
+++ b/gnu/dist/grep/doc/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 2 December 1998
-@set EDITION 2.2f
-@set VERSION 2.2f
+@set UPDATED 10 February 1999
+@set EDITION 2.3
+@set VERSION 2.3
diff --git a/gnu/dist/grep/doc/version.texi b/gnu/dist/grep/doc/version.texi
index 341dba1f795..ace04912de6 100644
--- a/gnu/dist/grep/doc/version.texi
+++ b/gnu/dist/grep/doc/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 2 December 1998
-@set EDITION 2.2f
-@set VERSION 2.2f
+@set UPDATED 10 February 1999
+@set EDITION 2.3
+@set VERSION 2.3
diff --git a/gnu/dist/grep/po/ChangeLog b/gnu/dist/grep/po/ChangeLog
index 7d2a22d81bb..0873b63491d 100644
--- a/gnu/dist/grep/po/ChangeLog
+++ b/gnu/dist/grep/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/gnu/dist/grep/po/cat-id-tbl.c b/gnu/dist/grep/po/cat-id-tbl.c
index 7003c3e317a..f21e69612d1 100644
--- a/gnu/dist/grep/po/cat-id-tbl.c
+++ b/gnu/dist/grep/po/cat-id-tbl.c
@@ -104,7 +104,7 @@ Report bugs to <bug-gnu-utils@gnu.org>.\n", 45},
{"matcher already specified", 48},
{"unknown directories method", 49},
{"grep (GNU grep) %s\n", 50},
- {"Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n", 51},
+ {"Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n", 51},
{"\
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", 52},
diff --git a/gnu/dist/grep/po/de.gmo b/gnu/dist/grep/po/de.gmo
index 7d296869aba..a95d8d6ccab 100644
--- a/gnu/dist/grep/po/de.gmo
+++ b/gnu/dist/grep/po/de.gmo
Binary files differ
diff --git a/gnu/dist/grep/po/de.po b/gnu/dist/grep/po/de.po
index 0a1885c1a16..02f234c6266 100644
--- a/gnu/dist/grep/po/de.po
+++ b/gnu/dist/grep/po/de.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 1999-02-14 12:08-0500\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,7 +13,7 @@ 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:858
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:861
msgid "Memory exhausted"
msgstr "Virtueller Speicher erschöpft."
@@ -162,49 +162,49 @@ msgstr "?? getopt ergab Zeichen 0%o ??\n"
msgid "non-option ARGV-elements: "
msgstr "Nicht-Options-ARGV-Elemente: "
-#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/grep.c:172 src/grep.c:189 src/grep.c:291 src/grep.c:347 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "Virtueller Speicher erschöpft."
-#: src/grep.c:372 src/grep.c:843
+#: src/grep.c:375 src/grep.c:846
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: Warnung: %s: %s\n"
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:500 src/grep.c:1321
msgid "writing output"
msgstr "schreibe Ausgabe"
-#: src/grep.c:726
+#: src/grep.c:729
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:742
+#: src/grep.c:745
msgid "(standard input)"
msgstr "(Standardeingabe)"
-#: src/grep.c:844
+#: src/grep.c:847
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:895
+#: src/grep.c:898
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI]...\n"
-#: src/grep.c:896
+#: src/grep.c:899
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "»%s --help« gibt Ihnen mehr Informationen.\n"
-#: src/grep.c:900
+#: src/grep.c:903
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI] ...\n"
-#: src/grep.c:901
+#: src/grep.c:904
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -232,7 +232,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:913
+#: src/grep.c:916
msgid ""
"\n"
"Miscellaneous:\n"
@@ -248,7 +248,7 @@ msgstr ""
" -V, --version Versionnummer ausgeben und beenden.\n"
" --help Diese Hilfe ausgeben und beenden.\n"
-#: src/grep.c:920
+#: src/grep.c:923
#, fuzzy
msgid ""
"\n"
@@ -279,7 +279,7 @@ msgstr ""
" -c, --count Nur Zahl der passenden Zeilen pro Datei "
"ausgeben.\n"
-#: src/grep.c:935
+#: src/grep.c:938
#, fuzzy
msgid ""
"\n"
@@ -313,7 +313,7 @@ msgstr ""
"Weniger als zwei DATEIen implizieren -h. Status ist 0 bei \n"
"Übereinstimmungen, 1 ohne, 2 bei Syntax- oder Systemfehlern.\n"
-#: src/grep.c:950
+#: src/grep.c:953
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -321,34 +321,34 @@ msgstr ""
"\n"
"Fehlerberichte bitte an <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1096 src/grep.c:1103 src/grep.c:1112
msgid "invalid context length argument"
msgstr "Ungültige Kontextlänge."
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+#: src/grep.c:1119 src/grep.c:1124 src/grep.c:1129
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:1145
+#: src/grep.c:1148
msgid "matcher already specified"
msgstr "Vergleicher ist bereits festgelegt."
-#: src/grep.c:1166
+#: src/grep.c:1169
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1252
+#: src/grep.c:1255
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1254
+#: src/grep.c:1257
#, fuzzy
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
msgstr ""
"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1256
+#: src/grep.c:1259
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"
@@ -362,9 +362,5 @@ msgstr ""
msgid "memory exhausted\n"
msgstr "Virtueller Speicher erschöpft.\n"
-#, fuzzy
-#~ msgid "infalid context length argument"
-#~ msgstr "Ungültige Kontextlänge."
-
#~ msgid "(standard input)\n"
#~ msgstr "(Standardeingabe)\n"
diff --git a/gnu/dist/grep/po/el.gmo b/gnu/dist/grep/po/el.gmo
index 59761512ede..27df9e4515a 100644
--- a/gnu/dist/grep/po/el.gmo
+++ b/gnu/dist/grep/po/el.gmo
Binary files differ
diff --git a/gnu/dist/grep/po/el.po b/gnu/dist/grep/po/el.po
index 0083996abe1..96ea4236eb2 100644
--- a/gnu/dist/grep/po/el.po
+++ b/gnu/dist/grep/po/el.po
@@ -1,29 +1,35 @@
-# 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.2f.
+# 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: 1999-02-03 13:09-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.2f\n"
+"POT-Creation-Date: 1999-02-14 12:08-0500\n"
+"PO-Revision-Date: 1999-02-09 00:25+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:858
+#
+# src/dfa.c:147 src/dfa.c:159 src/dfa.c:172
+# src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:827
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:861
msgid "Memory exhausted"
msgstr "Ç ìíÞìç åîáíôëÞèçêå"
-# src/dfa.c:444
+#
+# src/dfa.c:444
+# src/dfa.c:452
#: src/dfa.c: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
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
@@ -33,216 +39,292 @@ msgstr "Ìç ôåñìáôéóìÝíïò ÷áñáêôÞñáò äéáöõãÞò \\"
msgid "unfinished repeat count"
msgstr "ìç ôåñìáôéóìÝíïò ìåôñçôÞò åðáíÜëçøçò"
-# src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
+#
+# 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:577 src/dfa.c:591 src/dfa.c: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: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: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:841
+#
+# src/dfa.c:841
+# src/dfa.c:849
#: src/dfa.c:849
msgid "Unbalanced ("
msgstr "Ìç éóïññïðçìÝíï ("
-# src/dfa.c:962
+#
+# src/dfa.c:962
+# src/dfa.c:970
#: src/dfa.c:970
msgid "No syntax specified"
msgstr "Äåí ïñßóôçêå óõíôáêôéêü"
-# src/dfa.c:970
+#
+# src/dfa.c:970
+# src/dfa.c:978
#: src/dfa.c:978
msgid "Unbalanced )"
msgstr "Ìç éóïññïðçìÝíï )"
-# src/dfa.c:1990
+#
+# src/dfa.c:1990
+# src/dfa.c:1998
#: src/dfa.c:1998
msgid "out of memory"
msgstr "åîáíôëÞèçêå ç ìíÞìç"
-# src/getopt.c:628
+#
+# src/getopt.c:628
+# src/getopt.c:628
#: src/getopt.c: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
#, 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
#, 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
#, 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
#. --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
#. +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
#. 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
#, 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
#. 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
#, 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
#, 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
#, c-format
msgid "option %s"
msgstr "åðéëïãÞ %s"
-# src/getopt1.c:134
+#
+# src/getopt1.c:134
+# src/getopt1.c:134
#: src/getopt1.c: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
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
#, 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
msgid "option a\n"
msgstr "åðéëïãÞ á\n"
-# src/getopt1.c:159
+#
+# src/getopt1.c:159
+# src/getopt1.c:159
#: src/getopt1.c:159
msgid "option b\n"
msgstr "åðéëïãÞ â\n"
-# src/getopt1.c:163
+#
+# src/getopt1.c:163
+# src/getopt1.c:163
#: src/getopt1.c:163
#, 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
#, 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
#, 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
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:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 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
+# src/grep.c:164 src/grep.c:181 src/grep.c:283 src/grep.c:338 src/kwset.c:184
+# src/kwset.c:190
+#: src/grep.c:172 src/grep.c:189 src/grep.c:291 src/grep.c:347 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "ç ìíÞìç åîáíôëÞèçêå"
-# src/grep.c:293
-#: src/grep.c:372 src/grep.c:843
+#
+# src/grep.c:293
+# src/grep.c:366
+#: src/grep.c:375 src/grep.c:846
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: ðñïåéäïðïßçóç: %s: %s\n"
-# src/grep.c:392 src/grep.c:1034
-#: src/grep.c:497 src/grep.c:1318
+#
+# src/grep.c:392 src/grep.c:1034
+# src/grep.c:487 src/grep.c:1284
+#: src/grep.c:500 src/grep.c:1321
msgid "writing output"
msgstr "åããñáöÞ áðïôåëÝóìáôïò"
-#: src/grep.c:726
+#
+# src/grep.c:715
+#: src/grep.c:729
#, c-format
msgid "Binary file %s matches\n"
-msgstr ""
+msgstr "Äõáäéêü áñ÷åßï %s ôáéñéÜóìáôá\n"
-# src/grep.c:964 src/grep.c:1015
-#: src/grep.c:742
+#
+# src/grep.c:964 src/grep.c:1015
+# src/grep.c:730
+#: src/grep.c:745
msgid "(standard input)"
msgstr "(óôÜíôáñô åßóïäïò)"
-#: src/grep.c:844
+#
+# src/grep.c:844
+#: src/grep.c:847
msgid "recursive directory loop"
-msgstr ""
+msgstr "áíáäñïìéêÞ áëëçëïäéáäï÷Þ êáôáëüãùí"
-# src/grep.c:597
-#: src/grep.c:895
+#
+# src/grep.c:597
+# src/grep.c:862
+#: src/grep.c:898
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... Ó×ÇÌÁÔÉÓÌÏÓ [ÁÑ×ÅÉÏ]...\n"
-# src/grep.c:598
-#: src/grep.c:896
+#
+# src/grep.c:598
+# src/grep.c:863
+#: src/grep.c:899
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n"
-# src/grep.c:602
-#: src/grep.c:900
+#
+# src/grep.c:602
+# src/grep.c:867
+#: src/grep.c:903
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... Ó×ÇÌÁÔÉÓÌÏÓ [ÁÑ×ÅÉÏ] ...\n"
-# src/grep.c:603
-#: src/grep.c:901
+#
+# src/grep.c:603
+# src/grep.c:868
+#: src/grep.c:904
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -273,8 +355,10 @@ msgstr ""
" -x, --line-regexp åðéâïëÞ ôïõ force PATTERN íá ôáéñéÜæåé ìüíï "
"ïëüêëçñåò ãñáììÝò\n"
-# src/grep.c:615
-#: src/grep.c:913
+#
+# src/grep.c:615
+# src/grep.c:880
+#: src/grep.c:916
msgid ""
"\n"
"Miscellaneous:\n"
@@ -290,9 +374,10 @@ msgstr ""
" -V, --version åìöÜíéóçò ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
" --help åìöÜíéóçò áõôÞò ôçò âïÞèåéáò êáé Ýîïäïò\n"
-# src/grep.c:622
-#: src/grep.c:920
-#, fuzzy
+#
+# src/grep.c:622
+# src/grep.c:887
+#: src/grep.c:923
msgid ""
"\n"
"Output control:\n"
@@ -311,23 +396,29 @@ 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"
" -q, --quiet, --silent áðïöõãÞ åìöÜíéóçò üëçò ôçò êáíïíéêÞò åîüäïõ\n"
+" -a, --text íá ìçí áðïöåõ÷èåß ç Ýîïäïò äõáäéêþí äåäïìÝíùí\n"
+" -d, --directories=ÅÍÅÑÃÅÉÁ ôñüðïò ÷ñÞóçò ôùí êáôáëüãùí\n"
+" Ç ÅÍÅÑÃÅÉÁ åßíáé 'read', 'recurse' Þ 'skip'.\n"
+" (Ãéá áíÜãíùóç, áíáäñïìÞ êáé ðáñÜêáìøç "
+"áíôßóôïé÷á).\n"
+" -r, --recursive éóïäýíáìï ìå --directories=recurse.\n"
" -L, --files-without-match åìöÜíéóç ìüíï ôá ïíüìáôá ÁÑ×ÅÉÙÍ ðïõ äåí "
"ðåñéÝ÷ïõí ôáéñéÜóìáôá\n"
" -l, --files-with-matches åìöÜíéóç ìüíï ôá ïíüìáôá ÁÑ×ÅÉÙÍ ìå ôáéñéÜóìáôá\n"
-" -c, --count åìöÜíéóç ìüíï ôï óõíïëéêü áñéèìü ôùí ãñáììþí ìå "
+" -c, --count åìöÜíéóç ìüíï ôïí áñéèìü ôùí ãñáììþí ìå "
"ôáéñéÜóìáôá ãéá êÜèå ÁÑ×ÅÉÏ\n"
-# src/grep.c:633
-#: src/grep.c:935
-#, fuzzy
+#
+# src/grep.c:633
+# src/grep.c:902
+#: src/grep.c:938
msgid ""
"\n"
"Context control:\n"
@@ -350,8 +441,10 @@ msgstr ""
"ðåñéå÷üìåíï\n"
" -A, --after-context=ÁÑÉÈÌÏÓ åìöÜíéóç ÁÑÉÈÌÏÓ ãñáììþí ìå ðñïðïñåõüìåíï "
"ðåñéå÷üìåíï\n"
-" -NUM ôï ßäéï ìå -B ÁÑÉÈÌÏÓ êáé -A ÁÑÉÈÌÏÓ\n"
-" -C, --context ôï ßäéï ìå -2\n"
+" -C, --context[=ÁÑÉÈÌÏÓ] åìöÜíéóç ÁÑÉÈÌÏÓ (åî ïñéóìïý 2) ãñáììþí ìå "
+"ðåñéå÷üìåíï åîüäïõ\n"
+" åêôüò êé áí áíáéñåèåß ìå -A Þ -B\n"
+" -NUM ôï ßäéï ìå --context=ÁÑÉÈÌÏÓ\n"
" -U, --binary íá ìçí áðáëåßöïíôáé ÷áñáêôÞñåò CR óôï EOL "
"(MSDOS)\n"
" -u, --unix-byte-offsets áíáöïñÜ ó÷åôéêþí èÝóåùí óáí íá ìçí õðÞñ÷áí "
@@ -361,11 +454,13 @@ msgstr ""
"×ùñßò ÁÑ×ÅÉÏ Þ üôáí ôï ÁÑ×ÅÉÏ åßíáé -, áíÜãíùóç áðü óôÜíôáñô åßóïäï.\n"
"Áí äßíïíôáé ëéãüôåñá áðü äýï ÁÑ×ÅÉÁ, èåþñçóå üôé äßíåôáé -h. ¸îïäïò ìå 0 "
"üôáí õðÜñ÷åé ôáßñéáóìá,\n"
-"äéáöïñåôéêÜ ìå 1. ¸îïäïò ìå 2 óôç ðåñßðôùóç óõíôáêôéêþí óöáëìÜôùí Þ "
+"äéáöïñåôéêÜ ìå 1. ¸îïäïò ìå 2 óôçí ðåñßðôùóç óõíôáêôéêþí óöáëìÜôùí Þ "
"óöáëìÜôùí óõóôÞìáôïò.\n"
-# src/grep.c:647
-#: src/grep.c:950
+#
+# src/grep.c:647
+# src/grep.c:917
+#: src/grep.c:953
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -373,40 +468,53 @@ msgstr ""
"\n"
"Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
-# src/grep.c:785 src/grep.c:792
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#
+# src/grep.c:785 src/grep.c:792
+# src/grep.c:1060 src/grep.c:1067 src/grep.c:1076
+#: src/grep.c:1096 src/grep.c:1103 src/grep.c:1112
msgid "invalid context length argument"
msgstr "ìç Ýãêõñï üñéóìá ìÞêïõò ðåñéå÷ïìÝíïõ"
-# src/grep.c:800 src/grep.c:805 src/grep.c:810
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+#
+# src/grep.c:800 src/grep.c:805 src/grep.c:810
+# src/grep.c:1083 src/grep.c:1088 src/grep.c:1093
+#: src/grep.c:1119 src/grep.c:1124 src/grep.c:1129
msgid "you may specify only one of -E, -F, or -G"
msgstr "ìðïñåßôå íá ïñßóåôå ìüíï Ýíá áðü ôá-E, -F Þ -G"
-# src/grep.c:829
-#: src/grep.c:1145
+#
+# src/grep.c:829
+# src/grep.c:1112
+#: src/grep.c:1148
msgid "matcher already specified"
msgstr "ôï óôïé÷åßï ðïõ ðñüêåéôáé íá áíáæçôçèåß, Ý÷åé Þäç ïñéóôåß"
-#: src/grep.c:1166
+#
+# src/grep.c:1133
+#: src/grep.c:1169
msgid "unknown directories method"
-msgstr ""
+msgstr "Üãíùóôç ìÝèïäïò êáôáëüãùí"
-# src/grep.c:915
-#: src/grep.c:1252
+#
+# src/grep.c:915
+# src/grep.c:1219
+#: src/grep.c:1255
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-# src/grep.c:917
-#: src/grep.c:1254
+#
+# src/grep.c:917
+# src/grep.c:1221
+#: src/grep.c:1257
#, fuzzy
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
-msgstr ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 1992-1997, Free Software Foundation, Inc.\n"
-# src/grep.c:919
-#: src/grep.c:1256
+#
+# src/grep.c:919
+# src/grep.c:1223
+#: src/grep.c:1259
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"
@@ -416,16 +524,14 @@ msgstr ""
"ÄÅÍ õðÜñ÷åé åããýçóç· ïýôå áêüìá ãéá ×ÑÇÓÉÌÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ\n"
"ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n"
-# src/obstack.c:467
+#
+# src/obstack.c:467
+# src/obstack.c:467
#: src/obstack.c:467
msgid "memory exhausted\n"
msgstr "ç ìíÞìç åîáíôëÞèçêå\n"
-# src/grep.c:785 src/grep.c:792
-#, fuzzy
-#~ msgid "infalid context length argument"
-#~ msgstr "ìç Ýãêõñï üñéóìá ìÞêïõò ðåñéå÷ïìÝíïõ"
-
-# src/grep.c:1027 src/grep.c:1030
+#
+# src/grep.c:1027 src/grep.c:1030
#~ msgid "(standard input)\n"
-#~ msgstr "(óôÜíôáñô åßóïäïò)\n"
+#~ msgstr "(êáíïíéêÞ åßóïäïò)\n"
diff --git a/gnu/dist/grep/po/es.gmo b/gnu/dist/grep/po/es.gmo
index e507b4cf61b..c876bc9dcde 100644
--- a/gnu/dist/grep/po/es.gmo
+++ b/gnu/dist/grep/po/es.gmo
Binary files differ
diff --git a/gnu/dist/grep/po/es.po b/gnu/dist/grep/po/es.po
index 3c6da5e618f..5da3da44a34 100644
--- a/gnu/dist/grep/po/es.po
+++ b/gnu/dist/grep/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: 1999-02-03 13:09-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-14 12:08-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:858
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:861
msgid "Memory exhausted"
msgstr "Memoria agotada"
@@ -162,50 +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:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/grep.c:172 src/grep.c:189 src/grep.c:291 src/grep.c:347 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "memoria agotada"
-#: src/grep.c:372 src/grep.c:843
+#: src/grep.c:375 src/grep.c:846
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: atención: %s: %s\n"
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:500 src/grep.c:1321
msgid "writing output"
msgstr "escribiendo el resultado"
-#: src/grep.c:726
+#: src/grep.c:729
#, c-format
msgid "Binary file %s matches\n"
-msgstr ""
+msgstr "Coincidencia en el fichero binario %s\n"
-#: src/grep.c:742
+#: src/grep.c:745
msgid "(standard input)"
msgstr "(entrada estándar)"
-#: src/grep.c:844
+#: src/grep.c:847
msgid "recursive directory loop"
-msgstr ""
+msgstr "bucle de directorio recursivo"
-#: src/grep.c:895
+#: src/grep.c:898
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Modo de empleo: %s [OPCIÓN]... PATRÓN [FICHERO]...\n"
-#: src/grep.c:896
+#: src/grep.c:899
#, 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:900
+#: src/grep.c:903
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Modo de empleo: %s [OPCIÓN]... PATRÓN [FICHERO] ...\n"
-#: src/grep.c:901
+#: src/grep.c:904
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -234,7 +234,7 @@ msgstr ""
" -x, --line-regexp obliga a que PATRÓN coincida solamente\n"
" con líneas completas\n"
-#: src/grep.c:913
+#: src/grep.c:916
msgid ""
"\n"
"Miscellaneous:\n"
@@ -250,8 +250,7 @@ msgstr ""
" -V, --version muestra la versión y finaliza\n"
" --help muestra esta ayuda y finaliza\n"
-#: src/grep.c:920
-#, fuzzy
+#: src/grep.c:923
msgid ""
"\n"
"Output control:\n"
@@ -279,6 +278,10 @@ msgstr ""
" -h, --no-filename suprime los nombres de los ficheros en\n"
" el resultado\n"
" -q, --quiet, --silent suprime todo el resultado normal\n"
+" -a, --text no suprime el resultado binario\n"
+" -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"
@@ -287,8 +290,7 @@ msgstr ""
"coinciden\n"
" por cada FICHERO\n"
-#: src/grep.c:935
-#, fuzzy
+#: src/grep.c:938
msgid ""
"\n"
"Context control:\n"
@@ -309,8 +311,9 @@ msgstr ""
"Control del contexto:\n"
" -B, --before-context=NÚM muestra NÚM líneas de contexto anterior\n"
" -A, --after-context=NÚM muestra NÚM líneas de contexto posterior\n"
-" -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"
@@ -325,7 +328,7 @@ msgstr ""
"es\n"
"2 si hay errores de sintaxis o del sistema.\n"
-#: src/grep.c:950
+#: src/grep.c:953
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -333,11 +336,11 @@ msgstr ""
"\n"
"Comunicar `bugs' a <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1096 src/grep.c:1103 src/grep.c:1112
msgid "invalid context length argument"
msgstr "longitud de contexto inválida"
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+#: src/grep.c:1119 src/grep.c:1124 src/grep.c:1129
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"
@@ -352,26 +355,27 @@ 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:1145
+#: src/grep.c:1148
msgid "matcher already specified"
msgstr "la expresión a buscar ya fue especificada"
-#: src/grep.c:1166
+# Nota: Se refiere a la opción --directories=ACCIÓN cuando ACCIÓN
+# no es `read', `recurse' o `skip'.
+#: src/grep.c:1169
msgid "unknown directories method"
-msgstr ""
+msgstr "método de directorios desconocido"
-#: src/grep.c:1252
+#: src/grep.c:1255
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1254
+#: src/grep.c:1257
#, fuzzy
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
-msgstr ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
-#: src/grep.c:1256
+#: src/grep.c:1259
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"
@@ -384,10 +388,6 @@ msgstr ""
msgid "memory exhausted\n"
msgstr "memoria agotada\n"
-#, fuzzy
-#~ msgid "infalid context length argument"
-#~ msgstr "longitud de contexto inválida"
-
#~ msgid "(standard input)\n"
#~ msgstr "(salida estándar)\n"
diff --git a/gnu/dist/grep/po/fr.gmo b/gnu/dist/grep/po/fr.gmo
index e177ffb9bc4..9db88af1b24 100644
--- a/gnu/dist/grep/po/fr.gmo
+++ b/gnu/dist/grep/po/fr.gmo
Binary files differ
diff --git a/gnu/dist/grep/po/fr.po b/gnu/dist/grep/po/fr.po
index d5bf275fb8d..21fd98fb028 100644
--- a/gnu/dist/grep/po/fr.po
+++ b/gnu/dist/grep/po/fr.po
@@ -4,16 +4,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1999-02-03 13:09-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-14 12:08-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:858
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:861
msgid "Memory exhausted"
msgstr "Mémoire épuisée."
@@ -160,49 +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:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/grep.c:172 src/grep.c:189 src/grep.c:291 src/grep.c:347 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "Mémoire épuisée."
-#: src/grep.c:372 src/grep.c:843
+#: src/grep.c:375 src/grep.c:846
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: AVERTISSEMENT: %s: %s\n"
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:500 src/grep.c:1321
msgid "writing output"
msgstr "Génération du résultat."
-#: src/grep.c:726
+#: src/grep.c:729
#, c-format
msgid "Binary file %s matches\n"
-msgstr ""
+msgstr "Fichier binaire %s concorde\n"
-#: src/grep.c:742
+#: src/grep.c:745
msgid "(standard input)"
msgstr "(entrée standard)"
-#: src/grep.c:844
+#: src/grep.c:847
msgid "recursive directory loop"
-msgstr ""
+msgstr "boucle récursive sur le répertoire"
-#: src/grep.c:895
+#: src/grep.c:898
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Usage: %s [OPTION]... PATRON [FICHIER]...\n"
-#: src/grep.c:896
+#: src/grep.c:899
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
-#: src/grep.c:900
+#: src/grep.c:903
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Usage: %s [OPTION]... PATRON [FICHIER] ...\n"
-#: src/grep.c:901
+#: src/grep.c:904
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -231,7 +231,7 @@ msgstr ""
" -x, --line-regexp forcer l'appariement du PATRON que sur des "
"lignes entières\n"
-#: src/grep.c:913
+#: src/grep.c:916
msgid ""
"\n"
"Miscellaneous:\n"
@@ -247,8 +247,7 @@ msgstr ""
" -V, --version afficher le nom et la version du logiciel\n"
" --help afficher l'aide et quitter\n"
-#: src/grep.c:920
-#, fuzzy
+#: src/grep.c:923
msgid ""
"\n"
"Output control:\n"
@@ -276,6 +275,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"
@@ -283,8 +287,7 @@ msgstr ""
" -c, --count afficher seulement le décompte des lignes\n"
" concordantes par fichier\n"
-#: src/grep.c:935
-#, fuzzy
+#: src/grep.c:938
msgid ""
"\n"
"Context control:\n"
@@ -305,10 +308,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"
@@ -319,7 +323,7 @@ msgstr ""
"est implicite. Termine avec 0 s'il y a concordance avec 1 si aucune.\n"
"Termine avec 2 s'il y a des erreurs de syntaxe ou du système.\n"
-#: src/grep.c:950
+#: src/grep.c:953
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -327,36 +331,35 @@ msgstr ""
"\n"
"Rapporter toutes anomalies à <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1096 src/grep.c:1103 src/grep.c:1112
msgid "invalid context length argument"
msgstr "paramètre de contexte de longueur invalide"
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+#: src/grep.c:1119 src/grep.c:1124 src/grep.c:1129
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:1145
+#: src/grep.c:1148
msgid "matcher already specified"
msgstr "L'opérateur de concordance a déjà été spécifié."
-#: src/grep.c:1166
+#: src/grep.c:1169
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:1252
+#: src/grep.c:1255
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep de GNU %s\n"
-#: src/grep.c:1254
+#: src/grep.c:1257
#, fuzzy
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
-msgstr ""
-"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
-#: src/grep.c:1256
+#: src/grep.c:1259
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"
@@ -369,10 +372,6 @@ msgstr ""
msgid "memory exhausted\n"
msgstr "Mémoire épuisée.\n"
-#, fuzzy
-#~ msgid "infalid context length argument"
-#~ msgstr "paramètre de contexte de longueur invalide"
-
#~ msgid "(standard input)\n"
#~ msgstr "(entrée standard)\n"
diff --git a/gnu/dist/grep/po/grep.pot b/gnu/dist/grep/po/grep.pot
index 19d401d1085..2eb971bb7e1 100644
--- a/gnu/dist/grep/po/grep.pot
+++ b/gnu/dist/grep/po/grep.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 1999-02-14 12:08-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:861
msgid "Memory exhausted"
msgstr ""
@@ -161,49 +161,49 @@ msgstr ""
msgid "non-option ARGV-elements: "
msgstr ""
-#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/grep.c:172 src/grep.c:189 src/grep.c:291 src/grep.c:347 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr ""
-#: src/grep.c:372 src/grep.c:843
+#: src/grep.c:375 src/grep.c:846
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr ""
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:500 src/grep.c:1321
msgid "writing output"
msgstr ""
-#: src/grep.c:726
+#: src/grep.c:729
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:742
+#: src/grep.c:745
msgid "(standard input)"
msgstr ""
-#: src/grep.c:844
+#: src/grep.c:847
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:895
+#: src/grep.c:898
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr ""
-#: src/grep.c:896
+#: src/grep.c:899
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: src/grep.c:900
+#: src/grep.c:903
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr ""
-#: src/grep.c:901
+#: src/grep.c:904
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -218,7 +218,7 @@ msgid ""
" -x, --line-regexp force PATTERN to match only whole lines\n"
msgstr ""
-#: src/grep.c:913
+#: src/grep.c:916
msgid ""
"\n"
"Miscellaneous:\n"
@@ -228,7 +228,7 @@ msgid ""
" --help display this help and exit\n"
msgstr ""
-#: src/grep.c:920
+#: src/grep.c:923
msgid ""
"\n"
"Output control:\n"
@@ -246,7 +246,7 @@ msgid ""
" -c, --count only print a count of matching lines per FILE\n"
msgstr ""
-#: src/grep.c:935
+#: src/grep.c:938
msgid ""
"\n"
"Context control:\n"
@@ -264,38 +264,38 @@ msgid ""
"Exit with 2 if syntax errors or system errors.\n"
msgstr ""
-#: src/grep.c:950
+#: src/grep.c:953
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1096 src/grep.c:1103 src/grep.c:1112
msgid "invalid context length argument"
msgstr ""
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+#: src/grep.c:1119 src/grep.c:1124 src/grep.c:1129
msgid "you may specify only one of -E, -F, or -G"
msgstr ""
-#: src/grep.c:1145
+#: src/grep.c:1148
msgid "matcher already specified"
msgstr ""
-#: src/grep.c:1166
+#: src/grep.c:1169
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1252
+#: src/grep.c:1255
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr ""
-#: src/grep.c:1254
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+#: src/grep.c:1257
+msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
msgstr ""
-#: src/grep.c:1256
+#: src/grep.c:1259
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/gnu/dist/grep/po/ko.gmo b/gnu/dist/grep/po/ko.gmo
index 7d3e8d61f98..ebb0191f955 100644
--- a/gnu/dist/grep/po/ko.gmo
+++ b/gnu/dist/grep/po/ko.gmo
Binary files differ
diff --git a/gnu/dist/grep/po/ko.po b/gnu/dist/grep/po/ko.po
index 8b9f1708940..d3c57561d48 100644
--- a/gnu/dist/grep/po/ko.po
+++ b/gnu/dist/grep/po/ko.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.0f\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 1999-02-14 12:08-0500\n"
"PO-Revision-Date: 1997-09-03 11:19+0900\n"
"Last-Translator: Bang Jun-Young <bangjy@geocities.com>\n"
"Language-Team: Korean <ko@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-KR\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:861
msgid "Memory exhausted"
msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
@@ -160,49 +160,49 @@ msgstr "?? getopt°¡ ¹®ÀÚ ÄÚµå 0%o¸¦ µ¹·ÁÁÖ¾ú½À´Ï´Ù ??\n"
msgid "non-option ARGV-elements: "
msgstr "ºñ¿É¼Ç ARGV ¿ø¼Ò: "
-#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/grep.c:172 src/grep.c:189 src/grep.c:291 src/grep.c:347 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
-#: src/grep.c:372 src/grep.c:843
+#: src/grep.c:375 src/grep.c:846
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: °æ°í: %s: %s\n"
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:500 src/grep.c:1321
msgid "writing output"
msgstr "Ãâ·ÂÀ» ±â·ÏÇϰí ÀÖ½À´Ï´Ù"
-#: src/grep.c:726
+#: src/grep.c:729
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:742
+#: src/grep.c:745
msgid "(standard input)"
msgstr "(Ç¥ÁØ ÀÔ·Â)"
-#: src/grep.c:844
+#: src/grep.c:847
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:895
+#: src/grep.c:898
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "»ç¿ë¹ý: %s [¿É¼Ç]... ÆÐÅÏ [ÆÄÀÏ]...\n"
-#: src/grep.c:896
+#: src/grep.c:899
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ.\n"
-#: src/grep.c:900
+#: src/grep.c:903
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "»ç¿ë¹ý: %s [¿É¼Ç]... ÆÐÅÏ [ÆÄÀÏ] ...\n"
-#: src/grep.c:901
+#: src/grep.c:904
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -217,7 +217,7 @@ msgid ""
" -x, --line-regexp force PATTERN to match only whole lines\n"
msgstr ""
-#: src/grep.c:913
+#: src/grep.c:916
msgid ""
"\n"
"Miscellaneous:\n"
@@ -227,7 +227,7 @@ msgid ""
" --help display this help and exit\n"
msgstr ""
-#: src/grep.c:920
+#: src/grep.c:923
msgid ""
"\n"
"Output control:\n"
@@ -245,7 +245,7 @@ msgid ""
" -c, --count only print a count of matching lines per FILE\n"
msgstr ""
-#: src/grep.c:935
+#: src/grep.c:938
msgid ""
"\n"
"Context control:\n"
@@ -263,41 +263,41 @@ msgid ""
"Exit with 2 if syntax errors or system errors.\n"
msgstr ""
-#: src/grep.c:950
+#: src/grep.c:953
#, fuzzy
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "¹®Á¦Á¡Àº <bug0gnu-utils@prep.ai.mit.edu>·Î º¸°íÇØ ÁֽʽÿÀ.\n"
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1096 src/grep.c:1103 src/grep.c:1112
msgid "invalid context length argument"
msgstr ""
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+#: src/grep.c:1119 src/grep.c:1124 src/grep.c:1129
msgid "you may specify only one of -E, -F, or -G"
msgstr "-E, -F, -G Áß¿¡¼­ Çϳª¸¸ ÁöÁ¤ÇÒ ¼ö ÀÖ½À´Ï´Ù"
-#: src/grep.c:1145
+#: src/grep.c:1148
msgid "matcher already specified"
msgstr "¦ÀÌ ÀÌ¹Ì ÁöÁ¤µÇ¾úÀ½"
-#: src/grep.c:1166
+#: src/grep.c:1169
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1252
+#: src/grep.c:1255
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1254
+#: src/grep.c:1257
#, fuzzy
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
msgstr ""
"ÀúÀÛ±Ç (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1256
+#: src/grep.c:1259
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"
@@ -310,9 +310,6 @@ msgstr ""
msgid "memory exhausted\n"
msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²\n"
-#~ msgid "(standard input)\n"
-#~ msgstr "(Ç¥ÁØ ÀÔ·Â)\n"
-
#~ msgid "Regexp selection and interpretation:\n"
#~ msgstr "Á¤±Ô½Ä ¼±Åðú ÇØ¼®:\n"
@@ -419,3 +416,6 @@ msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²\n"
#~ msgid "If no -[GEF], then -G is assumed.\n"
#~ msgstr "-[GEF]°¡ ÁÖ¾îÁöÁö ¾ÊÀ¸¸é -G·Î °¡Á¤ÇÕ´Ï´Ù.\n"
+
+#~ msgid "(standard input)\n"
+#~ msgstr "(Ç¥ÁØ ÀÔ·Â)\n"
diff --git a/gnu/dist/grep/po/nl.gmo b/gnu/dist/grep/po/nl.gmo
index f4313445987..0cabe5cf2a9 100644
--- a/gnu/dist/grep/po/nl.gmo
+++ b/gnu/dist/grep/po/nl.gmo
Binary files differ
diff --git a/gnu/dist/grep/po/nl.po b/gnu/dist/grep/po/nl.po
index 258d4858fd0..e666047ac2d 100644
--- a/gnu/dist/grep/po/nl.po
+++ b/gnu/dist/grep/po/nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.0\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 1999-02-14 12:08-0500\n"
"PO-Revision-Date: 1996-08-18 11:24 EDT\n"
"Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
"Language-Team: Dutch <nl@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:861
#, fuzzy
msgid "Memory exhausted"
msgstr "geen geheugen meer beschikbaar"
@@ -161,49 +161,49 @@ msgstr ""
msgid "non-option ARGV-elements: "
msgstr ""
-#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/grep.c:172 src/grep.c:189 src/grep.c:291 src/grep.c:347 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "geen geheugen meer beschikbaar"
-#: src/grep.c:372 src/grep.c:843
+#: src/grep.c:375 src/grep.c:846
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: let op: %s: %s\n"
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:500 src/grep.c:1321
msgid "writing output"
msgstr "schrijven van uitvoer"
-#: src/grep.c:726
+#: src/grep.c:729
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:742
+#: src/grep.c:745
msgid "(standard input)"
msgstr "(standaardinvoer)"
-#: src/grep.c:844
+#: src/grep.c:847
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:895
+#: src/grep.c:898
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr ""
-#: src/grep.c:896
+#: src/grep.c:899
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: src/grep.c:900
+#: src/grep.c:903
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr ""
-#: src/grep.c:901
+#: src/grep.c:904
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -218,7 +218,7 @@ msgid ""
" -x, --line-regexp force PATTERN to match only whole lines\n"
msgstr ""
-#: src/grep.c:913
+#: src/grep.c:916
msgid ""
"\n"
"Miscellaneous:\n"
@@ -228,7 +228,7 @@ msgid ""
" --help display this help and exit\n"
msgstr ""
-#: src/grep.c:920
+#: src/grep.c:923
msgid ""
"\n"
"Output control:\n"
@@ -246,7 +246,7 @@ msgid ""
" -c, --count only print a count of matching lines per FILE\n"
msgstr ""
-#: src/grep.c:935
+#: src/grep.c:938
msgid ""
"\n"
"Context control:\n"
@@ -264,17 +264,17 @@ msgid ""
"Exit with 2 if syntax errors or system errors.\n"
msgstr ""
-#: src/grep.c:950
+#: src/grep.c:953
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1096 src/grep.c:1103 src/grep.c:1112
msgid "invalid context length argument"
msgstr ""
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+#: src/grep.c:1119 src/grep.c:1124 src/grep.c:1129
msgid "you may specify only one of -E, -F, or -G"
msgstr "alleen de volgende opties zijn toegestaan: -E, -F, of -G"
@@ -286,24 +286,24 @@ 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:1145
+#: src/grep.c:1148
msgid "matcher already specified"
msgstr "overeenkomer (matcher FIXME) al gespecificeerd"
-#: src/grep.c:1166
+#: src/grep.c:1169
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1252
+#: src/grep.c:1255
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr ""
-#: src/grep.c:1254
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+#: src/grep.c:1257
+msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
msgstr ""
-#: src/grep.c:1256
+#: src/grep.c:1259
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"
@@ -314,8 +314,8 @@ msgstr ""
msgid "memory exhausted\n"
msgstr "geen geheugen meer beschikbaar"
-#~ msgid "(standard input)\n"
-#~ msgstr "(standaardinvoer)\n"
-
#~ msgid "GNU grep version 2.0"
#~ msgstr "(FIXME) GNU grep version 2.0"
+
+#~ msgid "(standard input)\n"
+#~ msgstr "(standaardinvoer)\n"
diff --git a/gnu/dist/grep/po/no.gmo b/gnu/dist/grep/po/no.gmo
index 30515c9318d..5fc5e077161 100644
--- a/gnu/dist/grep/po/no.gmo
+++ b/gnu/dist/grep/po/no.gmo
Binary files differ
diff --git a/gnu/dist/grep/po/no.po b/gnu/dist/grep/po/no.po
index 0cdbeafc9bb..05d155ae4c1 100644
--- a/gnu/dist/grep/po/no.po
+++ b/gnu/dist/grep/po/no.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 1999-02-14 12:08-0500\n"
"PO-Revision-Date: 1998-08-01 13:45+0200\n"
"Last-Translator: Eivind Tagseth <eivindt@multinet.no>\n"
"Language-Team: Norwegian <no@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:861
msgid "Memory exhausted"
msgstr "Minnet oppbrukt"
@@ -162,49 +162,49 @@ msgstr "?? getopt returnerte tegnverdien 0%o ??\n"
msgid "non-option ARGV-elements: "
msgstr "ARGV-elementer som ikke er flagg: "
-#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/grep.c:172 src/grep.c:189 src/grep.c:291 src/grep.c:347 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "minnet oppbrukt"
-#: src/grep.c:372 src/grep.c:843
+#: src/grep.c:375 src/grep.c:846
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: advarsel: %s: %s\n"
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:500 src/grep.c:1321
msgid "writing output"
msgstr "skriver utdata"
-#: src/grep.c:726
+#: src/grep.c:729
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:742
+#: src/grep.c:745
msgid "(standard input)"
msgstr "(standard inn)"
-#: src/grep.c:844
+#: src/grep.c:847
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:895
+#: src/grep.c:898
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Bruk: %s [FLAGG]... MØNSTER [FIL]...\n"
-#: src/grep.c:896
+#: src/grep.c:899
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv «%s --help» for mer informasjon.\n"
-#: src/grep.c:900
+#: src/grep.c:903
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Bruk: %s [FLAGG]... MØNSTER [FIL] ...\n"
-#: src/grep.c:901
+#: src/grep.c:904
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -232,7 +232,7 @@ msgstr ""
" -w, --word-regexp MØNSTER må stemme overens med hele ord\n"
" -x, --line-regexp MØNSTER må stemme overens med hele linjer\n"
-#: src/grep.c:913
+#: src/grep.c:916
msgid ""
"\n"
"Miscellaneous:\n"
@@ -248,7 +248,7 @@ msgstr ""
" -V, --version vis versioninformasjon og avslutt\n"
" --help vis denne helpeteksten og avslutt\n"
-#: src/grep.c:920
+#: src/grep.c:923
#, fuzzy
msgid ""
"\n"
@@ -281,7 +281,7 @@ msgstr ""
"treff\n"
" per FIL\n"
-#: src/grep.c:935
+#: src/grep.c:938
#, fuzzy
msgid ""
"\n"
@@ -309,7 +309,7 @@ msgstr ""
" -u, --unix-byte-offsets rapporter posisjoner som om CRene ikke var der\n"
" (MSDOS)\n"
-#: src/grep.c:950
+#: src/grep.c:953
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -317,34 +317,34 @@ msgstr ""
"\n"
"Rapportér feil til <bug-gnu-utils@prep.ai.mit.edu>.\n"
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1096 src/grep.c:1103 src/grep.c:1112
msgid "invalid context length argument"
msgstr "ugyldig kontekstlengde"
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+#: src/grep.c:1119 src/grep.c:1124 src/grep.c:1129
msgid "you may specify only one of -E, -F, or -G"
msgstr "du kan bare spesifisere en av -E, -F eller -G"
-#: src/grep.c:1145
+#: src/grep.c:1148
msgid "matcher already specified"
msgstr "søkeuttrykk er allerede spesifisert"
-#: src/grep.c:1166
+#: src/grep.c:1169
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1252
+#: src/grep.c:1255
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1254
+#: src/grep.c:1257
#, fuzzy
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
msgstr ""
"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1256
+#: src/grep.c:1259
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,9 +357,5 @@ msgstr ""
msgid "memory exhausted\n"
msgstr "minnet oppbrukt\n"
-#, fuzzy
-#~ msgid "infalid context length argument"
-#~ msgstr "ugyldig kontekstlengde"
-
#~ msgid "(standard input)\n"
#~ msgstr "(standard inn)\n"
diff --git a/gnu/dist/grep/po/pl.gmo b/gnu/dist/grep/po/pl.gmo
index 53633bb8438..3ffeaf314a6 100644
--- a/gnu/dist/grep/po/pl.gmo
+++ b/gnu/dist/grep/po/pl.gmo
Binary files differ
diff --git a/gnu/dist/grep/po/pl.po b/gnu/dist/grep/po/pl.po
index 74a0230ffad..ddd0756046b 100644
--- a/gnu/dist/grep/po/pl.po
+++ b/gnu/dist/grep/po/pl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 1999-02-14 12:08-0500\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,7 +13,7 @@ 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:858
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:861
msgid "Memory exhausted"
msgstr "Pamiêæ wyczerpana"
@@ -161,49 +161,49 @@ 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:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/grep.c:172 src/grep.c:189 src/grep.c:291 src/grep.c:347 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "pamiêæ wyczerpana"
-#: src/grep.c:372 src/grep.c:843
+#: src/grep.c:375 src/grep.c:846
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: uwaga: %s: %s\n"
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:500 src/grep.c:1321
msgid "writing output"
msgstr "zapisujê wyniki"
-#: src/grep.c:726
+#: src/grep.c:729
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:742
+#: src/grep.c:745
msgid "(standard input)"
msgstr "(standardowe wej¶cie)"
-#: src/grep.c:844
+#: src/grep.c:847
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:895
+#: src/grep.c:898
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "U¿ycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
-#: src/grep.c:896
+#: src/grep.c:899
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Spróbuj `%s --help' dla uzyskania informacji.\n"
-#: src/grep.c:900
+#: src/grep.c:903
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "U¿ycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
-#: src/grep.c:901
+#: src/grep.c:904
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -229,7 +229,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:913
+#: src/grep.c:916
msgid ""
"\n"
"Miscellaneous:\n"
@@ -245,7 +245,7 @@ msgstr ""
" -V, --version wypisz informacjê o wersji i zakoñcz\n"
" --help wy¶wietl tê informacjê i zakoñcz\n"
-#: src/grep.c:920
+#: src/grep.c:923
#, fuzzy
msgid ""
"\n"
@@ -275,7 +275,7 @@ msgstr ""
" -c, --count wypisz tylko ilo¶æ pasuj±cych linii w ka¿dym "
"PLIKu\n"
-#: src/grep.c:935
+#: src/grep.c:938
#, fuzzy
msgid ""
"\n"
@@ -308,7 +308,7 @@ msgstr ""
"pasuje, z 1, je¿eli nie, z 2, je¿eli napotkano b³êdy syntaktyczne lub\n"
"systemowe.\n"
-#: src/grep.c:950
+#: src/grep.c:953
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -316,11 +316,11 @@ msgstr ""
"\n"
"Raporty o b³êdach wysy³aj do bug-gnu-utils@gnu.org.\n"
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1096 src/grep.c:1103 src/grep.c:1112
msgid "invalid context length argument"
msgstr "b³êdny argument d³ugo¶ci kontekstowej"
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+#: src/grep.c:1119 src/grep.c:1124 src/grep.c:1129
msgid "you may specify only one of -E, -F, or -G"
msgstr "mo¿esz podaæ tylko jedn± opcjê z -E -F -G"
@@ -332,26 +332,26 @@ 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:1145
+#: src/grep.c:1148
msgid "matcher already specified"
msgstr "wzorzec ju¿ podany"
-#: src/grep.c:1166
+#: src/grep.c:1169
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1252
+#: src/grep.c:1255
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1254
+#: src/grep.c:1257
#, fuzzy
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
msgstr ""
"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1256
+#: src/grep.c:1259
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"
@@ -366,9 +366,5 @@ msgstr ""
msgid "memory exhausted\n"
msgstr "pamiêæ wyczerpana\n"
-#, fuzzy
-#~ msgid "infalid context length argument"
-#~ msgstr "b³êdny argument d³ugo¶ci kontekstowej"
-
#~ msgid "(standard input)\n"
#~ msgstr "(standardowe wyj¶cie)\n"
diff --git a/gnu/dist/grep/po/ru.gmo b/gnu/dist/grep/po/ru.gmo
index d0726870427..8bd32b200f5 100644
--- a/gnu/dist/grep/po/ru.gmo
+++ b/gnu/dist/grep/po/ru.gmo
Binary files differ
diff --git a/gnu/dist/grep/po/ru.po b/gnu/dist/grep/po/ru.po
index a56d5c76f8f..ea603f076b5 100644
--- a/gnu/dist/grep/po/ru.po
+++ b/gnu/dist/grep/po/ru.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.1.1b\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 1999-02-14 12:08-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,7 +14,7 @@ msgstr ""
"Content-Transfer-Encoding: 8-bit\n"
#
-#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:861
msgid "Memory exhausted"
msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
@@ -161,49 +161,49 @@ msgstr "?? gotopt ×ÅÒÎÕÌ ÓÉÍ×ÏÌ Ó ËÏÄÏÍ 0%o ??\n"
msgid "non-option ARGV-elements: "
msgstr "ARGV-ÜÌÅÍÅÎÔÙ - ÎÅ ÏÐÃÉÉ: "
-#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/grep.c:172 src/grep.c:189 src/grep.c:291 src/grep.c:347 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
-#: src/grep.c:372 src/grep.c:843
+#: src/grep.c:375 src/grep.c:846
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s: %s\n"
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:500 src/grep.c:1321
msgid "writing output"
msgstr "ÚÁÐÉÓÙ×ÁÀ ×ÙÈÏÄÎÙÅ ÄÁÎÎÙÅ"
-#: src/grep.c:726
+#: src/grep.c:729
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:742
+#: src/grep.c:745
msgid "(standard input)"
msgstr "(ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ)"
-#: src/grep.c:844
+#: src/grep.c:847
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:895
+#: src/grep.c:898
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [OPTION]... PATTERN [FILE]...\n"
-#: src/grep.c:896
+#: src/grep.c:899
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
-#: src/grep.c:900
+#: src/grep.c:903
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [OPTION]... PATTERN [FILE] ...\n"
-#: src/grep.c:901
+#: src/grep.c:904
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -230,7 +230,7 @@ msgstr ""
" -w, --word-regexp PATTERN ÄÏÌÖÅÎ ÐÏÄÈÏÄÉÔØ ËÏ ×ÓÅÍÕ ÓÌÏ×Õ\n"
" -x, --line-regexp PATTERN ÄÏÌÖÅÎ ÐÏÄÈÏÄÉÔØ ËÏ ×ÓÅÊ ÓÔÒÏËÅ\n"
-#: src/grep.c:913
+#: src/grep.c:916
msgid ""
"\n"
"Miscellaneous:\n"
@@ -246,7 +246,7 @@ msgstr ""
" -V, --version ÎÁÐÅÞÁÔÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
" --help ÐÏËÁÚÁÔØ ÐÏÍÏÝØ É ×ÙÊÔÉ\n"
-#: src/grep.c:920
+#: src/grep.c:923
#, fuzzy
msgid ""
"\n"
@@ -279,7 +279,7 @@ msgstr ""
" -c, --count ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ËÏÌÉÞÅÓÔ×Ï ÓÏ×ÐÁÄÁÀÝÉÈ ÓÔÒÏË ÎÁ "
"ÆÁÊÌ\n"
-#: src/grep.c:935
+#: src/grep.c:938
#, fuzzy
msgid ""
"\n"
@@ -314,7 +314,7 @@ msgstr ""
"ÓÏ×ÐÁÄÅÎÉÑ,\n"
"Ó 1, ÅÓÌÉ ÎÅÔ. ÷ÙÈÏÄÉÔ Ó 2, ÅÓÌÉ ÅÓÔØ ÓÉÎÔÁËÓÉÞÅÓËÉÏ ÉÌÉ ÓÉÓÔÅÍÎÙÅ ÏÛÉÂËÉ.\n"
-#: src/grep.c:950
+#: src/grep.c:953
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -322,32 +322,32 @@ msgstr ""
"\n"
"ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1096 src/grep.c:1103 src/grep.c:1112
msgid "invalid context length argument"
msgstr ""
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+#: src/grep.c:1119 src/grep.c:1124 src/grep.c:1129
msgid "you may specify only one of -E, -F, or -G"
msgstr "×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÔÏÌØËÏ ÏÄÎÕ ÉÚ -E, -F ÉÌÉ -G"
-#: src/grep.c:1145
+#: src/grep.c:1148
msgid "matcher already specified"
msgstr "ÏÂÒÁÚÅÃ ÕÖÅ ÚÁÄÁÎ"
-#: src/grep.c:1166
+#: src/grep.c:1169
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1252
+#: src/grep.c:1255
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr ""
-#: src/grep.c:1254
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+#: src/grep.c:1257
+msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
msgstr ""
-#: src/grep.c:1256
+#: src/grep.c:1259
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"
@@ -361,9 +361,6 @@ msgstr ""
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"
@@ -410,3 +407,6 @@ msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n"
#~ "ÉÌÉ CHAR. CLASS ÏÄÉÎÏ ÉÚ ÓÌÏ× alnum, alpha, cntrl, digit, graph, lower,\n"
#~ "print, punct, space, upper ÉÌÉ xdigit. ÷ ÓÐÉÓËÅ ÐÒÏÍÅÖÕÔËÏ× ÐÏÍÅÝÁÊÔÅ\n"
#~ "] ÐÅÒ×ÙÍ, - ÐÏÓÌÅÄÎÉÍ É ^ ×ÅÚÄÅ, ËÒÏÍÅ ÐÅÒ×ÏÇÏ.\n"
+
+#~ msgid "(standard input)\n"
+#~ msgstr "(ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ)\n"
diff --git a/gnu/dist/grep/po/sl.gmo b/gnu/dist/grep/po/sl.gmo
index 6873229a0b2..aa2331eb331 100644
--- a/gnu/dist/grep/po/sl.gmo
+++ b/gnu/dist/grep/po/sl.gmo
Binary files differ
diff --git a/gnu/dist/grep/po/sl.po b/gnu/dist/grep/po/sl.po
index 703d22c81b2..eba9aa2f891 100644
--- a/gnu/dist/grep/po/sl.po
+++ b/gnu/dist/grep/po/sl.po
@@ -2,12 +2,12 @@
# Copyright (C) 1996 Free Software Foundation, Inc.
# Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 1996.
#
-# $Header: /cvsroot/src/gnu/dist/grep/po/Attic/sl.po,v 1.1.1.1 1999/02/09 12:38:48 simonb Exp $
+# $Header: /cvsroot/src/gnu/dist/grep/po/Attic/sl.po,v 1.1.1.2 1999/02/20 11:18:03 simonb Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.0\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 1999-02-14 12:08-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,7 +15,7 @@ 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:858
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:861
#, fuzzy
msgid "Memory exhausted"
msgstr "pomnilnik porabljen"
@@ -163,49 +163,49 @@ msgstr ""
msgid "non-option ARGV-elements: "
msgstr ""
-#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/grep.c:172 src/grep.c:189 src/grep.c:291 src/grep.c:347 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "pomnilnik porabljen"
-#: src/grep.c:372 src/grep.c:843
+#: src/grep.c:375 src/grep.c:846
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: pozor: %s: %s\n"
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:500 src/grep.c:1321
msgid "writing output"
msgstr "pisanje rezultatov"
-#: src/grep.c:726
+#: src/grep.c:729
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:742
+#: src/grep.c:745
msgid "(standard input)"
msgstr "(standardni vhod)"
-#: src/grep.c:844
+#: src/grep.c:847
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:895
+#: src/grep.c:898
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr ""
-#: src/grep.c:896
+#: src/grep.c:899
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: src/grep.c:900
+#: src/grep.c:903
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr ""
-#: src/grep.c:901
+#: src/grep.c:904
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -220,7 +220,7 @@ msgid ""
" -x, --line-regexp force PATTERN to match only whole lines\n"
msgstr ""
-#: src/grep.c:913
+#: src/grep.c:916
msgid ""
"\n"
"Miscellaneous:\n"
@@ -230,7 +230,7 @@ msgid ""
" --help display this help and exit\n"
msgstr ""
-#: src/grep.c:920
+#: src/grep.c:923
msgid ""
"\n"
"Output control:\n"
@@ -248,7 +248,7 @@ msgid ""
" -c, --count only print a count of matching lines per FILE\n"
msgstr ""
-#: src/grep.c:935
+#: src/grep.c:938
msgid ""
"\n"
"Context control:\n"
@@ -266,17 +266,17 @@ msgid ""
"Exit with 2 if syntax errors or system errors.\n"
msgstr ""
-#: src/grep.c:950
+#: src/grep.c:953
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1096 src/grep.c:1103 src/grep.c:1112
msgid "invalid context length argument"
msgstr ""
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+#: src/grep.c:1119 src/grep.c:1124 src/grep.c:1129
msgid "you may specify only one of -E, -F, or -G"
msgstr "izberete lahko samo eno od izbir: -E, -F ali -G"
@@ -285,24 +285,24 @@ 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:1145
+#: src/grep.c:1148
msgid "matcher already specified"
msgstr "vzorec ¾e doloèen"
-#: src/grep.c:1166
+#: src/grep.c:1169
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1252
+#: src/grep.c:1255
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr ""
-#: src/grep.c:1254
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+#: src/grep.c:1257
+msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
msgstr ""
-#: src/grep.c:1256
+#: src/grep.c:1259
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"
@@ -313,8 +313,8 @@ msgstr ""
msgid "memory exhausted\n"
msgstr "pomnilnik porabljen"
-#~ msgid "(standard input)\n"
-#~ msgstr "(standardni vhod)\n"
-
#~ msgid "GNU grep version 2.0"
#~ msgstr "GNU grep verzija 2.0"
+
+#~ msgid "(standard input)\n"
+#~ msgstr "(standardni vhod)\n"
diff --git a/gnu/dist/grep/po/sv.gmo b/gnu/dist/grep/po/sv.gmo
index aea5f10c1cf..ddd2b55c0a4 100644
--- a/gnu/dist/grep/po/sv.gmo
+++ b/gnu/dist/grep/po/sv.gmo
Binary files differ
diff --git a/gnu/dist/grep/po/sv.po b/gnu/dist/grep/po/sv.po
index 6b063233f60..c32200ac21b 100644
--- a/gnu/dist/grep/po/sv.po
+++ b/gnu/dist/grep/po/sv.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"POT-Creation-Date: 1999-02-14 12:08-0500\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,7 +14,7 @@ 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:858
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:861
msgid "Memory exhausted"
msgstr "Minnet slut"
@@ -161,49 +161,49 @@ msgstr "?? getopt returnerade teckenkod 0%o ??\n"
msgid "non-option ARGV-elements: "
msgstr "ARGV-element är inte flaggor: "
-#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/grep.c:172 src/grep.c:189 src/grep.c:291 src/grep.c:347 src/kwset.c:184
#: src/kwset.c:190
msgid "memory exhausted"
msgstr "minnet slut"
-#: src/grep.c:372 src/grep.c:843
+#: src/grep.c:375 src/grep.c:846
#, c-format
msgid "%s: warning: %s: %s\n"
msgstr "%s: varning: %s: %s\n"
-#: src/grep.c:497 src/grep.c:1318
+#: src/grep.c:500 src/grep.c:1321
msgid "writing output"
msgstr "skriver utdata"
-#: src/grep.c:726
+#: src/grep.c:729
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:742
+#: src/grep.c:745
msgid "(standard input)"
msgstr "(standard in)"
-#: src/grep.c:844
+#: src/grep.c:847
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:895
+#: src/grep.c:898
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Användning: %s [FLAGGA]... MÖNSTER [FIL]...\n"
-#: src/grep.c:896
+#: src/grep.c:899
#, 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:900
+#: src/grep.c:903
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Användning: %s [FLAGGA]... MÖNSTER [FIL]...\n"
-#: src/grep.c:901
+#: src/grep.c:904
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"\n"
@@ -230,7 +230,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:913
+#: src/grep.c:916
msgid ""
"\n"
"Miscellaneous:\n"
@@ -246,7 +246,7 @@ msgstr ""
" -V, --version visa versionsinformation och avsluta\n"
" --help visa detta hjälpmeddelande och avsluta\n"
-#: src/grep.c:920
+#: src/grep.c:923
#, fuzzy
msgid ""
"\n"
@@ -276,7 +276,7 @@ msgstr ""
" -c, --count skriv för varje FIL bara ut antal träffade "
"rader\n"
-#: src/grep.c:935
+#: src/grep.c:938
#, fuzzy
msgid ""
"\n"
@@ -309,7 +309,7 @@ msgstr ""
"två FILer är angivna, sätts flaggan -h. Programmet returnerar 0 om något\n"
"matchar, 1 om inget matchade och 2 vid syntaxfel eller systemrelaterade fel\n"
-#: src/grep.c:950
+#: src/grep.c:953
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -318,34 +318,34 @@ msgstr ""
"Rapportera buggar till <bug-gnu-utils@gnu.org>.\n"
"Skicka anmärkningar på översättningar till <sv@li.org>\n"
-#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+#: src/grep.c:1096 src/grep.c:1103 src/grep.c:1112
msgid "invalid context length argument"
msgstr "ogiltigt argument till -A, -B eller -C"
-#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+#: src/grep.c:1119 src/grep.c:1124 src/grep.c:1129
msgid "you may specify only one of -E, -F, or -G"
msgstr ""
-#: src/grep.c:1145
+#: src/grep.c:1148
msgid "matcher already specified"
msgstr "söksträng redan specificerad"
-#: src/grep.c:1166
+#: src/grep.c:1169
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1252
+#: src/grep.c:1255
#, c-format
msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1254
+#: src/grep.c:1257
#, fuzzy
-msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
msgstr ""
"Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1256
+#: src/grep.c:1259
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -358,9 +358,5 @@ msgstr ""
msgid "memory exhausted\n"
msgstr "minnet slut\n"
-#, fuzzy
-#~ msgid "infalid context length argument"
-#~ msgstr "ogiltigt argument till -A, -B eller -C"
-
#~ msgid "(standard input)\n"
#~ msgstr "(standard in)\n"
diff --git a/gnu/dist/grep/src/dosbuf.c b/gnu/dist/grep/src/dosbuf.c
index d3ba2f06a43..ff619c42da3 100644
--- a/gnu/dist/grep/src/dosbuf.c
+++ b/gnu/dist/grep/src/dosbuf.c
@@ -31,7 +31,9 @@ static int inp_map_idx = 0, out_map_idx = 1;
/* Guess DOS file type by looking at its contents. */
static inline File_type
-guess_type(char *buf, register size_t buflen)
+guess_type(buf, buflen)
+ char *buf;
+ register size_t buflen;
{
int crlf_seen = 0;
register char *bp = buf;
@@ -57,7 +59,9 @@ guess_type(char *buf, register size_t buflen)
Return the count of characters left in the buffer.
Build table to map character positions when reporting byte counts. */
static inline int
-undossify_input(register char *buf, size_t buflen)
+undossify_input(buf, buflen)
+ register char *buf;
+ size_t buflen;
{
int chars_left = 0;
@@ -146,7 +150,8 @@ undossify_input(register char *buf, size_t buflen)
/* Convert internal byte count into external. */
static inline off_t
-dossified_pos (off_t byteno)
+dossified_pos (byteno)
+ off_t byteno;
{
off_t pos_lo;
off_t pos_hi;
diff --git a/gnu/dist/grep/src/egrepmat.c b/gnu/dist/grep/src/egrepmat.c
index c9fb73ac84b..94f17bc9c09 100644
--- a/gnu/dist/grep/src/egrepmat.c
+++ b/gnu/dist/grep/src/egrepmat.c
@@ -1,4 +1,6 @@
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include "system.h"
#include "grep.h"
char const default_matcher[] = "egrep";
diff --git a/gnu/dist/grep/src/fgrepmat.c b/gnu/dist/grep/src/fgrepmat.c
index 732fe9221ad..32dee082784 100644
--- a/gnu/dist/grep/src/fgrepmat.c
+++ b/gnu/dist/grep/src/fgrepmat.c
@@ -1,4 +1,6 @@
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include "system.h"
#include "grep.h"
char const default_matcher[] = "fgrep";
diff --git a/gnu/dist/grep/src/grepmat.c b/gnu/dist/grep/src/grepmat.c
index bbc008e0241..0ac9913f396 100644
--- a/gnu/dist/grep/src/grepmat.c
+++ b/gnu/dist/grep/src/grepmat.c
@@ -1,4 +1,6 @@
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include "system.h"
#include "grep.h"
char const default_matcher[] = "grep";
diff --git a/gnu/dist/grep/src/vms_fab.c b/gnu/dist/grep/src/vms_fab.c
index a087b9e6cee..8d51e5a6c18 100644
--- a/gnu/dist/grep/src/vms_fab.c
+++ b/gnu/dist/grep/src/vms_fab.c
@@ -12,7 +12,9 @@
#include "vms_fab.h"
void
-vms_fab (int * argp, char **argvp[])
+vms_fab (argp, argvp)
+ int * argp;
+ char **argvp[];
{
extern int optind;
int optout;