Applied patches from Paul Eggert

89 files changed, 5784 insertions, 10871 deletions

diff --git a/.cvsignore b/.cvsignore
index f9ae1800..6e3cafdf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,7 +9,7 @@ config.h.in
 configure
 config.log
 config.status
-stamp-h
+stamp-h1
 config.sub
 config.rpath
 config.guess
diff --git a/ChangeLog b/ChangeLog
index 8991c101..404261c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+2006-08-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port recent fixes for symbolic modes involving X from gnulib,
+	and clarify the documentation in this area.
+	* doc/find.texi: Use "file mode bits" when talking about
+	all the file mode bits (including setuid, setgid, and sticky),
+	and "permissions" when talking only about permissions bits
+	(read, write, execute/search).  Use "execute/search" to
+	talk about the x bit, since it means both.  You do not need
+	permission to the linked-to file to follow a symlink for
+	syscalls like "stat", but you do need search permission for
+	the directories you traverse.  Clarify the explanation of
+	-perm.  Use "that" instead of "which" when "which" isn't
+	quite correct English.
+	(Mode Bits): Renamed from Permissions.  All uses changed.
+	* doc/perm.texi: Sync from coreutils 6.0.
+	* find/defs.h (struct perm_val.val): Now an array of two items,
+	one for non-directories, and one for directories.  This is
+	to handle symbolic modes like +X correctly.
+	* find/parser.c (parse_perm): Likewise.  Also, adjust to
+	latest gnulib interface for mode_adjust.
+	* find/pred.c (pred_perm): Likewise.
+	* find/testsuite/Makefile.am (EXTRA_DIST_XO): Add find.posix/perm-X.xo.
+	(EXTRA_DIST_EXP): Add find.posix/perm-X.exp.
+	* find/testsuite/find.posix/perm-X.exp: New file.
+	* find/testsuite/find.posix/perm-X.so: New file.
+
+12006-08-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port to latest gnulib, and simplify the bootstrapping procedure.
+	* intl: Remove this directory and everything in it.
+	* depcomp, install-sh, missing, mkinstalldirs, doc/texinfo.tex:
+	Remove these files from CVS, as they are now gotten from gnulib.
+	* README-CVS: Don't recommend "autoreconf -i", as it doesn't work
+	for us.
+	* import-gnulib.sh (findutils_files): New var.  Grab this stuff
+	from gnulib.
+	(findutils_modules): Add fopen-safer; remove stdio-safer.  This
+	adjusts to latest gnulib.
+	(modules): Remove obsolete reference to intl_modules.
+	* .cvsignore: Remove stamp-h; add stamp-h1.
+	* doc/.cvsignore: Add regexprops.texi.
+	* find/.cvsignore: Add oldfind.
+	* lib/.cvsignore: Add .deps, regexprops.
+	* m4/.cvsignore: Add Makefile.
+	* po/.cvsignore: Add stamp-po.
+
 2006-08-19  James Youngman <jay@gnu.org>
 
 	* locate/testsuite/config/unix.exp, locate/testsuite/locate.gnu/bigprefix1.exp:
diff --git a/README-CVS b/README-CVS
index f84f310f..618fb3ce 100644
--- a/README-CVS
+++ b/README-CVS
@@ -30,10 +30,6 @@ checked out of CVS, rather than from a released source distribution.
 
 4. Generate the configure scripts and Makefile.in files.
 
-    autoreconf -i
-
-   ... or use the alternative method ... 
-
     aclocal -I m4 -I gnulib/m4     && \
     autoheader			   && \
     autoconf			   && \
diff --git a/depcomp b/depcomp
index 04701da5..ffe5461b 100755
--- a/depcomp
+++ b/depcomp
@@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-07-09.11
+scriptversion=2006-07-09.11
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -276,6 +277,46 @@ icc)
   rm -f "$tmpdepfile"
   ;;
 
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -288,13 +329,13 @@ tru64)
 
    if test "$libtool" = yes; then
       # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
+      # static library.  This mechanism is used in libtool 1.4 series to
       # handle both shared and static libraries in a single compilation.
       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
       #
       # With libtool 1.5 this exception was removed, and libtool now
       # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # compilations output dependencies in $dir.libs/$base.o.d and
       # in $dir$base.o.d.  We have to check for both files, because
       # one of the two compilations can be disabled.  We should prefer
       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
diff --git a/doc/.cvsignore b/doc/.cvsignore
index b1a9b012..e7730941 100644
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -17,5 +17,6 @@ find.ps
 find.toc
 find.tp
 find.vr
+regexprops.texi
 stamp-vti
 version.texi
diff --git a/doc/find.texi b/doc/find.texi
index f00ce7b5..54f3f31f 100644
--- a/doc/find.texi
+++ b/doc/find.texi
@@ -188,7 +188,7 @@ are of a certain type (regular file, directory, symbolic link, etc.);
 @item
 are owned by a certain user or group;
 @item
-have certain access permissions;
+have certain access permissions or special mode bits;
 @item
 contain text that matches a certain pattern;
 @item
@@ -346,7 +346,7 @@ more information about the matching files.
 * Size::
 * Type::
 * Owner::
-* Permissions::
+* Mode Bits::
 * Contents::
 * Directories::
 * Filesystems::
@@ -620,11 +620,12 @@ links listed on the command line are dereferenced, but other symbolic
 links are not.
 
 Symbolic links are different to ``hard links'' in the sense that you
-need permissions upon the linked-to file in order to be able to
+need permission to search the directories
+in the the linked-to file name to
 dereference the link.  This can mean that even if you specify the
 @samp{-L} option, @code{find} may not be able to determine the
 properties of the file that the link points to (because you don't have
-sufficient permissions).  In this situation, @code{find} uses the
+sufficient permission).  In this situation, @code{find} uses the
 properties of the link itself.  This also occurs if a symbolic link
 exists but points to a file that is missing.
 
@@ -1008,10 +1009,10 @@ existing user or group, using the @code{chown} or @code{chgrp}
 program.
 @end deffn
 
-@node Permissions
-@section Permissions
+@node Mode Bits
+@section File Mode Bits
 
-@xref{File Permissions}, for information on how file permissions are
+@xref{File Permissions}, for information on how file mode bits are
 structured and how to specify them.
 
 Four tests determine what users can do with files.  These are
@@ -1052,27 +1053,31 @@ operation; for example, the filesystem might be full.
 @end deffn
 
 @deffn Test -executable
-True if the file can be executed by the invoking user.
+True if the file can be executed/searched by the invoking user.
 @end deffn
 
-@deffn Test -perm mode
+@deffn Test -perm pmode
 
-True if the file's permissions are exactly @var{mode}, which can be
-numeric or symbolic.
+True if the file's mode bits match @var{pmode}, which can be
+either a symbolic or numeric @var{mode} (@pxref{File Permissions})
+optionally prefixed by @samp{-} or @samp{/}.
 
-If @var{mode} starts with @samp{-}, true if
-@emph{all} of the permissions set in @var{mode} are set for the file;
-permissions not set in @var{mode} are ignored.
+A @var{pmode} that starts with neither @samp{-} nor @samp{/} matches
+if @var{mode} exactly matches the file mode bits.
 
-If @var{mode} starts with @samp{/}, true if
-@emph{any} of the permissions set in @var{mode} are set for the file;
-permissions not set in @var{mode} are ignored.
+A @var{pmode} that starts with @samp{-} matches if
+@emph{all} the file mode bits set in @var{mode} are set for the file;
+bits not set in @var{mode} are ignored.
+
+A @var{pmode} that starts with @samp{/} matches if
+@emph{any} of the file mode bits set in @var{mode} are set for the file;
+bits not set in @var{mode} are ignored.
 This is a GNU extension.
 
 If you don't use the @samp{/} or @samp{-} form with a symbolic mode
 string, you may have to specify a rather complex mode string.  For
-example @samp{-perm g=w} will only match files which have mode 0020
-(that is, ones for which group write permission is the only permission
+example @samp{-perm g=w} will only match files that have mode 0020
+(that is, ones for which group write permission is the only file mode bit
 set).  It is more likely that you will want to use the @samp{/} or
 @samp{-} forms, for example @samp{-perm -g=w}, which matches any file
 with group write permission.
@@ -1080,24 +1085,24 @@ with group write permission.
 
 @table @samp
 @item -perm 664
-Match files which have read and write permission for their owner,
-and group, but which the rest of the world can read but not write to.
-Files which meet these criteria but have other permissions bits set
-(for example if someone can execute the file) will not be matched.
+Match files that have read and write permission for their owner,
+and group, but that the rest of the world can read but not write to.
+Do not match files that meet these criteria but have other file mode
+bits set (for example if someone can execute/search the file).
 
 @item -perm -664
-Match files which have read and write permission for their owner,
-and group, but which the rest of the world can read but not write to,
-without regard to the presence of any extra permission bits (for
-example the executable bit).  This will match a file which has mode
+Match files that have read and write permission for their owner,
+and group, but that the rest of the world can read but not write to,
+without regard to the presence of any extra file mode bits (for
+example the executable bit).  This matchs a file with mode
 0777, for example.
 
 @item -perm /222
-Match files which are writable by somebody (their owner, or
+Match files that are writable by somebody (their owner, or
 their group, or anybody else).
 
 @item -perm /022
-Match files which are writable by either their owner or their
+Match files that are writable by either their owner or their
 group.  The files don't have to be writable by both the owner and
 group to be matched; either will do.
 
@@ -1105,16 +1110,16 @@ group to be matched; either will do.
 As above.
 
 @item -perm /g=w,o=w
-As above
+As above.
 
 @item -perm -022
-Search for files which are writable by both their owner and their
+Match files that are writable by both their owner and their
 group.
 
 @item -perm -444 -perm /222 ! -perm /111
-Search for files which are readable for everybody, have at least one
-write bit set (i.e. somebody can write to them), but which cannot be
-executed by anybody.  Note that in some shells the @samp{!} must be
+Match files that are readable for everybody, have at least one
+write bit set (i.e. somebody can write to them), but that cannot be
+executed/searched by anybody.  Note that in some shells the @samp{!} must be
 escaped;.
 
 @item -perm -a+r -perm /a+w ! -perm /a+x
@@ -1491,13 +1496,13 @@ which case 512-byte blocks are used.  @xref{Size}, for how to find
 files based on their size.
 
 @item
-The file's type and permissions.  The type is shown as a dash for a
+The file's type and file mode bits.  The type is shown as a dash for a
 regular file; for other file types, a letter like for @samp{-type} is
-used (@pxref{Type}).  The permissions are read, write, and execute for
+used (@pxref{Type}).  The file mode bits are read, write, and execute/search for
 the file's owner, its group, and other users, respectively; a dash
 means the permission is not granted.  @xref{File Permissions}, for
-more details about file permissions.  @xref{Permissions}, for how to
-find files based on their permissions.
+more details about file permissions.  @xref{Mode Bits}, for how to
+find files based on their file mode bits.
 
 @item
 The number of hard links to the file.
@@ -1666,17 +1671,17 @@ File's user name, or numeric user ID if the user has no name.
 File's numeric user ID.
 @item %m
 @c full support, including # and 0.
-File's permissions (in octal).  If you always want to have a leading
+File's mode bits (in octal).  If you always want to have a leading
 zero on the number, use the '#' format flag, for example '%#m'.  
 
-The permission numbers used are the traditional Unix permission
+The file mode bit numbers used are the traditional Unix
 numbers, which will be as expected on most systems, but if your
-system's permission bit layout differs from the traditional Unix
+system's file mode bit layout differs from the traditional Unix
 semantics, you will see a difference between the mode as printed by
 @samp{%m} and the mode as it appears in @code{struct stat}.
 
 @item %M
-File's permissions (in symbolic form, as for @code{ls}).  This
+File's type and mode bits (in symbolic form, as for @code{ls}).  This
 directive is supported in findutils 4.2.5 and later.
 @end table
 
@@ -4746,4 +4751,3 @@ Expressions}, for more information on expressions.
 @comment LocalWords: su Timar ubins ug unstripped vf VM Weitzel
 @comment LocalWords: wildcard zlogout basename execdir wholename iwholename
 @comment LocalWords: timestamp timestamps Solaris FreeBSD OpenBSD POSIX
-
diff --git a/doc/perm.texi b/doc/perm.texi
index 41b24f6d..f5190730 100644
--- a/doc/perm.texi
+++ b/doc/perm.texi
@@ -1,16 +1,20 @@
-Each file has a set of @dfn{permissions} that control the kinds of
-access that users have to that file.  The permissions for a file are
-also called its @dfn{access mode}.  They can be represented either in
+Each file has a set of @dfn{file mode bits} that control the kinds of
+access that users have to that file.  They can be represented either in
 symbolic form or as an octal number.
 
 @menu
-* Mode Structure::              Structure of file permissions.
-* Symbolic Modes::              Mnemonic permissions representation.
-* Numeric Modes::               Permissions as octal numbers.
+* Mode Structure::              Structure of file mode bits.
+* Symbolic Modes::              Mnemonic representation of file mode bits.
+* Numeric Modes::               File mode bits as octal numbers.
+* Directory Setuid and Setgid:: Set-user-ID and set-group-ID on directories.
 @end menu
 
 @node Mode Structure
-@section Structure of File Permissions
+@section Structure of File Mode Bits
+
+The file mode bits have two parts: the @dfn{file permission bits},
+which control ordinary access to the file, and @dfn{special mode
+bits}, which affect only some files.
 
 There are three kinds of permissions that a user can have for a file:
 
@@ -24,7 +28,7 @@ list the contents of the directory.
 permission to write to (change) the file.  For directories, this means
 permission to create and remove files in the directory.
 @item
-@cindex execute permission
+@cindex execute/search permission
 permission to execute the file (run it as a program).  For directories,
 this means permission to access files in the directory.
 @end enumerate
@@ -50,58 +54,66 @@ file system the file is created on, and the way the file is created.  You
 can change the owner and group of a file by using the @command{chown} and
 @command{chgrp} commands.
 
-In addition to the three sets of three permissions listed above, a
-file's permissions have three special components, which affect only
-executable files (programs) and, on some systems, directories:
+In addition to the three sets of three permissions listed above, the
+file mode bits have three special components, which affect only
+executable files (programs) and, on most systems, directories:
 
 @enumerate
 @item
+@cindex set-user-ID
 @cindex setuid
 Set the process's effective user ID to that of the file upon execution
-(called the @dfn{setuid bit}).  No effect on directories.
+(called the @dfn{set-user-ID bit}, or sometimes the @dfn{setgid bit}).
+For directories on a few systems, give files created in the directory
+the same owner as the directory, no matter who creates them, and set
+the set-user-ID bit of newly-created subdirectories.
 @item
+@cindex set-group-ID
 @cindex setgid
 Set the process's effective group ID to that of the file upon execution
-(called the @dfn{setgid bit}).  For directories on some systems, put
-files created in the directory into the same group as the directory, no
-matter what group the user who creates them is in.
+(called the @dfn{set-group-ID bit}, or sometimes the @dfn{setgid bit}).
+For directories on most systems, give files created in the directory
+the same group as the directory, no matter what group the user who
+creates them is in, and set the set-group-ID bit of newly-created
+subdirectories.
 @item
 @cindex sticky
 @cindex swap space, saving text image in
 @cindex text image, saving in swap space
 @cindex restricted deletion flag
-prevent users from removing or renaming a file in a directory
+Prevent unprivileged users from removing or renaming a file in a directory
 unless they own the file or the directory; this is called the
-@dfn{restricted deletion flag} for the directory.
-For regular files on some systems, save the program's text image on the
+@dfn{restricted deletion flag} for the directory, and is commonly
+found on world-writable directories like @file{/tmp}.
+
+For regular files on some older systems, save the program's text image on the
 swap device so it will load more quickly when run; this is called the
 @dfn{sticky bit}.
 @end enumerate
 
-In addition to the permissions listed above, there may be file attributes
-specific to the file system, e.g: access control lists (ACLs), whether a
-file is compressed, whether a file can be modified (immutability), whether
+In addition to the file mode bits listed above, there may be file attributes
+specific to the file system, e.g., access control lists (ACLs), whether a
+file is compressed, whether a file can be modified (immutability), and whether
 a file can be dumped.  These are usually set using programs
 specific to the file system.  For example:
 @c should probably say a lot more about ACLs... someday
 
 @table @asis
 @item ext2
-On @acronym{GNU} and @acronym{GNU}/Linux the file permissions
-(``attributes'') specific to
+On @acronym{GNU} and @acronym{GNU}/Linux the file attributes specific to
 the ext2 file system are set using @command{chattr}.
 
 @item FFS
-On FreeBSD the file permissions (``flags'') specific to the FFS
-file system are set using @command{chrflags}.
+On FreeBSD the file flags specific to the FFS
+file system are set using @command{chflags}.
 @end table
 
-Although a file's permission ``bits'' allow an operation on that file,
+Even if a file's mode bits allow an operation on that file,
 that operation may still fail, because:
 
 @itemize
 @item
-the file-system-specific permissions do not permit it;
+the file-system-specific attributes or flags do not permit it; or
 
 @item
 the file system is mounted as read-only.
@@ -115,9 +127,9 @@ may have just run @code{chmod a+w FILE}.
 @section Symbolic Modes
 
 @cindex symbolic modes
-@dfn{Symbolic modes} represent changes to files' permissions as
+@dfn{Symbolic modes} represent changes to files' mode bits as
 operations on single-character symbols.  They allow you to modify either
-all or selected parts of files' permissions, optionally based on
+all or selected parts of files' mode bits, optionally based on
 their previous values, and perhaps on the current @code{umask} as well
 (@pxref{Umask and Protection}).
 
@@ -137,7 +149,7 @@ symbolic modes.
 @menu
 * Setting Permissions::          Basic operations on permissions.
 * Copying Permissions::          Copying existing permissions.
-* Changing Special Permissions:: Special permissions.
+* Changing Special Mode Bits::   Special mode bits.
 * Conditional Executability::    Conditionally affecting executability.
 * Multiple Changes::             Making multiple changes.
 * Umask and Protection::              The effect of the umask.
@@ -148,7 +160,7 @@ symbolic modes.
 
 The basic symbolic operations on a file's permissions are adding,
 removing, and setting the permission that certain users have to read,
-write, and execute the file.  These operations have the following
+write, and execute or search the file.  These operations have the following
 format:
 
 @example
@@ -213,11 +225,12 @@ the permission the @var{users} have to read the file;
 @cindex write permission, symbolic
 the permission the @var{users} have to write to the file;
 @item x
-@cindex execute permission, symbolic
-the permission the @var{users} have to execute the file.
+@cindex execute/search permission, symbolic
+the permission the @var{users} have to execute the file,
+or search it if it is a directory.
 @end table
 
-For example, to give everyone permission to read and write a file,
+For example, to give everyone permission to read and write a regular file,
 but not to execute it, use:
 
 @example
@@ -275,38 +288,42 @@ it to mode 666 (@samp{rw-rw-rw-}).  If the file had started out as mode
 (@samp{rwxr--r-x}).  The @samp{-} and @samp{=} operations work
 analogously.
 
-@node Changing Special Permissions
-@subsection Changing Special Permissions
+@node Changing Special Mode Bits
+@subsection Changing Special Mode Bits
 
-@cindex changing special permissions
-In addition to changing a file's read, write, and execute permissions,
-you can change its special permissions.  @xref{Mode Structure}, for a
-summary of these permissions.
+@cindex changing special mode bits
+In addition to changing a file's read, write, and execute/search permissions,
+you can change its special mode bits.  @xref{Mode Structure}, for a
+summary of these special mode bits.
 
-To change a file's permission to set the user ID on execution, use
+To change the file mode bits to set the user ID on execution, use
 @samp{u} in the @var{users} part of the symbolic mode and
 @samp{s} in the @var{permissions} part.
 
-To change a file's permission to set the group ID on execution, use
+To change the file mode bits to set the group ID on execution, use
 @samp{g} in the @var{users} part of the symbolic mode and
 @samp{s} in the @var{permissions} part.
 
-To change a file's permission to set the restricted deletion flag or sticky bit,
-omit the @var{users} part of the symbolic mode (or use @samp{a}) and put
+To set both user and group ID on execution, omit the @var{users} part
+of the symbolic mode (or use @samp{a}) and use @samp{s} in the
+@var{permissions} part.
+
+To change the file mode bits to set the restricted deletion flag or sticky bit,
+omit the @var{users} part of the symbolic mode (or use @samp{a}) and use
 @samp{t} in the @var{permissions} part.
 
-For example, to add set-user-ID permission to a program,
+For example, to set the set-user-ID mode bit of a program,
 you can use the mode:
 
 @example
 u+s
 @end example
 
-To remove both set-user-ID and set-group-ID permission from
+To remove both set-user-ID and set-group-ID mode bits from
 it, you can use the mode:
 
 @example
-ug-s
+a-s
 @end example
 
 To set the restricted deletion flag or sticky bit, you can use
@@ -320,8 +337,8 @@ The combination @samp{o+s} has no effect.  On @acronym{GNU} systems
 the combinations @samp{u+t} and @samp{g+t} have no effect, and
 @samp{o+t} acts like plain @samp{+t}.
 
-The @samp{=} operator is not very useful with special permissions; for
-example, the mode:
+The @samp{=} operator is not very useful with special mode bits.
+For example, the mode:
 
 @example
 o=t
@@ -329,15 +346,18 @@ o=t
 
 @noindent
 does set the restricted deletion flag or sticky bit, but it also
-removes all read, write, and execute permissions that users not in the
+removes all read, write, and execute/search permissions that users not in the
 file's group might have had for it.
 
+@xref{Directory Setuid and Setgid}, for additional rules concerning
+set-user-ID and set-group-ID bits and directories.
+
 @node Conditional Executability
 @subsection Conditional Executability
 
 @cindex conditional executability
 There is one more special type of symbolic permission: if you use
-@samp{X} instead of @samp{x}, execute permission is affected only if the
+@samp{X} instead of @samp{x}, execute/search permission is affected only if the
 file is a directory or already had execute permission.
 
 For example, this mode:
@@ -356,7 +376,7 @@ anyone could execute them before.
 @cindex multiple changes to permissions
 The format of symbolic modes is actually more complex than described
 above (@pxref{Setting Permissions}).  It provides two ways to make
-multiple changes to files' permissions.
+multiple changes to files' mode bits.
 
 The first way is to specify multiple @var{operation} and
 @var{permissions} parts after a @var{users} part in the symbolic mode.
@@ -370,7 +390,7 @@ og+rX-w
 @noindent
 gives users other than the owner of the file read permission and, if
 it is a directory or if someone already had execute permission
-to it, gives them execute permission; and it also denies them write
+to it, gives them execute/search permission; and it also denies them write
 permission to the file.  It does not affect the permission that the
 owner of the file has for it.  The above mode is equivalent to
 the two modes:
@@ -396,7 +416,7 @@ u=rwx,g=rx,o=
 @end example
 
 @noindent
-sets all of the non-special permissions for the file explicitly.  (It
+sets all of the permission bits for the file explicitly.  (It
 gives users who are not in the file's group no permission at all for
 it.)
 
@@ -408,7 +428,7 @@ a+r,g+x-w
 
 @noindent
 gives all users permission to read the file, and gives users who are in
-the file's group permission to execute it, as well, but not permission
+the file's group permission to execute/search it as well, but not permission
 to write to it.  The above mode could be written in several different
 ways; another is:
 
@@ -457,52 +477,116 @@ the file to all users.
 @section Numeric Modes
 
 @cindex numeric modes
-@cindex file permissions, numeric
+@cindex file mode bits, numeric
 @cindex octal numbers for file modes
 As an
 alternative to giving a symbolic mode, you can give an octal (base 8)
-number that represents the new mode.
+number that represents the mode.
 This number is always interpreted in octal; you do not have to add a
-leading 0, as you do in C.  Mode 0055 is the same as mode 55.
+leading @samp{0}, as you do in C.  Mode @samp{0055} is the same as
+mode @samp{55}.
 
 A numeric mode is usually shorter than the corresponding symbolic
-mode, but it is limited in that it cannot take into account a file's
-previous permissions; it can only set them absolutely.
+mode, but it is limited in that normally it cannot take into account the
+previous file mode bits; it can only set them absolutely.
+(As discussed in the next section, the set-user-ID and set-group-ID
+bits of directories are an exception to this general limitation.)
 
 The permissions granted to the user,
 to other users in the file's group,
 and to other users not in the file's group each require three
 bits, which are represented as one octal digit.  The three special
-permissions also require one bit each, and they are as a group
+mode bits also require one bit each, and they are as a group
 represented as another octal digit.  Here is how the bits are arranged,
 starting with the lowest valued bit:
 
 @example
 Value in  Corresponding
-Mode      Permission
+Mode      Mode Bit
 
           Other users not in the file's group:
-   1      Execute
+   1      Execute/search
    2      Write
    4      Read
 
           Other users in the file's group:
-  10      Execute
+  10      Execute/search
   20      Write
   40      Read
 
           The file's owner:
- 100      Execute
+ 100      Execute/search
  200      Write
  400      Read
 
-          Special permissions:
+          Special mode bits:
 1000      Restricted deletion flag or sticky bit
 2000      Set group ID on execution
 4000      Set user ID on execution
 @end example
 
-For example, numeric mode 4755 corresponds to symbolic mode
-@samp{u=rwxs,go=rx}, and numeric mode 664 corresponds to symbolic mode
-@samp{ug=rw,o=r}.  Numeric mode 0 corresponds to symbolic mode
+For example, numeric mode @samp{4755} corresponds to symbolic mode
+@samp{u=rwxs,go=rx}, and numeric mode @samp{664} corresponds to symbolic mode
+@samp{ug=rw,o=r}.  Numeric mode @samp{0} corresponds to symbolic mode
 @samp{a=}.
+
+@node Directory Setuid and Setgid
+@section Directories and the Set-User-ID and Set-Group-ID Bits
+
+On most systems, if a directory's set-group-ID bit is set, newly
+created subfiles inherit the same group as the directory, and newly
+created subdirectories inherit the set-group-ID bit of the parent
+directory.  On a few systems, a directory's set-user-ID bit has a
+similar effect on the ownership of new subfiles and the set-user-ID
+bits of new subdirectories.  These mechanisms let users share files
+more easily, by lessening the need to use @command{chmod} or
+@command{chown} to share new files.
+
+These convenience mechanisms rely on the set-user-ID and set-group-ID
+bits of directories.  If commands like @command{chmod} and
+@command{mkdir} routinely cleared these bits on directories, the
+mechanisms would be less convenient and it would be harder to share
+files.  Therefore, a command like @command{chmod} does not affect the
+set-user-ID or set-group-ID bits of a directory unless the user
+specifically mentions them in a symbolic mode, or sets them in
+a numeric mode.  For example, on systems that support
+set-group-ID inheritance:
+
+@example
+# These commands leave the set-user-ID and
+# set-group-ID bits of the subdirectories alone,
+# so that they retain their default values.
+mkdir A B C
+chmod 755 A
+chmod 0755 B
+chmod u=rwx,go=rx C
+mkdir -m 755 D
+mkdir -m 0755 E
+mkdir -m u=rwx,go=rx F
+@end example
+
+If you want to try to set these bits, you must mention them
+explicitly in the symbolic or numeric modes, e.g.:
+
+@example
+# These commands try to set the set-user-ID
+# and set-group-ID bits of the subdirectories.
+mkdir G H
+chmod 6755 G
+chmod u=rwx,go=rx,a+s H
+mkdir -m 6755 I
+mkdir -m u=rwx,go=rx,a+s J
+@end example
+
+If you want to try to clear these bits, you must mention them
+explicitly in a symbolic mode, e.g.:
+
+@example
+# This command tries to clear the set-user-ID
+# and set-group-ID bits of the directory D.
+chmod a-s D
+@end example
+
+This behavior is a @acronym{GNU} extension.  Portable scripts should
+not rely on requests to set or clear these bits on directories, as
+@acronym{POSIX} allows implementations to ignore these requests.
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index ff2c4065..36c1acad 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -3,11 +3,11 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2005-07-05.19}
+\def\texinfoversion{2006-07-17.16}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
-% Foundation, Inc.
+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
+% Software Foundation, Inc.
 %
 % This texinfo.tex file is free software; you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
@@ -153,27 +153,9 @@
 \ifx\putwordDefopt\undefined    \gdef\putwordDefopt{User Option}\fi
 \ifx\putwordDeffunc\undefined   \gdef\putwordDeffunc{Function}\fi
 
-% In some macros, we cannot use the `\? notation---the left quote is
-% in some cases the escape char.
-\chardef\backChar  = `\\
-\chardef\colonChar = `\:
-\chardef\commaChar = `\,
-\chardef\dotChar   = `\.
-\chardef\exclamChar= `\!
-\chardef\plusChar  = `\+
-\chardef\questChar = `\?
-\chardef\semiChar  = `\;
-\chardef\underChar = `\_
-
-\chardef\spaceChar = `\ %
+% Since the category of space is not known, we have to be careful.
 \chardef\spacecat = 10
-\def\spaceisspace{\catcode\spaceChar=\spacecat}
-
-{% for help with debugging.
- % example usage: \expandafter\show\activebackslash
- \catcode`\! = 0 \catcode`\\ = \active
- !global!def!activebackslash{\}
-}
+\def\spaceisspace{\catcode`\ =\spacecat}
 
 % Ignore a token.
 %
@@ -311,6 +293,13 @@
     % before the \shipout runs.
     %
     \indexdummies         % don't expand commands in the output.
+    \normalturnoffactive  % \ in index entries must not stay \, e.g., if
+               % the page break happens to be in the middle of an example.
+               % We don't want .vr (or whatever) entries like this:
+               % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
+               % "\acronym" won't work when it's read back in;
+               % it needs to be 
+               % {\code {{\tt \backslashcurfont }acronym}
     \shipout\vbox{%
       % Do this early so pdf references go to the beginning of the page.
       \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
@@ -338,9 +327,9 @@
       \pagebody{#1}%
       \ifdim\ht\footlinebox > 0pt
         % Only leave this space if the footline is nonempty.
-        % (We lessened \vsize for it in \oddfootingxxx.)
+        % (We lessened \vsize for it in \oddfootingyyy.)
         % The \baselineskip=24pt in plain's \makefootline has no effect.
-        \vskip 2\baselineskip
+        \vskip 24pt
         \unvbox\footlinebox
       \fi
       %
@@ -396,7 +385,7 @@
 %
 \def\parsearg{\parseargusing{}}
 \def\parseargusing#1#2{%
-  \def\next{#2}%
+  \def\argtorun{#2}%
   \begingroup
     \obeylines
     \spaceisspace
@@ -427,8 +416,7 @@
 \def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
   \def\temp{#3}%
   \ifx\temp\empty
-    % We cannot use \next here, as it holds the macro to run;
-    % thus we reuse \temp.
+    % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
     \let\temp\finishparsearg
   \else
     \let\temp\argcheckspaces
@@ -440,14 +428,14 @@
 % If a _delimited_ argument is enclosed in braces, they get stripped; so
 % to get _exactly_ the rest of the line, we had to prevent such situation.
 % We prepended an \empty token at the very beginning and we expand it now,
-% just before passing the control to \next.
+% just before passing the control to \argtorun.
 % (Similarily, we have to think about #3 of \argcheckspacesY above: it is
 % either the null string, or it ends with \^^M---thus there is no danger
 % that a pair of braces would be stripped.
 %
 % But first, we have to remove the trailing space token.
 %
-\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}}
+\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
 
 % \parseargdef\foo{...}
 %	is roughly equivalent to
@@ -1051,9 +1039,9 @@ where each line of input produces a line of output.}
 % _ active, and distinguish by seeing if the current family is \slfam,
 % which is what @var uses.
 {
-  \catcode\underChar = \active
+  \catcode`\_ = \active
   \gdef\mathunderscore{%
-    \catcode\underChar=\active
+    \catcode`\_=\active
     \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
   }
 }
@@ -1096,15 +1084,24 @@ where each line of input produces a line of output.}
 \def\minus{$-$}
 
 % @dots{} outputs an ellipsis using the current font.
-% We do .5em per period so that it has the same spacing in a typewriter
-% font as three actual period characters.
+% We do .5em per period so that it has the same spacing in the cm
+% typewriter fonts as three actual period characters; on the other hand,
+% in other typewriter fonts three periods are wider than 1.5em.  So do
+% whichever is larger.
 %
 \def\dots{%
   \leavevmode
-  \hbox to 1.5em{%
-    \hskip 0pt plus 0.25fil
-    .\hfil.\hfil.%
-    \hskip 0pt plus 0.5fil
+  \setbox0=\hbox{...}% get width of three periods
+  \ifdim\wd0 > 1.5em
+    \dimen0 = \wd0
+  \else
+    \dimen0 = 1.5em
+  \fi
+  \hbox to \dimen0{%
+    \hskip 0pt plus.25fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus.5fil
   }%
 }
 
@@ -1197,21 +1194,20 @@ where each line of input produces a line of output.}
   \fi
 \fi
 
-% PDF uses PostScript string constants for the names of xref targets, to
+% PDF uses PostScript string constants for the names of xref targets,
 % for display in the outlines, and in other places.  Thus, we have to
 % double any backslashes.  Otherwise, a name like "\node" will be
 % interpreted as a newline (\n), followed by o, d, e.  Not good.
 % http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
 % (and related messages, the final outcome is that it is up to the TeX
 % user to double the backslashes and otherwise make the string valid, so
-% that's we do).
+% that's what we do).
 
 % double active backslashes.
 % 
 {\catcode`\@=0 \catcode`\\=\active
- @gdef@activebackslash{@catcode`@\=@active @otherbackslash}
  @gdef@activebackslashdouble{%
-   @catcode@backChar=@active
+   @catcode`@\=@active
    @let\=@doublebackslash}
 }
 
@@ -1243,21 +1239,17 @@ where each line of input produces a line of output.}
 \def\backslashparens#1{%
   \xdef#1{#1}% redefine it as its expansion; the definition is simply
              % \lastnode when called from \setref -> \pdfmkdest.
-  \HyPsdSubst{(}{\backslashlparen}{#1}%
-  \HyPsdSubst{)}{\backslashrparen}{#1}%
-}
-
-{\catcode\exclamChar = 0 \catcode\backChar = \other
- !gdef!backslashlparen{\(}%
- !gdef!backslashrparen{\)}%
+  \HyPsdSubst{(}{\realbackslash(}{#1}%
+  \HyPsdSubst{)}{\realbackslash)}{#1}%
 }
 
 \ifpdf
   \input pdfcolor
   \pdfcatalog{/PageMode /UseOutlines}%
+  % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
   \def\dopdfimage#1#2#3{%
-    \def\imagewidth{#2}%
-    \def\imageheight{#3}%
+    \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
+    \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
     % without \immediate, pdftex seg faults when the same image is
     % included twice.  (Version 3.14159-pre-1.0-unofficial-20010704.)
     \ifnum\pdftexversion < 14
@@ -1265,8 +1257,8 @@ where each line of input produces a line of output.}
     \else
       \immediate\pdfximage
     \fi
-      \ifx\empty\imagewidth\else width \imagewidth \fi
-      \ifx\empty\imageheight\else height \imageheight \fi
+      \ifdim \wd0 >0pt width \imagewidth \fi
+      \ifdim \wd2 >0pt height \imageheight \fi
       \ifnum\pdftexversion<13
          #1.pdf%
        \else
@@ -1390,7 +1382,7 @@ where each line of input produces a line of output.}
       % now, I guess we'll just let the pdf reader have its way.
       \indexnofonts
       \setupdatafile
-      \activebackslash
+      \catcode`\\=\active \otherbackslash
       \input \jobname.toc
     \endgroup
   }
@@ -1409,9 +1401,17 @@ where each line of input produces a line of output.}
   \else
     \let \startlink \pdfstartlink
   \fi
+  % make a live url in pdf output.
   \def\pdfurl#1{%
     \begingroup
-      \normalturnoffactive\def\@{@}%
+      % it seems we really need yet another set of dummies; have not
+      % tried to figure out what each command should do in the context
+      % of @url.  for now, just make @/ a no-op, that's the only one
+      % people have actually reported a problem with.
+      % 
+      \normalturnoffactive
+      \def\@{@}%
+      \let\/=\empty
       \makevalueexpandable
       \leavevmode\Red
       \startlink attr{/Border [0 0 0]}%
@@ -1481,6 +1481,7 @@ where each line of input produces a line of output.}
 % We don't need math for this font style.
 \def\ttsl{\setfontstyle{ttsl}}
 
+
 % Default leading.
 \newdimen\textleading  \textleading = 13.2pt
 
@@ -1502,11 +1503,13 @@ where each line of input produces a line of output.}
   }%
 }
 
+
 % Set the font macro #1 to the font named #2, adding on the
 % specified font prefix (normally `cm').
 % #3 is the font's design size, #4 is a scale factor
 \def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
 
+
 % Use cm as the default font prefix.
 % To specify the font prefix, you must define \fontprefix
 % before you read in texinfo.tex.
@@ -1530,6 +1533,10 @@ where each line of input produces a line of output.}
 \def\scshape{csc}
 \def\scbshape{csc}
 
+% Definitions for a main text size of 11pt.  This is the default in
+% Texinfo.
+% 
+\def\definetextfontsizexi{
 % Text fonts (11.2pt, magstep1).
 \def\textnominalsize{11pt}
 \edef\mainmagstep{\magstephalf}
@@ -1643,6 +1650,165 @@ where each line of input produces a line of output.}
 \font\reducedi=cmmi10
 \font\reducedsy=cmsy10
 
+% reset the current fonts
+\textfonts
+\rm
+} % end of 11pt text font size definitions
+
+
+% Definitions to make the main text be 10pt Computer Modern, with
+% section, chapter, etc., sizes following suit.  This is for the GNU
+% Press printing of the Emacs 22 manual.  Maybe other manuals in the
+% future.  Used with @smallbook, which sets the leading to 12pt.
+% 
+\def\definetextfontsizex{%
+% Text fonts (10pt).
+\def\textnominalsize{10pt}
+\edef\mainmagstep{1000}
+\setfont\textrm\rmshape{10}{\mainmagstep}
+\setfont\texttt\ttshape{10}{\mainmagstep}
+\setfont\textbf\bfshape{10}{\mainmagstep}
+\setfont\textit\itshape{10}{\mainmagstep}
+\setfont\textsl\slshape{10}{\mainmagstep}
+\setfont\textsf\sfshape{10}{\mainmagstep}
+\setfont\textsc\scshape{10}{\mainmagstep}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}
+\font\texti=cmmi10 scaled \mainmagstep
+\font\textsy=cmsy10 scaled \mainmagstep
+
+% A few fonts for @defun names and args.
+\setfont\defbf\bfshape{10}{\magstephalf}
+\setfont\deftt\ttshape{10}{\magstephalf}
+\setfont\defttsl\ttslshape{10}{\magstephalf}
+\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
+
+% Fonts for indices, footnotes, small examples (9pt).
+\def\smallnominalsize{9pt}
+\setfont\smallrm\rmshape{9}{1000}
+\setfont\smalltt\ttshape{9}{1000}
+\setfont\smallbf\bfshape{10}{900}
+\setfont\smallit\itshape{9}{1000}
+\setfont\smallsl\slshape{9}{1000}
+\setfont\smallsf\sfshape{9}{1000}
+\setfont\smallsc\scshape{10}{900}
+\setfont\smallttsl\ttslshape{10}{900}
+\font\smalli=cmmi9
+\font\smallsy=cmsy9
+
+% Fonts for small examples (8pt).
+\def\smallernominalsize{8pt}
+\setfont\smallerrm\rmshape{8}{1000}
+\setfont\smallertt\ttshape{8}{1000}
+\setfont\smallerbf\bfshape{10}{800}
+\setfont\smallerit\itshape{8}{1000}
+\setfont\smallersl\slshape{8}{1000}
+\setfont\smallersf\sfshape{8}{1000}
+\setfont\smallersc\scshape{10}{800}
+\setfont\smallerttsl\ttslshape{10}{800}
+\font\smalleri=cmmi8
+\font\smallersy=cmsy8
+
+% Fonts for title page (20.4pt):
+\def\titlenominalsize{20pt}
+\setfont\titlerm\rmbshape{12}{\magstep3}
+\setfont\titleit\itbshape{10}{\magstep4}
+\setfont\titlesl\slbshape{10}{\magstep4}
+\setfont\titlett\ttbshape{12}{\magstep3}
+\setfont\titlettsl\ttslshape{10}{\magstep4}
+\setfont\titlesf\sfbshape{17}{\magstep1}
+\let\titlebf=\titlerm
+\setfont\titlesc\scbshape{10}{\magstep4}
+\font\titlei=cmmi12 scaled \magstep3
+\font\titlesy=cmsy10 scaled \magstep4
+\def\authorrm{\secrm}
+\def\authortt{\sectt}
+
+% Chapter fonts (14.4pt).
+\def\chapnominalsize{14pt}
+\setfont\chaprm\rmbshape{12}{\magstep1}
+\setfont\chapit\itbshape{10}{\magstep2}
+\setfont\chapsl\slbshape{10}{\magstep2}
+\setfont\chaptt\ttbshape{12}{\magstep1}
+\setfont\chapttsl\ttslshape{10}{\magstep2}
+\setfont\chapsf\sfbshape{12}{\magstep1}
+\let\chapbf\chaprm
+\setfont\chapsc\scbshape{10}{\magstep2}
+\font\chapi=cmmi12 scaled \magstep1
+\font\chapsy=cmsy10 scaled \magstep2
+
+% Section fonts (12pt).
+\def\secnominalsize{12pt}
+\setfont\secrm\rmbshape{12}{1000}
+\setfont\secit\itbshape{10}{\magstep1}
+\setfont\secsl\slbshape{10}{\magstep1}
+\setfont\sectt\ttbshape{12}{1000}
+\setfont\secttsl\ttslshape{10}{\magstep1}
+\setfont\secsf\sfbshape{12}{1000}
+\let\secbf\secrm
+\setfont\secsc\scbshape{10}{\magstep1}
+\font\seci=cmmi12 
+\font\secsy=cmsy10 scaled \magstep1
+
+% Subsection fonts (10pt).
+\def\ssecnominalsize{10pt}
+\setfont\ssecrm\rmbshape{10}{1000}
+\setfont\ssecit\itbshape{10}{1000}
+\setfont\ssecsl\slbshape{10}{1000}
+\setfont\ssectt\ttbshape{10}{1000}
+\setfont\ssecttsl\ttslshape{10}{1000}
+\setfont\ssecsf\sfbshape{10}{1000}
+\let\ssecbf\ssecrm
+\setfont\ssecsc\scbshape{10}{1000}
+\font\sseci=cmmi10
+\font\ssecsy=cmsy10
+
+% Reduced fonts for @acro in text (9pt).
+\def\reducednominalsize{9pt}
+\setfont\reducedrm\rmshape{9}{1000}
+\setfont\reducedtt\ttshape{9}{1000}
+\setfont\reducedbf\bfshape{10}{900}
+\setfont\reducedit\itshape{9}{1000}
+\setfont\reducedsl\slshape{9}{1000}
+\setfont\reducedsf\sfshape{9}{1000}
+\setfont\reducedsc\scshape{10}{900}
+\setfont\reducedttsl\ttslshape{10}{900}
+\font\reducedi=cmmi9
+\font\reducedsy=cmsy9
+
+% reduce space between paragraphs
+\divide\parskip by 2
+
+% reset the current fonts
+\textfonts
+\rm
+} % end of 10pt text font size definitions
+
+
+% We provide the user-level command
+%   @fonttextsize 10
+% (or 11) to redefine the text font size.  pt is assumed.
+% 
+\def\xword{10}
+\def\xiword{11}
+%
+\parseargdef\fonttextsize{%
+  \def\textsizearg{#1}%
+  \wlog{doing @fonttextsize \textsizearg}%
+  %
+  % Set \globaldefs so that documents can use this inside @tex, since
+  % makeinfo 4.8 does not support it, but we need it nonetheless.
+  % 
+ \begingroup \globaldefs=1
+  \ifx\textsizearg\xword \definetextfontsizex
+  \else \ifx\textsizearg\xiword \definetextfontsizexi
+  \else
+    \errhelp=\EMsimple
+    \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'}
+  \fi\fi
+ \endgroup
+}
+
+
 % In order for the font changes to affect most math symbols and letters,
 % we have to define the \textfont of the standard families.  Since
 % texinfo doesn't allow for producing subscripts and superscripts except
@@ -1753,7 +1919,7 @@ where each line of input produces a line of output.}
 
 % Set up the default fonts, so we can use them for creating boxes.
 %
-\textfonts \rm
+\definetextfontsizexi
 
 % Define these so they can be easily changed for other fonts.
 \def\angleleft{$\langle$}
@@ -1810,6 +1976,13 @@ where each line of input produces a line of output.}
 % Can't use plain's \frenchspacing because it uses the `\x notation, and
 % sometimes \x has an active definition that messes things up.
 %
+\chardef\colonChar = `\:
+\chardef\commaChar = `\,
+\chardef\dotChar   = `\.
+\chardef\exclamChar= `\!
+\chardef\questChar = `\?
+\chardef\semiChar  = `\;
+%
 \catcode`@=11
   \def\plainfrenchspacing{%
     \sfcode\dotChar  =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
@@ -1878,11 +2051,11 @@ where each line of input produces a line of output.}
 % and arrange explicitly to hyphenate at a dash.
 %  -- rms.
 {
-  \catcode`\-=\active
-  \catcode`\_=\active
+  \catcode`\-=\active \catcode`\_=\active \catcode`\'=\active
   %
   \global\def\code{\begingroup
-    \catcode`\-=\active  \catcode`\_=\active
+    \catcode`\-=\active  \catcode`\_=\active \catcode`\'=\active
+    \let'\singlequotechar
     \ifallowcodebreaks
      \let-\codedash
      \let_\codeunder
@@ -2299,8 +2472,8 @@ where each line of input produces a line of output.}
   %
   % Leave some space for the footline.  Hopefully ok to assume
   % @evenfooting will not be used by itself.
-  \global\advance\pageheight by -\baselineskip
-  \global\advance\vsize by -\baselineskip
+  \global\advance\pageheight by -12pt
+  \global\advance\vsize by -12pt
 }
 
 \parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
@@ -2959,6 +3132,7 @@ where each line of input produces a line of output.}
 
 \def\doignore#1{\begingroup
   % Scan in ``verbatim'' mode:
+  \obeylines
   \catcode`\@ = \other
   \catcode`\{ = \other
   \catcode`\} = \other
@@ -2979,16 +3153,16 @@ where each line of input produces a line of output.}
   \gdef\dodoignore#1{%
     % #1 contains the command name as a string, e.g., `ifinfo'.
     %
-    % Define a command to find the next `@end #1', which must be on a line
-    % by itself.
-    \long\def\doignoretext##1^^M@end #1{\doignoretextyyy##1^^M@#1\_STOP_}%
+    % Define a command to find the next `@end #1'.
+    \long\def\doignoretext##1^^M@end #1{%
+      \doignoretextyyy##1^^M@#1\_STOP_}%
+    %
     % And this command to find another #1 command, at the beginning of a
     % line.  (Otherwise, we would consider a line `@c @ifset', for
     % example, to count as an @ifset for nesting.)
     \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
     %
     % And now expand that command.
-    \obeylines %
     \doignoretext ^^M%
   }%
 }
@@ -3018,7 +3192,12 @@ where each line of input produces a line of output.}
 }
 
 % Finish off ignored text.
-\def\enddoignore{\endgroup\ignorespaces}
+{ \obeylines%
+  % Ignore anything after the last `@end #1'; this matters in verbatim
+  % environments, where otherwise the newline after an ignored conditional
+  % would result in a blank line in the output.
+  \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
+}
 
 
 % @set VAR sets the variable VAR to an empty value.
@@ -3221,12 +3400,39 @@ where each line of input produces a line of output.}
   \escapechar = `\\     % use backslash in output files.
   \def\@{@}% change to @@ when we switch to @ as escape char in index files.
   \def\ {\realbackslash\space }%
+  %
   % Need these in case \tex is in effect and \{ is a \delimiter again.
   % But can't use \lbracecmd and \rbracecmd because texindex assumes
   % braces and backslashes are used only as delimiters.
   \let\{ = \mylbrace
   \let\} = \myrbrace
   %
+  % I don't entirely understand this, but when an index entry is
+  % generated from a macro call, the \endinput which \scanmacro inserts
+  % causes processing to be prematurely terminated.  This is,
+  % apparently, because \indexsorttmp is fully expanded, and \endinput
+  % is an expandable command.  The redefinition below makes \endinput
+  % disappear altogether for that purpose -- although logging shows that
+  % processing continues to some further point.  On the other hand, it
+  % seems \endinput does not hurt in the printed index arg, since that
+  % is still getting written without apparent harm.
+  % 
+  % Sample source (mac-idx3.tex, reported by Graham Percival to
+  % help-texinfo, 22may06):
+  % @macro funindex {WORD}
+  % @findex xyz
+  % @end macro
+  % ...
+  % @funindex commtest
+  % 
+  % The above is not enough to reproduce the bug, but it gives the flavor.
+  % 
+  % Sample whatsit resulting:
+  % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
+  % 
+  % So:
+  \let\endinput = \empty
+  %
   % Do the redefinitions.
   \commondummies
 }
@@ -3244,6 +3450,7 @@ where each line of input produces a line of output.}
   %
   % Do the redefinitions.
   \commondummies
+  \otherbackslash
 }
 
 % Called from \indexdummies and \atdummies.
@@ -3330,63 +3537,62 @@ where each line of input produces a line of output.}
 
 % \commondummiesnofonts: common to \commondummies and \indexnofonts.
 %
-% Better have this without active chars.
-{
-  \catcode`\~=\other
-  \gdef\commondummiesnofonts{%
-    % Control letters and accents.
-    \definedummyletter\!%
-    \definedummyaccent\"%
-    \definedummyaccent\'%
-    \definedummyletter\*%
-    \definedummyaccent\,%
-    \definedummyletter\.%
-    \definedummyletter\/%
-    \definedummyletter\:%
-    \definedummyaccent\=%
-    \definedummyletter\?%
-    \definedummyaccent\^%
-    \definedummyaccent\`%
-    \definedummyaccent\~%
-    \definedummyword\u
-    \definedummyword\v
-    \definedummyword\H
-    \definedummyword\dotaccent
-    \definedummyword\ringaccent
-    \definedummyword\tieaccent
-    \definedummyword\ubaraccent
-    \definedummyword\udotaccent
-    \definedummyword\dotless
-    %
-    % Texinfo font commands.
-    \definedummyword\b
-    \definedummyword\i
-    \definedummyword\r
-    \definedummyword\sc
-    \definedummyword\t
-    %
-    % Commands that take arguments.
-    \definedummyword\acronym
-    \definedummyword\cite
-    \definedummyword\code
-    \definedummyword\command
-    \definedummyword\dfn
-    \definedummyword\emph
-    \definedummyword\env
-    \definedummyword\file
-    \definedummyword\kbd
-    \definedummyword\key
-    \definedummyword\math
-    \definedummyword\option
-    \definedummyword\samp
-    \definedummyword\strong
-    \definedummyword\tie
-    \definedummyword\uref
-    \definedummyword\url
-    \definedummyword\var
-    \definedummyword\verb
-    \definedummyword\w
-  }
+\def\commondummiesnofonts{%
+  % Control letters and accents.
+  \definedummyletter\!%
+  \definedummyaccent\"%
+  \definedummyaccent\'%
+  \definedummyletter\*%
+  \definedummyaccent\,%
+  \definedummyletter\.%
+  \definedummyletter\/%
+  \definedummyletter\:%
+  \definedummyaccent\=%
+  \definedummyletter\?%
+  \definedummyaccent\^%
+  \definedummyaccent\`%
+  \definedummyaccent\~%
+  \definedummyword\u
+  \definedummyword\v
+  \definedummyword\H
+  \definedummyword\dotaccent
+  \definedummyword\ringaccent
+  \definedummyword\tieaccent
+  \definedummyword\ubaraccent
+  \definedummyword\udotaccent
+  \definedummyword\dotless
+  %
+  % Texinfo font commands.
+  \definedummyword\b
+  \definedummyword\i
+  \definedummyword\r
+  \definedummyword\sc
+  \definedummyword\t
+  %
+  % Commands that take arguments.
+  \definedummyword\acronym
+  \definedummyword\cite
+  \definedummyword\code
+  \definedummyword\command
+  \definedummyword\dfn
+  \definedummyword\emph
+  \definedummyword\env
+  \definedummyword\file
+  \definedummyword\kbd
+  \definedummyword\key
+  \definedummyword\math
+  \definedummyword\option
+  \definedummyword\pxref
+  \definedummyword\ref
+  \definedummyword\samp
+  \definedummyword\strong
+  \definedummyword\tie
+  \definedummyword\uref
+  \definedummyword\url
+  \definedummyword\var
+  \definedummyword\verb
+  \definedummyword\w
+  \definedummyword\xref
 }
 
 % \indexnofonts is used when outputting the strings to sort the index
@@ -3799,9 +4005,9 @@ where each line of input produces a line of output.}
   \endgroup
 }
 
-% Like \dotfill except takes at least 1 em.
+% Like plain.tex's \dotfill, except uses up at least 1 em.
 \def\indexdotfill{\cleaders
-  \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill}
+  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
 
 \def\primary #1{\line{#1\hfil}}
 
@@ -4375,14 +4581,17 @@ where each line of input produces a line of output.}
     \ifx\temptype\Ynothingkeyword
       \setbox0 = \hbox{}%
       \def\toctype{unnchap}%
+      \gdef\thischapternum{}%
       \gdef\thischapter{#1}%
     \else\ifx\temptype\Yomitfromtockeyword
       \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
       \def\toctype{omit}%
+      \gdef\thischapternum{}%
       \gdef\thischapter{}%
     \else\ifx\temptype\Yappendixkeyword
       \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
       \def\toctype{app}%
+      \xdef\thischapternum{\appendixletter}%
       % We don't substitute the actual chapter name into \thischapter
       % because we don't want its macros evaluated now.  And we don't
       % use \thissection because that changes with each section.
@@ -4392,6 +4601,7 @@ where each line of input produces a line of output.}
     \else
       \setbox0 = \hbox{#3\enspace}%
       \def\toctype{numchap}%
+      \xdef\thischapternum{\the\chapno}%
       \xdef\thischapter{\putwordChapter{} \the\chapno:
                         \noexpand\thischaptername}%
     \fi\fi\fi
@@ -4503,13 +4713,21 @@ where each line of input produces a line of output.}
       \gdef\thissection{#1}%
     \fi\fi\fi
     %
-    % Write the toc entry (before \donoderef).  See comments in \chfplain.
+    % Write the toc entry (before \donoderef).  See comments in \chapmacro.
     \writetocentry{\toctype\sectionlevel}{#1}{#4}%
     %
     % Write the node reference (= pdf destination for pdftex).
-    % Again, see comments in \chfplain.
+    % Again, see comments in \chapmacro.
     \donoderef{#3}%
     %
+    % Interline glue will be inserted when the vbox is completed.
+    % That glue will be a valid breakpoint for the page, since it'll be
+    % preceded by a whatsit (usually from the \donoderef, or from the
+    % \writetocentry if there was no node).  We don't want to allow that
+    % break, since then the whatsits could end up on page n while the
+    % section is on page n+1, thus toc/etc. are wrong.  Debian bug 276000.
+    \nobreak
+    %
     % Output the actual section heading.
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
           \hangindent=\wd0  % zero if no section number
@@ -4572,7 +4790,7 @@ where each line of input produces a line of output.}
        \edef\temp{%
          \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}%
        \temp
-      }
+      }%
     \fi
   \fi
   %
@@ -4824,7 +5042,7 @@ where each line of input produces a line of output.}
 {\tentt \global\dimen0 = 3em}% Width of the box.
 \dimen2 = .55pt % Thickness of rules
 % The text. (`r' is open on the right, `e' somewhat less so on the left.)
-\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
+\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
 %
 \setbox\errorbox=\hbox to \dimen0{\hfil
    \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
@@ -5047,11 +5265,10 @@ where each line of input produces a line of output.}
 %
 \maketwodispenvs {lisp}{example}{%
   \nonfillstart
-  \tt
+  \tt\quoteexpand
   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
   \gobble       % eat return
 }
-
 % @display/@smalldisplay: same as @lisp except keep current font.
 %
 \makedispenv {display}{%
@@ -5179,6 +5396,22 @@ where each line of input produces a line of output.}
 \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
 %
 \def\starttabbox{\setbox0=\hbox\bgroup}
+
+% Allow an option to not replace quotes with a regular directed right
+% quote/apostrophe (char 0x27), but instead use the undirected quote
+% from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
+% the default, but it works for pasting with more pdf viewers (at least
+% evince), the lilypond developers report.  xpdf does work with the
+% regular 0x27.  
+% 
+\def\singlequotechar{%
+  \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
+    '%
+  \else
+    \char'15
+  \fi
+}
+%
 \begingroup
   \catcode`\^^I=\active
   \gdef\tabexpand{%
@@ -5191,7 +5424,13 @@ where each line of input produces a line of output.}
       \wd0=\dimen0 \box0 \starttabbox
     }%
   }
+  \catcode`\'=\active
+  \gdef\quoteexpand{%
+    \catcode`\'=\active
+    \def'{\singlequotechar}
+  }%
 \endgroup
+%
 \def\setupverbatim{%
   \let\nonarrowing = t%
   \nonfillstart
@@ -5200,6 +5439,7 @@ where each line of input produces a line of output.}
   \def\par{\leavevmode\egroup\box0\endgraf}%
   \catcode`\`=\active
   \tabexpand
+  \quoteexpand
   % Respect line breaks,
   % print special symbols as themselves, and
   % make each space count
@@ -5649,7 +5889,6 @@ where each line of input produces a line of output.}
     \spaceisspace
     %
     % Append \endinput to make sure that TeX does not see the ending newline.
-    %
     % I've verified that it is necessary both for e-TeX and for ordinary TeX
     %							--kasal, 29nov03
     \scantokens{#1\endinput}%
@@ -5916,11 +6155,11 @@ where each line of input produces a line of output.}
 % {.  If so it reads up to the closing }, if not, it reads the whole
 % line.  Whatever was read is then fed to the next control sequence
 % as an argument (by \parsebrace or \parsearg)
-\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx}
+\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
 \def\braceorlinexxx{%
   \ifx\nchar\bgroup\else
     \expandafter\parsearg
-  \fi \next}
+  \fi \macnamexxx}
 
 
 % @alias.
@@ -6085,7 +6324,7 @@ where each line of input produces a line of output.}
     % If the user specified the print name (third arg) to the ref,
     % print it instead of our usual "Figure 1.2".
     \ifdim\wd0 = 0pt
-      \refx{#1-snt}%
+      \refx{#1-snt}{}%
     \else
       \printedrefname
     \fi
@@ -6515,7 +6754,7 @@ where each line of input produces a line of output.}
     % above and below.
     \nobreak\vskip\parskip
     \nobreak
-    \line\bgroup\hss
+    \line\bgroup
   \fi
   %
   % Output the image.
@@ -6528,7 +6767,7 @@ where each line of input produces a line of output.}
     \epsfbox{#1.eps}%
   \fi
   %
-  \ifimagevmode \hss \egroup \bigbreak \fi  % space after the image
+  \ifimagevmode \egroup \bigbreak \fi  % space after the image
 \endgroup}
 
 
@@ -6669,6 +6908,7 @@ where each line of input produces a line of output.}
       % caption if specified, else the full caption if specified, else nothing.
       {%
         \atdummies
+        %
         % since we read the caption text in the macro world, where ^^M
         % is turned into a normal character, we have to scan it back, so
         % we don't write the literal three characters "^^M" into the aux file.
@@ -6689,8 +6929,9 @@ where each line of input produces a line of output.}
   %
   % place the captured inserts
   %
-  % BEWARE: when the floats start float, we have to issue warning whenever an
-  % insert appears inside a float which could possibly float. --kasal, 26may04
+  % BEWARE: when the floats start floating, we have to issue warning
+  % whenever an insert appears inside a float which could possibly
+  % float. --kasal, 26may04
   %
   \checkinserts
 }
@@ -7117,6 +7358,13 @@ should work if nowhere else does.}
 % \otherifyactive is called near the end of this file.
 \def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
 
+% Used sometimes to turn off (effectively) the active characters even after
+% parsing them.
+\def\turnoffactive{%
+  \normalturnoffactive
+  \otherbackslash
+}
+
 \catcode`\@=0
 
 % \backslashcurfont outputs one backslash character in current font,
@@ -7124,28 +7372,29 @@ should work if nowhere else does.}
 \global\chardef\backslashcurfont=`\\
 \global\let\rawbackslashxx=\backslashcurfont  % let existing .??s files work
 
-% \rawbackslash defines an active \ to do \backslashcurfont.
-% \otherbackslash defines an active \ to be a literal `\' character with
-% catcode other.
-{\catcode`\\=\active
- @gdef@rawbackslash{@let\=@backslashcurfont}
- @gdef@otherbackslash{@let\=@realbackslash}
-}
-
 % \realbackslash is an actual character `\' with catcode other, and
 % \doublebackslash is two of them (for the pdf outlines).
 {\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
 
-% \normalbackslash outputs one backslash in fixed width font.
-\def\normalbackslash{{\tt\backslashcurfont}}
-
+% In texinfo, backslash is an active character; it prints the backslash
+% in fixed width font.
 \catcode`\\=\active
+@def@normalbackslash{{@tt@backslashcurfont}}
+% On startup, @fixbackslash assigns:
+%  @let \ = @normalbackslash
 
-% Used sometimes to turn off (effectively) the active characters
-% even after parsing them.
-@def@turnoffactive{%
+% \rawbackslash defines an active \ to do \backslashcurfont.
+% \otherbackslash defines an active \ to be a literal `\' character with
+% catcode other.
+@gdef@rawbackslash{@let\=@backslashcurfont}
+@gdef@otherbackslash{@let\=@realbackslash}
+
+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
+% the literal character `\'.
+% 
+@def@normalturnoffactive{%
+  @let\=@normalbackslash
   @let"=@normaldoublequote
-  @let\=@realbackslash
   @let~=@normaltilde
   @let^=@normalcaret
   @let_=@normalunderscore
@@ -7157,12 +7406,6 @@ should work if nowhere else does.}
   @unsepspaces
 }
 
-% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.  (Thus, \ is not expandable when this is in
-% effect.)
-%
-@def@normalturnoffactive{@turnoffactive @let\=@normalbackslash}
-
 % Make _ and + \other characters, temporarily.
 % This is canceled by @fixbackslash.
 @otherifyactive
@@ -7175,7 +7418,7 @@ should work if nowhere else does.}
 @global@let\ = @eatinput
 
 % On the other hand, perhaps the file did not have a `\input texinfo'. Then
-% the first `\{ in the file would cause an error. This macro tries to fix
+% the first `\' in the file would cause an error. This macro tries to fix
 % that, assuming it is called before the first `\' could plausibly occur.
 % Also turn back on active characters that might appear in the input
 % file name, in case not using a pre-dumped format.
diff --git a/find/.cvsignore b/find/.cvsignore
index 4ce9bd44..310cc398 100644
--- a/find/.cvsignore
+++ b/find/.cvsignore
@@ -2,3 +2,4 @@
 Makefile
 Makefile.in
 find
+oldfind
diff --git a/find/defs.h b/find/defs.h
index 8ce6f29b..157f3fbf 100644
--- a/find/defs.h
+++ b/find/defs.h
@@ -1,5 +1,5 @@
 /* defs.h -- data types and declarations.
-   Copyright (C) 1990, 91, 92, 93, 94, 2000, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1990, 91, 92, 93, 94, 2000, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -201,7 +201,7 @@ struct long_val
 struct perm_val
 {
   enum permissions_type kind;
-  mode_t val;
+  mode_t val[2];
 };
 
 /* dir_id is used to support loop detection in find.c and 
diff --git a/find/ftsfind.c b/find/ftsfind.c
index 2a60b471..9871d382 100644
--- a/find/ftsfind.c
+++ b/find/ftsfind.c
@@ -369,7 +369,7 @@ find(char *arg)
       break;
 	  
     case SYMLINK_DEREF_ARGSONLY:
-      ftsoptions |= FTS_COMFOLLOW;
+      ftsoptions |= FTS_COMFOLLOW|FTS_PHYSICAL;
       break;
 	  
     case SYMLINK_NEVER_DEREF:
diff --git a/find/parser.c b/find/parser.c
index 8a3c6511..28e0500d 100644
--- a/find/parser.c
+++ b/find/parser.c
@@ -1,6 +1,6 @@
 /* parser.c -- convert the command line args into an expression tree.
    Copyright (C) 1990, 1991, 1992, 1993, 1994, 2000, 2001, 2003, 
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1403,7 +1403,7 @@ parse_wholename (const struct parser_table* entry, char **argv, int *arg_ptr)
 static boolean
 parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr)
 {
-  mode_t perm_val;
+  mode_t perm_val[2];
   float rate;
   int mode_start = 0;
   boolean havekind = false;
@@ -1472,7 +1472,8 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr)
       if (NULL == change)
 	error (1, 0, _("invalid mode `%s'"), argv[*arg_ptr]);
     }
-  perm_val = mode_adjust (0, change, 0);
+  perm_val[0] = mode_adjust (0, false, 0, change, NULL);
+  perm_val[1] = mode_adjust (0, true, 0, change, NULL);
   free (change);
   
   our_pred = insert_primary (entry);
@@ -1497,7 +1498,7 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr)
 	  break;
 	}
     }
-  if (('/' == argv[*arg_ptr][0]) && (0 == perm_val))
+  if (('/' == argv[*arg_ptr][0]) && (0 == perm_val[0]) && (0 == perm_val[1]))
     {
       /* The meaning of -perm /000 will change in the future.
        * It currently matches no files, but like -perm -000 it
@@ -1512,7 +1513,7 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr)
 	     argv[*arg_ptr]);
     }
 
-  our_pred->args.perm.val = perm_val & MODE_ALL;
+  memcpy (our_pred->args.perm.val, perm_val, sizeof perm_val);
   (*arg_ptr)++;
   return true;
 }
diff --git a/find/pred.c b/find/pred.c
index fc0c9fc6..ea67885f 100644
--- a/find/pred.c
+++ b/find/pred.c
@@ -1195,11 +1195,13 @@ pred_path (char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)
 boolean
 pred_perm (char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)
 {
+  mode_t mode = stat_buf->st_mode;
+  mode_t perm_val = pred_ptr->args.perm.val[S_ISDIR (mode) != 0];
   (void) pathname;
   switch (pred_ptr->args.perm.kind)
     {
     case PERM_AT_LEAST:
-      return (stat_buf->st_mode & pred_ptr->args.perm.val) == pred_ptr->args.perm.val;
+      return (mode & perm_val) == perm_val;
       break;
 
     case PERM_ANY:
@@ -1213,14 +1215,14 @@ pred_perm (char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)
        * Eric Blake's interpretation is that the mode argument is zero, 
        
        */
-      if (0 == pred_ptr->args.perm.val)
+      if (0 == perm_val)
 	return true;		/* Savannah bug 14748; we used to return false */
       else
-	return (stat_buf->st_mode & pred_ptr->args.perm.val) != 0;
+	return (mode & perm_val) != 0;
       break;
 
     case PERM_EXACT:
-      return (stat_buf->st_mode & MODE_ALL) == pred_ptr->args.perm.val;
+      return (mode & MODE_ALL) == perm_val;
       break;
 
     default:
diff --git a/find/testsuite/Makefile.am b/find/testsuite/Makefile.am
index 4ffe175d..8c8671fb 100644
--- a/find/testsuite/Makefile.am
+++ b/find/testsuite/Makefile.am
@@ -63,6 +63,7 @@ find.posix/files-not-expressions3.xo \
 find.posix/grouping.xo \
 find.posix/links.xo \
 find.posix/name.xo \
+find.posix/perm-X.xo \
 find.posix/perm-vanilla.xo \
 find.posix/posixnot.xo \
 find.posix/prune.xo \
@@ -136,6 +137,7 @@ find.posix/files-not-expressions3.exp \
 find.posix/grouping.exp \
 find.posix/links.exp \
 find.posix/name.exp \
+find.posix/perm-X.exp \
 find.posix/perm-vanilla.exp \
 find.posix/posixnot.exp \
 find.posix/prune.exp \
diff --git a/import-gnulib.sh b/import-gnulib.sh
index 50cfaa63..8f5ded22 100755
--- a/import-gnulib.sh
+++ b/import-gnulib.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # import-gnulib.sh -- imports a copy of gnulib into findutils
-# Copyright (C) 2003,2004,2005 Free Software Foundation, Inc.
+# Copyright (C) 2003,2004,2005,2006 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,37 +20,50 @@
 #
 ##########################################################################
 #
-# This script is intended to populate the "gnulib" directory 
+# This script is intended to populate the "gnulib" directory
 # with a subset of the gnulib code, as provided by "gnulib-tool".
 #
-# To use it, run this script, speficying the location of the 
-# gnulib code as the only argument.   Some sanity-checking is done 
+# To use it, run this script, speficying the location of the
+# gnulib code as the only argument.   Some sanity-checking is done
 # before we commit to modifying things.   The gnulib code is placed
-# in the "gnulib" subdirectory, which is where the buid files expect 
-# it to be. 
-# 
+# in the "gnulib" subdirectory, which is where the buid files expect
+# it to be.
+#
 
-# If CDPATH is set, it will sometimes print the name of the directory 
-# to which you have moved.  Unsetting CDPATH prevents this, as does 
+# If CDPATH is set, it will sometimes print the name of the directory
+# to which you have moved.  Unsetting CDPATH prevents this, as does
 # prefixing it with ".".
 unset CDPATH
 
 destdir="gnulib"
 
 
-# Modules needed for findutils itself.
+# Random extra gnulib files needed for findutils.
+# The source path is relative to gnulib, the destination to .
+findutils_files='
+build-aux/config.guess
+build-aux/config.rpath
+build-aux/config.sub
+build-aux/depcomp
+build-aux/install-sh
+build-aux/mdate-sh
+build-aux/missing
+build-aux/texinfo.tex
+'
+
+# Modules needed for findutils.
 findutils_modules="\
-alloca  argmatch  dirname error fileblocks  fnmatch-gnu fts \
-getline getopt human idcache lstat malloc memcmp memset mktime	\
-modechange pathmax quotearg realloc regex rpmatch savedir stdio-safer \
+alloca argmatch dirname error fileblocks fnmatch-gnu fopen-safer fts \
+getline getopt human idcache lstat malloc memcmp memset mktime \
+modechange pathmax quotearg realloc regex rpmatch savedir \
 stpcpy strdup strftime  strstr strtol strtoul strtoull strtoumax  \
 xalloc xalloc-die xgetcwd  xstrtod xstrtol  xstrtoumax yesno human filemode \
 getline stpcpy canonicalize mountlist closeout gettext stat-macros"
 
-# We need regex to ensure that we can build on platforms like 
-# Solaris which lack those functions. 
+# We need regex to ensure that we can build on platforms like
+# Solaris which lack those functions.
 
-modules="$findutils_modules $intl_modules"
+modules="$findutils_modules"
 export modules
 
 if test $# -lt 1
@@ -83,7 +96,7 @@ else
     exit 1
 fi
 
-    
+
 # exec "$1"/gnulib-tool --create-testdir --dir="$destdir" --lib=libgnulib $modules
 
 if [ -d gnulib ]
@@ -103,6 +116,15 @@ else
 fi
 
 
+for file in $findutils_files; do
+  case $file in
+    */mdate-sh | */texinfo.tex) dest=doc;;
+    *) dest=.;;
+  esac
+  cp -fp "$1"/$file $dest || exit
+done
+
+
 
 cat > gnulib/Makefile.am <<EOF
 # Copyright (C) 2004 Free Software Foundation, Inc.
@@ -135,5 +157,5 @@ EOF
 ## printf "%s" "EXTRA_DIST = "
 ## cd  ./gnulib/m4
 ## ls *.m4 | sed -e 's/$/ \\/' | sed -e '$ s/\\$//'
-## echo 
+## echo
 ## ) > gnulib/m4/Makefile.am
diff --git a/install-sh b/install-sh
index 4d4a9519..9d6a5eb7 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+scriptversion=2006-05-11.20
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,15 +39,24 @@ scriptversion=2005-05-14.22
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
 
 mvprog="${MVPROG-mv}"
 cpprog="${CPPROG-cp}"
@@ -58,7 +67,13 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-chmodcmd="$chmodprog 0755"
+posix_glob=
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chmodcmd=$chmodprog
 chowncmd=
 chgrpcmd=
 stripcmd=
@@ -95,7 +110,7 @@ Environment variables override the default commands:
   CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
     -c) shift
         continue;;
@@ -111,9 +126,15 @@ while test -n "$1"; do
 
     --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
+    -m) mode=$2
         shift
         shift
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
         continue;;
 
     -o) chowncmd="$chownprog $2"
@@ -136,25 +157,33 @@ while test -n "$1"; do
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
+    --)	shift
 	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
   esac
 done
 
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dstarg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dstarg"
+      shift # fnord
+    fi
+    shift # arg
+    dstarg=$arg
+  done
+fi
+
+if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -164,6 +193,33 @@ if test -z "$1"; then
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
 for src
 do
   # Protect names starting with `-'.
@@ -173,15 +229,11 @@ do
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
   else
+
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -208,53 +260,174 @@ do
 	echo "$0: $dstarg: Is a directory" >&2
 	exit 1
       fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
     fi
   fi
 
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
-  # Make sure that the destination directory exists.
-
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
-
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- / "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      # Check for bugs in HP-UX 11.23 and IRIX 6.5 mkdir.
+	      case `ls -ld "$tmpdir"` in
+		d????-??-* ) posix_mkdir=:;;
+	      esac
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
 
-    pathcomp=
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
 
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix=/ ;;
+	-*) prefix=./ ;;
+	*)  prefix= ;;
+      esac
+
+      case $posix_glob in
+        '')
+	  if (set -f) 2>/dev/null; then
+	    posix_glob=true
+	  else
+	    posix_glob=false
+	  fi ;;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob && set -f
+      set fnord $dstdir
       shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
+      $posix_glob && set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
       fi
-      pathcomp=$pathcomp/
-    done
+    fi
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
   else
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -262,10 +435,9 @@ do
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -276,10 +448,10 @@ do
     { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
       && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
 
     # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
       || {
 	   # The rename failed, perhaps because mv can't rename something else
 	   # to itself, or perhaps because mv is so ancient that it does not
@@ -291,11 +463,12 @@ do
 	   # reasons.  In this case, the final cleanup might fail but the new
 	   # file should still install successfully.
 	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	     if test -f "$dst"; then
+	       $doit $rmcmd -f "$dst" 2>/dev/null \
+	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
 	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 echo "$0: cannot unlink or rename $dst" >&2
 		 (exit 1); exit 1
 	       }
 	     else
@@ -304,16 +477,13 @@ do
 	   } &&
 
 	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	   $doit $mvcmd "$dsttmp" "$dst"
 	 }
-    }
-  fi || { (exit 1); exit 1; }
-done
+    } || exit 1
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
+    trap '' 0
+  fi
+done
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/intl/.cvsignore b/intl/.cvsignore
deleted file mode 100644
index 3b6496f8..00000000
--- a/intl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-po2tbl.sed
diff --git a/intl/ChangeLog b/intl/ChangeLog
deleted file mode 100644
index df904de3..00000000
--- a/intl/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2001-05-23  GNU  <bug-gnu-utils@gnu.org>
-
-	* Version 0.10.38 released.
-
diff --git a/intl/Makefile.in b/intl/Makefile.in
deleted file mode 100644
index 603170bc..00000000
--- a/intl/Makefile.in
+++ /dev/null
@@ -1,312 +0,0 @@
-# Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-transform = @program_transform_name@
-libdir = @libdir@
-includedir = @includedir@
-datadir = @datadir@
-localedir = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/intl
-aliaspath = $(localedir)
-subdir = intl
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
-
-l = @INTL_LIBTOOL_SUFFIX_PREFIX@
-
-AR = ar
-CC = @CC@
-LIBTOOL = @LIBTOOL@
-RANLIB = @RANLIB@
-YACC = @INTLBISON@ -y -d
-YFLAGS = --name-prefix=__gettext
-
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
--DLIBDIR=\"$(libdir)\" @DEFS@
-CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-HEADERS = $(COMHDRS) libgnuintl.h libgettext.h loadinfo.h
-COMHDRS = gettext.h gettextP.h hash-string.h
-SOURCES = $(COMSRCS) intl-compat.c
-COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
-finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \
-localcharset.c
-OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
-finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \
-plural.$lo localcharset.$lo
-GETTOBJS = intl-compat.$lo
-DISTFILES.common = Makefile.in \
-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
-DISTFILES.generated = plural.c
-DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc
-DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c
-
-# Libtool's library version information for libintl.
-# Before making a gettext release, the gettext maintainer must change this
-# according to the libtool documentation, section "Library interface versions".
-# Maintainers of other packages that include the intl directory must *not*
-# change these values.
-LTV_CURRENT=1
-LTV_REVISION=1
-LTV_AGE=0
-
-.SUFFIXES:
-.SUFFIXES: .c .y .o .lo .sin .sed
-.c.o:
-	$(COMPILE) $<
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) $<
-
-.y.c:
-	$(YACC) $(YFLAGS) --output $@ $<
-	rm -f $*.h
-
-.sin.sed:
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
-	mv t-$@ $@
-
-INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/gnulib/lib
-
-all: all-@USE_INCLUDED_LIBINTL@
-all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
-all-no: all-no-@BUILD_INCLUDED_LIBINTL@
-all-no-yes: libgnuintl.$la
-all-no-no:
-
-libintl.a libgnuintl.a: $(OBJECTS)
-	rm -f $@
-	$(AR) cru $@ $(OBJECTS)
-	$(RANLIB) $@
-
-libintl.la libgnuintl.la: $(OBJECTS)
-	$(LIBTOOL) --mode=link \
-	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
-	  $(OBJECTS) @LIBICONV@ \
-	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-	  -rpath $(libdir) \
-	  -no-undefined
-
-libintl.h: libgnuintl.h
-	cp $(srcdir)/libgnuintl.h libintl.h
-
-charset.alias: config.charset
-	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
-	mv t-$@ $@
-
-check: all
-
-# This installation goal is only used in GNU gettext.  Packages which
-# only use the library should use install instead.
-
-# We must not install the libintl.h/libintl.a files if we are on a
-# system which has the GNU gettext() function in its C library or in a
-# separate library.
-# If you want to use the one which comes with this version of the
-# package, you have to use `configure --with-included-gettext'.
-install: install-exec install-data
-install-exec: all
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
-	  $(LIBTOOL) --mode=install \
-	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
-	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-	  dest=$(DESTDIR)$(libdir)/charset.alias; \
-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-	    orig=$(DESTDIR)$(libdir)/charset.alias; \
-	    sed -f ref-add.sed $$orig > $$temp; \
-	    $(INSTALL_DATA) $$temp $$dest; \
-	    rm -f $$temp; \
-	  else \
-	    if test @GLIBC21@ = no; then \
-	      orig=charset.alias; \
-	      sed -f ref-add.sed $$orig > $$temp; \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	      rm -f $$temp; \
-	    fi; \
-	  fi; \
-	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
-	  test -f $(DESTDIR)$(localedir)/locale.alias \
-	    && orig=$(DESTDIR)$(localedir)/locale.alias \
-	    || orig=$(srcdir)/locale.alias; \
-	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-	  dest=$(DESTDIR)$(localedir)/locale.alias; \
-	  sed -f ref-add.sed $$orig > $$temp; \
-	  $(INSTALL_DATA) $$temp $$dest; \
-	  rm -f $$temp; \
-	else \
-	  : ; \
-	fi
-install-data: all
-	if test "$(PACKAGE)" = "gettext"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
-	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
-	  dists="$(DISTFILES.common)"; \
-	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
-	  dists="$(DISTFILES.generated)"; \
-	  for file in $$dists; do \
-	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	    $(INSTALL_DATA) $$dir/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  dists="$(DISTFILES.obsolete)"; \
-	  for file in $$dists; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  rm -f $(DESTDIR)$(includedir)/libintl.h; \
-	  $(LIBTOOL) --mode=uninstall \
-	    rm -f $(DESTDIR)$(libdir)/libintl.$la; \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-	    dest=$(DESTDIR)$(libdir)/charset.alias; \
-	    sed -f ref-del.sed $$dest > $$temp; \
-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-	      rm -f $$dest; \
-	    else \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	    fi; \
-	    rm -f $$temp; \
-	  fi; \
-	  if test -f $(DESTDIR)$(localedir)/locale.alias; then \
-	    temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-	    dest=$(DESTDIR)$(localedir)/locale.alias; \
-	    sed -f ref-del.sed $$dest > $$temp; \
-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-	      rm -f $$dest; \
-	    else \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	    fi; \
-	    rm -f $$temp; \
-	  fi; \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext"; then \
-	  for file in VERSION ChangeLog $(DISTFILES.common) $(DISTFILES.generated); do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-
-info dvi:
-
-$(OBJECTS): ../config.h libgnuintl.h
-bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
-dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
-
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
-
-id: ID
-
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
-
-
-mostlyclean:
-	rm -f *.a *.la *.o *.lo core core.*
-	rm -f libintl.h charset.alias ref-add.sed ref-del.sed
-	rm -f -r .libs _libs
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile ID TAGS
-	if test "$(PACKAGE)" = gettext; then \
-	  rm -f ChangeLog.inst $(DISTFILES.normal); \
-	else \
-	  : ; \
-	fi
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-
-# GNU gettext needs not contain the file `VERSION' but contains some
-# other files which should not be distributed in other packages.
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile
-	if test "$(PACKAGE)" = gettext; then \
-	  additional="$(DISTFILES.gettext)"; \
-	else \
-	  additional="$(DISTFILES.normal)"; \
-	fi; \
-	$(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
-	for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
-	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	  ln $$dir/$$file $(distdir) 2> /dev/null \
-	    || cp -p $$dir/$$file $(distdir); \
-	done
-
-Makefile: Makefile.in ../config.status
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/intl/VERSION b/intl/VERSION
deleted file mode 100644
index 268da64a..00000000
--- a/intl/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-GNU gettext library from gettext-0.10.38
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
deleted file mode 100644
index 6752a7b3..00000000
--- a/intl/bindtextdom.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-#include "gettextP.h"
-
-#ifdef _LIBC
-/* We have to handle multi-threaded applications.  */
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_dirname _nl_default_dirname__
-# define _nl_domain_bindings _nl_domain_bindings__
-#endif
-
-/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
-#ifndef offsetof
-# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Contains the default location of the message catalogs.  */
-extern const char _nl_default_dirname[];
-
-/* List with bindings of specific domains.  */
-extern struct binding *_nl_domain_bindings;
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock)
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define BINDTEXTDOMAIN __bindtextdomain
-# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
-# ifndef strdup
-#  define strdup(str) __strdup (str)
-# endif
-#else
-# define BINDTEXTDOMAIN bindtextdomain__
-# define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__
-#endif
-
-/* Prototypes for local functions.  */
-static void set_binding_values PARAMS ((const char *domainname,
-					const char **dirnamep,
-					const char **codesetp));
-     
-/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
-   to be used for the DOMAINNAME message catalog.
-   If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
-   modified, only the current value is returned.
-   If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
-   modified nor returned.  */
-static void
-set_binding_values (domainname, dirnamep, codesetp)
-     const char *domainname;
-     const char **dirnamep;
-     const char **codesetp;
-{
-  struct binding *binding;
-  int modified;
-
-  /* Some sanity checks.  */
-  if (domainname == NULL || domainname[0] == '\0')
-    {
-      if (dirnamep)
-	*dirnamep = NULL;
-      if (codesetp)
-	*codesetp = NULL;
-      return;
-    }
-
-  __libc_rwlock_wrlock (_nl_state_lock);
-
-  modified = 0;
-
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (binding != NULL)
-    {
-      if (dirnamep)
-	{
-	  const char *dirname = *dirnamep;
-
-	  if (dirname == NULL)
-	    /* The current binding has be to returned.  */
-	    *dirnamep = binding->dirname;
-	  else
-	    {
-	      /* The domain is already bound.  If the new value and the old
-		 one are equal we simply do nothing.  Otherwise replace the
-		 old binding.  */
-	      char *result = binding->dirname;
-	      if (strcmp (dirname, result) != 0)
-		{
-		  if (strcmp (dirname, _nl_default_dirname) == 0)
-		    result = (char *) _nl_default_dirname;
-		  else
-		    {
-#if defined _LIBC || defined HAVE_STRDUP
-		      result = strdup (dirname);
-#else
-		      size_t len = strlen (dirname) + 1;
-		      result = (char *) malloc (len);
-		      if (__builtin_expect (result != NULL, 1))
-			memcpy (result, dirname, len);
-#endif
-		    }
-
-		  if (__builtin_expect (result != NULL, 1))
-		    {
-		      if (binding->dirname != _nl_default_dirname)
-			free (binding->dirname);
-
-		      binding->dirname = result;
-		      modified = 1;
-		    }
-		}
-	      *dirnamep = result;
-	    }
-	}
-
-      if (codesetp)
-	{
-	  const char *codeset = *codesetp;
-
-	  if (codeset == NULL)
-	    /* The current binding has be to returned.  */
-	    *codesetp = binding->codeset;
-	  else
-	    {
-	      /* The domain is already bound.  If the new value and the old
-		 one are equal we simply do nothing.  Otherwise replace the
-		 old binding.  */
-	      char *result = binding->codeset;
-	      if (result == NULL || strcmp (codeset, result) != 0)
-		{
-#if defined _LIBC || defined HAVE_STRDUP
-		  result = strdup (codeset);
-#else
-		  size_t len = strlen (codeset) + 1;
-		  result = (char *) malloc (len);
-		  if (__builtin_expect (result != NULL, 1))
-		    memcpy (result, codeset, len);
-#endif
-
-		  if (__builtin_expect (result != NULL, 1))
-		    {
-		      if (binding->codeset != NULL)
-			free (binding->codeset);
-
-		      binding->codeset = result;
-		      binding->codeset_cntr++;
-		      modified = 1;
-		    }
-		}
-	      *codesetp = result;
-	    }
-	}
-    }
-  else if ((dirnamep == NULL || *dirnamep == NULL)
-	   && (codesetp == NULL || *codesetp == NULL))
-    {
-      /* Simply return the default values.  */
-      if (dirnamep)
-	*dirnamep = _nl_default_dirname;
-      if (codesetp)
-	*codesetp = NULL;
-    }
-  else
-    {
-      /* We have to create a new binding.  */
-      size_t len = strlen (domainname) + 1;
-      struct binding *new_binding =
-	(struct binding *) malloc (offsetof (struct binding, domainname) + len);
-
-      if (__builtin_expect (new_binding == NULL, 0))
-	goto failed;
-
-      memcpy (new_binding->domainname, domainname, len);
-
-      if (dirnamep)
-	{
-	  const char *dirname = *dirnamep;
-
-	  if (dirname == NULL)
-	    /* The default value.  */
-	    dirname = _nl_default_dirname;
-	  else
-	    {
-	      if (strcmp (dirname, _nl_default_dirname) == 0)
-		dirname = _nl_default_dirname;
-	      else
-		{
-		  char *result;
-#if defined _LIBC || defined HAVE_STRDUP
-		  result = strdup (dirname);
-		  if (__builtin_expect (result == NULL, 0))
-		    goto failed_dirname;
-#else
-		  size_t len = strlen (dirname) + 1;
-		  result = (char *) malloc (len);
-		  if (__builtin_expect (result == NULL, 0))
-		    goto failed_dirname;
-		  memcpy (result, dirname, len);
-#endif
-		  dirname = result;
-		}
-	    }
-	  *dirnamep = dirname;
-	  new_binding->dirname = (char *) dirname;
-	}
-      else
-	/* The default value.  */
-	new_binding->dirname = (char *) _nl_default_dirname;
-
-      new_binding->codeset_cntr = 0;
-
-      if (codesetp)
-	{
-	  const char *codeset = *codesetp;
-
-	  if (codeset != NULL)
-	    {
-	      char *result;
-
-#if defined _LIBC || defined HAVE_STRDUP
-	      result = strdup (codeset);
-	      if (__builtin_expect (result == NULL, 0))
-		goto failed_codeset;
-#else
-	      size_t len = strlen (codeset) + 1;
-	      result = (char *) malloc (len);
-	      if (__builtin_expect (result == NULL, 0))
-		goto failed_codeset;
-	      memcpy (result, codeset, len);
-#endif
-	      codeset = result;
-	      new_binding->codeset_cntr++;
-	    }
-	  *codesetp = codeset;
-	  new_binding->codeset = (char *) codeset;
-	}
-      else
-	new_binding->codeset = NULL;
-
-      /* Now enqueue it.  */
-      if (_nl_domain_bindings == NULL
-	  || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
-	{
-	  new_binding->next = _nl_domain_bindings;
-	  _nl_domain_bindings = new_binding;
-	}
-      else
-	{
-	  binding = _nl_domain_bindings;
-	  while (binding->next != NULL
-		 && strcmp (domainname, binding->next->domainname) > 0)
-	    binding = binding->next;
-
-	  new_binding->next = binding->next;
-	  binding->next = new_binding;
-	}
-
-      modified = 1;
-
-      /* Here we deal with memory allocation failures.  */
-      if (0)
-	{
-	failed_codeset:
-	  if (new_binding->dirname != _nl_default_dirname)
-	    free (new_binding->dirname);
-	failed_dirname:
-	  free (new_binding);
-	failed:
-	  if (dirnamep)
-	    *dirnamep = NULL;
-	  if (codesetp)
-	    *codesetp = NULL;
-	}
-    }
-
-  /* If we modified any binding, we flush the caches.  */
-  if (modified)
-    ++_nl_msg_cat_cntr;
-
-  __libc_rwlock_unlock (_nl_state_lock);
-}
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-char *
-BINDTEXTDOMAIN (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  set_binding_values (domainname, &dirname, NULL);
-  return (char *) dirname;
-}
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-char *
-BIND_TEXTDOMAIN_CODESET (domainname, codeset)
-     const char *domainname;
-     const char *codeset;
-{
-  set_binding_values (domainname, NULL, &codeset);
-  return (char *) codeset;
-}
-
-#ifdef _LIBC
-/* Aliases for function names in GNU C Library.  */
-weak_alias (__bindtextdomain, bindtextdomain);
-weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
-#endif
diff --git a/intl/config.charset b/intl/config.charset
deleted file mode 100755
index 014d493a..00000000
--- a/intl/config.charset
+++ /dev/null
@@ -1,438 +0,0 @@
-#! /bin/sh
-# Output a system dependent table of character encoding aliases.
-#
-#   Copyright (C) 2000-2001 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library General Public
-#   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-#   USA.
-#
-# The table consists of lines of the form
-#    ALIAS  CANONICAL
-#
-# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
-# ALIAS is compared in a case sensitive way.
-#
-# CANONICAL is the GNU canonical name for this character encoding.
-# It must be an encoding supported by libiconv. Support by GNU libc is
-# also desirable. CANONICAL is case insensitive. Usually an upper case
-# MIME charset name is preferred.
-# The current list of GNU canonical charset names is as follows.
-#
-#       name                         used by which systems         a MIME name?
-#   ASCII, ANSI_X3.4-1968     glibc solaris freebsd
-#   ISO-8859-1                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-2                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-3                glibc                                     yes
-#   ISO-8859-4                osf solaris freebsd                       yes
-#   ISO-8859-5                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-6                glibc aix hpux solaris                    yes
-#   ISO-8859-7                glibc aix hpux irix osf solaris           yes
-#   ISO-8859-8                glibc aix hpux osf solaris                yes
-#   ISO-8859-9                glibc aix hpux irix osf solaris           yes
-#   ISO-8859-13               glibc
-#   ISO-8859-15               glibc aix osf solaris freebsd
-#   KOI8-R                    glibc solaris freebsd                     yes
-#   KOI8-U                    glibc freebsd                             yes
-#   CP437                     dos
-#   CP775                     dos
-#   CP850                     aix osf dos
-#   CP852                     dos
-#   CP855                     dos
-#   CP856                     aix
-#   CP857                     dos
-#   CP861                     dos
-#   CP862                     dos
-#   CP864                     dos
-#   CP865                     dos
-#   CP866                     freebsd dos
-#   CP869                     dos
-#   CP874                     win32 dos
-#   CP922                     aix
-#   CP932                     aix win32 dos
-#   CP943                     aix
-#   CP949                     osf win32 dos
-#   CP950                     win32 dos
-#   CP1046                    aix
-#   CP1124                    aix
-#   CP1129                    aix
-#   CP1250                    win32
-#   CP1251                    glibc win32
-#   CP1252                    aix win32
-#   CP1253                    win32
-#   CP1254                    win32
-#   CP1255                    win32
-#   CP1256                    win32
-#   CP1257                    win32
-#   GB2312                    glibc aix hpux irix solaris freebsd       yes
-#   EUC-JP                    glibc aix hpux irix osf solaris freebsd   yes
-#   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
-#   EUC-TW                    glibc aix hpux irix osf solaris
-#   BIG5                      glibc aix hpux osf solaris freebsd        yes
-#   BIG5HKSCS                 glibc
-#   GBK                       aix osf win32 dos
-#   GB18030                   glibc
-#   SJIS                      hpux osf solaris freebsd
-#   JOHAB                     glibc win32
-#   TIS-620                   glibc aix hpux osf solaris
-#   VISCII                    glibc                                     yes
-#   HP-ROMAN8                 hpux
-#   HP-ARABIC8                hpux
-#   HP-GREEK8                 hpux
-#   HP-HEBREW8                hpux
-#   HP-TURKISH8               hpux
-#   HP-KANA8                  hpux
-#   DEC-KANJI                 osf
-#   DEC-HANYU                 osf
-#   UTF-8                     glibc aix hpux osf solaris                yes
-#
-# Note: Names which are not marked as being a MIME name should not be used in
-# Internet protocols for information interchange (mail, news, etc.).
-#
-# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
-# must understand both names and treat them as equivalent.
-#
-# The first argument passed to this file is the canonical host specification,
-#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or
-#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-
-host="$1"
-os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
-echo "# This file contains a table of character encoding aliases,"
-echo "# suitable for operating system '${os}'."
-echo "# It was automatically generated from config.charset."
-# List of references, updated during installation:
-echo "# Packages using this file: "
-case "$os" in
-    linux* | *-gnu*)
-	# With glibc-2.1 or newer, we don't need any canonicalization,
-	# because glibc has iconv and both glibc and libiconv support all
-	# GNU canonical names directly. Therefore, the Makefile does not
-	# need to install the alias file at all.
-	# The following applies only to glibc-2.0.x and older libcs.
-	echo "ISO_646.IRV:1983 ASCII"
-	;;
-    aix*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-6 ISO-8859-6"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "IBM-850 CP850"
-	echo "IBM-856 CP856"
-	echo "IBM-921 ISO-8859-13"
-	echo "IBM-922 CP922"
-	echo "IBM-932 CP932"
-	echo "IBM-943 CP943"
-	echo "IBM-1046 CP1046"
-	echo "IBM-1124 CP1124"
-	echo "IBM-1129 CP1129"
-	echo "IBM-1252 CP1252"
-	echo "IBM-eucCN GB2312"
-	echo "IBM-eucJP EUC-JP"
-	echo "IBM-eucKR EUC-KR"
-	echo "IBM-eucTW EUC-TW"
-	echo "big5 BIG5"
-	echo "GBK GBK"
-	echo "TIS-620 TIS-620"
-	echo "UTF-8 UTF-8"
-	;;
-    hpux*)
-	echo "iso88591 ISO-8859-1"
-	echo "iso88592 ISO-8859-2"
-	echo "iso88595 ISO-8859-5"
-	echo "iso88596 ISO-8859-6"
-	echo "iso88597 ISO-8859-7"
-	echo "iso88598 ISO-8859-8"
-	echo "iso88599 ISO-8859-9"
-	echo "iso885915 ISO-8859-15"
-	echo "roman8 HP-ROMAN8"
-	echo "arabic8 HP-ARABIC8"
-	echo "greek8 HP-GREEK8"
-	echo "hebrew8 HP-HEBREW8"
-	echo "turkish8 HP-TURKISH8"
-	echo "kana8 HP-KANA8"
-	echo "tis620 TIS-620"
-	echo "big5 BIG5"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	echo "hp15CN GB2312"
-	#echo "ccdc ?" # what is this?
-	echo "SJIS SJIS"
-	echo "utf8 UTF-8"
-	;;
-    irix*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "eucCN GB2312"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	;;
-    osf*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-4 ISO-8859-4"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "cp850 CP850"
-	echo "big5 BIG5"
-	echo "dechanyu DEC-HANYU"
-	echo "dechanzi GB2312"
-	echo "deckanji DEC-KANJI"
-	echo "deckorean EUC-KR"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	echo "GBK GBK"
-	echo "KSC5601 CP949"
-	echo "sdeckanji EUC-JP"
-	echo "SJIS SJIS"
-	echo "TACTIS TIS-620"
-	echo "UTF-8 UTF-8"
-	;;
-    solaris*)
-	echo "646 ASCII"
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-4 ISO-8859-4"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-6 ISO-8859-6"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "koi8-r KOI8-R"
-	echo "BIG5 BIG5"
-	echo "gb2312 GB2312"
-	echo "cns11643 EUC-TW"
-	echo "5601 EUC-KR"
-	echo "eucJP EUC-JP"
-	echo "PCK SJIS"
-	echo "TIS620.2533 TIS-620"
-	#echo "sun_eu_greek ?" # what is this?
-	echo "UTF-8 UTF-8"
-	;;
-    freebsd*)
-	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
-	# localcharset.c falls back to using the full locale name
-	# from the environment variables.
-	echo "C ASCII"
-	echo "US-ASCII ASCII"
-	for l in la_LN lt_LN; do
-	  echo "$l.ASCII ASCII"
-	done
-	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
-	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
-	         lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
-	  echo "$l.ISO_8859-1 ISO-8859-1"
-	  echo "$l.DIS_8859-15 ISO-8859-15"
-	done
-	for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
-	  echo "$l.ISO_8859-2 ISO-8859-2"
-	done
-	for l in la_LN lt_LT; do
-	  echo "$l.ISO_8859-4 ISO-8859-4"
-	done
-	for l in ru_RU ru_SU; do
-	  echo "$l.KOI8-R KOI8-R"
-	  echo "$l.ISO_8859-5 ISO-8859-5"
-	  echo "$l.CP866 CP866"
-	done
-	echo "uk_UA.KOI8-U KOI8-U"
-	echo "zh_TW.BIG5 BIG5"
-	echo "zh_TW.Big5 BIG5"
-	echo "zh_CN.EUC GB2312"
-	echo "ja_JP.EUC EUC-JP"
-	echo "ja_JP.SJIS SJIS"
-	echo "ja_JP.Shift_JIS SJIS"
-	echo "ko_KR.EUC EUC-KR"
-	;;
-    beos*)
-	# BeOS has a single locale, and it has UTF-8 encoding.
-	echo "* UTF-8"
-	;;
-    msdosdjgpp*)
-	# DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
-	# localcharset.c falls back to using the full locale name
-	# from the environment variables.
-	echo "#"
-	echo "# The encodings given here may not all be correct."
-	echo "# If you find that the encoding given for your language and"
-	echo "# country is not the one your DOS machine actually uses, just"
-	echo "# correct it in this file, and send a mail to"
-	echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
-	echo "# and Bruno Haible <haible@clisp.cons.org>."
-	echo "#"
-	echo "C ASCII"
-	# ISO-8859-1 languages
-	echo "ca CP850"
-	echo "ca_ES CP850"
-	echo "da CP865"    # not CP850 ??
-	echo "da_DK CP865" # not CP850 ??
-	echo "de CP850"
-	echo "de_AT CP850"
-	echo "de_CH CP850"
-	echo "de_DE CP850"
-	echo "en CP850"
-	echo "en_AU CP850" # not CP437 ??
-	echo "en_CA CP850"
-	echo "en_GB CP850"
-	echo "en_NZ CP437"
-	echo "en_US CP437"
-	echo "en_ZA CP850" # not CP437 ??
-	echo "es CP850"
-	echo "es_AR CP850"
-	echo "es_BO CP850"
-	echo "es_CL CP850"
-	echo "es_CO CP850"
-	echo "es_CR CP850"
-	echo "es_CU CP850"
-	echo "es_DO CP850"
-	echo "es_EC CP850"
-	echo "es_ES CP850"
-	echo "es_GT CP850"
-	echo "es_HN CP850"
-	echo "es_MX CP850"
-	echo "es_NI CP850"
-	echo "es_PA CP850"
-	echo "es_PY CP850"
-	echo "es_PE CP850"
-	echo "es_SV CP850"
-	echo "es_UY CP850"
-	echo "es_VE CP850"
-	echo "et CP850"
-	echo "et_EE CP850"
-	echo "eu CP850"
-	echo "eu_ES CP850"
-	echo "fi CP850"
-	echo "fi_FI CP850"
-	echo "fr CP850"
-	echo "fr_BE CP850"
-	echo "fr_CA CP850"
-	echo "fr_CH CP850"
-	echo "fr_FR CP850"
-	echo "ga CP850"
-	echo "ga_IE CP850"
-	echo "gd CP850"
-	echo "gd_GB CP850"
-	echo "gl CP850"
-	echo "gl_ES CP850"
-	echo "id CP850"    # not CP437 ??
-	echo "id_ID CP850" # not CP437 ??
-	echo "is CP861"    # not CP850 ??
-	echo "is_IS CP861" # not CP850 ??
-	echo "it CP850"
-	echo "it_CH CP850"
-	echo "it_IT CP850"
-	echo "lt CP775"
-	echo "lt_LT CP775"
-	echo "lv CP775"
-	echo "lv_LV CP775"
-	echo "nb CP865"    # not CP850 ??
-	echo "nb_NO CP865" # not CP850 ??
-	echo "nl CP850"
-	echo "nl_BE CP850"
-	echo "nl_NL CP850"
-	echo "nn CP865"    # not CP850 ??
-	echo "nn_NO CP865" # not CP850 ??
-	echo "no CP865"    # not CP850 ??
-	echo "no_NO CP865" # not CP850 ??
-	echo "pt CP850"
-	echo "pt_BR CP850"
-	echo "pt_PT CP850"
-	echo "sv CP850"
-	echo "sv_SE CP850"
-	# ISO-8859-2 languages
-	echo "cs CP852"
-	echo "cs_CZ CP852"
-	echo "hr CP852"
-	echo "hr_HR CP852"
-	echo "hu CP852"
-	echo "hu_HU CP852"
-	echo "pl CP852"
-	echo "pl_PL CP852"
-	echo "ro CP852"
-	echo "ro_RO CP852"
-	echo "sk CP852"
-	echo "sk_SK CP852"
-	echo "sl CP852"
-	echo "sl_SI CP852"
-	echo "sq CP852"
-	echo "sq_AL CP852"
-	echo "sr CP852"    # CP852 or CP866 or CP855 ??
-	echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
-	# ISO-8859-3 languages
-	echo "mt CP850"
-	echo "mt_MT CP850"
-	# ISO-8859-5 languages
-	echo "be CP866"
-	echo "be_BE CP866"
-	echo "bg CP866"    # not CP855 ??
-	echo "bg_BG CP866" # not CP855 ??
-	echo "mk CP866"    # not CP855 ??
-	echo "mk_MK CP866" # not CP855 ??
-	echo "ru KOI8-R"    # not CP866 ??
-	echo "ru_RU KOI8-R" # not CP866 ??
-	# ISO-8859-6 languages
-	echo "ar CP864"
-	echo "ar_AE CP864"
-	echo "ar_DZ CP864"
-	echo "ar_EG CP864"
-	echo "ar_IQ CP864"
-	echo "ar_IR CP864"
-	echo "ar_JO CP864"
-	echo "ar_KW CP864"
-	echo "ar_MA CP864"
-	echo "ar_OM CP864"
-	echo "ar_QA CP864"
-	echo "ar_SA CP864"
-	echo "ar_SY CP864"
-	# ISO-8859-7 languages
-	echo "el CP869"
-	echo "el_GR CP869"
-	# ISO-8859-8 languages
-	echo "he CP862"
-	echo "he_IL CP862"
-	# ISO-8859-9 languages
-	echo "tr CP857"
-	echo "tr_TR CP857"
-	# Japanese
-	echo "ja CP932"
-	echo "ja_JP CP932"
-	# Chinese
-	echo "zh_CN GBK"
-	echo "zh_TW CP950" # not CP938 ??
-	# Korean
-	echo "kr CP949"    # not CP934 ??
-	echo "kr_KR CP949" # not CP934 ??
-	# Thai
-	echo "th CP874"
-	echo "th_TH CP874"
-	# Other
-	echo "eo CP850"
-	echo "eo_EO CP850"
-	;;
-esac
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
deleted file mode 100644
index 4edb2cbe..00000000
--- a/intl/dcgettext.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCGETTEXT __dcgettext
-# define DCIGETTEXT __dcigettext
-#else
-# define DCGETTEXT dcgettext__
-# define DCIGETTEXT dcigettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-char *
-DCGETTEXT (domainname, msgid, category)
-     const char *domainname;
-     const char *msgid;
-     int category;
-{
-  return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dcgettext, dcgettext);
-#endif
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
deleted file mode 100644
index 19122652..00000000
--- a/intl/dcigettext.c
+++ /dev/null
@@ -1,1258 +0,0 @@
-/* Implementation of the internal dcigettext function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(val) errno = (val)
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-
-#include <string.h>
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-/* The presence of unistd.h is assumed by gnulib these days, so we 
- * might as well assume it too. 
- */
-#include <unistd.h>
-
-#include <locale.h>
-
-#if defined HAVE_SYS_PARAM_H || defined _LIBC
-# include <sys/param.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-#include "hash-string.h"
-
-/* Thread safetyness.  */
-#ifdef _LIBC
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_lock_define_initialized(CLASS, NAME)
-# define __libc_lock_lock(NAME)
-# define __libc_lock_unlock(NAME)
-# define __libc_rwlock_define_initialized(CLASS, NAME)
-# define __libc_rwlock_rdlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* Alignment of types.  */
-#if defined __GNUC__ && __GNUC__ >= 2
-# define alignof(TYPE) __alignof__ (TYPE)
-#else
-# define alignof(TYPE) \
-    ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_default_domain _nl_default_default_domain__
-# define _nl_current_default_domain _nl_current_default_domain__
-# define _nl_default_dirname _nl_default_dirname__
-# define _nl_domain_bindings _nl_domain_bindings__
-#endif
-
-/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
-#ifndef offsetof
-# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define getcwd __getcwd
-# ifndef stpcpy
-#  define stpcpy __stpcpy
-# endif
-# define tfind __tfind
-#else
-# if !defined HAVE_GETCWD
-char *getwd ();
-#  define getcwd(buf, max) getwd (buf)
-# else
-char *getcwd ();
-# endif
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-# ifndef HAVE_MEMPCPY
-static void *mempcpy PARAMS ((void *dest, const void *src, size_t n));
-# endif
-#endif
-
-/* Amount to increase buffer size by in each try.  */
-#define PATH_INCR 32
-
-/* The following is from pathmax.h.  */
-/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
-   PATH_MAX but might cause redefinition warnings when sys/param.h is
-   later included (as on MORE/BSD 4.3).  */
-#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
-# include <limits.h>
-#endif
-
-#ifndef _POSIX_PATH_MAX
-# define _POSIX_PATH_MAX 255
-#endif
-
-#if !defined PATH_MAX && defined _PC_PATH_MAX
-# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
-#endif
-
-/* Don't include sys/param.h if it already has been.  */
-#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
-# include <sys/param.h>
-#endif
-
-#if !defined PATH_MAX && defined MAXPATHLEN
-# define PATH_MAX MAXPATHLEN
-#endif
-
-#ifndef PATH_MAX
-# define PATH_MAX _POSIX_PATH_MAX
-#endif
-
-/* Pathname support.
-   ISSLASH(C)           tests whether C is a directory separator character.
-   IS_ABSOLUTE_PATH(P)  tests whether P is an absolute path.  If it is not,
-                        it may be concatenated to a directory pathname.
-   IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
- */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-# define HAS_DEVICE(P) \
-    ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
-     && (P)[1] == ':')
-# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
-# define IS_PATH_WITH_DIR(P) \
-    (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
-#else
-  /* Unix */
-# define ISSLASH(C) ((C) == '/')
-# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
-# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
-#endif
-
-/* XPG3 defines the result of `setlocale (category, NULL)' as:
-   ``Directs `setlocale()' to query `category' and return the current
-     setting of `local'.''
-   However it does not specify the exact format.  Neither do SUSV2 and
-   ISO C 99.  So we can use this feature only on selected systems (e.g.
-   those using GNU C Library).  */
-#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
-# define HAVE_LOCALE_NULL
-#endif
-
-/* This is the type used for the search tree where known translations
-   are stored.  */
-struct known_translation_t
-{
-  /* Domain in which to search.  */
-  char *domainname;
-
-  /* The category.  */
-  int category;
-
-  /* State of the catalog counter at the point the string was found.  */
-  int counter;
-
-  /* Catalog where the string was found.  */
-  struct loaded_l10nfile *domain;
-
-  /* And finally the translation.  */
-  const char *translation;
-  size_t translation_length;
-
-  /* Pointer to the string in question.  */
-  char msgid[ZERO];
-};
-
-/* Root of the search tree with known translations.  We can use this
-   only if the system provides the `tsearch' function family.  */
-#if defined HAVE_TSEARCH || defined _LIBC
-# include <search.h>
-
-static void *root;
-
-# ifdef _LIBC
-#  define tsearch __tsearch
-# endif
-
-/* Function to compare two entries in the table of known translations.  */
-static int transcmp PARAMS ((const void *p1, const void *p2));
-static int
-transcmp (p1, p2)
-     const void *p1;
-     const void *p2;
-{
-  const struct known_translation_t *s1;
-  const struct known_translation_t *s2;
-  int result;
-
-  s1 = (const struct known_translation_t *) p1;
-  s2 = (const struct known_translation_t *) p2;
-
-  result = strcmp (s1->msgid, s2->msgid);
-  if (result == 0)
-    {
-      result = strcmp (s1->domainname, s2->domainname);
-      if (result == 0)
-	/* We compare the category last (though this is the cheapest
-	   operation) since it is hopefully always the same (namely
-	   LC_MESSAGES).  */
-	result = s1->category - s2->category;
-    }
-
-  return result;
-}
-#endif
-
-/* Name of the default domain used for gettext(3) prior any call to
-   textdomain(3).  The default value for this is "messages".  */
-const char _nl_default_default_domain[] = "messages";
-
-/* Value used as the default domain for gettext(3).  */
-const char *_nl_current_default_domain = _nl_default_default_domain;
-
-/* Contains the default location of the message catalogs.  */
-const char _nl_default_dirname[] = LOCALEDIR;
-
-/* List with bindings of specific domains created by bindtextdomain()
-   calls.  */
-struct binding *_nl_domain_bindings;
-
-/* Prototypes for local functions.  */
-static char *plural_lookup PARAMS ((struct loaded_l10nfile *domain,
-				    unsigned long int n,
-				    const char *translation,
-				    size_t translation_len))
-     internal_function;
-static unsigned long int plural_eval PARAMS ((struct expression *pexp,
-					      unsigned long int n))
-     internal_function;
-static const char *category_to_name PARAMS ((int category)) internal_function;
-static const char *guess_category_value PARAMS ((int category,
-						 const char *categoryname))
-     internal_function;
-
-
-/* For those loosing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done.  */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
-  void *address;
-  struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						      \
-  do {									      \
-    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
-    /* If we cannot get a free block we cannot add the new element to	      \
-       the list.  */							      \
-    if (newp != NULL) {							      \
-      newp->address = (addr);						      \
-      newp->next = (list);						      \
-      (list) = newp;							      \
-    }									      \
-  } while (0)
-# define FREE_BLOCKS(list)						      \
-  do {									      \
-    while (list != NULL) {						      \
-      struct block_list *old = list;					      \
-      list = list->next;						      \
-      free (old);							      \
-    }									      \
-  } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif	/* have alloca */
-
-
-#ifdef _LIBC
-/* List of blocks allocated for translations.  */
-typedef struct transmem_list
-{
-  struct transmem_list *next;
-  char data[ZERO];
-} transmem_block_t;
-static struct transmem_list *transmem_list;
-#else
-typedef unsigned char transmem_block_t;
-#endif
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCIGETTEXT __dcigettext
-#else
-# define DCIGETTEXT dcigettext__
-#endif
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-#ifdef _LIBC
-__libc_rwlock_define_initialized (, _nl_state_lock)
-#endif
-
-/* Checking whether the binaries runs SUID must be done and glibc provides
-   easier methods therefore we make a difference here.  */
-#ifdef _LIBC
-# define ENABLE_SECURE __libc_enable_secure
-# define DETERMINE_SECURE
-#else
-# ifndef HAVE_GETUID
-#  define getuid() 0
-# endif
-# ifndef HAVE_GETGID
-#  define getgid() 0
-# endif
-# ifndef HAVE_GETEUID
-#  define geteuid() getuid()
-# endif
-# ifndef HAVE_GETEGID
-#  define getegid() getgid()
-# endif
-static int enable_secure;
-# define ENABLE_SECURE (enable_secure == 1)
-# define DETERMINE_SECURE \
-  if (enable_secure == 0)						      \
-    {									      \
-      if (getuid () != geteuid () || getgid () != getegid ())		      \
-	enable_secure = 1;						      \
-      else								      \
-	enable_secure = -1;						      \
-    }
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   CATEGORY locale and, if PLURAL is nonzero, search over string
-   depending on the plural form determined by N.  */
-char *
-DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     int plural;
-     unsigned long int n;
-     int category;
-{
-#ifndef HAVE_ALLOCA
-  struct block_list *block_list = NULL;
-#endif
-  struct loaded_l10nfile *domain;
-  struct binding *binding;
-  const char *categoryname;
-  const char *categoryvalue;
-  char *dirname, *xdomainname;
-  char *single_locale;
-  char *retval;
-  size_t retlen;
-  int saved_errno;
-#if defined HAVE_TSEARCH || defined _LIBC
-  struct known_translation_t *search;
-  struct known_translation_t **foundp = NULL;
-  size_t msgid_len;
-#endif
-  size_t domainname_len;
-
-  /* If no real MSGID is given return NULL.  */
-  if (msgid1 == NULL)
-    return NULL;
-
-  __libc_rwlock_rdlock (_nl_state_lock);
-
-  /* If DOMAINNAME is NULL, we are interested in the default domain.  If
-     CATEGORY is not LC_MESSAGES this might not make much sense but the
-     definition left this undefined.  */
-  if (domainname == NULL)
-    domainname = _nl_current_default_domain;
-
-#if defined HAVE_TSEARCH || defined _LIBC
-  msgid_len = strlen (msgid1) + 1;
-
-  /* Try to find the translation among those which we found at
-     some time.  */
-  search = (struct known_translation_t *)
-	   alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
-  memcpy (search->msgid, msgid1, msgid_len);
-  search->domainname = (char *) domainname;
-  search->category = category;
-
-  foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
-  if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
-    {
-      /* Now deal with plural.  */
-      if (plural)
-	retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation,
-				(*foundp)->translation_length);
-      else
-	retval = (char *) (*foundp)->translation;
-
-      __libc_rwlock_unlock (_nl_state_lock);
-      return retval;
-    }
-#endif
-
-  /* Preserve the `errno' value.  */
-  saved_errno = errno;
-
-  /* See whether this is a SUID binary or not.  */
-  DETERMINE_SECURE;
-
-  /* First find matching binding.  */
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (binding == NULL)
-    dirname = (char *) _nl_default_dirname;
-  else if (IS_ABSOLUTE_PATH (binding->dirname))
-    dirname = binding->dirname;
-  else
-    {
-      /* We have a relative path.  Make it absolute now.  */
-      size_t dirname_len = strlen (binding->dirname) + 1;
-      size_t path_max;
-      char *ret;
-
-      path_max = (unsigned int) PATH_MAX;
-      path_max += 2;		/* The getcwd docs say to do this.  */
-
-      for (;;)
-	{
-	  dirname = (char *) alloca (path_max + dirname_len);
-	  ADD_BLOCK (block_list, dirname);
-
-	  __set_errno (0);
-	  ret = getcwd (dirname, path_max);
-	  if (ret != NULL || errno != ERANGE)
-	    break;
-
-	  path_max += path_max / 2;
-	  path_max += PATH_INCR;
-	}
-
-      if (ret == NULL)
-	{
-	  /* We cannot get the current working directory.  Don't signal an
-	     error but simply return the default string.  */
-	  FREE_BLOCKS (block_list);
-	  __set_errno (saved_errno);
-	  return (plural == 0
-		  ? (char *) msgid1
-		  /* Use the Germanic plural rule.  */
-		  : n == 1 ? (char *) msgid1 : (char *) msgid2);
-	}
-
-      stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
-    }
-
-  /* Now determine the symbolic name of CATEGORY and its value.  */
-  categoryname = category_to_name (category);
-  categoryvalue = guess_category_value (category, categoryname);
-
-  domainname_len = strlen (domainname);
-  xdomainname = (char *) alloca (strlen (categoryname)
-				 + domainname_len + 5);
-  ADD_BLOCK (block_list, xdomainname);
-
-  stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
-		  domainname, domainname_len),
-	  ".mo");
-
-  /* Creating working area.  */
-  single_locale = (char *) alloca (strlen (categoryvalue) + 1);
-  ADD_BLOCK (block_list, single_locale);
-
-
-  /* Search for the given string.  This is a loop because we perhaps
-     got an ordered list of languages to consider for the translation.  */
-  while (1)
-    {
-      /* Make CATEGORYVALUE point to the next element of the list.  */
-      while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
-	++categoryvalue;
-      if (categoryvalue[0] == '\0')
-	{
-	  /* The whole contents of CATEGORYVALUE has been searched but
-	     no valid entry has been found.  We solve this situation
-	     by implicitly appending a "C" entry, i.e. no translation
-	     will take place.  */
-	  single_locale[0] = 'C';
-	  single_locale[1] = '\0';
-	}
-      else
-	{
-	  char *cp = single_locale;
-	  while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
-	    *cp++ = *categoryvalue++;
-	  *cp = '\0';
-
-	  /* When this is a SUID binary we must not allow accessing files
-	     outside the dedicated directories.  */
-	  if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale))
-	    /* Ingore this entry.  */
-	    continue;
-	}
-
-      /* If the current locale value is C (or POSIX) we don't load a
-	 domain.  Return the MSGID.  */
-      if (strcmp (single_locale, "C") == 0
-	  || strcmp (single_locale, "POSIX") == 0)
-	{
-	  FREE_BLOCKS (block_list);
-	  __libc_rwlock_unlock (_nl_state_lock);
-	  __set_errno (saved_errno);
-	  return (plural == 0
-		  ? (char *) msgid1
-		  /* Use the Germanic plural rule.  */
-		  : n == 1 ? (char *) msgid1 : (char *) msgid2);
-	}
-
-
-      /* Find structure describing the message catalog matching the
-	 DOMAINNAME and CATEGORY.  */
-      domain = _nl_find_domain (dirname, single_locale, xdomainname, binding);
-
-      if (domain != NULL)
-	{
-	  retval = _nl_find_msg (domain, binding, msgid1, &retlen);
-
-	  if (retval == NULL)
-	    {
-	      int cnt;
-
-	      for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
-		{
-		  retval = _nl_find_msg (domain->successor[cnt], binding,
-					 msgid1, &retlen);
-
-		  if (retval != NULL)
-		    {
-		      domain = domain->successor[cnt];
-		      break;
-		    }
-		}
-	    }
-
-	  if (retval != NULL)
-	    {
-	      /* Found the translation of MSGID1 in domain DOMAIN:
-		 starting at RETVAL, RETLEN bytes.  */
-	      FREE_BLOCKS (block_list);
-	      __set_errno (saved_errno);
-#if defined HAVE_TSEARCH || defined _LIBC
-	      if (foundp == NULL)
-		{
-		  /* Create a new entry and add it to the search tree.  */
-		  struct known_translation_t *newp;
-
-		  newp = (struct known_translation_t *)
-		    malloc (offsetof (struct known_translation_t, msgid)
-			    + msgid_len + domainname_len + 1);
-		  if (newp != NULL)
-		    {
-		      newp->domainname =
-			mempcpy (newp->msgid, msgid1, msgid_len);
-		      memcpy (newp->domainname, domainname, domainname_len + 1);
-		      newp->category = category;
-		      newp->counter = _nl_msg_cat_cntr;
-		      newp->domain = domain;
-		      newp->translation = retval;
-		      newp->translation_length = retlen;
-
-		      /* Insert the entry in the search tree.  */
-		      foundp = (struct known_translation_t **)
-			tsearch (newp, &root, transcmp);
-		      if (foundp == NULL
-			  || __builtin_expect (*foundp != newp, 0))
-			/* The insert failed.  */
-			free (newp);
-		    }
-		}
-	      else
-		{
-		  /* We can update the existing entry.  */
-		  (*foundp)->counter = _nl_msg_cat_cntr;
-		  (*foundp)->domain = domain;
-		  (*foundp)->translation = retval;
-		  (*foundp)->translation_length = retlen;
-		}
-#endif
-	      /* Now deal with plural.  */
-	      if (plural)
-		retval = plural_lookup (domain, n, retval, retlen);
-
-	      __libc_rwlock_unlock (_nl_state_lock);
-	      return retval;
-	    }
-	}
-    }
-  /* NOTREACHED */
-}
-
-
-char *
-internal_function
-_nl_find_msg (domain_file, domainbinding, msgid, lengthp)
-     struct loaded_l10nfile *domain_file;
-     struct binding *domainbinding;
-     const char *msgid;
-     size_t *lengthp;
-{
-  struct loaded_domain *domain;
-  size_t act;
-  char *result;
-  size_t resultlen;
-
-  if (domain_file->decided == 0)
-    _nl_load_domain (domain_file, domainbinding);
-
-  if (domain_file->data == NULL)
-    return NULL;
-
-  domain = (struct loaded_domain *) domain_file->data;
-
-  /* Locate the MSGID and its translation.  */
-  if (domain->hash_size > 2 && domain->hash_tab != NULL)
-    {
-      /* Use the hashing table.  */
-      nls_uint32 len = strlen (msgid);
-      nls_uint32 hash_val = hash_string (msgid);
-      nls_uint32 idx = hash_val % domain->hash_size;
-      nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
-
-      while (1)
-	{
-	  nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
-
-	  if (nstr == 0)
-	    /* Hash table entry is empty.  */
-	    return NULL;
-
-	  /* Compare msgid with the original string at index nstr-1.
-	     We compare the lengths with >=, not ==, because plural entries
-	     are represented by strings with an embedded NUL.  */
-	  if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) >= len
-	      && (strcmp (msgid,
-			  domain->data + W (domain->must_swap,
-					    domain->orig_tab[nstr - 1].offset))
-		  == 0))
-	    {
-	      act = nstr - 1;
-	      goto found;
-	    }
-
-	  if (idx >= domain->hash_size - incr)
-	    idx -= domain->hash_size - incr;
-	  else
-	    idx += incr;
-	}
-      /* NOTREACHED */
-    }
-  else
-    {
-      /* Try the default method:  binary search in the sorted array of
-	 messages.  */
-      size_t top, bottom;
-
-      bottom = 0;
-      top = domain->nstrings;
-      while (bottom < top)
-	{
-	  int cmp_val;
-
-	  act = (bottom + top) / 2;
-	  cmp_val = strcmp (msgid, (domain->data
-				    + W (domain->must_swap,
-					 domain->orig_tab[act].offset)));
-	  if (cmp_val < 0)
-	    top = act;
-	  else if (cmp_val > 0)
-	    bottom = act + 1;
-	  else
-	    goto found;
-	}
-      /* No translation was found.  */
-      return NULL;
-    }
-
- found:
-  /* The translation was found at index ACT.  If we have to convert the
-     string to use a different character set, this is the time.  */
-  result = ((char *) domain->data
-	    + W (domain->must_swap, domain->trans_tab[act].offset));
-  resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
-
-#if defined _LIBC || HAVE_ICONV
-  if (domain->codeset_cntr
-      != (domainbinding != NULL ? domainbinding->codeset_cntr : 0))
-    {
-      /* The domain's codeset has changed through bind_textdomain_codeset()
-	 since the message catalog was initialized or last accessed.  We
-	 have to reinitialize the converter.  */
-      _nl_free_domain_conv (domain);
-      _nl_init_domain_conv (domain_file, domain, domainbinding);
-    }
-
-  if (
-# ifdef _LIBC
-      domain->conv != (__gconv_t) -1
-# else
-#  if HAVE_ICONV
-      domain->conv != (iconv_t) -1
-#  endif
-# endif
-      )
-    {
-      /* We are supposed to do a conversion.  First allocate an
-	 appropriate table with the same structure as the table
-	 of translations in the file, where we can put the pointers
-	 to the converted strings in.
-	 There is a slight complication with plural entries.  They
-	 are represented by consecutive NUL terminated strings.  We
-	 handle this case by converting RESULTLEN bytes, including
-	 NULs.  */
-
-      if (domain->conv_tab == NULL
-	  && ((domain->conv_tab = (char **) calloc (domain->nstrings,
-						    sizeof (char *)))
-	      == NULL))
-	/* Mark that we didn't succeed allocating a table.  */
-	domain->conv_tab = (char **) -1;
-
-      if (__builtin_expect (domain->conv_tab == (char **) -1, 0))
-	/* Nothing we can do, no more memory.  */
-	goto converted;
-
-      if (domain->conv_tab[act] == NULL)
-	{
-	  /* We haven't used this string so far, so it is not
-	     translated yet.  Do this now.  */
-	  /* We use a bit more efficient memory handling.
-	     We allocate always larger blocks which get used over
-	     time.  This is faster than many small allocations.   */
-	  __libc_lock_define_initialized (static, lock)
-# define INITIAL_BLOCK_SIZE	4080
-	  static unsigned char *freemem;
-	  static size_t freemem_size;
-
-	  const unsigned char *inbuf;
-	  unsigned char *outbuf;
-	  int malloc_count;
-# ifndef _LIBC
-	  transmem_block_t *transmem_list = NULL;
-# endif
-
-	  __libc_lock_lock (lock);
-
-	  inbuf = (const unsigned char *) result;
-	  outbuf = freemem + sizeof (size_t);
-
-	  malloc_count = 0;
-	  while (1)
-	    {
-	      transmem_block_t *newmem;
-# ifdef _LIBC
-	      size_t non_reversible;
-	      int res;
-
-	      if (freemem_size < sizeof (size_t))
-		goto resize_freemem;
-
-	      res = __gconv (domain->conv,
-			     &inbuf, inbuf + resultlen,
-			     &outbuf,
-			     outbuf + freemem_size - sizeof (size_t),
-			     &non_reversible);
-
-	      if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
-		break;
-
-	      if (res != __GCONV_FULL_OUTPUT)
-		{
-		  __libc_lock_unlock (lock);
-		  goto converted;
-		}
-
-	      inbuf = result;
-# else
-#  if HAVE_ICONV
-	      const char *inptr = (const char *) inbuf;
-	      size_t inleft = resultlen;
-	      char *outptr = (char *) outbuf;
-	      size_t outleft;
-
-	      if (freemem_size < sizeof (size_t))
-		goto resize_freemem;
-
-	      outleft = freemem_size - sizeof (size_t);
-	      if (iconv (domain->conv,
-			 (ICONV_CONST char **) &inptr, &inleft,
-			 &outptr, &outleft)
-		  != (size_t) (-1))
-		{
-		  outbuf = (unsigned char *) outptr;
-		  break;
-		}
-	      if (errno != E2BIG)
-		{
-		  __libc_lock_unlock (lock);
-		  goto converted;
-		}
-#  endif
-# endif
-
-	    resize_freemem:
-	      /* We must allocate a new buffer or resize the old one.  */
-	      if (malloc_count > 0)
-		{
-		  ++malloc_count;
-		  freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
-		  newmem = (transmem_block_t *) realloc (transmem_list,
-							 freemem_size);
-# ifdef _LIBC
-		  if (newmem != NULL)
-		    transmem_list = transmem_list->next;
-		  else
-		    {
-		      struct transmem_list *old = transmem_list;
-
-		      transmem_list = transmem_list->next;
-		      free (old);
-		    }
-# endif
-		}
-	      else
-		{
-		  malloc_count = 1;
-		  freemem_size = INITIAL_BLOCK_SIZE;
-		  newmem = (transmem_block_t *) malloc (freemem_size);
-		}
-	      if (__builtin_expect (newmem == NULL, 0))
-		{
-		  freemem = NULL;
-		  freemem_size = 0;
-		  __libc_lock_unlock (lock);
-		  goto converted;
-		}
-
-# ifdef _LIBC
-	      /* Add the block to the list of blocks we have to free
-                 at some point.  */
-	      newmem->next = transmem_list;
-	      transmem_list = newmem;
-
-	      freemem = newmem->data;
-	      freemem_size -= offsetof (struct transmem_list, data);
-# else
-	      transmem_list = newmem;
-	      freemem = newmem;
-# endif
-
-	      outbuf = freemem + sizeof (size_t);
-	    }
-
-	  /* We have now in our buffer a converted string.  Put this
-	     into the table of conversions.  */
-	  *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
-	  domain->conv_tab[act] = (char *) freemem;
-	  /* Shrink freemem, but keep it aligned.  */
-	  freemem_size -= outbuf - freemem;
-	  freemem = outbuf;
-	  freemem += freemem_size & (alignof (size_t) - 1);
-	  freemem_size = freemem_size & ~ (alignof (size_t) - 1);
-
-	  __libc_lock_unlock (lock);
-	}
-
-      /* Now domain->conv_tab[act] contains the translation of all
-	 the plural variants.  */
-      result = domain->conv_tab[act] + sizeof (size_t);
-      resultlen = *(size_t *) domain->conv_tab[act];
-    }
-
- converted:
-  /* The result string is converted.  */
-
-#endif /* _LIBC || HAVE_ICONV */
-
-  *lengthp = resultlen;
-  return result;
-}
-
-
-/* Look up a plural variant.  */
-static char *
-internal_function
-plural_lookup (domain, n, translation, translation_len)
-     struct loaded_l10nfile *domain;
-     unsigned long int n;
-     const char *translation;
-     size_t translation_len;
-{
-  struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
-  unsigned long int idx; /* can't call this index, we may need to use index() */
-  const char *p;
-
-  idx = plural_eval (domaindata->plural, n);
-  if (idx >= domaindata->nplurals)
-    /* This should never happen.  It means the plural expression and the
-       given maximum value do not match.  */
-    idx = 0;
-
-  /* Skip INDEX strings at TRANSLATION.  */
-  p = translation;
-  while (idx-- > 0)
-    {
-#ifdef _LIBC
-      p = __rawmemchr (p, '\0');
-#else
-      p = strchr (p, '\0');
-#endif
-      /* And skip over the NUL byte.  */
-      p++;
-
-      if (p >= translation + translation_len)
-	/* This should never happen.  It means the plural expression
-	   evaluated to a value larger than the number of variants
-	   available for MSGID1.  */
-	return (char *) translation;
-    }
-  return (char *) p;
-}
-
-
-/* Function to evaluate the plural expression and return an index value.  */
-static unsigned long int
-internal_function
-plural_eval (pexp, n)
-     struct expression *pexp;
-     unsigned long int n;
-{
-  switch (pexp->nargs)
-    {
-    case 0:
-      switch (pexp->operation)
-	{
-	case var:
-	  return n;
-	case num:
-	  return pexp->val.num;
-	default:
-	  break;
-	}
-      /* NOTREACHED */
-      break;
-    case 1:
-      {
-	/* pexp->operation must be lnot.  */
-	unsigned long int arg = plural_eval (pexp->val.args[0], n);
-	return ! arg;
-      }
-    case 2:
-      {
-	unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
-	if (pexp->operation == lor)
-	  return leftarg || plural_eval (pexp->val.args[1], n);
-	else if (pexp->operation == land)
-	  return leftarg && plural_eval (pexp->val.args[1], n);
-	else
-	  {
-	    unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
-
-	    switch (pexp->operation)
-	      {
-	      case mult:
-		return leftarg * rightarg;
-	      case divide:
-		return leftarg / rightarg;
-	      case module:
-		return leftarg % rightarg;
-	      case plus:
-		return leftarg + rightarg;
-	      case minus:
-		return leftarg - rightarg;
-	      case less_than:
-		return leftarg < rightarg;
-	      case greater_than:
-		return leftarg > rightarg;
-	      case less_or_equal:
-		return leftarg <= rightarg;
-	      case greater_or_equal:
-		return leftarg >= rightarg;
-	      case equal:
-		return leftarg == rightarg;
-	      case not_equal:
-		return leftarg != rightarg;
-	      default:
-		break;
-	      }
-	  }
-	/* NOTREACHED */
-	break;
-      }
-    case 3:
-      {
-	/* pexp->operation must be qmop.  */
-	unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
-	return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
-      }
-    }
-  /* NOTREACHED */
-  return 0;
-}
-
-
-/* Return string representation of locale CATEGORY.  */
-static const char *
-internal_function
-category_to_name (category)
-     int category;
-{
-  const char *retval;
-
-  switch (category)
-  {
-#ifdef LC_COLLATE
-  case LC_COLLATE:
-    retval = "LC_COLLATE";
-    break;
-#endif
-#ifdef LC_CTYPE
-  case LC_CTYPE:
-    retval = "LC_CTYPE";
-    break;
-#endif
-#ifdef LC_MONETARY
-  case LC_MONETARY:
-    retval = "LC_MONETARY";
-    break;
-#endif
-#ifdef LC_NUMERIC
-  case LC_NUMERIC:
-    retval = "LC_NUMERIC";
-    break;
-#endif
-#ifdef LC_TIME
-  case LC_TIME:
-    retval = "LC_TIME";
-    break;
-#endif
-#ifdef LC_MESSAGES
-  case LC_MESSAGES:
-    retval = "LC_MESSAGES";
-    break;
-#endif
-#ifdef LC_RESPONSE
-  case LC_RESPONSE:
-    retval = "LC_RESPONSE";
-    break;
-#endif
-#ifdef LC_ALL
-  case LC_ALL:
-    /* This might not make sense but is perhaps better than any other
-       value.  */
-    retval = "LC_ALL";
-    break;
-#endif
-  default:
-    /* If you have a better idea for a default value let me know.  */
-    retval = "LC_XXX";
-  }
-
-  return retval;
-}
-
-/* Guess value of current locale from value of the environment variables.  */
-static const char *
-internal_function
-guess_category_value (category, categoryname)
-     int category;
-     const char *categoryname;
-{
-  const char *language;
-  const char *retval;
-
-  /* The highest priority value is the `LANGUAGE' environment
-     variable.  But we don't use the value if the currently selected
-     locale is the C locale.  This is a GNU extension.  */
-  language = getenv ("LANGUAGE");
-  if (language != NULL && language[0] == '\0')
-    language = NULL;
-
-  /* We have to proceed with the POSIX methods of looking to `LC_ALL',
-     `LC_xxx', and `LANG'.  On some systems this can be done by the
-     `setlocale' function itself.  */
-#if defined _LIBC || (defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL)
-  retval = setlocale (category, NULL);
-#else
-  /* Setting of LC_ALL overwrites all other.  */
-  retval = getenv ("LC_ALL");
-  if (retval == NULL || retval[0] == '\0')
-    {
-      /* Next comes the name of the desired category.  */
-      retval = getenv (categoryname);
-      if (retval == NULL || retval[0] == '\0')
-	{
-	  /* Last possibility is the LANG environment variable.  */
-	  retval = getenv ("LANG");
-	  if (retval == NULL || retval[0] == '\0')
-	    /* We use C as the default domain.  POSIX says this is
-	       implementation defined.  */
-	    return "C";
-	}
-    }
-#endif
-
-  return language != NULL && strcmp (retval, "C") != 0 ? language : retval;
-}
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
-
-#if !_LIBC && !HAVE_MEMPCPY
-static void *
-mempcpy (dest, src, n)
-     void *dest;
-     const void *src;
-     size_t n;
-{
-  return (void *) ((char *) memcpy (dest, src, n) + n);
-}
-#endif
-
-
-#ifdef _LIBC
-/* If we want to free all resources we have to do some work at
-   program's end.  */
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  void *old;
-
-  while (_nl_domain_bindings != NULL)
-    {
-      struct binding *oldp = _nl_domain_bindings;
-      _nl_domain_bindings = _nl_domain_bindings->next;
-      if (oldp->dirname != _nl_default_dirname)
-	/* Yes, this is a pointer comparison.  */
-	free (oldp->dirname);
-      free (oldp->codeset);
-      free (oldp);
-    }
-
-  if (_nl_current_default_domain != _nl_default_default_domain)
-    /* Yes, again a pointer comparison.  */
-    free ((char *) _nl_current_default_domain);
-
-  /* Remove the search tree with the known translations.  */
-  __tdestroy (root, free);
-  root = NULL;
-
-  while (transmem_list != NULL)
-    {
-      old = transmem_list;
-      transmem_list = transmem_list->next;
-      free (old);
-    }
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
diff --git a/intl/dcngettext.c b/intl/dcngettext.c
deleted file mode 100644
index 85ff413c..00000000
--- a/intl/dcngettext.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Implementation of the dcngettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCNGETTEXT __dcngettext
-# define DCIGETTEXT __dcigettext
-#else
-# define DCNGETTEXT dcngettext__
-# define DCIGETTEXT dcigettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-char *
-DCNGETTEXT (domainname, msgid1, msgid2, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-     int category;
-{
-  return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dcngettext, dcngettext);
-#endif
diff --git a/intl/dgettext.c b/intl/dgettext.c
deleted file mode 100644
index 24be226b..00000000
--- a/intl/dgettext.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Implementation of the dgettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <locale.h>
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DGETTEXT __dgettext
-# define DCGETTEXT __dcgettext
-#else
-# define DGETTEXT dgettext__
-# define DCGETTEXT dcgettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
-   LC_MESSAGES locale.  */
-char *
-DGETTEXT (domainname, msgid)
-     const char *domainname;
-     const char *msgid;
-{
-  return DCGETTEXT (domainname, msgid, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dgettext, dgettext);
-#endif
diff --git a/intl/dngettext.c b/intl/dngettext.c
deleted file mode 100644
index 94c74b62..00000000
--- a/intl/dngettext.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Implementation of the dngettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <locale.h>
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DNGETTEXT __dngettext
-# define DCNGETTEXT __dcngettext
-#else
-# define DNGETTEXT dngettext__
-# define DCNGETTEXT dcngettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
-   LC_MESSAGES locale and skip message according to the plural form.  */
-char *
-DNGETTEXT (domainname, msgid1, msgid2, n)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-{
-  return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dngettext, dngettext);
-#endif
diff --git a/intl/explodename.c b/intl/explodename.c
deleted file mode 100644
index 7b685a9d..00000000
--- a/intl/explodename.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found.  Sigh!  */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-char *
-_nl_find_language (name)
-     const char *name;
-{
-  while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
-	 && name[0] != '+' && name[0] != ',')
-    ++name;
-
-  return (char *) name;
-}
-
-
-int
-_nl_explode_name (name, language, modifier, territory, codeset,
-		  normalized_codeset, special, sponsor, revision)
-     char *name;
-     const char **language;
-     const char **modifier;
-     const char **territory;
-     const char **codeset;
-     const char **normalized_codeset;
-     const char **special;
-     const char **sponsor;
-     const char **revision;
-{
-  enum { undecided, xpg, cen } syntax;
-  char *cp;
-  int mask;
-
-  *modifier = NULL;
-  *territory = NULL;
-  *codeset = NULL;
-  *normalized_codeset = NULL;
-  *special = NULL;
-  *sponsor = NULL;
-  *revision = NULL;
-
-  /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_' and `@' if
-     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
-  mask = 0;
-  syntax = undecided;
-  *language = cp = name;
-  cp = _nl_find_language (*language);
-
-  if (*language == cp)
-    /* This does not make sense: language has to be specified.  Use
-       this entry as it is without exploding.  Perhaps it is an alias.  */
-    cp = strchr (*language, '\0');
-  else if (cp[0] == '_')
-    {
-      /* Next is the territory.  */
-      cp[0] = '\0';
-      *territory = ++cp;
-
-      while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
-	     && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
-	++cp;
-
-      mask |= TERRITORY;
-
-      if (cp[0] == '.')
-	{
-	  /* Next is the codeset.  */
-	  syntax = xpg;
-	  cp[0] = '\0';
-	  *codeset = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '@')
-	    ++cp;
-
-	  mask |= XPG_CODESET;
-
-	  if (*codeset != cp && (*codeset)[0] != '\0')
-	    {
-	      *normalized_codeset = _nl_normalize_codeset (*codeset,
-							   cp - *codeset);
-	      if (strcmp (*codeset, *normalized_codeset) == 0)
-		free ((char *) *normalized_codeset);
-	      else
-		mask |= XPG_NORM_CODESET;
-	    }
-	}
-    }
-
-  if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
-    {
-      /* Next is the modifier.  */
-      syntax = cp[0] == '@' ? xpg : cen;
-      cp[0] = '\0';
-      *modifier = ++cp;
-
-      while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
-	     && cp[0] != ',' && cp[0] != '_')
-	++cp;
-
-      mask |= XPG_MODIFIER | CEN_AUDIENCE;
-    }
-
-  if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
-    {
-      syntax = cen;
-
-      if (cp[0] == '+')
-	{
- 	  /* Next is special application (CEN syntax).  */
-	  cp[0] = '\0';
-	  *special = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
-	    ++cp;
-
-	  mask |= CEN_SPECIAL;
-	}
-
-      if (cp[0] == ',')
-	{
- 	  /* Next is sponsor (CEN syntax).  */
-	  cp[0] = '\0';
-	  *sponsor = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '_')
-	    ++cp;
-
-	  mask |= CEN_SPONSOR;
-	}
-
-      if (cp[0] == '_')
-	{
- 	  /* Next is revision (CEN syntax).  */
-	  cp[0] = '\0';
-	  *revision = ++cp;
-
-	  mask |= CEN_REVISION;
-	}
-    }
-
-  /* For CEN syntax values it might be important to have the
-     separator character in the file name, not for XPG syntax.  */
-  if (syntax == xpg)
-    {
-      if (*territory != NULL && (*territory)[0] == '\0')
-	mask &= ~TERRITORY;
-
-      if (*codeset != NULL && (*codeset)[0] == '\0')
-	mask &= ~XPG_CODESET;
-
-      if (*modifier != NULL && (*modifier)[0] == '\0')
-	mask &= ~XPG_MODIFIER;
-    }
-
-  return mask;
-}
diff --git a/intl/finddomain.c b/intl/finddomain.c
deleted file mode 100644
index ae6dfe01..00000000
--- a/intl/finddomain.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/* Handle list of needed message catalogs
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.org>, 1995.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-/* List of already loaded domains.  */
-static struct loaded_l10nfile *_nl_loaded_domains;
-
-
-/* Return a data structure describing the message catalog described by
-   the DOMAINNAME and CATEGORY parameters with respect to the currently
-   established bindings.  */
-struct loaded_l10nfile *
-internal_function
-_nl_find_domain (dirname, locale, domainname, domainbinding)
-     const char *dirname;
-     char *locale;
-     const char *domainname;
-     struct binding *domainbinding;
-{
-  struct loaded_l10nfile *retval;
-  const char *language;
-  const char *modifier;
-  const char *territory;
-  const char *codeset;
-  const char *normalized_codeset;
-  const char *special;
-  const char *sponsor;
-  const char *revision;
-  const char *alias_value;
-  int mask;
-
-  /* LOCALE can consist of up to four recognized parts for the XPG syntax:
-
-		language[_territory[.codeset]][@modifier]
-
-     and six parts for the CEN syntax:
-
-	language[_territory][+audience][+special][,[sponsor][_revision]]
-
-     Beside the first part all of them are allowed to be missing.  If
-     the full specified locale is not found, the less specific one are
-     looked for.  The various parts will be stripped off according to
-     the following order:
-		(1) revision
-		(2) sponsor
-		(3) special
-		(4) codeset
-		(5) normalized codeset
-		(6) territory
-		(7) audience/modifier
-   */
-
-  /* If we have already tested for this locale entry there has to
-     be one data set in the list of loaded domains.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, 0, locale, NULL, NULL,
-			       NULL, NULL, NULL, NULL, NULL, domainname, 0);
-  if (retval != NULL)
-    {
-      /* We know something about this locale.  */
-      int cnt;
-
-      if (retval->decided == 0)
-	_nl_load_domain (retval, domainbinding);
-
-      if (retval->data != NULL)
-	return retval;
-
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt], domainbinding);
-
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
-      return cnt >= 0 ? retval : NULL;
-      /* NOTREACHED */
-    }
-
-  /* See whether the locale value is an alias.  If yes its value
-     *overwrites* the alias name.  No test for the original value is
-     done.  */
-  alias_value = _nl_expand_alias (locale);
-  if (alias_value != NULL)
-    {
-#if defined _LIBC || defined HAVE_STRDUP
-      locale = strdup (alias_value);
-      if (locale == NULL)
-	return NULL;
-#else
-      size_t len = strlen (alias_value) + 1;
-      locale = (char *) malloc (len);
-      if (locale == NULL)
-	return NULL;
-
-      memcpy (locale, alias_value, len);
-#endif
-    }
-
-  /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_' and `@' if
-     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
-  mask = _nl_explode_name (locale, &language, &modifier, &territory,
-			   &codeset, &normalized_codeset, &special,
-			   &sponsor, &revision);
-
-  /* Create all possible locale entries which might be interested in
-     generalization.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, mask, language, territory,
-			       codeset, normalized_codeset, modifier, special,
-			       sponsor, revision, domainname, 1);
-  if (retval == NULL)
-    /* This means we are out of core.  */
-    return NULL;
-
-  if (retval->decided == 0)
-    _nl_load_domain (retval, domainbinding);
-  if (retval->data == NULL)
-    {
-      int cnt;
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt], domainbinding);
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
-    }
-
-  /* The room for an alias was dynamically allocated.  Free it now.  */
-  if (alias_value != NULL)
-    free (locale);
-
-  /* The space for normalized_codeset is dynamically allocated.  Free it.  */
-  if (mask & XPG_NORM_CODESET)
-    free ((void *) normalized_codeset);
-
-  return retval;
-}
-
-
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  struct loaded_l10nfile *runp = _nl_loaded_domains;
-
-  while (runp != NULL)
-    {
-      struct loaded_l10nfile *here = runp;
-      if (runp->data != NULL)
-	_nl_unload_domain ((struct loaded_domain *) runp->data);
-      runp = runp->next;
-      free ((char *) here->filename);
-      free (here);
-    }
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
diff --git a/intl/gettext.c b/intl/gettext.c
deleted file mode 100644
index 77c1627f..00000000
--- a/intl/gettext.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Implementation of gettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# include <stdlib.h>		/* Just for NULL.  */
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define GETTEXT __gettext
-# define DCGETTEXT __dcgettext
-#else
-# define GETTEXT gettext__
-# define DCGETTEXT dcgettext__
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-char *
-GETTEXT (msgid)
-     const char *msgid;
-{
-  return DCGETTEXT (NULL, msgid, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__gettext, gettext);
-#endif
diff --git a/intl/gettext.h b/intl/gettext.h
deleted file mode 100644
index d56e8c75..00000000
--- a/intl/gettext.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Description of GNU message catalog format: general file layout.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifndef _GETTEXT_H
-#define _GETTEXT_H 1
-
-#if HAVE_LIMITS_H || _LIBC
-# include <limits.h>
-#endif
-
-/* @@ end of prolog @@ */
-
-/* The magic number of the GNU message catalog format.  */
-#define _MAGIC 0x950412de
-#define _MAGIC_SWAPPED 0xde120495
-
-/* Revision number of the currently used .mo (binary) file format.  */
-#define MO_REVISION_NUMBER 0
-
-/* The following contortions are an attempt to use the C preprocessor
-   to determine an unsigned integral type that is 32 bits wide.  An
-   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
-   as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
-   when cross-compiling.  */
-
-#if __STDC__
-# define UINT_MAX_32_BITS 4294967295U
-#else
-# define UINT_MAX_32_BITS 0xFFFFFFFF
-#endif
-
-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
-   This should be valid for all systems GNU cares about because
-   that doesn't include 16-bit systems, and only modern systems
-   (that certainly have <limits.h>) have 64+-bit integral types.  */
-
-#ifndef UINT_MAX
-# define UINT_MAX UINT_MAX_32_BITS
-#endif
-
-#if UINT_MAX == UINT_MAX_32_BITS
-typedef unsigned nls_uint32;
-#else
-# if USHRT_MAX == UINT_MAX_32_BITS
-typedef unsigned short nls_uint32;
-# else
-#  if ULONG_MAX == UINT_MAX_32_BITS
-typedef unsigned long nls_uint32;
-#  else
-  /* The following line is intended to throw an error.  Using #error is
-     not portable enough.  */
-  "Cannot determine unsigned 32-bit data type."
-#  endif
-# endif
-#endif
-
-
-/* Header for binary .mo file format.  */
-struct mo_file_header
-{
-  /* The magic number.  */
-  nls_uint32 magic;
-  /* The revision number of the file format.  */
-  nls_uint32 revision;
-  /* The number of strings pairs.  */
-  nls_uint32 nstrings;
-  /* Offset of table with start offsets of original strings.  */
-  nls_uint32 orig_tab_offset;
-  /* Offset of table with start offsets of translation strings.  */
-  nls_uint32 trans_tab_offset;
-  /* Size of hashing table.  */
-  nls_uint32 hash_tab_size;
-  /* Offset of first hashing entry.  */
-  nls_uint32 hash_tab_offset;
-};
-
-struct string_desc
-{
-  /* Length of addressed string.  */
-  nls_uint32 length;
-  /* Offset of string in file.  */
-  nls_uint32 offset;
-};
-
-/* @@ begin of epilog @@ */
-
-#endif	/* gettext.h  */
diff --git a/intl/gettextP.h b/intl/gettextP.h
deleted file mode 100644
index 96951713..00000000
--- a/intl/gettextP.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/* Header describing internals of libintl library.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifndef _GETTEXTP_H
-#define _GETTEXTP_H
-
-#include <stddef.h>		/* Get size_t.  */
-
-#ifdef _LIBC
-# include "../iconv/gconv_int.h"
-#else
-# if HAVE_ICONV
-#  include <iconv.h>
-# endif
-#endif
-
-#include "loadinfo.h"
-
-#include "gettext.h"		/* Get nls_uint32.  */
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-#ifndef W
-# define W(flag, data) ((flag) ? SWAP (data) : (data))
-#endif
-
-
-#ifdef _LIBC
-# include <byteswap.h>
-# define SWAP(i) bswap_32 (i)
-#else
-static inline nls_uint32
-SWAP (i)
-     nls_uint32 i;
-{
-  return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
-}
-#endif
-
-
-/* This is the representation of the expressions to determine the
-   plural form.  */
-struct expression
-{
-  int nargs;			/* Number of arguments.  */
-  enum operator
-  {
-    /* Without arguments:  */
-    var,			/* The variable "n".  */
-    num,			/* Decimal number.  */
-    /* Unary operators:  */
-    lnot,			/* Logical NOT.  */
-    /* Binary operators:  */
-    mult,			/* Multiplication.  */
-    divide,			/* Division.  */
-    module,			/* Module operation.  */
-    plus,			/* Addition.  */
-    minus,			/* Subtraction.  */
-    less_than,			/* Comparison.  */
-    greater_than,		/* Comparison.  */
-    less_or_equal,		/* Comparison.  */
-    greater_or_equal,		/* Comparison.  */
-    equal,			/* Comparision for equality.  */
-    not_equal,			/* Comparision for inequality.  */
-    land,			/* Logical AND.  */
-    lor,			/* Logical OR.  */
-    /* Ternary operators:  */
-    qmop			/* Question mark operator.  */
-  } operation;
-  union
-  {
-    unsigned long int num;	/* Number value for `num'.  */
-    struct expression *args[3];	/* Up to three arguments.  */
-  } val;
-};
-
-/* This is the data structure to pass information to the parser and get
-   the result in a thread-safe way.  */
-struct parse_args
-{
-  const char *cp;
-  struct expression *res;
-};
-
-
-/* The representation of an opened message catalog.  */
-struct loaded_domain
-{
-  const char *data;
-  int use_mmap;
-  size_t mmap_size;
-  int must_swap;
-  nls_uint32 nstrings;
-  struct string_desc *orig_tab;
-  struct string_desc *trans_tab;
-  nls_uint32 hash_size;
-  nls_uint32 *hash_tab;
-  int codeset_cntr;
-#ifdef _LIBC
-  __gconv_t conv;
-#else
-# if HAVE_ICONV
-  iconv_t conv;
-# endif
-#endif
-  char **conv_tab;
-
-  struct expression *plural;
-  unsigned long int nplurals;
-};
-
-/* We want to allocate a string at the end of the struct.  But ISO C
-   doesn't allow zero sized arrays.  */
-#ifdef __GNUC__
-# define ZERO 0
-#else
-# define ZERO 1
-#endif
-
-/* A set of settings bound to a message domain.  Used to store settings
-   from bindtextdomain() and bind_textdomain_codeset().  */
-struct binding
-{
-  struct binding *next;
-  char *dirname;
-  int codeset_cntr;	/* Incremented each time codeset changes.  */
-  char *codeset;
-  char domainname[ZERO];
-};
-
-/* A counter which is incremented each time some previous translations
-   become invalid.
-   This variable is part of the external ABI of the GNU libintl.  */
-extern int _nl_msg_cat_cntr;
-
-struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
-						 char *__locale,
-						 const char *__domainname,
-					      struct binding *__domainbinding))
-     internal_function;
-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain,
-			      struct binding *__domainbinding))
-     internal_function;
-void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
-     internal_function;
-const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file,
-					  struct loaded_domain *__domain,
-					  struct binding *__domainbinding))
-     internal_function;
-void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain))
-     internal_function;
-
-char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file,
-			    struct binding *domainbinding,
-			    const char *msgid, size_t *lengthp))
-     internal_function;
-
-#ifdef _LIBC
-extern char *__gettext PARAMS ((const char *__msgid));
-extern char *__dgettext PARAMS ((const char *__domainname,
-				 const char *__msgid));
-extern char *__dcgettext PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n));
-extern char *__dngettext PARAMS ((const char *__domainname,
-				  const char *__msgid1, const char *__msgid2,
-				  unsigned long int n));
-extern char *__dcngettext PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   unsigned long int __n, int __category));
-extern char *__dcigettext PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   int __plural, unsigned long int __n,
-				   int __category));
-extern char *__textdomain PARAMS ((const char *__domainname));
-extern char *__bindtextdomain PARAMS ((const char *__domainname,
-				       const char *__dirname));
-extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname,
-						const char *__codeset));
-#else
-extern char *gettext__ PARAMS ((const char *__msgid));
-extern char *dgettext__ PARAMS ((const char *__domainname,
-				 const char *__msgid));
-extern char *dcgettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-extern char *ngettext__ PARAMS ((const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n));
-extern char *dngettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid1, const char *__msgid2,
-				  unsigned long int __n));
-extern char *dcngettext__ PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   unsigned long int __n, int __category));
-extern char *dcigettext__ PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   int __plural, unsigned long int __n,
-				   int __category));
-extern char *textdomain__ PARAMS ((const char *__domainname));
-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
-				       const char *__dirname));
-extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname,
-						const char *__codeset));
-#endif
-
-#ifdef _LIBC
-extern void __gettext_free_exp PARAMS ((struct expression *exp))
-     internal_function;
-extern int __gettextparse PARAMS ((void *arg));
-#else
-extern void gettext_free_exp__ PARAMS ((struct expression *exp))
-     internal_function;
-extern int gettextparse__ PARAMS ((void *arg));
-#endif
-
-/* @@ begin of epilog @@ */
-
-#endif /* gettextP.h  */
diff --git a/intl/hash-string.h b/intl/hash-string.h
deleted file mode 100644
index 82af351d..00000000
--- a/intl/hash-string.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Description of GNU message catalog format: string hashing function.
-   Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-/* We assume to have `unsigned long int' value with at least 32 bits.  */
-#define HASHWORDBITS 32
-
-
-/* Defines the so called `hashpjw' function by P.J. Weinberger
-   [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
-   1986, 1987 Bell Telephone Laboratories, Inc.]  */
-static unsigned long int hash_string PARAMS ((const char *__str_param));
-
-static inline unsigned long int
-hash_string (str_param)
-     const char *str_param;
-{
-  unsigned long int hval, g;
-  const char *str = str_param;
-
-  /* Compute the hash value for the given string.  */
-  hval = 0;
-  while (*str != '\0')
-    {
-      hval <<= 4;
-      hval += (unsigned long int) *str++;
-      g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
-      if (g != 0)
-	{
-	  hval ^= g >> (HASHWORDBITS - 8);
-	  hval ^= g;
-	}
-    }
-  return hval;
-}
diff --git a/intl/intl-compat.c b/intl/intl-compat.c
deleted file mode 100644
index 32049a47..00000000
--- a/intl/intl-compat.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
-   Library.
-   Copyright (C) 1995, 2000, 2001 Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "libgnuintl.h"
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-/* This file redirects the gettext functions (without prefix or suffix) to
-   those defined in the included GNU gettext library (with "__" suffix).
-   It is compiled into libintl when the included GNU gettext library is
-   configured --with-included-gettext.
-
-   This redirection works also in the case that the system C library or
-   the system libintl library contain gettext/textdomain/... functions.
-   If it didn't, we would need to add preprocessor level redirections to
-   libgnuintl.h of the following form:
-
-#    define gettext gettext__
-#    define dgettext dgettext__
-#    define dcgettext dcgettext__
-#    define ngettext ngettext__
-#    define dngettext dngettext__
-#    define dcngettext dcngettext__
-#    define textdomain textdomain__
-#    define bindtextdomain bindtextdomain__
-#    define bind_textdomain_codeset bind_textdomain_codeset__
-
-   How does this redirection work? There are two cases.
-   A. When libintl.a is linked into an executable, it works because
-      functions defined in the executable always override functions in
-      the shared libraries.
-   B. When libintl.so is used, it works because
-      1. those systems defining gettext/textdomain/... in the C library
-         (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer) are
-         ELF systems and define these symbols as weak, thus explicitly
-         letting other shared libraries override it.
-      2. those systems defining gettext/textdomain/... in a standalone
-         libintl.so library (namely, Solaris 2.3 and newer) have this
-         shared library in /usr/lib, and the linker will search /usr/lib
-         *after* the directory where the GNU gettext library is installed.
-
-   A third case, namely when libintl.a is linked into a shared library
-   whose name is not libintl.so, is not supported. In this case, on
-   Solaris, when -lintl precedes the linker option for the shared library
-   containing GNU gettext, the system's gettext would indeed override
-   the GNU gettext. Anyone doing this kind of stuff must be clever enough
-   to 1. compile libintl.a with -fPIC, 2. remove -lintl from his linker
-   command line.  */
-
-
-#undef gettext
-#undef dgettext
-#undef dcgettext
-#undef ngettext
-#undef dngettext
-#undef dcngettext
-#undef textdomain
-#undef bindtextdomain
-#undef bind_textdomain_codeset
-
-
-char *
-gettext (msgid)
-     const char *msgid;
-{
-  return gettext__ (msgid);
-}
-
-
-char *
-dgettext (domainname, msgid)
-     const char *domainname;
-     const char *msgid;
-{
-  return dgettext__ (domainname, msgid);
-}
-
-
-char *
-dcgettext (domainname, msgid, category)
-     const char *domainname;
-     const char *msgid;
-     int category;
-{
-  return dcgettext__ (domainname, msgid, category);
-}
-
-
-char *
-ngettext (msgid1, msgid2, n)
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-{
-  return ngettext__ (msgid1, msgid2, n);
-}
-
-
-char *
-dngettext (domainname, msgid1, msgid2, n)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-{
-  return dngettext__ (domainname, msgid1, msgid2, n);
-}
-
-
-char *
-dcngettext (domainname, msgid1, msgid2, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-     int category;
-{
-  return dcngettext__ (domainname, msgid1, msgid2, n, category);
-}
-
-
-char *
-textdomain (domainname)
-     const char *domainname;
-{
-  return textdomain__ (domainname);
-}
-
-
-char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  return bindtextdomain__ (domainname, dirname);
-}
-
-
-char *
-bind_textdomain_codeset (domainname, codeset)
-     const char *domainname;
-     const char *codeset;
-{
-  return bind_textdomain_codeset__ (domainname, codeset);
-}
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
deleted file mode 100644
index 634e343b..00000000
--- a/intl/l10nflist.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-/* Tell glibc's <string.h> to provide a prototype for stpcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <string.h>
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined _LIBC || defined HAVE_ARGZ_H
-# include <argz.h>
-#endif
-#include <ctype.h>
-#include <sys/types.h>
-#include <stdlib.h>
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found.  Sigh!  */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# ifndef stpcpy
-#  define stpcpy(dest, src) __stpcpy(dest, src)
-# endif
-#else
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-#endif
-
-/* Define function which are usually not available.  */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
-/* Returns the number of strings in ARGZ.  */
-static size_t argz_count__ PARAMS ((const char *argz, size_t len));
-
-static size_t
-argz_count__ (argz, len)
-     const char *argz;
-     size_t len;
-{
-  size_t count = 0;
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len + 1;
-      len -= part_len + 1;
-      count++;
-    }
-  return count;
-}
-# undef __argz_count
-# define __argz_count(argz, len) argz_count__ (argz, len)
-#endif	/* !_LIBC && !HAVE___ARGZ_COUNT */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
-/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
-   except the last into the character SEP.  */
-static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
-
-static void
-argz_stringify__ (argz, len, sep)
-     char *argz;
-     size_t len;
-     int sep;
-{
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len;
-      len -= part_len + 1;
-      if (len > 0)
-	*argz++ = sep;
-    }
-}
-# undef __argz_stringify
-# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
-#endif	/* !_LIBC && !HAVE___ARGZ_STRINGIFY */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
-static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
-				  const char *entry));
-
-static char *
-argz_next__ (argz, argz_len, entry)
-     char *argz;
-     size_t argz_len;
-     const char *entry;
-{
-  if (entry)
-    {
-      if (entry < argz + argz_len)
-        entry = strchr (entry, '\0') + 1;
-
-      return entry >= argz + argz_len ? NULL : (char *) entry;
-    }
-  else
-    if (argz_len > 0)
-      return argz;
-    else
-      return 0;
-}
-# undef __argz_next
-# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
-#endif	/* !_LIBC && !HAVE___ARGZ_NEXT */
-
-
-/* Return number of bits set in X.  */
-static int pop PARAMS ((int x));
-
-static inline int
-pop (x)
-     int x;
-{
-  /* We assume that no more than 16 bits are used.  */
-  x = ((x & ~0x5555) >> 1) + (x & 0x5555);
-  x = ((x & ~0x3333) >> 2) + (x & 0x3333);
-  x = ((x >> 4) + x) & 0x0f0f;
-  x = ((x >> 8) + x) & 0xff;
-
-  return x;
-}
-
-
-struct loaded_l10nfile *
-_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
-		    territory, codeset, normalized_codeset, modifier, special,
-		    sponsor, revision, filename, do_allocate)
-     struct loaded_l10nfile **l10nfile_list;
-     const char *dirlist;
-     size_t dirlist_len;
-     int mask;
-     const char *language;
-     const char *territory;
-     const char *codeset;
-     const char *normalized_codeset;
-     const char *modifier;
-     const char *special;
-     const char *sponsor;
-     const char *revision;
-     const char *filename;
-     int do_allocate;
-{
-  char *abs_filename;
-  struct loaded_l10nfile *last = NULL;
-  struct loaded_l10nfile *retval;
-  char *cp;
-  size_t entries;
-  int cnt;
-
-  /* Allocate room for the full file name.  */
-  abs_filename = (char *) malloc (dirlist_len
-				  + strlen (language)
-				  + ((mask & TERRITORY) != 0
-				     ? strlen (territory) + 1 : 0)
-				  + ((mask & XPG_CODESET) != 0
-				     ? strlen (codeset) + 1 : 0)
-				  + ((mask & XPG_NORM_CODESET) != 0
-				     ? strlen (normalized_codeset) + 1 : 0)
-				  + (((mask & XPG_MODIFIER) != 0
-				      || (mask & CEN_AUDIENCE) != 0)
-				     ? strlen (modifier) + 1 : 0)
-				  + ((mask & CEN_SPECIAL) != 0
-				     ? strlen (special) + 1 : 0)
-				  + (((mask & CEN_SPONSOR) != 0
-				      || (mask & CEN_REVISION) != 0)
-				     ? (1 + ((mask & CEN_SPONSOR) != 0
-					     ? strlen (sponsor) + 1 : 0)
-					+ ((mask & CEN_REVISION) != 0
-					   ? strlen (revision) + 1 : 0)) : 0)
-				  + 1 + strlen (filename) + 1);
-
-  if (abs_filename == NULL)
-    return NULL;
-
-  retval = NULL;
-  last = NULL;
-
-  /* Construct file name.  */
-  memcpy (abs_filename, dirlist, dirlist_len);
-  __argz_stringify (abs_filename, dirlist_len, PATH_SEPARATOR);
-  cp = abs_filename + (dirlist_len - 1);
-  *cp++ = '/';
-  cp = stpcpy (cp, language);
-
-  if ((mask & TERRITORY) != 0)
-    {
-      *cp++ = '_';
-      cp = stpcpy (cp, territory);
-    }
-  if ((mask & XPG_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, codeset);
-    }
-  if ((mask & XPG_NORM_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, normalized_codeset);
-    }
-  if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
-    {
-      /* This component can be part of both syntaces but has different
-	 leading characters.  For CEN we use `+', else `@'.  */
-      *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
-      cp = stpcpy (cp, modifier);
-    }
-  if ((mask & CEN_SPECIAL) != 0)
-    {
-      *cp++ = '+';
-      cp = stpcpy (cp, special);
-    }
-  if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
-    {
-      *cp++ = ',';
-      if ((mask & CEN_SPONSOR) != 0)
-	cp = stpcpy (cp, sponsor);
-      if ((mask & CEN_REVISION) != 0)
-	{
-	  *cp++ = '_';
-	  cp = stpcpy (cp, revision);
-	}
-    }
-
-  *cp++ = '/';
-  stpcpy (cp, filename);
-
-  /* Look in list of already loaded domains whether it is already
-     available.  */
-  last = NULL;
-  for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
-    if (retval->filename != NULL)
-      {
-	int compare = strcmp (retval->filename, abs_filename);
-	if (compare == 0)
-	  /* We found it!  */
-	  break;
-	if (compare < 0)
-	  {
-	    /* It's not in the list.  */
-	    retval = NULL;
-	    break;
-	  }
-
-	last = retval;
-      }
-
-  if (retval != NULL || do_allocate == 0)
-    {
-      free (abs_filename);
-      return retval;
-    }
-
-  retval = (struct loaded_l10nfile *)
-    malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len)
-				* (1 << pop (mask))
-				* sizeof (struct loaded_l10nfile *)));
-  if (retval == NULL)
-    return NULL;
-
-  retval->filename = abs_filename;
-  retval->decided = (__argz_count (dirlist, dirlist_len) != 1
-		     || ((mask & XPG_CODESET) != 0
-			 && (mask & XPG_NORM_CODESET) != 0));
-  retval->data = NULL;
-
-  if (last == NULL)
-    {
-      retval->next = *l10nfile_list;
-      *l10nfile_list = retval;
-    }
-  else
-    {
-      retval->next = last->next;
-      last->next = retval;
-    }
-
-  entries = 0;
-  /* If the DIRLIST is a real list the RETVAL entry corresponds not to
-     a real file.  So we have to use the DIRLIST separation mechanism
-     of the inner loop.  */
-  cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask;
-  for (; cnt >= 0; --cnt)
-    if ((cnt & ~mask) == 0
-	&& ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
-	&& ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
-      {
-	/* Iterate over all elements of the DIRLIST.  */
-	char *dir = NULL;
-
-	while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
-	       != NULL)
-	  retval->successor[entries++]
-	    = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt,
-				  language, territory, codeset,
-				  normalized_codeset, modifier, special,
-				  sponsor, revision, filename, 1);
-      }
-  retval->successor[entries] = NULL;
-
-  return retval;
-}
-
-/* Normalize codeset name.  There is no standard for the codeset
-   names.  Normalization allows the user to use any of the common
-   names.  The return value is dynamically allocated and has to be
-   freed by the caller.  */
-const char *
-_nl_normalize_codeset (codeset, name_len)
-     const char *codeset;
-     size_t name_len;
-{
-  int len = 0;
-  int only_digit = 1;
-  char *retval;
-  char *wp;
-  size_t cnt;
-
-  for (cnt = 0; cnt < name_len; ++cnt)
-    if (isalnum (codeset[cnt]))
-      {
-	++len;
-
-	if (isalpha (codeset[cnt]))
-	  only_digit = 0;
-      }
-
-  retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
-
-  if (retval != NULL)
-    {
-      if (only_digit)
-	wp = stpcpy (retval, "iso");
-      else
-	wp = retval;
-
-      for (cnt = 0; cnt < name_len; ++cnt)
-	if (isalpha (codeset[cnt]))
-	  *wp++ = tolower (codeset[cnt]);
-	else if (isdigit (codeset[cnt]))
-	  *wp++ = codeset[cnt];
-
-      *wp = '\0';
-    }
-
-  return (const char *) retval;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
diff --git a/intl/libgettext.h b/intl/libgettext.h
deleted file mode 100644
index 93eb4403..00000000
--- a/intl/libgettext.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifndef _LIBGETTEXT_H
-#define _LIBGETTEXT_H 1
-
-/* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
-
-/* Get declarations of GNU message catalog functions.  */
-# include <libintl.h>
-
-#else
-
-# define gettext(Msgid) (Msgid)
-# define dgettext(Domainname, Msgid) (Msgid)
-# define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define ngettext(Msgid1, Msgid2, N) \
-    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
-# define dngettext(Domainname, Msgid1, Msgid2, N) \
-    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
-# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
-# define textdomain(Domainname) ((char *) (Domainname))
-# define bindtextdomain(Domainname, Dirname) ((char *) (Dirname))
-# define bind_textdomain_codeset(Domainname, Codeset) ((char *) (Codeset))
-
-#endif
-
-/* For automatical extraction of messages sometimes no real
-   translation is needed.  Instead the string itself is the result.  */
-#define gettext_noop(Str) (Str)
-
-#endif /* _LIBGETTEXT_H */
diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h
deleted file mode 100644
index 014a8b5a..00000000
--- a/intl/libgnuintl.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H	1
-
-#include <locale.h>
-
-/* The LC_MESSAGES locale category is the category used by the functions
-   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
-   On systems that don't define it, use an arbitrary value instead.
-   On Solaris, <locale.h> defines __LOCALE_H then includes <libintl.h> (i.e.
-   this file!) and then only defines LC_MESSAGES.  To avoid a redefinition
-   warning, don't define LC_MESSAGES in this case.  */
-#if !defined LC_MESSAGES && !defined __LOCALE_H
-# define LC_MESSAGES 1729
-#endif
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
-   precedence over _conio_gettext.  */
-#ifdef __DJGPP__
-# undef gettext
-# define gettext gettext
-#endif
-
-#ifndef PARAMS
-# if __STDC__ || defined __cplusplus
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext PARAMS ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
-				int __category));
-
-
-/* Similar to `gettext' but select the plural form corresponding to the
-   number N.  */
-extern char *ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
-			       unsigned long int __n));
-
-/* Similar to `dgettext' but select the plural form corresponding to the
-   number N.  */
-extern char *dngettext PARAMS ((const char *__domainname, const char *__msgid1,
-				const char *__msgid2, unsigned long int __n));
-
-/* Similar to `dcgettext' but select the plural form corresponding to the
-   number N.  */
-extern char *dcngettext PARAMS ((const char *__domainname, const char *__msgid1,
-				 const char *__msgid2, unsigned long int __n,
-				 int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain PARAMS ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain PARAMS ((const char *__domainname,
-				     const char *__dirname));
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-extern char *bind_textdomain_codeset PARAMS ((const char *__domainname,
-					      const char *__codeset));
-
-
-/* Optimized version of the functions above.  */
-#if defined __OPTIMIZED
-/* These are macros, but could also be inline functions.  */
-
-# define gettext(msgid)							      \
-  dgettext (NULL, msgid)
-
-# define dgettext(domainname, msgid)					      \
-  dcgettext (domainname, msgid, LC_MESSAGES)
-
-# define ngettext(msgid1, msgid2, n)					      \
-  dngettext (NULL, msgid1, msgid2, n)
-
-# define dngettext(domainname, msgid1, msgid2, n)			      \
-  dcngettext (domainname, msgid1, msgid2, n, LC_MESSAGES)
-
-#endif /* Optimizing. */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
deleted file mode 100644
index 43b6e6c2..00000000
--- a/intl/loadinfo.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifndef _LOADINFO_H
-#define _LOADINFO_H	1
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-/* Separator in PATH like lists of pathnames.  */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
-# define PATH_SEPARATOR ';'
-#else
-  /* Unix */
-# define PATH_SEPARATOR ':'
-#endif
-
-/* Encoding of locale name parts.  */
-#define CEN_REVISION		1
-#define CEN_SPONSOR		2
-#define CEN_SPECIAL		4
-#define XPG_NORM_CODESET	8
-#define XPG_CODESET		16
-#define TERRITORY		32
-#define CEN_AUDIENCE		64
-#define XPG_MODIFIER		128
-
-#define CEN_SPECIFIC	(CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
-#define XPG_SPECIFIC	(XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
-
-
-struct loaded_l10nfile
-{
-  const char *filename;
-  int decided;
-
-  const void *data;
-
-  struct loaded_l10nfile *next;
-  struct loaded_l10nfile *successor[1];
-};
-
-
-/* Normalize codeset name.  There is no standard for the codeset
-   names.  Normalization allows the user to use any of the common
-   names.  The return value is dynamically allocated and has to be
-   freed by the caller.  */
-extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
-						  size_t name_len));
-
-extern struct loaded_l10nfile *
-_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
-			    const char *dirlist, size_t dirlist_len, int mask,
-			    const char *language, const char *territory,
-			    const char *codeset,
-			    const char *normalized_codeset,
-			    const char *modifier, const char *special,
-			    const char *sponsor, const char *revision,
-			    const char *filename, int do_allocate));
-
-
-extern const char *_nl_expand_alias PARAMS ((const char *name));
-
-/* normalized_codeset is dynamically allocated and has to be freed by
-   the caller.  */
-extern int _nl_explode_name PARAMS ((char *name, const char **language,
-				     const char **modifier,
-				     const char **territory,
-				     const char **codeset,
-				     const char **normalized_codeset,
-				     const char **special,
-				     const char **sponsor,
-				     const char **revision));
-
-extern char *_nl_find_language PARAMS ((const char *name));
-
-#endif	/* loadinfo.h */
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
deleted file mode 100644
index 175a0a8c..00000000
--- a/intl/loadmsgcat.c
+++ /dev/null
@@ -1,566 +0,0 @@
-/* Load needed message catalogs.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE    1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#ifdef _LIBC
-# include <langinfo.h>
-# include <locale.h>
-#endif
-
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || (defined _LIBC && defined _POSIX_MAPPED_FILES)
-# include <sys/mman.h>
-# undef HAVE_MMAP
-# define HAVE_MMAP	1
-#else
-# undef HAVE_MMAP
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-
-#ifdef _LIBC
-# include "../locale/localeinfo.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ISO C functions.  This is required by the standard
-   because some ISO C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define open   __open
-# define close  __close
-# define read   __read
-# define mmap   __mmap
-# define munmap __munmap
-#endif
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define PLURAL_PARSE __gettextparse
-#else
-# define PLURAL_PARSE gettextparse__
-#endif
-
-/* For those losing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-# define freea(p) /* nothing */
-#else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
-#endif
-
-/* For systems that distinguish between text and binary I/O.
-   O_BINARY is usually declared in <fcntl.h>. */
-#if !defined O_BINARY && defined _O_BINARY
-  /* For MSC-compatible compilers.  */
-# define O_BINARY _O_BINARY
-# define O_TEXT _O_TEXT
-#endif
-#ifdef __BEOS__
-  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
-# undef O_BINARY
-# undef O_TEXT
-#endif
-/* On reasonable systems, binary I/O is the default.  */
-#ifndef O_BINARY
-# define O_BINARY 0
-#endif
-
-/* We need a sign, whether a new catalog was loaded, which can be associated
-   with all translations.  This is important if the translations are
-   cached by one of GCC's features.  */
-int _nl_msg_cat_cntr;
-
-#if (defined __GNUC__ && !defined __APPLE_CC__) \
-    || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
-
-/* These structs are the constant expression for the germanic plural
-   form determination.  It represents the expression  "n != 1".  */
-static const struct expression plvar =
-{
-  .nargs = 0,
-  .operation = var,
-};
-static const struct expression plone =
-{
-  .nargs = 0,
-  .operation = num,
-  .val =
-  {
-    .num = 1
-  }
-};
-static struct expression germanic_plural =
-{
-  .nargs = 2,
-  .operation = not_equal,
-  .val =
-  {
-    .args =
-    {
-      [0] = (struct expression *) &plvar,
-      [1] = (struct expression *) &plone
-    }
-  }
-};
-
-# define INIT_GERMANIC_PLURAL()
-
-#else
-
-/* For compilers without support for ISO C 99 struct/union initializers:
-   Initialization at run-time.  */
-
-static struct expression plvar;
-static struct expression plone;
-static struct expression germanic_plural;
-
-static void
-init_germanic_plural ()
-{
-  if (plone.val.num == 0)
-    {
-      plvar.nargs = 0;
-      plvar.operation = var;
-
-      plone.nargs = 0;
-      plone.operation = num;
-      plone.val.num = 1;
-
-      germanic_plural.nargs = 2;
-      germanic_plural.operation = not_equal;
-      germanic_plural.val.args[0] = &plvar;
-      germanic_plural.val.args[1] = &plone;
-    }
-}
-
-# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
-
-#endif
-
-
-/* Initialize the codeset dependent parts of an opened message catalog.
-   Return the header entry.  */
-const char *
-internal_function
-_nl_init_domain_conv (domain_file, domain, domainbinding)
-     struct loaded_l10nfile *domain_file;
-     struct loaded_domain *domain;
-     struct binding *domainbinding;
-{
-  /* Find out about the character set the file is encoded with.
-     This can be found (in textual form) in the entry "".  If this
-     entry does not exist or if this does not contain the `charset='
-     information, we will assume the charset matches the one the
-     current locale and we don't have to perform any conversion.  */
-  char *nullentry;
-  size_t nullentrylen;
-
-  /* Preinitialize fields, to avoid recursion during _nl_find_msg.  */
-  domain->codeset_cntr =
-    (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
-#ifdef _LIBC
-  domain->conv = (__gconv_t) -1;
-#else
-# if HAVE_ICONV
-  domain->conv = (iconv_t) -1;
-# endif
-#endif
-  domain->conv_tab = NULL;
-
-  /* Get the header entry.  */
-  nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
-
-  if (nullentry != NULL)
-    {
-#if defined _LIBC || HAVE_ICONV
-      const char *charsetstr;
-
-      charsetstr = strstr (nullentry, "charset=");
-      if (charsetstr != NULL)
-	{
-	  size_t len;
-	  char *charset;
-	  const char *outcharset;
-
-	  charsetstr += strlen ("charset=");
-	  len = strcspn (charsetstr, " \t\n");
-
-	  charset = (char *) alloca (len + 1);
-# if defined _LIBC || HAVE_MEMPCPY
-	  *((char *) mempcpy (charset, charsetstr, len)) = '\0';
-# else
-	  memcpy (charset, charsetstr, len);
-	  charset[len] = '\0';
-# endif
-
-	  /* The output charset should normally be determined by the
-	     locale.  But sometimes the locale is not used or not correctly
-	     set up, so we provide a possibility for the user to override
-	     this.  Moreover, the value specified through
-	     bind_textdomain_codeset overrides both.  */
-	  if (domainbinding != NULL && domainbinding->codeset != NULL)
-	    outcharset = domainbinding->codeset;
-	  else
-	    {
-	      outcharset = getenv ("OUTPUT_CHARSET");
-	      if (outcharset == NULL || outcharset[0] == '\0')
-		{
-# ifdef _LIBC
-		  outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
-# else
-#  if HAVE_ICONV
-		  extern const char *locale_charset (void);
-		  outcharset = locale_charset ();
-#  endif
-# endif
-		}
-	    }
-
-# ifdef _LIBC
-	  /* We always want to use transliteration.  */
-	  outcharset = norm_add_slashes (outcharset, "TRANSLIT");
-	  charset = norm_add_slashes (charset, NULL);
-	  if (__gconv_open (outcharset, charset, &domain->conv,
-			    GCONV_AVOID_NOCONV)
-	      != __GCONV_OK)
-	    domain->conv = (__gconv_t) -1;
-# else
-#  if HAVE_ICONV
-	  /* When using GNU libiconv, we want to use transliteration.  */
-#   if _LIBICONV_VERSION >= 0x0105
-	  len = strlen (outcharset);
-	  {
-	    char *tmp = (char *) alloca (len + 10 + 1);
-	    memcpy (tmp, outcharset, len);
-	    memcpy (tmp + len, "//TRANSLIT", 10 + 1);
-	    outcharset = tmp;
-	  }
-#   endif
-	  domain->conv = iconv_open (outcharset, charset);
-#   if _LIBICONV_VERSION >= 0x0105
-	  freea (outcharset);
-#   endif
-#  endif
-# endif
-
-	  freea (charset);
-	}
-#endif /* _LIBC || HAVE_ICONV */
-    }
-
-  return nullentry;
-}
-
-/* Frees the codeset dependent parts of an opened message catalog.  */
-void
-internal_function
-_nl_free_domain_conv (domain)
-     struct loaded_domain *domain;
-{
-  if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
-    free (domain->conv_tab);
-
-#ifdef _LIBC
-  if (domain->conv != (__gconv_t) -1)
-    __gconv_close (domain->conv);
-#else
-# if HAVE_ICONV
-  if (domain->conv != (iconv_t) -1)
-    iconv_close (domain->conv);
-# endif
-#endif
-}
-
-/* Load the message catalogs specified by FILENAME.  If it is no valid
-   message catalog do nothing.  */
-void
-internal_function
-_nl_load_domain (domain_file, domainbinding)
-     struct loaded_l10nfile *domain_file;
-     struct binding *domainbinding;
-{
-  int fd;
-  size_t size;
-#ifdef _LIBC
-  struct stat64 st;
-#else
-  struct stat st;
-#endif
-  struct mo_file_header *data = (struct mo_file_header *) -1;
-  int use_mmap = 0;
-  struct loaded_domain *domain;
-  const char *nullentry;
-
-  domain_file->decided = 1;
-  domain_file->data = NULL;
-
-  /* Note that it would be useless to store domainbinding in domain_file
-     because domainbinding might be == NULL now but != NULL later (after
-     a call to bind_textdomain_codeset).  */
-
-  /* If the record does not represent a valid locale the FILENAME
-     might be NULL.  This can happen when according to the given
-     specification the locale file name is different for XPG and CEN
-     syntax.  */
-  if (domain_file->filename == NULL)
-    return;
-
-  /* Try to open the addressed file.  */
-  fd = open (domain_file->filename, O_RDONLY | O_BINARY);
-  if (fd == -1)
-    return;
-
-  /* We must know about the size of the file.  */
-  if (
-#ifdef _LIBC
-      __builtin_expect (fstat64 (fd, &st) != 0, 0)
-#else
-      __builtin_expect (fstat (fd, &st) != 0, 0)
-#endif
-      || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
-      || __builtin_expect (size < sizeof (struct mo_file_header), 0))
-    {
-      /* Something went wrong.  */
-      close (fd);
-      return;
-    }
-
-#ifdef HAVE_MMAP
-  /* Now we are ready to load the file.  If mmap() is available we try
-     this first.  If not available or it failed we try to load it.  */
-  data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
-					 MAP_PRIVATE, fd, 0);
-
-  if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
-    {
-      /* mmap() call was successful.  */
-      close (fd);
-      use_mmap = 1;
-    }
-#endif
-
-  /* If the data is not yet available (i.e. mmap'ed) we try to load
-     it manually.  */
-  if (data == (struct mo_file_header *) -1)
-    {
-      size_t to_read;
-      char *read_ptr;
-
-      data = (struct mo_file_header *) malloc (size);
-      if (data == NULL)
-	return;
-
-      to_read = size;
-      read_ptr = (char *) data;
-      do
-	{
-	  long int nb = (long int) read (fd, read_ptr, to_read);
-	  if (nb <= 0)
-	    {
-#ifdef EINTR
-	      if (nb == -1 && errno == EINTR)
-		continue;
-#endif
-	      close (fd);
-	      return;
-	    }
-	  read_ptr += nb;
-	  to_read -= nb;
-	}
-      while (to_read > 0);
-
-      close (fd);
-    }
-
-  /* Using the magic number we can test whether it really is a message
-     catalog file.  */
-  if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
-			0))
-    {
-      /* The magic number is wrong: not a message catalog file.  */
-#ifdef HAVE_MMAP
-      if (use_mmap)
-	munmap ((caddr_t) data, size);
-      else
-#endif
-	free (data);
-      return;
-    }
-
-  domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
-  if (domain == NULL)
-    return;
-  domain_file->data = domain;
-
-  domain->data = (char *) data;
-  domain->use_mmap = use_mmap;
-  domain->mmap_size = size;
-  domain->must_swap = data->magic != _MAGIC;
-
-  /* Fill in the information about the available tables.  */
-  switch (W (domain->must_swap, data->revision))
-    {
-    case 0:
-      domain->nstrings = W (domain->must_swap, data->nstrings);
-      domain->orig_tab = (struct string_desc *)
-	((char *) data + W (domain->must_swap, data->orig_tab_offset));
-      domain->trans_tab = (struct string_desc *)
-	((char *) data + W (domain->must_swap, data->trans_tab_offset));
-      domain->hash_size = W (domain->must_swap, data->hash_tab_size);
-      domain->hash_tab = (nls_uint32 *)
-	((char *) data + W (domain->must_swap, data->hash_tab_offset));
-      break;
-    default:
-      /* This is an invalid revision.  */
-#ifdef HAVE_MMAP
-      if (use_mmap)
-	munmap ((caddr_t) data, size);
-      else
-#endif
-	free (data);
-      free (domain);
-      domain_file->data = NULL;
-      return;
-    }
-
-  /* Now initialize the character set converter from the character set
-     the file is encoded with (found in the header entry) to the domain's
-     specified character set or the locale's character set.  */
-  nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
-
-  /* Also look for a plural specification.  */
-  if (nullentry != NULL)
-    {
-      const char *plural;
-      const char *nplurals;
-
-      plural = strstr (nullentry, "plural=");
-      nplurals = strstr (nullentry, "nplurals=");
-      if (plural == NULL || nplurals == NULL)
-	goto no_plural;
-      else
-	{
-	  /* First get the number.  */
-	  char *endp;
-	  unsigned long int n;
-	  struct parse_args args;
-
-	  nplurals += 9;
-	  while (*nplurals != '\0' && isspace (*nplurals))
-	    ++nplurals;
-#if defined HAVE_STRTOUL || defined _LIBC
-	  n = strtoul (nplurals, &endp, 10);
-#else
-	  for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
-	    n = n * 10 + (*endp - '0');
-#endif
-	  domain->nplurals = n;
-	  if (nplurals == endp)
-	    goto no_plural;
-
-	  /* Due to the restrictions bison imposes onto the interface of the
-	     scanner function we have to put the input string and the result
-	     passed up from the parser into the same structure which address
-	     is passed down to the parser.  */
-	  plural += 7;
-	  args.cp = plural;
-	  if (PLURAL_PARSE (&args) != 0)
-	    goto no_plural;
-	  domain->plural = args.res;
-	}
-    }
-  else
-    {
-      /* By default we are using the Germanic form: singular form only
-         for `one', the plural form otherwise.  Yes, this is also what
-         English is using since English is a Germanic language.  */
-    no_plural:
-      INIT_GERMANIC_PLURAL ();
-      domain->plural = &germanic_plural;
-      domain->nplurals = 2;
-    }
-}
-
-
-#ifdef _LIBC
-void
-internal_function
-_nl_unload_domain (domain)
-     struct loaded_domain *domain;
-{
-  if (domain->plural != &germanic_plural)
-    __gettext_free_exp (domain->plural);
-
-  _nl_free_domain_conv (domain);
-
-# ifdef _POSIX_MAPPED_FILES
-  if (domain->use_mmap)
-    munmap ((caddr_t) domain->data, domain->mmap_size);
-  else
-# endif	/* _POSIX_MAPPED_FILES */
-    free ((void *) domain->data);
-
-  free (domain);
-}
-#endif
diff --git a/intl/localcharset.c b/intl/localcharset.c
deleted file mode 100644
index 2e1e0c73..00000000
--- a/intl/localcharset.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/* Determine a canonical name for the current locale's character encoding.
-
-   Copyright (C) 2000-2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
-
-/* Written by Bruno Haible <haible@clisp.cons.org>.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if HAVE_STDDEF_H
-# include <stddef.h>
-#endif
-
-#include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#if defined _WIN32 || defined __WIN32__
-# undef WIN32   /* avoid warning on mingw32 */
-# define WIN32
-#endif
-
-#ifndef WIN32
-# if HAVE_LANGINFO_CODESET
-#  include <langinfo.h>
-# else
-#  if HAVE_SETLOCALE
-#   include <locale.h>
-#  endif
-# endif
-#else /* WIN32 */
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-#endif
-
-#ifndef DIRECTORY_SEPARATOR
-# define DIRECTORY_SEPARATOR '/'
-#endif
-
-#ifndef ISSLASH
-# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
-#endif
-
-/* The following static variable is declared 'volatile' to avoid a
-   possible multithread problem in the function get_charset_aliases. If we
-   are running in a threaded environment, and if two threads initialize
-   'charset_aliases' simultaneously, both will produce the same value,
-   and everything will be ok if the two assignments to 'charset_aliases'
-   are atomic. But I don't know what will happen if the two assignments mix.  */
-#if __STDC__ != 1
-# define volatile /* empty */
-#endif
-/* Pointer to the contents of the charset.alias file, if it has already been
-   read, else NULL.  Its format is:
-   ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
-static char * volatile charset_aliases;
-
-/* Return a pointer to the contents of the charset.alias file.  */
-static const char *
-get_charset_aliases ()
-{
-  char *cp;
-
-  cp = charset_aliases;
-  if (cp == NULL)
-    {
-#ifndef WIN32
-      FILE *fp;
-      const char *dir = LIBDIR;
-      const char *base = "charset.alias";
-      char *file_name;
-
-      /* Concatenate dir and base into freshly allocated file_name.  */
-      {
-	size_t dir_len = strlen (dir);
-	size_t base_len = strlen (base);
-	int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
-	file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
-	if (file_name != NULL)
-	  {
-	    memcpy (file_name, dir, dir_len);
-	    if (add_slash)
-	      file_name[dir_len] = DIRECTORY_SEPARATOR;
-	    memcpy (file_name + dir_len + add_slash, base, base_len + 1);
-	  }
-      }
-
-      if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
-	/* Out of memory or file not found, treat it as empty.  */
-	cp = "";
-      else
-	{
-	  /* Parse the file's contents.  */
-	  int c;
-	  char buf1[50+1];
-	  char buf2[50+1];
-	  char *res_ptr = NULL;
-	  size_t res_size = 0;
-	  size_t l1, l2;
-
-	  for (;;)
-	    {
-	      c = getc (fp);
-	      if (c == EOF)
-		break;
-	      if (c == '\n' || c == ' ' || c == '\t')
-		continue;
-	      if (c == '#')
-		{
-		  /* Skip comment, to end of line.  */
-		  do
-		    c = getc (fp);
-		  while (!(c == EOF || c == '\n'));
-		  if (c == EOF)
-		    break;
-		  continue;
-		}
-	      ungetc (c, fp);
-	      if (fscanf(fp, "%50s %50s", buf1, buf2) < 2)
-		break;
-	      l1 = strlen (buf1);
-	      l2 = strlen (buf2);
-	      if (res_size == 0)
-		{
-		  res_size = l1 + 1 + l2 + 1;
-		  res_ptr = malloc (res_size + 1);
-		}
-	      else
-		{
-		  res_size += l1 + 1 + l2 + 1;
-		  res_ptr = realloc (res_ptr, res_size + 1);
-		}
-	      if (res_ptr == NULL)
-		{
-		  /* Out of memory. */
-		  res_size = 0;
-		  break;
-		}
-	      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
-	      strcpy (res_ptr + res_size - (l2 + 1), buf2);
-	    }
-	  fclose (fp);
-	  if (res_size == 0)
-	    cp = "";
-	  else
-	    {
-	      *(res_ptr + res_size) = '\0';
-	      cp = res_ptr;
-	    }
-	}
-
-      if (file_name != NULL)
-	free (file_name);
-
-#else /* WIN32 */
-
-      /* To avoid the troubles of installing a separate file in the same
-	 directory as the DLL and of retrieving the DLL's directory at
-	 runtime, simply inline the aliases here.  */
-
-      cp = "CP936" "\0" "GBK" "\0"
-	   "CP1361" "\0" "JOHAB" "\0";
-#endif
-
-      charset_aliases = cp;
-    }
-
-  return cp;
-}
-
-/* Determine the current locale's character encoding, and canonicalize it
-   into one of the canonical names listed in config.charset.
-   The result must not be freed; it is statically allocated.
-   If the canonical name cannot be determined, the result is a non-canonical
-   name.  */
-
-#ifdef STATIC
-STATIC
-#endif
-const char *
-locale_charset ()
-{
-  const char *codeset;
-  const char *aliases;
-
-#ifndef WIN32
-
-# if HAVE_LANGINFO_CODESET
-
-  /* Most systems support nl_langinfo (CODESET) nowadays.  */
-  codeset = nl_langinfo (CODESET);
-
-# else
-
-  /* On old systems which lack it, use setlocale or getenv.  */
-  const char *locale = NULL;
-
-  /* But most old systems don't have a complete set of locales.  Some
-     (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
-     use setlocale here; it would return "C" when it doesn't support the
-     locale name the user has set.  */
-#  if HAVE_SETLOCALE && 0
-  locale = setlocale (LC_CTYPE, NULL);
-#  endif
-  if (locale == NULL || locale[0] == '\0')
-    {
-      locale = getenv ("LC_ALL");
-      if (locale == NULL || locale[0] == '\0')
-	{
-	  locale = getenv ("LC_CTYPE");
-	  if (locale == NULL || locale[0] == '\0')
-	    locale = getenv ("LANG");
-	}
-    }
-
-  /* On some old systems, one used to set locale = "iso8859_1". On others,
-     you set it to "language_COUNTRY.charset". In any case, we resolve it
-     through the charset.alias file.  */
-  codeset = locale;
-
-# endif
-
-#else /* WIN32 */
-
-  static char buf[2 + 10 + 1];
-
-  /* Win32 has a function returning the locale's codepage as a number.  */
-  sprintf (buf, "CP%u", GetACP ());
-  codeset = buf;
-
-#endif
-
-  if (codeset == NULL)
-    /* The canonical name cannot be determined.  */
-    codeset = "";
-
-  /* Resolve alias. */
-  for (aliases = get_charset_aliases ();
-       *aliases != '\0';
-       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
-    if (strcmp (codeset, aliases) == 0
-	|| (aliases[0] == '*' && aliases[1] == '\0'))
-      {
-	codeset = aliases + strlen (aliases) + 1;
-	break;
-      }
-
-  return codeset;
-}
diff --git a/intl/locale.alias b/intl/locale.alias
deleted file mode 100644
index d8073859..00000000
--- a/intl/locale.alias
+++ /dev/null
@@ -1,77 +0,0 @@
-# Locale name alias data base.
-# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# The format of this file is the same as for the corresponding file of
-# the X Window System, which normally can be found in
-#	/usr/lib/X11/locale/locale.alias
-# A single line contains two fields: an alias and a substitution value.
-# All entries are case independent.
-
-# Note: This file is far from being complete.  If you have a value for
-# your own site which you think might be useful for others too, share
-# it with the rest of us.  Send it using the `glibcbug' script to
-# bugs@gnu.org.
-
-# Packages using this file: 
-
-bokmal		no_NO.ISO-8859-1
-bokm�l		no_NO.ISO-8859-1
-catalan		ca_ES.ISO-8859-1
-croatian	hr_HR.ISO-8859-2
-czech		cs_CZ.ISO-8859-2
-danish          da_DK.ISO-8859-1
-dansk		da_DK.ISO-8859-1
-deutsch		de_DE.ISO-8859-1
-dutch		nl_NL.ISO-8859-1
-eesti		et_EE.ISO-8859-1
-estonian	et_EE.ISO-8859-1
-finnish         fi_FI.ISO-8859-1
-fran�ais	fr_FR.ISO-8859-1
-french		fr_FR.ISO-8859-1
-galego		gl_ES.ISO-8859-1
-galician	gl_ES.ISO-8859-1
-german		de_DE.ISO-8859-1
-greek           el_GR.ISO-8859-7
-hebrew          iw_IL.ISO-8859-8
-hrvatski	hr_HR.ISO-8859-2
-hungarian       hu_HU.ISO-8859-2
-icelandic       is_IS.ISO-8859-1
-italian         it_IT.ISO-8859-1
-japanese	ja_JP.eucJP
-japanese.euc	ja_JP.eucJP
-ja_JP		ja_JP.eucJP
-ja_JP.ujis	ja_JP.eucJP
-japanese.sjis	ja_JP.SJIS
-korean		ko_KR.eucKR
-korean.euc 	ko_KR.eucKR
-ko_KR		ko_KR.eucKR
-lithuanian      lt_LT.ISO-8859-13
-nb_NO		no_NO.ISO-8859-1
-nb_NO.ISO-8859-1 no_NO.ISO-8859-1
-norwegian       no_NO.ISO-8859-1
-nynorsk		nn_NO.ISO-8859-1
-polish          pl_PL.ISO-8859-2
-portuguese      pt_PT.ISO-8859-1
-romanian        ro_RO.ISO-8859-2
-russian         ru_RU.ISO-8859-5
-slovak          sk_SK.ISO-8859-2
-slovene         sl_SI.ISO-8859-2
-slovenian       sl_SI.ISO-8859-2
-spanish         es_ES.ISO-8859-1
-swedish         sv_SE.ISO-8859-1
-thai		th_TH.TIS-620
-turkish         tr_TR.ISO-8859-9
diff --git a/intl/localealias.c b/intl/localealias.c
deleted file mode 100644
index d62c0b20..00000000
--- a/intl/localealias.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/* Handle aliases for locale names.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE    1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#include <stdlib.h>
-
-#include <string.h>
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define strcasecmp __strcasecmp
-
-# ifndef mempcpy
-#  define mempcpy __mempcpy
-# endif
-# define HAVE_MEMPCPY	1
-
-/* We need locking here since we can be called from different places.  */
-# include <bits/libc-lock.h>
-
-__libc_lock_define_initialized (static, lock);
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-/* For those losing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-# define freea(p) /* nothing */
-#else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
-#endif
-
-#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED
-# undef fgets
-# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
-#endif
-#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED
-# undef feof
-# define feof(s) feof_unlocked (s)
-#endif
-
-
-struct alias_map
-{
-  const char *alias;
-  const char *value;
-};
-
-
-static char *string_space;
-static size_t string_space_act;
-static size_t string_space_max;
-static struct alias_map *map;
-static size_t nmap;
-static size_t maxmap;
-
-
-/* Prototypes for local functions.  */
-static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
-     internal_function;
-static int extend_alias_table PARAMS ((void));
-static int alias_compare PARAMS ((const struct alias_map *map1,
-				  const struct alias_map *map2));
-
-
-const char *
-_nl_expand_alias (name)
-    const char *name;
-{
-  static const char *locale_alias_path = LOCALE_ALIAS_PATH;
-  struct alias_map *retval;
-  const char *result = NULL;
-  size_t added;
-
-#ifdef _LIBC
-  __libc_lock_lock (lock);
-#endif
-
-  do
-    {
-      struct alias_map item;
-
-      item.alias = name;
-
-      if (nmap > 0)
-	retval = (struct alias_map *) bsearch (&item, map, nmap,
-					       sizeof (struct alias_map),
-					       (int (*) PARAMS ((const void *,
-								 const void *))
-						) alias_compare);
-      else
-	retval = NULL;
-
-      /* We really found an alias.  Return the value.  */
-      if (retval != NULL)
-	{
-	  result = retval->value;
-	  break;
-	}
-
-      /* Perhaps we can find another alias file.  */
-      added = 0;
-      while (added == 0 && locale_alias_path[0] != '\0')
-	{
-	  const char *start;
-
-	  while (locale_alias_path[0] == PATH_SEPARATOR)
-	    ++locale_alias_path;
-	  start = locale_alias_path;
-
-	  while (locale_alias_path[0] != '\0'
-		 && locale_alias_path[0] != PATH_SEPARATOR)
-	    ++locale_alias_path;
-
-	  if (start < locale_alias_path)
-	    added = read_alias_file (start, locale_alias_path - start);
-	}
-    }
-  while (added != 0);
-
-#ifdef _LIBC
-  __libc_lock_unlock (lock);
-#endif
-
-  return result;
-}
-
-
-static size_t
-internal_function
-read_alias_file (fname, fname_len)
-     const char *fname;
-     int fname_len;
-{
-  FILE *fp;
-  char *full_fname;
-  size_t added;
-  static const char aliasfile[] = "/locale.alias";
-
-  full_fname = (char *) alloca (fname_len + sizeof aliasfile);
-#ifdef HAVE_MEMPCPY
-  mempcpy (mempcpy (full_fname, fname, fname_len),
-	   aliasfile, sizeof aliasfile);
-#else
-  memcpy (full_fname, fname, fname_len);
-  memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
-#endif
-
-  fp = fopen (full_fname, "r");
-  freea (full_fname);
-  if (fp == NULL)
-    return 0;
-
-  added = 0;
-  while (!feof (fp))
-    {
-      /* It is a reasonable approach to use a fix buffer here because
-	 a) we are only interested in the first two fields
-	 b) these fields must be usable as file names and so must not
-	    be that long
-       */
-      char buf[BUFSIZ];
-      char *alias;
-      char *value;
-      char *cp;
-
-      if (fgets (buf, sizeof buf, fp) == NULL)
-	/* EOF reached.  */
-	break;
-
-      /* Possibly not the whole line fits into the buffer.  Ignore
-	 the rest of the line.  */
-      if (strchr (buf, '\n') == NULL)
-	{
-	  char altbuf[BUFSIZ];
-	  do
-	    if (fgets (altbuf, sizeof altbuf, fp) == NULL)
-	      /* Make sure the inner loop will be left.  The outer loop
-		 will exit at the `feof' test.  */
-	      break;
-	  while (strchr (altbuf, '\n') == NULL);
-	}
-
-      cp = buf;
-      /* Ignore leading white space.  */
-      while (isspace (cp[0]))
-	++cp;
-
-      /* A leading '#' signals a comment line.  */
-      if (cp[0] != '\0' && cp[0] != '#')
-	{
-	  alias = cp++;
-	  while (cp[0] != '\0' && !isspace (cp[0]))
-	    ++cp;
-	  /* Terminate alias name.  */
-	  if (cp[0] != '\0')
-	    *cp++ = '\0';
-
-	  /* Now look for the beginning of the value.  */
-	  while (isspace (cp[0]))
-	    ++cp;
-
-	  if (cp[0] != '\0')
-	    {
-	      size_t alias_len;
-	      size_t value_len;
-
-	      value = cp++;
-	      while (cp[0] != '\0' && !isspace (cp[0]))
-		++cp;
-	      /* Terminate value.  */
-	      if (cp[0] == '\n')
-		{
-		  /* This has to be done to make the following test
-		     for the end of line possible.  We are looking for
-		     the terminating '\n' which do not overwrite here.  */
-		  *cp++ = '\0';
-		  *cp = '\n';
-		}
-	      else if (cp[0] != '\0')
-		*cp++ = '\0';
-
-	      if (nmap >= maxmap)
-		if (__builtin_expect (extend_alias_table (), 0))
-		  return added;
-
-	      alias_len = strlen (alias) + 1;
-	      value_len = strlen (value) + 1;
-
-	      if (string_space_act + alias_len + value_len > string_space_max)
-		{
-		  /* Increase size of memory pool.  */
-		  size_t new_size = (string_space_max
-				     + (alias_len + value_len > 1024
-					? alias_len + value_len : 1024));
-		  char *new_pool = (char *) realloc (string_space, new_size);
-		  if (new_pool == NULL)
-		    return added;
-
-		  if (__builtin_expect (string_space != new_pool, 0))
-		    {
-		      size_t i;
-
-		      for (i = 0; i < nmap; i++)
-			{
-			  map[i].alias += new_pool - string_space;
-			  map[i].value += new_pool - string_space;
-			}
-		    }
-
-		  string_space = new_pool;
-		  string_space_max = new_size;
-		}
-
-	      map[nmap].alias = memcpy (&string_space[string_space_act],
-					alias, alias_len);
-	      string_space_act += alias_len;
-
-	      map[nmap].value = memcpy (&string_space[string_space_act],
-					value, value_len);
-	      string_space_act += value_len;
-
-	      ++nmap;
-	      ++added;
-	    }
-	}
-    }
-
-  /* Should we test for ferror()?  I think we have to silently ignore
-     errors.  --drepper  */
-  fclose (fp);
-
-  if (added > 0)
-    qsort (map, nmap, sizeof (struct alias_map),
-	   (int (*) PARAMS ((const void *, const void *))) alias_compare);
-
-  return added;
-}
-
-
-static int
-extend_alias_table ()
-{
-  size_t new_size;
-  struct alias_map *new_map;
-
-  new_size = maxmap == 0 ? 100 : 2 * maxmap;
-  new_map = (struct alias_map *) realloc (map, (new_size
-						* sizeof (struct alias_map)));
-  if (new_map == NULL)
-    /* Simply don't extend: we don't have any more core.  */
-    return -1;
-
-  map = new_map;
-  maxmap = new_size;
-  return 0;
-}
-
-
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  if (string_space != NULL)
-    free (string_space);
-  if (map != NULL)
-    free (map);
-}
-text_set_element (__libc_subfreeres, free_mem);
-#endif
-
-
-static int
-alias_compare (map1, map2)
-     const struct alias_map *map1;
-     const struct alias_map *map2;
-{
-#if defined _LIBC || defined HAVE_STRCASECMP
-  return strcasecmp (map1->alias, map2->alias);
-#else
-  const unsigned char *p1 = (const unsigned char *) map1->alias;
-  const unsigned char *p2 = (const unsigned char *) map2->alias;
-  unsigned char c1, c2;
-
-  if (p1 == p2)
-    return 0;
-
-  do
-    {
-      /* I know this seems to be odd but the tolower() function in
-	 some systems libc cannot handle nonalpha characters.  */
-      c1 = isupper (*p1) ? tolower (*p1) : *p1;
-      c2 = isupper (*p2) ? tolower (*p2) : *p2;
-      if (c1 == '\0')
-	break;
-      ++p1;
-      ++p2;
-    }
-  while (c1 == c2);
-
-  return c1 - c2;
-#endif
-}
diff --git a/intl/ngettext.c b/intl/ngettext.c
deleted file mode 100644
index 52b9c3c1..00000000
--- a/intl/ngettext.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Implementation of ngettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# include <stdlib.h>		/* Just for NULL.  */
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-#include <locale.h>
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define NGETTEXT __ngettext
-# define DCNGETTEXT __dcngettext
-#else
-# define NGETTEXT ngettext__
-# define DCNGETTEXT dcngettext__
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-char *
-NGETTEXT (msgid1, msgid2, n)
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-{
-  return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__ngettext, ngettext);
-#endif
diff --git a/intl/plural.c b/intl/plural.c
deleted file mode 100644
index 100009cb..00000000
--- a/intl/plural.c
+++ /dev/null
@@ -1,1325 +0,0 @@
-
-/*  A Bison parser, made from plural.y
-    by GNU Bison version 1.28  */
-
-#define YYBISON 1  /* Identify Bison output.  */
-
-#define yyparse __gettextparse
-#define yylex __gettextlex
-#define yyerror __gettexterror
-#define yylval __gettextlval
-#define yychar __gettextchar
-#define yydebug __gettextdebug
-#define yynerrs __gettextnerrs
-#define	EQUOP2	257
-#define	CMPOP2	258
-#define	ADDOP2	259
-#define	MULOP2	260
-#define	NUMBER	261
-
-#line 1 "plural.y"
-
-/* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-/* The bison generated parser uses alloca.  AIX 3 forces us to put this
-   declaration at the beginning of the file.  The declaration in bison's
-   skeleton file comes too late.  This must come before <config.h>
-   because <config.h> may include arbitrary system headers.  */
-#if defined _AIX && !defined __GNUC__
- #pragma alloca
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include "gettextP.h"
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define FREE_EXPRESSION __gettext_free_exp
-#else
-# define FREE_EXPRESSION gettext_free_exp__
-# define __gettextparse gettextparse__
-#endif
-
-#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
-#define YYPARSE_PARAM	arg
-
-#line 52 "plural.y"
-typedef union {
-  unsigned long int num;
-  enum operator op;
-  struct expression *exp;
-} YYSTYPE;
-#line 58 "plural.y"
-
-/* Prototypes for local functions.  */
-static struct expression *new_exp PARAMS ((int nargs, enum operator op,
-					   struct expression * const *args));
-static inline struct expression *new_exp_0 PARAMS ((enum operator op));
-static inline struct expression *new_exp_1 PARAMS ((enum operator op,
-						   struct expression *right));
-static struct expression *new_exp_2 PARAMS ((enum operator op,
-					     struct expression *left,
-					     struct expression *right));
-static inline struct expression *new_exp_3 PARAMS ((enum operator op,
-						   struct expression *bexp,
-						   struct expression *tbranch,
-						   struct expression *fbranch));
-static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
-static void yyerror PARAMS ((const char *str));
-
-/* Allocation of expressions.  */
-
-static struct expression *
-new_exp (nargs, op, args)
-     int nargs;
-     enum operator op;
-     struct expression * const *args;
-{
-  int i;
-  struct expression *newp;
-
-  /* If any of the argument could not be malloc'ed, just return NULL.  */
-  for (i = nargs - 1; i >= 0; i--)
-    if (args[i] == NULL)
-      goto fail;
-
-  /* Allocate a new expression.  */
-  newp = (struct expression *) malloc (sizeof (*newp));
-  if (newp != NULL)
-    {
-      newp->nargs = nargs;
-      newp->operation = op;
-      for (i = nargs - 1; i >= 0; i--)
-	newp->val.args[i] = args[i];
-      return newp;
-    }
-
- fail:
-  for (i = nargs - 1; i >= 0; i--)
-    FREE_EXPRESSION (args[i]);
-
-  return NULL;
-}
-
-static inline struct expression *
-new_exp_0 (op)
-     enum operator op;
-{
-  return new_exp (0, op, NULL);
-}
-
-static inline struct expression *
-new_exp_1 (op, right)
-     enum operator op;
-     struct expression *right;
-{
-  struct expression *args[1];
-
-  args[0] = right;
-  return new_exp (1, op, args);
-}
-
-static struct expression *
-new_exp_2 (op, left, right)
-     enum operator op;
-     struct expression *left;
-     struct expression *right;
-{
-  struct expression *args[2];
-
-  args[0] = left;
-  args[1] = right;
-  return new_exp (2, op, args);
-}
-
-static inline struct expression *
-new_exp_3 (op, bexp, tbranch, fbranch)
-     enum operator op;
-     struct expression *bexp;
-     struct expression *tbranch;
-     struct expression *fbranch;
-{
-  struct expression *args[3];
-
-  args[0] = bexp;
-  args[1] = tbranch;
-  args[2] = fbranch;
-  return new_exp (3, op, args);
-}
-
-#include <stdio.h>
-
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
-#endif
-#endif
-
-
-
-#define	YYFINAL		27
-#define	YYFLAG		-32768
-#define	YYNTBASE	16
-
-#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
-
-static const char yytranslate[] = {     0,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    10,     2,     2,     2,     2,     5,     2,    14,
-    15,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,    12,     2,     2,
-     2,     2,     3,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,    13,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     4,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     6,     7,     8,     9,
-    11
-};
-
-#if YYDEBUG != 0
-static const short yyprhs[] = {     0,
-     0,     2,     8,    12,    16,    20,    24,    28,    32,    35,
-    37,    39
-};
-
-static const short yyrhs[] = {    17,
-     0,    17,     3,    17,    12,    17,     0,    17,     4,    17,
-     0,    17,     5,    17,     0,    17,     6,    17,     0,    17,
-     7,    17,     0,    17,     8,    17,     0,    17,     9,    17,
-     0,    10,    17,     0,    13,     0,    11,     0,    14,    17,
-    15,     0
-};
-
-#endif
-
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-   177,   185,   189,   193,   197,   201,   205,   209,   213,   217,
-   221,   226
-};
-#endif
-
-
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
-
-static const char * const yytname[] = {   "$","error","$undefined.","'?'","'|'",
-"'&'","EQUOP2","CMPOP2","ADDOP2","MULOP2","'!'","NUMBER","':'","'n'","'('","')'",
-"start","exp", NULL
-};
-#endif
-
-static const short yyr1[] = {     0,
-    16,    17,    17,    17,    17,    17,    17,    17,    17,    17,
-    17,    17
-};
-
-static const short yyr2[] = {     0,
-     1,     5,     3,     3,     3,     3,     3,     3,     2,     1,
-     1,     3
-};
-
-static const short yydefact[] = {     0,
-     0,    11,    10,     0,     1,     9,     0,     0,     0,     0,
-     0,     0,     0,     0,    12,     0,     3,     4,     5,     6,
-     7,     8,     0,     2,     0,     0,     0
-};
-
-static const short yydefgoto[] = {    25,
-     5
-};
-
-static const short yypact[] = {    -9,
-    -9,-32768,-32768,    -9,    34,-32768,    11,    -9,    -9,    -9,
-    -9,    -9,    -9,    -9,-32768,    24,    39,    43,    16,    26,
-    -3,-32768,    -9,    34,    21,    53,-32768
-};
-
-static const short yypgoto[] = {-32768,
-    -1
-};
-
-
-#define	YYLAST		53
-
-
-static const short yytable[] = {     6,
-     1,     2,     7,     3,     4,    14,    16,    17,    18,    19,
-    20,    21,    22,     8,     9,    10,    11,    12,    13,    14,
-    26,    24,    12,    13,    14,    15,     8,     9,    10,    11,
-    12,    13,    14,    13,    14,    23,     8,     9,    10,    11,
-    12,    13,    14,    10,    11,    12,    13,    14,    11,    12,
-    13,    14,    27
-};
-
-static const short yycheck[] = {     1,
-    10,    11,     4,    13,    14,     9,     8,     9,    10,    11,
-    12,    13,    14,     3,     4,     5,     6,     7,     8,     9,
-     0,    23,     7,     8,     9,    15,     3,     4,     5,     6,
-     7,     8,     9,     8,     9,    12,     3,     4,     5,     6,
-     7,     8,     9,     5,     6,     7,     8,     9,     6,     7,
-     8,     9,     0
-};
-#define YYPURE 1
-
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/bison/bison.simple"
-/* This file comes from bison-1.28.  */
-
-/* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
-
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C.  */
-/* This used to test MSDOS, but that is a bad idea
-   since that symbol is in the user namespace.  */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
-	 instead, just don't use alloca.  */
-#include <malloc.h>
-#endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
-   So I turned it off.   rms, 2 May 1997.  */
-/* #include <malloc.h>  */
- #pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
-		 and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
-#endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
-
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-#endif
-
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
-#define YYEOF		0
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
-#define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-#define YYFAIL		goto yyerrlab
-#define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    { yychar = (token), yylval = (value);			\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
-      goto yybackup;						\
-    }								\
-  else								\
-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
-while (0)
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-#ifndef YYPURE
-#define YYLEX		yylex()
-#endif
-
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval, &yylloc)
-#endif
-#else /* not YYLSP_NEEDED */
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
-#endif
-
-/* If nonreentrant, generate the variables here */
-
-#ifndef YYPURE
-
-int	yychar;			/*  the lookahead symbol		*/
-YYSTYPE	yylval;			/*  the semantic value of the		*/
-				/*  lookahead symbol			*/
-
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;			/*  location data for the lookahead	*/
-				/*  symbol				*/
-#endif
-
-int yynerrs;			/*  number of parse errors so far       */
-#endif  /* not YYPURE */
-
-#if YYDEBUG != 0
-int yydebug;			/*  nonzero means print parse trace	*/
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
-#endif
-
-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
-
-#ifndef	YYINITDEPTH
-#define YYINITDEPTH 200
-#endif
-
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
-
-#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
-#endif
-
-/* Define __yy_memcpy.  Note that the size argument
-   should be passed with type unsigned int, because that is what the non-GCC
-   definitions require.  With GCC, __builtin_memcpy takes an arg
-   of type size_t, but it can handle unsigned int.  */
-
-#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
-#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
-#else				/* not GNU C or C++ */
-#ifndef __cplusplus
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (to, from, count)
-     char *to;
-     char *from;
-     unsigned int count;
-{
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#else /* __cplusplus */
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (char *to, char *from, unsigned int count)
-{
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#endif
-#endif
-
-#line 217 "/usr/share/bison/bison.simple"
-
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
-
-#ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-#ifdef YYPARSE_PARAM
-int yyparse (void *);
-#else
-int yyparse (void);
-#endif
-#endif
-
-int
-yyparse(YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
-
-  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
-  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
-
-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
-
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-#define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
-
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
-
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
-
-  YYSTYPE yyval;		/*  the variable used to return		*/
-				/*  semantic values from the action	*/
-				/*  routines				*/
-
-  int yylen;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss - 1;
-  yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
-  yylsp = yyls;
-#endif
-
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
-
-  *++yyssp = yystate;
-
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
-
-      /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-	 the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-	 but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yyls1, size * sizeof (*yylsp),
-		 &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yystacksize);
-#endif
-
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
-#else /* no yyoverflow */
-      /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	{
-	  yyerror("parser stack overflow");
-	  if (yyfree_stacks)
-	    {
-	      free (yyss);
-	      free (yyvs);
-#ifdef YYLSP_NEEDED
-	      free (yyls);
-#endif
-	    }
-	  return 2;
-	}
-      yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
-	yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
-      yyfree_stacks = 1;
-#endif
-      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1,
-		   size * (unsigned int) sizeof (*yyssp));
-      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
-		   size * (unsigned int) sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1,
-		   size * (unsigned int) sizeof (*yylsp));
-#endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
-#endif
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
-
-      if (yyssp >= yyss + yystacksize - 1)
-	YYABORT;
-    }
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
-
-  goto yybackup;
- yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
-  if (yychar == YYEMPTY)
-    {
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Reading a token: ");
-#endif
-      yychar = YYLEX;
-    }
-
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
-    {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Now at end of input.\n");
-#endif
-    }
-  else
-    {
-      yychar1 = YYTRANSLATE(yychar);
-
-#if YYDEBUG != 0
-      if (yydebug)
-	{
-	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise meaning
-	     of a token, for further debugging info.  */
-#ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-#endif
-	  fprintf (stderr, ")\n");
-	}
-#endif
-    }
-
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
-    goto yydefault;
-
-  yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrlab;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-/* Do the default action for the current state.  */
-yydefault:
-
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
-yyreduce:
-  yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      int i;
-
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-	       yyn, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-
-
-  switch (yyn) {
-
-case 1:
-#line 178 "plural.y"
-{
-	    if (yyvsp[0].exp == NULL)
-	      YYABORT;
-	    ((struct parse_args *) arg)->res = yyvsp[0].exp;
-	  ;
-    break;}
-case 2:
-#line 186 "plural.y"
-{
-	    yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 3:
-#line 190 "plural.y"
-{
-	    yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 4:
-#line 194 "plural.y"
-{
-	    yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 5:
-#line 198 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 6:
-#line 202 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 7:
-#line 206 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 8:
-#line 210 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 9:
-#line 214 "plural.y"
-{
-	    yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
-	  ;
-    break;}
-case 10:
-#line 218 "plural.y"
-{
-	    yyval.exp = new_exp_0 (var);
-	  ;
-    break;}
-case 11:
-#line 222 "plural.y"
-{
-	    if ((yyval.exp = new_exp_0 (num)) != NULL)
-	      yyval.exp->val.num = yyvsp[0].num;
-	  ;
-    break;}
-case 12:
-#line 227 "plural.y"
-{
-	    yyval.exp = yyvsp[-1].exp;
-	  ;
-    break;}
-}
-   /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/share/bison/bison.simple"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#ifdef YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-  *++yyvsp = yyval;
-
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
-#endif
-
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTBASE];
-
-  goto yynewstate;
-
-yyerrlab:   /* here on detecting error */
-
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
-    {
-      ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && yyn < YYLAST)
-	{
-	  int size = 0;
-	  char *msg;
-	  int x, count;
-
-	  count = 0;
-	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-	  for (x = (yyn < 0 ? -yyn : 0);
-	       x < (sizeof(yytname) / sizeof(char *)); x++)
-	    if (yycheck[x + yyn] == x)
-	      size += strlen(yytname[x]) + 15, count++;
-	  msg = (char *) malloc(size + 15);
-	  if (msg != 0)
-	    {
-	      strcpy(msg, "parse error");
-
-	      if (count < 5)
-		{
-		  count = 0;
-		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof(yytname) / sizeof(char *)); x++)
-		    if (yycheck[x + yyn] == x)
-		      {
-			strcat(msg, count == 0 ? ", expecting `" : " or `");
-			strcat(msg, yytname[x]);
-			strcat(msg, "'");
-			count++;
-		      }
-		}
-	      yyerror(msg);
-	      free(msg);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exceeded");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror("parse error");
-    }
-
-  goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
-
-  if (yyerrstatus == 3)
-    {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
-      yychar = YYEMPTY;
-    }
-
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
-
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
-yyerrdefault:  /* current state does not do anything special for the error token. */
-
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
-#endif
-
-yyerrpop:   /* pop the current state because it cannot handle the error token */
-
-  if (yyssp == yyss) YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
-  yylsp--;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-yyerrhandle:
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
-
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrpop;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  yystate = yyn;
-  goto yynewstate;
-
- yyacceptlab:
-  /* YYACCEPT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 0;
-
- yyabortlab:
-  /* YYABORT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 1;
-}
-#line 232 "plural.y"
-
-
-void
-internal_function
-FREE_EXPRESSION (exp)
-     struct expression *exp;
-{
-  if (exp == NULL)
-    return;
-
-  /* Handle the recursive case.  */
-  switch (exp->nargs)
-    {
-    case 3:
-      FREE_EXPRESSION (exp->val.args[2]);
-      /* FALLTHROUGH */
-    case 2:
-      FREE_EXPRESSION (exp->val.args[1]);
-      /* FALLTHROUGH */
-    case 1:
-      FREE_EXPRESSION (exp->val.args[0]);
-      /* FALLTHROUGH */
-    default:
-      break;
-    }
-
-  free (exp);
-}
-
-
-static int
-yylex (lval, pexp)
-     YYSTYPE *lval;
-     const char **pexp;
-{
-  const char *exp = *pexp;
-  int result;
-
-  while (1)
-    {
-      if (exp[0] == '\0')
-	{
-	  *pexp = exp;
-	  return YYEOF;
-	}
-
-      if (exp[0] != ' ' && exp[0] != '\t')
-	break;
-
-      ++exp;
-    }
-
-  result = *exp++;
-  switch (result)
-    {
-    case '0': case '1': case '2': case '3': case '4':
-    case '5': case '6': case '7': case '8': case '9':
-      {
-	unsigned long int n = result - '0';
-	while (exp[0] >= '0' && exp[0] <= '9')
-	  {
-	    n *= 10;
-	    n += exp[0] - '0';
-	    ++exp;
-	  }
-	lval->num = n;
-	result = NUMBER;
-      }
-      break;
-
-    case '=':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = equal;
-	  result = EQUOP2;
-	}
-      else
-	result = YYERRCODE;
-      break;
-
-    case '!':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = not_equal;
-	  result = EQUOP2;
-	}
-      break;
-
-    case '&':
-    case '|':
-      if (exp[0] == result)
-	++exp;
-      else
-	result = YYERRCODE;
-      break;
-
-    case '<':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = less_or_equal;
-	}
-      else
-	lval->op = less_than;
-      result = CMPOP2;
-      break;
-
-    case '>':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = greater_or_equal;
-	}
-      else
-	lval->op = greater_than;
-      result = CMPOP2;
-      break;
-
-    case '*':
-      lval->op = mult;
-      result = MULOP2;
-      break;
-
-    case '/':
-      lval->op = divide;
-      result = MULOP2;
-      break;
-
-    case '%':
-      lval->op = module;
-      result = MULOP2;
-      break;
-
-    case '+':
-      lval->op = plus;
-      result = ADDOP2;
-      break;
-
-    case '-':
-      lval->op = minus;
-      result = ADDOP2;
-      break;
-
-    case 'n':
-    case '?':
-    case ':':
-    case '(':
-    case ')':
-      /* Nothing, just return the character.  */
-      break;
-
-    case ';':
-    case '\n':
-    case '\0':
-      /* Be safe and let the user call this function again.  */
-      --exp;
-      result = YYEOF;
-      break;
-
-    default:
-      result = YYERRCODE;
-#if YYDEBUG != 0
-      --exp;
-#endif
-      break;
-    }
-
-  *pexp = exp;
-
-  return result;
-}
-
-
-static void
-yyerror (str)
-     const char *str;
-{
-  /* Do nothing.  We don't print error messages here.  */
-}
diff --git a/intl/plural.y b/intl/plural.y
deleted file mode 100644
index 936cceef..00000000
--- a/intl/plural.y
+++ /dev/null
@@ -1,413 +0,0 @@
-%{
-/* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-/* The bison generated parser uses alloca.  AIX 3 forces us to put this
-   declaration at the beginning of the file.  The declaration in bison's
-   skeleton file comes too late.  This must come before <config.h>
-   because <config.h> may include arbitrary system headers.  */
-#if defined _AIX && !defined __GNUC__
- #pragma alloca
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include "gettextP.h"
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define FREE_EXPRESSION __gettext_free_exp
-#else
-# define FREE_EXPRESSION gettext_free_exp__
-# define __gettextparse gettextparse__
-#endif
-
-#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
-#define YYPARSE_PARAM	arg
-%}
-%pure_parser
-%expect 10
-
-%union {
-  unsigned long int num;
-  enum operator op;
-  struct expression *exp;
-}
-
-%{
-/* Prototypes for local functions.  */
-static struct expression *new_exp PARAMS ((int nargs, enum operator op,
-					   struct expression * const *args));
-static inline struct expression *new_exp_0 PARAMS ((enum operator op));
-static inline struct expression *new_exp_1 PARAMS ((enum operator op,
-						   struct expression *right));
-static struct expression *new_exp_2 PARAMS ((enum operator op,
-					     struct expression *left,
-					     struct expression *right));
-static inline struct expression *new_exp_3 PARAMS ((enum operator op,
-						   struct expression *bexp,
-						   struct expression *tbranch,
-						   struct expression *fbranch));
-static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
-static void yyerror PARAMS ((const char *str));
-
-/* Allocation of expressions.  */
-
-static struct expression *
-new_exp (nargs, op, args)
-     int nargs;
-     enum operator op;
-     struct expression * const *args;
-{
-  int i;
-  struct expression *newp;
-
-  /* If any of the argument could not be malloc'ed, just return NULL.  */
-  for (i = nargs - 1; i >= 0; i--)
-    if (args[i] == NULL)
-      goto fail;
-
-  /* Allocate a new expression.  */
-  newp = (struct expression *) malloc (sizeof (*newp));
-  if (newp != NULL)
-    {
-      newp->nargs = nargs;
-      newp->operation = op;
-      for (i = nargs - 1; i >= 0; i--)
-	newp->val.args[i] = args[i];
-      return newp;
-    }
-
- fail:
-  for (i = nargs - 1; i >= 0; i--)
-    FREE_EXPRESSION (args[i]);
-
-  return NULL;
-}
-
-static inline struct expression *
-new_exp_0 (op)
-     enum operator op;
-{
-  return new_exp (0, op, NULL);
-}
-
-static inline struct expression *
-new_exp_1 (op, right)
-     enum operator op;
-     struct expression *right;
-{
-  struct expression *args[1];
-
-  args[0] = right;
-  return new_exp (1, op, args);
-}
-
-static struct expression *
-new_exp_2 (op, left, right)
-     enum operator op;
-     struct expression *left;
-     struct expression *right;
-{
-  struct expression *args[2];
-
-  args[0] = left;
-  args[1] = right;
-  return new_exp (2, op, args);
-}
-
-static inline struct expression *
-new_exp_3 (op, bexp, tbranch, fbranch)
-     enum operator op;
-     struct expression *bexp;
-     struct expression *tbranch;
-     struct expression *fbranch;
-{
-  struct expression *args[3];
-
-  args[0] = bexp;
-  args[1] = tbranch;
-  args[2] = fbranch;
-  return new_exp (3, op, args);
-}
-
-%}
-
-/* This declares that all operators have the same associativity and the
-   precedence order as in C.  See [Harbison, Steele: C, A Reference Manual].
-   There is no unary minus and no bitwise operators.
-   Operators with the same syntactic behaviour have been merged into a single
-   token, to save space in the array generated by bison.  */
-%right '?'		/*   ?		*/
-%left '|'		/*   ||		*/
-%left '&'		/*   &&		*/
-%left EQUOP2		/*   == !=	*/
-%left CMPOP2		/*   < > <= >=	*/
-%left ADDOP2		/*   + -	*/
-%left MULOP2		/*   * / %	*/
-%right '!'		/*   !		*/
-
-%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
-%token <num> NUMBER
-%type <exp> exp
-
-%%
-
-start:	  exp
-	  {
-	    if ($1 == NULL)
-	      YYABORT;
-	    ((struct parse_args *) arg)->res = $1;
-	  }
-	;
-
-exp:	  exp '?' exp ':' exp
-	  {
-	    $$ = new_exp_3 (qmop, $1, $3, $5);
-	  }
-	| exp '|' exp
-	  {
-	    $$ = new_exp_2 (lor, $1, $3);
-	  }
-	| exp '&' exp
-	  {
-	    $$ = new_exp_2 (land, $1, $3);
-	  }
-	| exp EQUOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp CMPOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp ADDOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp MULOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| '!' exp
-	  {
-	    $$ = new_exp_1 (lnot, $2);
-	  }
-	| 'n'
-	  {
-	    $$ = new_exp_0 (var);
-	  }
-	| NUMBER
-	  {
-	    if (($$ = new_exp_0 (num)) != NULL)
-	      $$->val.num = $1;
-	  }
-	| '(' exp ')'
-	  {
-	    $$ = $2;
-	  }
-	;
-
-%%
-
-void
-internal_function
-FREE_EXPRESSION (exp)
-     struct expression *exp;
-{
-  if (exp == NULL)
-    return;
-
-  /* Handle the recursive case.  */
-  switch (exp->nargs)
-    {
-    case 3:
-      FREE_EXPRESSION (exp->val.args[2]);
-      /* FALLTHROUGH */
-    case 2:
-      FREE_EXPRESSION (exp->val.args[1]);
-      /* FALLTHROUGH */
-    case 1:
-      FREE_EXPRESSION (exp->val.args[0]);
-      /* FALLTHROUGH */
-    default:
-      break;
-    }
-
-  free (exp);
-}
-
-
-static int
-yylex (lval, pexp)
-     YYSTYPE *lval;
-     const char **pexp;
-{
-  const char *exp = *pexp;
-  int result;
-
-  while (1)
-    {
-      if (exp[0] == '\0')
-	{
-	  *pexp = exp;
-	  return YYEOF;
-	}
-
-      if (exp[0] != ' ' && exp[0] != '\t')
-	break;
-
-      ++exp;
-    }
-
-  result = *exp++;
-  switch (result)
-    {
-    case '0': case '1': case '2': case '3': case '4':
-    case '5': case '6': case '7': case '8': case '9':
-      {
-	unsigned long int n = result - '0';
-	while (exp[0] >= '0' && exp[0] <= '9')
-	  {
-	    n *= 10;
-	    n += exp[0] - '0';
-	    ++exp;
-	  }
-	lval->num = n;
-	result = NUMBER;
-      }
-      break;
-
-    case '=':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = equal;
-	  result = EQUOP2;
-	}
-      else
-	result = YYERRCODE;
-      break;
-
-    case '!':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = not_equal;
-	  result = EQUOP2;
-	}
-      break;
-
-    case '&':
-    case '|':
-      if (exp[0] == result)
-	++exp;
-      else
-	result = YYERRCODE;
-      break;
-
-    case '<':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = less_or_equal;
-	}
-      else
-	lval->op = less_than;
-      result = CMPOP2;
-      break;
-
-    case '>':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = greater_or_equal;
-	}
-      else
-	lval->op = greater_than;
-      result = CMPOP2;
-      break;
-
-    case '*':
-      lval->op = mult;
-      result = MULOP2;
-      break;
-
-    case '/':
-      lval->op = divide;
-      result = MULOP2;
-      break;
-
-    case '%':
-      lval->op = module;
-      result = MULOP2;
-      break;
-
-    case '+':
-      lval->op = plus;
-      result = ADDOP2;
-      break;
-
-    case '-':
-      lval->op = minus;
-      result = ADDOP2;
-      break;
-
-    case 'n':
-    case '?':
-    case ':':
-    case '(':
-    case ')':
-      /* Nothing, just return the character.  */
-      break;
-
-    case ';':
-    case '\n':
-    case '\0':
-      /* Be safe and let the user call this function again.  */
-      --exp;
-      result = YYEOF;
-      break;
-
-    default:
-      result = YYERRCODE;
-#if YYDEBUG != 0
-      --exp;
-#endif
-      break;
-    }
-
-  *pexp = exp;
-
-  return result;
-}
-
-
-static void
-yyerror (str)
-     const char *str;
-{
-  /* Do nothing.  We don't print error messages here.  */
-  (void) &str;
-}
diff --git a/intl/ref-add.sin b/intl/ref-add.sin
deleted file mode 100644
index 3678c289..00000000
--- a/intl/ref-add.sin
+++ /dev/null
@@ -1,31 +0,0 @@
-# Add this package to a list of references stored in a text file.
-#
-#   Copyright (C) 2000 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library General Public
-#   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-#   USA.
-#
-# Written by Bruno Haible <haible@clisp.cons.org>.
-#
-/^# Packages using this file: / {
-  s/# Packages using this file://
-  ta
-  :a
-  s/ @PACKAGE@ / @PACKAGE@ /
-  tb
-  s/ $/ @PACKAGE@ /
-  :b
-  s/^/# Packages using this file:/
-}
diff --git a/intl/ref-del.sin b/intl/ref-del.sin
deleted file mode 100644
index 0c12d8e9..00000000
--- a/intl/ref-del.sin
+++ /dev/null
@@ -1,26 +0,0 @@
-# Remove this package from a list of references stored in a text file.
-#
-#   Copyright (C) 2000 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library General Public
-#   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-#   USA.
-#
-# Written by Bruno Haible <haible@clisp.cons.org>.
-#
-/^# Packages using this file: / {
-  s/# Packages using this file://
-  s/ @PACKAGE@ / /
-  s/^/# Packages using this file:/
-}
diff --git a/intl/textdomain.c b/intl/textdomain.c
deleted file mode 100644
index ddc9c62c..00000000
--- a/intl/textdomain.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Implementation of the textdomain(3) function.
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-#include "gettextP.h"
-
-#ifdef _LIBC
-/* We have to handle multi-threaded applications.  */
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_default_domain _nl_default_default_domain__
-# define _nl_current_default_domain _nl_current_default_domain__
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Name of the default text domain.  */
-extern const char _nl_default_default_domain[];
-
-/* Default text domain in which entries for gettext(3) are to be found.  */
-extern const char *_nl_current_default_domain;
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define TEXTDOMAIN __textdomain
-# ifndef strdup
-#  define strdup(str) __strdup (str)
-# endif
-#else
-# define TEXTDOMAIN textdomain__
-#endif
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock)
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-char *
-TEXTDOMAIN (domainname)
-     const char *domainname;
-{
-  char *new_domain;
-  char *old_domain;
-
-  /* A NULL pointer requests the current setting.  */
-  if (domainname == NULL)
-    return (char *) _nl_current_default_domain;
-
-  __libc_rwlock_wrlock (_nl_state_lock);
-
-  old_domain = (char *) _nl_current_default_domain;
-
-  /* If domain name is the null string set to default domain "messages".  */
-  if (domainname[0] == '\0'
-      || strcmp (domainname, _nl_default_default_domain) == 0)
-    {
-      _nl_current_default_domain = _nl_default_default_domain;
-      new_domain = (char *) _nl_current_default_domain;
-    }
-  else if (strcmp (domainname, old_domain) == 0)
-    /* This can happen and people will use it to signal that some
-       environment variable changed.  */
-    new_domain = old_domain;
-  else
-    {
-      /* If the following malloc fails `_nl_current_default_domain'
-	 will be NULL.  This value will be returned and so signals we
-	 are out of core.  */
-#if defined _LIBC || defined HAVE_STRDUP
-      new_domain = strdup (domainname);
-#else
-      size_t len = strlen (domainname) + 1;
-      new_domain = (char *) malloc (len);
-      if (new_domain != NULL)
-	memcpy (new_domain, domainname, len);
-#endif
-
-      if (new_domain != NULL)
-	_nl_current_default_domain = new_domain;
-    }
-
-  /* We use this possibility to signal a change of the loaded catalogs
-     since this is most likely the case and there is no other easy we
-     to do it.  Do it only when the call was successful.  */
-  if (new_domain != NULL)
-    {
-      ++_nl_msg_cat_cntr;
-
-      if (old_domain != new_domain && old_domain != _nl_default_default_domain)
-	free (old_domain);
-    }
-
-  __libc_rwlock_unlock (_nl_state_lock);
-
-  return new_domain;
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__textdomain, textdomain);
-#endif
diff --git a/lib/.cvsignore b/lib/.cvsignore
index 282522db..9339ac1b 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -1,2 +1,4 @@
+.deps
 Makefile
 Makefile.in
+regexprops
diff --git a/m4/.cvsignore b/m4/.cvsignore
index 70845e08..282522db 100644
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -1 +1,2 @@
+Makefile
 Makefile.in
diff --git a/missing b/missing
index 894e786e..1c8ff704 100755
--- a/missing
+++ b/missing
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
@@ -33,6 +33,8 @@ if test $# -eq 0; then
 fi
 
 run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -44,7 +46,7 @@ fi
 
 msg="missing on your system"
 
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -77,6 +79,7 @@ Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@ esac
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
-case "$1" in
+case $1 in
   lex|yacc)
     # Not GNU programs, they don't have --version.
     ;;
@@ -135,7 +138,7 @@ esac
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $1 in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -164,7 +167,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg.
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
 	touch $file
     else
@@ -214,25 +217,25 @@ WARNING: \`$1' $msg.  You should only need it if
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
@@ -244,18 +247,18 @@ WARNING: \`$1' is $msg.  You should only need it if
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
@@ -267,11 +270,9 @@ WARNING: \`$1' is $msg.  You should only need it if
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
 	touch $file
     else
 	test -z "$file" || exec >$file
@@ -289,11 +290,17 @@ WARNING: \`$1' is $msg.  You should only need it if
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
@@ -317,13 +324,13 @@ WARNING: \`$1' is $msg.  You should only need it if
     fi
     firstarg="$1"
     if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
diff --git a/po/.cvsignore b/po/.cvsignore
index 67f3ebd6..ce44cbb5 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -3,3 +3,4 @@ Makefile
 Makefile.in
 POTFILES
 cat-id-tbl.c
+stamp-po
diff --git a/po/be.po b/po/be.po
index 9c4e6674..37b39ab1 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.1.7\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2003-11-04 05:21+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -30,7 +30,7 @@ msgstr "неадназначны довад %s для \"%s\""
 msgid "Valid arguments are:"
 msgstr "Рэчаісныя довады:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Невядомая сыстэмная памылка"
 
@@ -130,46 +130,46 @@ msgstr "^[тТ]"
 msgid "^[nN]"
 msgstr "^[нН]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Выкарыстаньне: %s [шлях...] [выраз]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Выкарыстаньне: %s [шлях...] [выраз]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "увага: нераспазнаная службовая пасьлядоўнасьць \"\\%c\""
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -358,7 +358,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "нерэчаісны рэжым \"%s\""
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -367,42 +367,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "нерэчаісны null-довад да -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "нерэчаісны від -size \"%c\""
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find вэрсыі %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "увага: нераспазнаная службовая пасьлядоўнасьць \"\\%c\""
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "увага: нераспазнанае прадпісаньне фармату \"%%%c\""
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -411,18 +411,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "асяродзьдзе занадта вялікае для exec"
@@ -432,16 +432,16 @@ msgstr "асяродзьдзе занадта вялікае для exec"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "немагчыма нарадзіць працэс"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "памылка чаканьня %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s завершаны сыгналам %d"
@@ -552,7 +552,7 @@ msgid ""
 "or     %s most_common_bigrams < file-list > locate-database\n"
 msgstr "Выкарыстаньне: %s most_common_bigrams < list > coded_list\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 #, fuzzy
 msgid ""
 "\n"
@@ -566,75 +566,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU find вэрсыі %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "дзён"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr ""
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "увага: база даньняў \"%s\" большая за %d %s"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -647,142 +677,163 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate вэрсыі %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "сьпіс довадаў занадта доўгі"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "увага: база даньняў \"%s\" большая за %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "асяродзьдзе занадта вялікае для exec"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs вэрсыі %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "двайныя"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "адзінарныя"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "сьпіс довадаў занадта доўгі"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr ""
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr ""
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: спынена сыгналам %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: пярэрвана сыгналам %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: нерэчаіснае значэньне для выбара -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: значэньне для выбара -%c мусіць быць >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: значэньне для выбара -%c мусіць быць < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/bg.po b/po/bg.po
index ac1a380b..5e6f3ac9 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.27\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2006-05-23 13:22+0300\n"
 "Last-Translator: Anton Zinoviev <zinoviev@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -36,7 +36,7 @@ msgstr "двусмислен аргумент %s за %s"
 msgid "Valid arguments are:"
 msgstr "Допустими аргументи са:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Непозната системна грешка"
 
@@ -138,46 +138,46 @@ msgstr "^[дДoOyY]"
 msgid "^[nN]"
 msgstr "^[нНkKnN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Използване: %s [-H] [-L] [-P] [път...] [израз]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Използване: %s [път...] [израз]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "внимание: непозната обратно наклонена черта „\\%c“"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -407,7 +407,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "неправилен режим „%s“"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -420,42 +420,42 @@ msgstr ""
 "perm -000.  Т.е. в момента на него не пасва никой файл, но скоро ще бъде "
 "изменен така, че да му пасват всички файлове."
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "недопустим празен аргумент на -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "неправилен тип „%c“ на -size"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "find на ГНУ, версия %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Разрешени свойства:"
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "внимание: непозната обратно наклонена черта „\\%c“"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "внимание: непозната форматна директива „%%%c“"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -467,7 +467,7 @@ msgstr ""
 "несигурно при използване на действието %s на find.  Моля, премахнете текущия "
 "каталог от $PATH (т.е. премахнете „.“ или началните или крайни двоеточия)"
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -475,12 +475,12 @@ msgstr ""
 "Не може да използвате {} при името на команда за -execdir и -okdir, тъй като "
 "това създава проблем със сигурността."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "С -exec%s ... + е позволено само едно използване на {}"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "обкръжението е твърде голямо за exec"
@@ -490,16 +490,16 @@ msgstr "обкръжението е твърде голямо за exec"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "не може да се създаде нов процес с fork"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "изчакване на грешка за %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s бе прекратен със сигнал %d"
@@ -615,7 +615,7 @@ msgstr ""
 "Използване: %s [--version | --help]\n"
 "или         %s най-чести_биграми < файлов-списък > база-данни-на-locate\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -629,31 +629,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "findutils на ГНУ, версия %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "дена"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "базата данни „%s“ на locate е повредена или грешна"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "Размер на базата данни на locate: %s байта\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Файлови имена: %s "
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Файлови имена: %s "
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "със съвкупна дължина %s байта"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -662,7 +667,7 @@ msgstr ""
 "\n"
 "\tот които %s съдържат интервали и/или табулации, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -671,7 +676,7 @@ msgstr ""
 "\n"
 "\t%s съдържат знаци за нов ред, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -680,32 +685,55 @@ msgstr ""
 "\n"
 "\tи %s съдържат знаци и вдигнат старши бит.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "Степен на компресия %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "Степен на компресия %4.2f%%\n"
+
+#: locate/locate.c:938
+#, c-format
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
 msgstr ""
-"внимание: базата данни на locate може да се чете от стандартния вход само "
-"веднъж."
 
-#: locate/locate.c:883
+#: locate/locate.c:1025
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "внимание: базата данни „%s“ е по-стара от %d %s"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "Форматът на базата данни %s е %s.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "стар"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -726,23 +754,46 @@ msgstr ""
 "      [-version] [--help]\n"
 "      образец...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "locate на ГНУ, версия %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "аргумент на --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+"внимание: базата данни на locate може да се чете от стандартния вход само "
+"веднъж."
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "внимание: базата данни „%s“ е по-стара от %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 "Неправилна поредица с обратно наклонена черта %s в описанието на входния "
 "разделител."
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -751,7 +802,7 @@ msgstr ""
 "Неправилна поредица с обратно наклонена черта %s в описанието на входния "
 "разделител; стойностите на знаците не може да превишават %lx."
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -760,7 +811,7 @@ msgstr ""
 "Неправилна поредица с обратно наклонена черта %s в описанието на входния "
 "разделител; стойностите на знаците не може да превишават %lo."
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
@@ -769,7 +820,7 @@ msgstr ""
 "Неправилна поредица с обратно наклонена черта %s в описанието на входния "
 "разделител; крайните знаци %s не са познати."
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
@@ -778,47 +829,47 @@ msgstr ""
 "Неправилно описание на входния разделител %s: разделителят трябва да бъде "
 "или единичен знак, или поредица с обратно наклонена черта „\\“."
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "обкръжението е твърде голямо за exec"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "xargs на ГНУ, версия %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "Не може да се отвори входният файл „%s“"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Променливите на обкръжението заемат %ld байта\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 "Горна и долна граница на дължината на аргументите според POSIX: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Максимална дължина на командата, която може да се използва: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Размер на командния буфер, който действително се използва: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -828,54 +879,54 @@ msgstr ""
 "специални за xargs, освен ако използвате опцията -0"
 
 # CHECK: да се провери използва ли се другаде, освен в xargs/xargs.c
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "Двойна"
 
 # CHECK: да се провери използва ли се другаде, освен в xargs/xargs.c
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "Единична"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "реда с аргументи е твърде дълъг"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "грешка при очакване на дъщерен процес"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: завърши с код 255; прекратяване"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: спрян със сигнал %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: прекратен със сигнал %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: неправилно число за опцията -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: стойността на опцията -%c трябва да бъде не по-малка от %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: стойността на опцията -%c трябва да бъде по-малка от < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -899,6 +950,9 @@ msgstr ""
 "       [--verbose] [--exit] [--no-run-if-empty] [--arg-file=файл]\n"
 "       [--version] [--help] [команда [начални-аргументи]]\n"
 
+#~ msgid "old"
+#~ msgstr "стар"
+
 #, fuzzy
 #~ msgid "Reducing arg_max (%lu) to arg_size (%lu)\n"
 #~ msgstr "Стойността на arg_max (%ld) се намалява до arg_size (%ld)\n"
diff --git a/po/ca.po b/po/ca.po
index 8169eb00..23ae07fb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.27\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2006-05-20 14:54+0200\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -29,7 +29,7 @@ msgstr "l'argument %s és ambigu per a %s"
 msgid "Valid arguments are:"
 msgstr "Els arguments vàlids són:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "S'ha produït un error desconegut del sistema"
 
@@ -131,46 +131,46 @@ msgstr "^[sS]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Forma d'ús: %s [-H] [-L] [-P] [camí...] [expressió]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Forma d'ús: %s [camí...] [expressió]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "avís: seqüència d'escapament «\\%c» no reconegut"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -398,7 +398,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "el mode «%s» no és vàlid"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -411,42 +411,42 @@ msgstr ""
 "perm -000; això vol dir, de moment no concorda amb cap fitxer, però prompte "
 "canviarà per a que concorde amb tots."
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "l'argument nul no és vàlid per a -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "el tipus de -size «%c» no vàlid"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find versió %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Funcionalitats habilitades: "
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "avís: seqüència d'escapament «\\%c» no reconegut"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "avís: directiva de format «%%%c» no reconeguda"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -459,7 +459,7 @@ msgstr ""
 "del vostre $PATH (és a dir, elimineu «.» o els dos punts del principi o "
 "final)"
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -467,12 +467,12 @@ msgstr ""
 "No pdeu utilitzar {} dins del nom de la utilitat per a -execdir i -okdir, ja "
 "que això és un problema de seguretat potencial."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "Només es suporta una instància de {} amb -exec%s ... +"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "l'entorn és massa gran per a l'execució"
@@ -482,17 +482,17 @@ msgstr "l'entorn és massa gran per a l'execució"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ?"
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "no es pot fer «fork»"
 
 # Suggerències? jm
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "error a l'esperar al procés %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s finalitzat pel senyal %d"
@@ -610,7 +610,7 @@ msgstr ""
 "Forma d'ús: %s [--version | --help]\n"
 "            %s biagrames_més_comuns < llista-fitxers > base-de-dades-locate\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -623,31 +623,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils versió %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "dies"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "la base de dades de locate «%s» és corrupta o invàlida"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "Mida de la base de dades de locate: %s octets\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Noms de fitxers: %s"
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Noms de fitxers: %s"
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "amb una longitud acumulada de %s octets"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -656,7 +661,7 @@ msgstr ""
 "\n"
 "\tdels quals %s contenen espais, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -665,7 +670,7 @@ msgstr ""
 "\n"
 "\t%s contenen caràcters de retorn de carro, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -674,32 +679,55 @@ msgstr ""
 "\n"
 "\ti %s contenen caràcters amb el bit alt establert.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "El ràtio de compressió és %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "El ràtio de compressió és %4.2f%%\n"
+
+#: locate/locate.c:938
+#, c-format
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
 msgstr ""
-"avís: la base de dades de locate només es pot llegir una vegada des de "
-"l'entrada estàndard."
 
-#: locate/locate.c:883
+#: locate/locate.c:1025
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "avís: la base de dades «%s» té més de %d %s"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "La base de dades %s és en el format %s.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "vella"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -721,23 +749,46 @@ msgstr ""
 "            [--version] [--help]\n"
 "            patró...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate versió %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "argument per a --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+"avís: la base de dades de locate només es pot llegir una vegada des de "
+"l'entrada estàndard."
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "avís: la base de dades «%s» té més de %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 "La seqüència d'escapament %s és il·legal en una especificació de delimitació "
 "d'entrada."
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -746,7 +797,7 @@ msgstr ""
 "La seqüència d'escapament %s és il·legal en una especificació de delimitació "
 "d'entrada; els valors dels caràcters no han d'excedir %lx."
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -755,7 +806,7 @@ msgstr ""
 "La seqüència d'escapament %s és il·legal en una especificació de delimitació "
 "d'entrada; els valors dels caràcters no han d'excedir %lo."
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
@@ -764,7 +815,7 @@ msgstr ""
 "La seqüència d'escapament %s és il·legal en una especificació de delimitació "
 "d'entrada; no es reconeixen el caràcters finals %s."
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
@@ -774,47 +825,47 @@ msgstr ""
 "d'entrada: el delimitador ha de ser un únic caràcter o una seqüència "
 "d'escapament que comence amb \\."
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "l'entorn és massa gran per a l'execució"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs versió %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "No s'ha pogut obrir el fitxer d'entrada «%s»"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Les vostres variables d'entorn utilitzen %ld octets\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 "límits inferior i superior POSIX per a la mida dels arguments: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "La mida màxima de l'ordre que podem utilitzar: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "La mida de la memòria intermèdia que s'està utilitzant: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -823,53 +874,53 @@ msgstr ""
 "s'ha trobat una cometa %s no emparellada. Per defecte, les cometes són "
 "especials per a xargs a no ser que s'utilitze l'opció -O"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "doble"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "simple"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "línia d'arguments massa llarga"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "error a l'esperar al procés fill"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: ha acabat amb estat 255; avortant"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: interromput pel senyal %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: terminat pel senyal %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: número no vàlid per a l'opció -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: el valor per a l'opció -%c ha de ser >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: el valor per a l'opció -%c ha de ser < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -893,6 +944,9 @@ msgstr ""
 "       [--verbose] [--exit] [--no-run-if-empty] [--arg-file=fitxer]\n"
 "       [--version] [--help] [ordre [arguments-inicials]]\n"
 
+#~ msgid "old"
+#~ msgstr "vella"
+
 #, fuzzy
 #~ msgid "Reducing arg_max (%lu) to arg_size (%lu)\n"
 #~ msgstr "S'està reduint arg_max (%ld) a arg_size (%ld)\n"
diff --git a/po/da.po b/po/da.po
index 5bb2167a..136cd31c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.24\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2005-08-01 18:25+0200\n"
 "Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -33,7 +33,7 @@ msgstr "tvetydig parameter %s til %s"
 msgid "Valid arguments are:"
 msgstr "Gyldige parametre er:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
@@ -134,46 +134,46 @@ msgstr "^[yYjJ]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Brug: %s [-H] [-L] [-P] [sti...] [udtryk]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Brug: %s [sti...] [udtryk]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "advarsel: ukendt undvigetegn '\\%c'"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "ugyldig tilstand '%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -403,42 +403,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "ugyldig tom parameter til -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "ugyldig -size type '%c'"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find version %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Faciliteter aktiveret: "
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "advarsel: ukendt undvigetegn '\\%c'"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "advarsel: ukendt formatteringsdirektiv '%%%c'"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -451,7 +451,7 @@ msgstr ""
 "katalog fra din $PATH (dvs. fjern \".\" eller begyndende og afsluttende "
 "koloner)"
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -459,12 +459,12 @@ msgstr ""
 "Det kan ikke bruge {} i programnavnet for -execdir og -okdir fordi der er et "
 "potentielt sikkerhedsproblem."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "Kun en forekomst af {} er underst�ttet med -exec%s ... +"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "milj� for stort til at eksekvere"
@@ -475,17 +475,17 @@ msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
 # der er plads nok at tage af
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "kan ikke fraspalte en ny proces"
 
 # ditto, ingen grund til kryptiskhed
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "fejl i forbindelse med at vente p� %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s afsluttet af signal %d"
@@ -597,7 +597,7 @@ msgstr ""
 "Brug: %s [--version | --help]\n"
 "eller %s mest-brugte-bigrammer < liste > locate-database\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -611,31 +611,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils version %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "dage"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "locate-databasen '%s' er �delagt eller ugyldig"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "Locate-databasest�rrelse: %s byte\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Filnavne: %s "
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Filnavne: %s "
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "men en kumulativ l�ngde p� %s byte"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -644,7 +649,7 @@ msgstr ""
 "\n"
 "\taf hvilke %s indeholder mellemrum, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -653,7 +658,7 @@ msgstr ""
 "\n"
 "\t%s indeholder linjeskift, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -662,30 +667,55 @@ msgstr ""
 "\n"
 "\tog %s indeholder tegn med den h�jeste bit sat.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "Komprimeringsforhold %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
-msgstr "advarsel: locate-databasen kan kun l�ses fra standard-ind en gang."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "Komprimeringsforhold %4.2f%%\n"
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "advarsel: databasen '%s' er mere end %d %s gammel"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
+
+#: locate/locate.c:1025
+#, c-format
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "Database %s er i formatet %s.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "gammel"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -707,88 +737,109 @@ msgstr ""
 "      [--version] [--help]\n"
 "      M�NSTER...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate version %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "parameter til --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr "advarsel: locate-databasen kan kun l�ses fra standard-ind en gang."
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "advarsel: databasen '%s' er mere end %d %s gammel"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "milj� for stort til at eksekvere"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs version %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "Kan ikke �bne inddatafilen '%s'"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Din milj�variabel optager %ld byte\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "POSIX nedre og �vre gr�nser p� parameterl�ngde: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Maksimal l�ngde af kommando der faktisk kunne bruges: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "St�rrelsen af det kommandomellemlager som faktisk bruges: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -797,54 +848,54 @@ msgstr ""
 "uafbalanceret citationstegn %s; som standard er citationstegn specielle for "
 "xargs medmindre du bruger tilvalget -0"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "dobbelt"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "enkelt"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "parameterlinje for lang"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "fejl i forbindelse med at vente p� afkomproces"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: stoppede med status 255; afbryder"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: standset af signal %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: afsluttet af signal %d"
 
 # omvendt ordstilling for at undg� sammens�tningsproblem
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: ugyldig v�rdi til tilvalget -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: v�rdien for tilvalget -%c skal v�re >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: v�rdien for tilvalget -%c skal v�re < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -867,6 +918,9 @@ msgstr ""
 "      [--max-args=maks-parametre] [--no-run-if-empty] [--arg-file=fil]\n"
 "      [--version] [--help] [kommando [startparametre]]\n"
 
+#~ msgid "old"
+#~ msgstr "gammel"
+
 #, fuzzy
 #~ msgid "Reducing arg_max (%lu) to arg_size (%lu)\n"
 #~ msgstr "Reducerer arg_max (%ld) til arg_size (%ld)\n"
diff --git a/po/de.po b/po/de.po
index 3ed6efe6..4729b780 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.1.20\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2003-11-07 21:54+0100\n"
 "Last-Translator: Nils Naumann <nnau@gmx.net>\n"
 "Language-Team: German <de@li.org>\n"
@@ -29,7 +29,7 @@ msgstr "Mehrdeutiges Argument %s f�r \"%s\"."
 msgid "Valid arguments are:"
 msgstr "G�ltige Argumente sind:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Unbekannter Systemfehler."
 
@@ -129,46 +129,46 @@ msgstr "^[yY]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Aufruf: %s [Pfad...] [Suchkriterium]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Aufruf: %s [Pfad...] [Suchkriterium]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "Warnung: Unerkanntes Fluchtsymbol \"\\%c\"."
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -358,7 +358,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "Ung�ltiger Modus \"%s\"."
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -367,42 +367,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "\"-size\" erfordert ein Argument."
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "Ung�ltige Einheit \"%c\" f�r \"-size\"."
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find Version %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "Warnung: Unerkanntes Fluchtsymbol \"\\%c\"."
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "Warnung: Unerkannte Formatanweisung \"%%%c\"."
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -411,18 +411,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "Der Umgebungsspeicher ist f�r \"exec\" nicht ausreichend."
@@ -432,16 +432,16 @@ msgstr "Der Umgebungsspeicher ist f�r \"exec\" nicht ausreichend."
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "Kann keinen neuen Proze� starten."
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "Fehler beim Warten auf das Proze�ende von %s."
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "Der Proze� %s wurde durch das Signal %d abgebrochen."
@@ -556,7 +556,7 @@ msgstr ""
 "Aufruf: %s h�ufigste_gemeinsame_Buchstabenpaare < Liste > "
 "komprimierte_Liste\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 #, fuzzy
 msgid ""
 "\n"
@@ -571,75 +571,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU find Version %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "Tage"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr ""
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "Warnung: Die Datenbank `%s' ist �lter als %d %s."
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -652,142 +682,163 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate Version %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "Die Argumentzeile ist zu lang."
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "Warnung: Die Datenbank `%s' ist �lter als %d %s."
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "Der Umgebungsspeicher ist f�r \"exec\" nicht ausreichend."
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs Version %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "doppelte"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "einfache"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "Die Argumentzeile ist zu lang."
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "Fehler beim Warten auf das Ende des Kindsprozesses."
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "Proze� %s mit R�ckgabewert 255 beendet. Abbruch!"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "Proze� %s wurde durch das Signal %d angehalten."
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "Proze� %s wurde durch das Signal %d abgebrochen."
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: Ung�ltiger Wert f�r die \"-%c\" Option.\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: Der Wert f�r die \"-%c\" Option mu� gr��er als %ld sein.\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: Der Wert f�r die \"-%c\" Option mu� kleiner als %ld sein.\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/el.po b/po/el.po
index 468717c8..447e9c8a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils-4.2.6\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2005-01-02 13:54+0200\n"
 "Last-Translator: Lefteris Dimitroulakis <edimitro@tee.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -31,7 +31,7 @@ msgstr "Το όρισμα %s είναι ασαφές για την %s"
 msgid "Valid arguments are:"
 msgstr "Έγκυρα ορίσματα είναι:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Αγνωστο σφάλμα συστήματος"
 
@@ -131,46 +131,46 @@ msgstr "^[yY]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Χρήση: %s [-H] [-L] [-P] [διαδρομή...] έκφραση]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Χρήση: %s [διαδρομή...] [έκφραση]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "προειδοποίηση: μη αναγνωριζόμενη ακολουθία διαφυγής «\\%c»"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -390,7 +390,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "άκυρη κατάσταση «%s»"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -399,42 +399,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "το όρισμα null είναι άκυρο για την επιλογή -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "Ο τύπος «%c» για την επιλογή -size είναι άκυρος"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find έκδοση %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "προειδοποίηση: μη αναγνωριζόμενη ακολουθία διαφυγής «\\%c»"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "προειδοποίηση: άγνωστη οδηγία μορφοποίησης «%%%c»"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -443,18 +443,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "το περιβάλλον είναι πολύ μεγάλο γιά την εκτέλεση"
@@ -464,16 +464,16 @@ msgstr "το περιβάλλον είναι πολύ μεγάλο γιά την
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "Δεν μπορώ να κλωνοποιήσω"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "σφάλμα περιμένοντας γιά %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s τερματίστηκε από το σήμα %d"
@@ -588,7 +588,7 @@ msgstr ""
 "Χρήση: %s [--version | --help]\n"
 "ή     %s most_common_bigrams < file-list > locate-database\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -601,75 +601,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils έκδοση %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "μέρες"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "η βάση δεδομένων locate  «%s» δεν είναι έγκυρη ή έχει υποστεί αλλοίωση"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "προειδοποίηση: η βάση δεδομένων «%s» είναι περισσότερο από %d %s παλιά"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -685,88 +715,109 @@ msgstr ""
 "      [-i | --ignore-case] [--wholepath] [--basename] [--limit=N | -l N]\n"
 "      [--version] [--help] pattern...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate έκδοση %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "όρισμα επιλογής --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "προειδοποίηση: η βάση δεδομένων «%s» είναι περισσότερο από %d %s παλιά"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "το περιβάλλον είναι πολύ μεγάλο γιά την εκτέλεση"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs έκδοση %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Οι μεταβλητές περιβάλλοντος καταλαμβάνουν %ld bytes\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "Άνω και κάτω όριο κατά POSIX για μήκος ορίσματος: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Μέγιστο μήκος εντολής που θα μπορούσαμε να χρησιμοποιήσουμε: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Μέγεθος του buffer εντολών που χρησιμοποιούμε: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -775,53 +826,53 @@ msgstr ""
 "unmatched %s quote; εκ προεπιλογής τα εισαγωγικά έχουν ειδική σημασία για το "
 "xargs εκτός κι αν χρησιμοπείτε την επιλογή -0."
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "διπλά"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "μονά"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "γραμμή ορισμάτων πολύ μεγάλη"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "σφάλμα αναμένοντας τη θυγατρική διεργασία"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: τερματίστηκε με ένδειξη 255, απότομο σταμάτημα"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: σταμάτησε από το σήμα %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: τερματίστηκε από το σήμα  %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: άκυρος αριθμός γιά την επιλογή -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s:η τιμή για την επιλογή -%c πρέπει να είναι >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: η τιμή για την επιλογή -%c πρέπει να είναι < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/eo.po b/po/eo.po
index 8b1aa439..bd0ff7a4 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.1.20\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2004-01-04 15:27-0500\n"
 "Last-Translator: D. Dale Gulledge <dsplat@rochester.rr.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -29,7 +29,7 @@ msgstr "plursenca argumento %s por %s"
 msgid "Valid arguments are:"
 msgstr "Validaj argumentoj estas:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Nekonata sistemeraro"
 
@@ -129,46 +129,46 @@ msgstr "^[jJ]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Uzado: %s [pado...] [esprimo]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Uzado: %s [pado...] [esprimo]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "averto: nerekonata eskapsigno `\\%c'"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -360,7 +360,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "malvalida re�imo `%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -369,42 +369,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "malvalida senvalora argumento por -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "malvalida -size speco `%c'"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find versio %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "averto: nerekonata eskapsigno `\\%c'"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "averto: nerekonata formatdirektivo `%%%c'"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -413,18 +413,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "medio estas tro granda por exec"
@@ -434,16 +434,16 @@ msgstr "medio estas tro granda por exec"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "ne povas forki"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "eraro atendante por %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s �esigita per signalo %d"
@@ -556,7 +556,7 @@ msgid ""
 "or     %s most_common_bigrams < file-list > locate-database\n"
 msgstr "Uzado: %s plej_oftaj_dusigna�oj < listo > kodita_listo\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 #, fuzzy
 msgid ""
 "\n"
@@ -570,75 +570,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU find versio %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "tagoj"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr ""
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "averto: datumbazo `%s'estas pli a�a ol %d %s"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -651,142 +681,163 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate versio %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "argumentlinio tro longa"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "averto: datumbazo `%s'estas pli a�a ol %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "medio estas tro granda por exec"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs versio %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "duobla"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "unuobla"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "argumentlinio tro longa"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "eraro atendante ida proceso"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: finis kun stato 255; �esanta"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: haltigita per signalo %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: �esigita per signalo %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: malvalida nombro por -%c opcio\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: valoro de -%c opcio devas esti >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: valoro de -%c opcio devas esti < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/es.po b/po/es.po
index 1a63509b..ad5474b2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU findutils 4.2.6\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2004-12-23 16:57+0100\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -30,7 +30,7 @@ msgstr "argumento %s ambiguo para %s"
 msgid "Valid arguments are:"
 msgstr "Los argumentos v�lidos son:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Error del sistema desconocido"
 
@@ -137,7 +137,7 @@ msgstr "^[nN]"
 #  �Ol�! Gracias a tos los de es@li.org que me habeis dado "ruta de acceso".
 #  No se qu� significado tendr�a mi vida sin vuestra ayuda ;), snif ... :~)
 #  IPG
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Modo de empleo: %s [-H] [-L] [-P] [ruta-de-acceso...] [expresi�n]\n"
@@ -147,41 +147,41 @@ msgstr "Modo de empleo: %s [-H] [-L] [-P] [ruta-de-acceso...] [expresi�n]\n"
 #  �Ol�! Gracias a tos los de es@li.org que me habeis dado "ruta de acceso".
 #  No se qu� significado tendr�a mi vida sin vuestra ayuda ;), snif ... :~)
 #  IPG
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Modo de empleo: %s [ruta-de-acceso...] [expresi�n]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "atenci�n: secuencia de escape `\\%c' no reconocida"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -459,7 +459,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "modo inv�lido `%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -478,42 +478,42 @@ msgstr ""
 #
 # find . -size ""
 #
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "argumento nulo inv�lido para la opci�n -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "tipo dado a -size inv�lido `%c'"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find versi�n %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "atenci�n: secuencia de escape `\\%c' no reconocida"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "atenci�n: directiva de formato `%%%c' no reconocida"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -522,18 +522,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "el entorno es demasiado grande para exec"
@@ -583,16 +583,16 @@ msgstr "< %s ... %s > ? "
 # Al fin y al cabo es la coletilla que tengo yo al final de mi
 # comentario, �no? Me parece lo mismo, m� o meno, pero por no meternos
 # en darle ca�a y acabar ya esto de una vez :) ...
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "fall� la llamada al sistema `fork()'"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "error esperando al proceso %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s terminado por la se�al %d"
@@ -844,7 +844,7 @@ msgstr ""
 "o bien  %s bigramas_m�s_comunes < lista-de-ficheros > base-de-datos-de-"
 "locate\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -857,75 +857,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils versi�n %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "d�as"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "la base de datos de locate `%s' est� corrupta o es inv�lida"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "atenci�n: la base de datos `%s' tiene una antig�edad de m�s de %d %s"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -941,89 +971,110 @@ msgstr ""
 "   [-e | --existing] [-i | --ignore-case] [--wholepath] [--basename]\n"
 "   [--limit=N | -l N] [--version] [--help] expr-reg...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate versi�n %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "argumento para --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "atenci�n: la base de datos `%s' tiene una antig�edad de m�s de %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "el entorno es demasiado grande para exec"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs versi�n %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Las variables de entorno ocupan %ld bytes\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 "L�mites POSIX inferior y superior sobre la longitud del argumento: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "M�xima longitud de orden que se podr�a usar realmente: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Tama�o del b�fer de �rdenes que se est� usando realmente: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -1033,19 +1084,19 @@ msgstr ""
 "xargs\n"
 "a menos que utilice la opci�n -0"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "doble"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "simple"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "l�nea de argumentos demasiado larga"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "error esperando al proceso hijo"
 
@@ -1066,22 +1117,22 @@ msgstr "error esperando al proceso hijo"
 # Me quedo con la duda de c�mo se llama eso en espa�ol.
 # Esperemos que lo vea otro. sv
 #
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: acab� con status 255; abortando"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: interrumpido por la se�al %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: terminado por la se�al %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: n�mero inv�lido para la opci�n -%c\n"
@@ -1090,17 +1141,17 @@ msgstr "%s: n�mero inv�lido para la opci�n -%c\n"
 # queda mucho mejor. Si a alguien no le gusta, que me lo diga ;). IPG
 # Me parece acertado y lo digo :-) sv
 # falen ... :) ... ipg
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: el valor para la opci�n -%c deber�a ser mayor o igual que %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: el valor para la opci�n -%c deber�a ser menor que %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/et.po b/po/et.po
index d7eef2c1..2a31eb2e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.27\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2006-07-28 09:35+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -29,7 +29,7 @@ msgstr "segane argument %s (%s)"
 msgid "Valid arguments are:"
 msgstr "Lubatud argumendid on:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Tundmatu s�steemi viga"
 
@@ -129,46 +129,46 @@ msgstr "^[jJ]"
 msgid "^[nN]"
 msgstr "^[eE]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Kasuta: %s [-H] [-L] [-P] [tee...] [avaldis]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Kasuta: %s [tee...] [avaldis]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "hoiatus: tundmatu paojada `\\%c'"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -389,7 +389,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "vigane mood `%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -401,42 +401,42 @@ msgstr ""
 "t�hendus muudetakse varsti, et oleks koosk�las -perm -000; see t�hendab, "
 "praegu selline muster ei leia �htegi faili, aga hakkab leidma k�iki faile. "
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "vigane t�hi argument -size predikaadile"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "vigane t��p `%c' -size predikaadile"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find versioon %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Lubatud omadused: "
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "hoiatus: tundmatu paojada `\\%c'"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "hoiatus: tundmatu formaadidirektiiv `%%%c'"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -448,7 +448,7 @@ msgstr ""
 "korral ebaturvaline.  Palun eemaldage jooksev kataloog PATH muutujast "
 "(eemaldage \".\" v�i algavad v�i l�petavad koolonid)"
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -456,12 +456,12 @@ msgstr ""
 "V�tmetega -execdir ja -okdir ei ole lubatud programmi nimes kasutada {}, "
 "kuna see v�ib olla turvarisk."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "Predikaadiga -exec%s ... + on lubatud kasutada ainult �hte {} paari"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "exec funktsioonile antud keskkond on liiga suur"
@@ -471,16 +471,16 @@ msgstr "exec funktsioonile antud keskkond on liiga suur"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "fork eba�nnestus"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "viga %s oodates"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s katkestati signaaliga %d"
@@ -594,7 +594,7 @@ msgstr ""
 "Kasuta: %s [--version | --help]\n"
 "v�i     %s enamus_bigram_koode < faili-loend > locate-andmebaas\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -607,31 +607,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils versioon %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "p�eva"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "locate andmebaas `%s' on katki"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "Locate andmebaasi maht: %s baiti\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Failinimed: %s "
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Failinimed: %s "
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "kogumahuga %s baiti"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -640,7 +645,7 @@ msgstr ""
 "\n"
 "\tmillest %s sisaldab t�hemikke, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -649,7 +654,7 @@ msgstr ""
 "\n"
 "\t%s sisaldab reavahetuse s�mboleid, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -658,30 +663,55 @@ msgstr ""
 "\n"
 "\tja %s sisaldab s�mboleid, milles on k�rgeim bitt seatud.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "Tihenduse suhe %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
-msgstr "hoiatus: locate andmebaasi saab standardsisendist ainult korra lugeda."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "Tihenduse suhe %4.2f%%\n"
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "hoiatus: andmebaas `%s' on rohkem, kui %d %s vana"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
+
+#: locate/locate.c:1025
+#, c-format
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "Andmebaas %s kasutab %s vormingut.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "vana"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -702,21 +732,42 @@ msgstr ""
 "      [--version] [--help]\n"
 "      muster...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate versioon %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "v�tme --limit argument"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr "hoiatus: locate andmebaasi saab standardsisendist ainult korra lugeda."
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "hoiatus: andmebaas `%s' on rohkem, kui %d %s vana"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr "Sisendi eraldaja m��rangus on vigane paojada %s."
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -725,7 +776,7 @@ msgstr ""
 "Sisendi eraldaja m��rangus on vigane paojada %s; s�mboli v��rtus ei v�i "
 "�letada %lx."
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -734,7 +785,7 @@ msgstr ""
 "Sisendi eraldaja m��rangus on vigane paojada %s; s�mboli v��rtus ei v�i "
 "�letada %lo."
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
@@ -743,7 +794,7 @@ msgstr ""
 "Sisendi eraldaja m��rangus on vigane paojada %s; l�petavad s�mbolid %s on "
 "tundmatud."
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
@@ -752,46 +803,46 @@ msgstr ""
 "Vigane sisendi eraldaja m��rang %s: eraldaja peab olema kas �ks s�mbol v�i "
 "s�mboliga \\ algav paojada."
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "exec funktsioonile antud keskkond on liiga suur"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs versioon %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "Ei �nnestu avada sisendfaili `%s'"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Teie keskkonnamuutujad kasutavad %ld baiti\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "POSIX alumine ja �lemine piirang argumendi pikkusele on: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Tegelikult kasutatava k�su maksimum pikkus on: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Tegelikult kasutatava k�supuhvri suurus on: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -800,53 +851,53 @@ msgstr ""
 "puudub kvoot %s; vaikimisi kasutatab xargs omi kvoote, kui just pole "
 "kasutatud v�tit -O"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "dubleeritud"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "�hekordne"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "argumendi rida on liiga pikk"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "viga alamprotsessi ootamisel"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: l�petas olekuga 255; katkestan"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: peatatud signaaliga %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: katkestatud signaaliga %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: vigane number v�tmele -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: v�tme -%c v��rtus peab olema suurem v�i v�rdne kui %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: v�tme -%c v��rtus peab olema v�iksem kui %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -870,5 +921,8 @@ msgstr ""
 "       [--verbose] [--exit] [--no-run-if-empty] [--arg-file=fail]\n"
 "       [--version] [--help] [k�sk [argumendid]]\n"
 
+#~ msgid "old"
+#~ msgstr "vana"
+
 #~ msgid "Reducing arg_max (%ld) to arg_size (%ld)\n"
 #~ msgstr "Kahandan arg_max (%ld) v��rtusele arg_size (%ld)\n"
diff --git a/po/fi.po b/po/fi.po
index 7dc4010d..467b4c31 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.1.7\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2002-07-10 09:43+03:00\n"
 "Last-Translator: Matti Koskimies <matti@apulanta.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -29,7 +29,7 @@ msgstr "Moniselitteinen parametri %s \"%s\":lle"
 msgid "Valid arguments are:"
 msgstr "Tarjolla olevat parametrit:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Tuntematon j�rjestem�virhe"
 
@@ -129,46 +129,46 @@ msgstr "^[kKyY]"
 msgid "^[nN]"
 msgstr "^[eEnN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "K�ytt�: %s [polku...] [lauseke]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "K�ytt�: %s [polku...] [lauseke]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "varoitus: tunnistamaton ohjausmerkki \"\\%c\""
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -358,7 +358,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "ep�kelpo tila \"%s\""
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -367,42 +367,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "ep�kelpo tyhj� parametri \"-size\":lle"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "el�kelpo \"-size\"-tyyppi \"%c\""
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find versio %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "varoitus: tunnistamaton ohjausmerkki \"\\%c\""
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "varoitus: tunnistamaton muotoilum��rite \"%%%c\""
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -411,18 +411,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "ymp�rist� on liian iso \"exec\":ille"
@@ -432,16 +432,16 @@ msgstr "ymp�rist� on liian iso \"exec\":ille"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "haarautuminen ei onnistu"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "%s:n odotuksenaikainen virhe"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s keskeytettiin signaalilla %d"
@@ -554,7 +554,7 @@ msgid ""
 "or     %s most_common_bigrams < file-list > locate-database\n"
 msgstr "K�ytt�: %s yleisimm�t_bigrammit < lista > koodattu_lista\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 #, fuzzy
 msgid ""
 "\n"
@@ -568,75 +568,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU find versio %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "p�iv��"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr ""
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "varoitus: tietokanta \"%s\" on vanhempi kuin %d %s"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -649,142 +679,163 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate versio %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "liian pitk� parametririvi"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "varoitus: tietokanta \"%s\" on vanhempi kuin %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "ymp�rist� on liian iso \"exec\":ille"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs versio %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "kaksinkertainen"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "yksinkertainen"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "liian pitk� parametririvi"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "lapsiprosessin oduksenaikainen virhe"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: poistumisstatus 255; keskeytet��n"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: pys�ytetty signaalilla %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: keskeytetty signaalilla %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: ep�kelpo numero -%c -valitsimelle\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: -%c -valitsimelle annetun arvon t�ytyy olla >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: -%c -valitsimelle annetun arvon t�ytyy olla < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/findutils.pot b/po/findutils.pot
index c53640a5..c928ad01 100644
--- a/po/findutils.pot
+++ b/po/findutils.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\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"
@@ -31,7 +31,7 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""
 
@@ -131,46 +131,46 @@ msgstr ""
 msgid "^[nN]"
 msgstr ""
 
-#: find/util.c:157
+#: find/util.c:158
 #, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr ""
 
-#: find/util.c:159
+#: find/util.c:160
 #, c-format
 msgid "] [path...] [expression]\n"
 msgstr ""
 
-#: find/util.c:595
+#: find/util.c:596
 #, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr ""
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -339,7 +339,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr ""
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -348,42 +348,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr ""
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr ""
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr ""
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr ""
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr ""
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -392,18 +392,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 msgid "The environment is too large for exec()."
 msgstr ""
 
@@ -412,16 +412,16 @@ msgstr ""
 msgid "< %s ... %s > ? "
 msgstr ""
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr ""
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr ""
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr ""
@@ -529,7 +529,7 @@ msgid ""
 "or     %s most_common_bigrams < file-list > locate-database\n"
 msgstr ""
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -540,75 +540,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr ""
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr ""
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr ""
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
 msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -621,141 +651,162 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr ""
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr ""
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr ""
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr ""
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr ""
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr ""
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr ""
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr ""
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr ""
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr ""
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr ""
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr ""
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/fr.po b/po/fr.po
index c18f9141..4b7f2bfa 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU findutils 4.2.27\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2006-05-23 08:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -30,7 +30,7 @@ msgstr "le param�tre %s est ambigu� pour %s"
 msgid "Valid arguments are:"
 msgstr "Les param�tres valides sont:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Erreur syst�me inconnue"
 
@@ -130,46 +130,46 @@ msgstr "^[yY]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Usage: %s [-H] [-L] [-P] [CHEMIN...] [EXPRESSION]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Usage: %s [chemin...] [expression]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "AVERTISSEMENT: s�quence d'�chappement � \\%c � inconnue."
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -402,7 +402,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "mode invalide � %s �"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -415,42 +415,42 @@ msgstr ""
 "consistant avec -perm -000 pour qu'� ce moment il ne concorde avec aucun "
 "fichier mais il sera bient^t changer pour concorder avec tous les fichiers."
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "Param�tre nul invalide pour l'option -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "Type invalide pour l'option -size � %c �"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "� find � de GNU version %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Options activ�es: "
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "AVERTISSEMENT: s�quence d'�chappement � \\%c � inconnue."
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "AVERTISSEMENT: directive de formatage � %%%c � inconnue."
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -463,7 +463,7 @@ msgstr ""
 "enlever le r�pertoire courant de  $PATH (i.e enlver \".\" ou : en pr�fixe et "
 "suffixe)"
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -471,12 +471,12 @@ msgstr ""
 "Vous ne pouvez utiliser {} � l'int�rieur du nom de l'utilitaire pour --"
 "execdir et -okdir, parce qu'il pose un probl�me potentiel de s�curit�."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "Une seule instance de {} est support�e avec -exec%s ... +"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "L'environnement est trop large pour l'ex�cution."
@@ -486,16 +486,16 @@ msgstr "L'environnement est trop large pour l'ex�cution."
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "Ne peut faire un clonage (fork)."
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "Erreur s'attendait � %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s a termin� son ex�cution par le signal %d"
@@ -610,7 +610,7 @@ msgstr ""
 "ou     %s bigrammes_les_plus_communs < liste_de_fichiers > base-de-donn�es-"
 "locate\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -623,31 +623,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils version %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "jours"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "la localisation de la base de donn�es � %s � est corrompu ou invalide"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "Taille de la base de donn�es localis�e: %s octets\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Noms de fichiers: %s "
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Noms de fichiers: %s "
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "avec une longueur cumulaive de %s octets"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -656,7 +661,7 @@ msgstr ""
 "\n"
 "\tduquel %s contient des espaces blancs, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -665,7 +670,7 @@ msgstr ""
 "\n"
 "\t%s contient des caract�res de chariot (newline), "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -674,32 +679,55 @@ msgstr ""
 "\n"
 "\tet %s contient des caract�res avec le bit du haut mis � un.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "Taux de compression %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "Taux de compression %4.2f%%\n"
+
+#: locate/locate.c:938
+#, c-format
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
 msgstr ""
-"AVERTISSEMENT: la base de donn�es des localisations peut seulement �tre lue "
-"une seule fois � partir de stdin."
 
-#: locate/locate.c:883
+#: locate/locate.c:1025
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "AVERTISSEMENT: la base de donn�es � %s � est plus vieille de %d %s"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "La base de donn�es %s est dans le format %s.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "ancien"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -720,23 +748,46 @@ msgstr ""
 "      [--version] [--help]\n"
 "      mod�le...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate version %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "argument � --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+"AVERTISSEMENT: la base de donn�es des localisations peut seulement �tre lue "
+"une seule fois � partir de stdin."
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "AVERTISSEMENT: la base de donn�es � %s � est plus vieille de %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 "S�quence d'�chappement invalide %s dans la sp�cification d'entr�e de "
 "d�limiteur"
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -745,7 +796,7 @@ msgstr ""
 "S�quence d'�chappement invalide %s dans la sp�cification d'entr�e de "
 "d�limiteur; la valeur du caract�re ne doit pas exc�der %lx."
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -754,7 +805,7 @@ msgstr ""
 "S�quence d'�chappement invalide %s dans la sp�cification d'entr�e de "
 "d�limiteur; la valeur du caract�re ne doit pas exc�der %lo."
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
@@ -763,7 +814,7 @@ msgstr ""
 "S�quence d'�chappement invalide %s dans la sp�cification d'entr�e de "
 "d�limiteur; la valeur du caract�re en suffixe %s n'est pas reconnu."
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
@@ -772,48 +823,48 @@ msgstr ""
 "Sp�cification d'entr�e de d�limiteur invalide %s: le d�limituer doit �tre "
 "soit un caract�re simple ou une s�quence d'�chappement d�butant par \\."
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "L'environnement est trop large pour l'ex�cution."
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs version %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "Ne peut ouvrir le fichier d'entr�e `%s'"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Vos variables d'environnement prennent %ld octets\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 "Les limites inf�rieures et sup�rieures de POSIX sur la longueure de "
 "l'argument: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "La longueur maximale de la commande qui pourrait �tre utilis�e: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Taille du tampon de la commande qui est actuellement utilis�: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -822,53 +873,53 @@ msgstr ""
 "guillemets %s non pair�s; par d�faut les guillemets sont particuliers � "
 "xargs � moins d'utiliser l'option -O"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "double"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "simple"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "La ligne de param�tres est trop longue."
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "Erreur lors de l'attente de la fin d'ex�cution du processus enfant."
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: a termin� son ex�cution avec le statut 255; arr�t abrupt."
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: stopp� par le signal %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s a termin� son ex�cution par le signal %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: l'option -%c contient un nombre invalide.\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: la valeur de l'option -%c devrait �tre >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: la valeur de l'option -%c devrait �tre < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -892,6 +943,9 @@ msgstr ""
 "       [--verbose] [--exit] [--no-run-if-empty] [--arg-file=fichier]\n"
 "       [--version] [--help] [command [arguments-initiaux]]\n"
 
+#~ msgid "old"
+#~ msgstr "ancien"
+
 #, fuzzy
 #~ msgid "Reducing arg_max (%lu) to arg_size (%lu)\n"
 #~ msgstr "R�duction de arg_max (%ld) � arg_size (%ld)\n"
diff --git a/po/ga.po b/po/ga.po
index 72c90b84..a48f2f58 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.27\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2006-05-22 05:47-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -29,7 +29,7 @@ msgstr "arg�int dh�bhr�och %s chun %s"
 msgid "Valid arguments are:"
 msgstr "Na harg�int� bail�:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Earr�id ch�rais anaithnid"
 
@@ -132,46 +132,46 @@ msgstr "^[yYiIsS]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "�s�id: %s [-H] [-L] [-P] [conair...] [slonn]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "�s�id: %s [conair...] [slonn]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "rabhadh: seicheamh �al�ch�in anaithnid `\\%c'"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -402,7 +402,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "m�d neamhbhail� `%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -415,42 +415,42 @@ msgstr ""
 "000'; .i., n� mheaitse�lann s� comhad ar bith faoi l�thair, ach "
 "meaitse�lfaidh s� gach uile chomhad roimh i bhfad."
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "arg�int nialasach neamhbhail� i ndiaidh -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "arg�int neamhbhail� `%c' i ndiaidh -size"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find, leagan %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Gn�ithe arna gcumas�: "
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "rabhadh: seicheamh �al�ch�in anaithnid `\\%c'"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "rabhadh: treoir fhorm�ide anaithnid `%%%c'"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -462,7 +462,7 @@ msgstr ""
 "neamhdhaingean � seo in �ineacht leis an ghn�omh %s.  Bain an chomhadlann "
 "reatha as $PATH (.i., bain \".\", n� idirstad ar dt�s/i ndeireadh, amach)"
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -470,12 +470,12 @@ msgstr ""
 "N� cheada�tear {} mar chuid d'ainm uirlise le -execdir n� -okdir, de bharr "
 "gur neamhdhaingean � seo."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "N� thaca�tear ach aon ph�ire amh�in {} le -exec%s ... +"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "T� an timpeallacht r�mh�r � rith"
@@ -486,16 +486,16 @@ msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
 # "fork" not in standard refs/corpus.  Maybe want a "gabhl*" word instead? -KPS
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "n� f�idir forc a dh�anamh"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "earr�id ag feitheamh le %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "Stopadh %s leis an chomhartha %d"
@@ -607,7 +607,7 @@ msgstr ""
 "�s�id: %s [--version | --help]\n"
 "n�     %s bigramanna_n�os_coitianta < liosta > locate-bunachar-sonra�\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -620,31 +620,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils, leagan %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "l�"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "T� an bunachar sonra� locate `%s' truaillithe n� neamhbhail�"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "M�id an bhunachair sonra� `Locate': %s beart\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Ainmneacha comhaid: %s "
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Ainmneacha comhaid: %s "
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "le fad ioml�n = %s beart"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -653,7 +658,7 @@ msgstr ""
 "\n"
 "\tt� %s beart ina sp�s b�n, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -662,7 +667,7 @@ msgstr ""
 "\n"
 "\t%s beart ina l�nte nua, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -671,32 +676,55 @@ msgstr ""
 "\n"
 "\tagus %s beart lena ngiot�n n�os airde socraithe.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "C�imheas comhbhr�ite %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "C�imheas comhbhr�ite %4.2f%%\n"
+
+#: locate/locate.c:938
+#, c-format
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
 msgstr ""
-"rabhadh: n� f�idir an bunachar sonra� `locale' a l�amh � stdin ach aon uair "
-"amh�in."
 
-#: locate/locate.c:883
+#: locate/locate.c:1025
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "rabhadh: t� an bunachar sonra� `%s' thar %d %s d'aois"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "Bunachar sonra� %s san fhorm�id %s.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "sean"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -717,21 +745,44 @@ msgstr ""
 "      [--version] [--help]\n"
 "      patr�n...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate, leagan %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "arg�int i ndiaidh --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+"rabhadh: n� f�idir an bunachar sonra� `locale' a l�amh � stdin ach aon uair "
+"amh�in."
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "rabhadh: t� an bunachar sonra� `%s' thar %d %s d'aois"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr "Seicheamh neamhcheadaithe �al�ch�in %s i dteormharc�ir ionchurtha."
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -740,7 +791,7 @@ msgstr ""
 "Seicheamh neamhcheadaithe �al�ch�in %s i dteormharc�ir ionchurtha; n� "
 "cheada�tear carachtair le luach n�os m� n� %lx."
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -749,7 +800,7 @@ msgstr ""
 "Seicheamh neamhcheadaithe �al�ch�in %s i dteormharc�ir ionchurtha; n� "
 "cheada�tear carachtair le luach n�os m� n� %lo."
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
@@ -758,7 +809,7 @@ msgstr ""
 "Seicheamh neamhcheadaithe �al�ch�in %s i dteormharc�ir ionchurtha; "
 "carachtair anaithnid %s ag an gcr�och."
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
@@ -768,46 +819,46 @@ msgstr ""
 "teormharc�ir a bheith ina charachtar aonair n� seicheamh �al�ch�in le \\ ar "
 "tosach."
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "T� an timpeallacht r�mh�r � rith"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs, leagan %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "N� f�idir an t-inchomhad `%s' a oscailt"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "L�onann do chuid athr�ga timpeallachta %ld beart\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "�osluach agus uasluach d'fhad na harg�int� de r�ir POSIX: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Uasfhad d'ord� gur f�idir linn a �s�id: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "M�id an mhaol�in ordaithe at� in �s�id i nd�ir�re: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -816,55 +867,55 @@ msgstr ""
 "comhartha athfhriotail %s corr; caitheann xargs le comhartha� athfhriotail "
 "go speisialta mura bhfuil an rogha -O tugtha agat"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "d�bailte"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "singil"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "t� l�ne na n-arg�int� r�fhada"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "earr�id ag feitheamh le pr�iseas sleachta"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: st�das scortha 255; � thobscor"
 
 # does "stopped" have the implication of "temporarily"?  
 # might then want to distinguish from following msgid... --KPS
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: stopadh leis an chomhartha %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: stopadh leis an chomhartha %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: uimhir neamhbhail� i ndiaidh na rogha -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: caithfidh an luach i ndiaidh na rogha -%c a bheith >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: caithfidh an luach i ndiaidh na rogha -%c a bheith < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -887,6 +938,9 @@ msgstr ""
 "       [--verbose] [--exit] [--no-run-if-empty] [--arg-file=comhad]\n"
 "       [--version] [--help] [ord� [arg�int�-tosaigh]]\n"
 
+#~ msgid "old"
+#~ msgstr "sean"
+
 #, fuzzy
 #~ msgid "Reducing arg_max (%lu) to arg_size (%lu)\n"
 #~ msgstr "Ag laghd� arg_max (%ld) go arg_size (%ld)\n"
diff --git a/po/gl.po b/po/gl.po
index bde93119..e4313bd4 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.1.5\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2000-05-30 10:11+0200\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -34,7 +34,7 @@ msgstr "argumento %s de `%s' non v�lido"
 msgid "Valid arguments are:"
 msgstr "Os argumentos v�lidos son:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Erro de sistema desco�ecido"
 
@@ -134,46 +134,46 @@ msgstr ""
 msgid "^[nN]"
 msgstr ""
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Uso: %s [cami�o...] [expresi�n]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Uso: %s [cami�o...] [expresi�n]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "aviso: secuencia de escape `\\%c' desco�ecida"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -365,7 +365,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "modo `%s' non v�lido"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -374,42 +374,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "argumento nulo de -size non v�lido"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "tipo `%c' de -size non v�lido"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find versi�n %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "aviso: secuencia de escape `\\%c' desco�ecida"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "aviso: directiva de formato `%%%c' desco�ecida"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -418,18 +418,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "o ambiente � grande de m�is para exec"
@@ -439,16 +439,16 @@ msgstr "o ambiente � grande de m�is para exec"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "non se pode facer fork"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "erro agardando a %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s terminado por sinal %d"
@@ -561,7 +561,7 @@ msgid ""
 "or     %s most_common_bigrams < file-list > locate-database\n"
 msgstr "Uso: %s bigramas_m�is_com�ns < lista > lista_codificada\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -572,75 +572,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU find versi�n %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "d�as"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr ""
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "aviso: a base de datos `%s' ten m�is de %d %s"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -653,142 +683,163 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate versi�n %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "li�a de argumentos longa de m�is"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "aviso: a base de datos `%s' ten m�is de %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "o ambiente � grande de m�is para exec"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs versi�n %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "dobre"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "simple"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "li�a de argumentos longa de m�is"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "erro agardando polo proceso fillo"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: sa�u con estado 255; abortando"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: parado por sinal %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: terminado por sinal %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: n�mero para a opci�n -%c non v�lido\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: o valor para a opci�n -%c ten que ser >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: o valor para a opci�n -%c ten que ser < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/hr.po b/po/hr.po
index 64f75677..87e60409 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.1.7\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2002-04-22 02:04+02:00\n"
 "Last-Translator: Hrvoje Niksic <hniksic@xemacs.org>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -29,7 +29,7 @@ msgstr "dvosmislen argument %s za `%s'"
 msgid "Valid arguments are:"
 msgstr "Valjani argumenti su:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Nepoznata sistemska gre~ka"
 
@@ -129,46 +129,46 @@ msgstr "^[dDyY]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Uporaba: %s [staza...] [izraz]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Uporaba: %s [staza...] [izraz]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "upozorenje: nepoznati escape `\\%c'"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -359,7 +359,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "neispravan mod `%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -368,42 +368,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "neispravan prazan argument -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "neispravan -size tip `%c'"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find verzija %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "upozorenje: nepoznati escape `\\%c'"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "upozorenje: nepoznata format direktiva `%%%c'"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -412,18 +412,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "okoli� je prevelik za exec"
@@ -433,16 +433,16 @@ msgstr "okoli� je prevelik za exec"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "ne mogu se forkati"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "gre�ka pri �ekanju na %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s terminiran signalom %d"
@@ -555,7 +555,7 @@ msgid ""
 "or     %s most_common_bigrams < file-list > locate-database\n"
 msgstr "Uporaba: %s most_common_bigrams < lista > kodirana_lista\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 #, fuzzy
 msgid ""
 "\n"
@@ -569,75 +569,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU find verzija %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "dana"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr ""
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "upozorenje: baza `%s' starija je od %d %s"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -650,142 +680,163 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate verzija %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "linija s argumentima preduga�ka"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "upozorenje: baza `%s' starija je od %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "okoli� je prevelik za exec"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs verzija %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "dvostruki"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "jednostruki"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "linija s argumentima preduga�ka"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "gre�ka za vrijeme �ekanja na dje�ji proces"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: iza�ao sa statusom 255; poni�tavam"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: zaustavljen signalom %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: terminiran signalom %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: neispravan broj za opciju -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: vrijednost opcije -%c mora biti >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: vrijednost opcije -%c mora biti < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/hu.po b/po/hu.po
index dead8fb8..1a24bb5a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.26\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2006-01-05 23:32+0100\n"
 "Last-Translator: Emese Kovacs <emese@instantweb.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -33,7 +33,7 @@ msgstr "a(z) \"%s\" argumentum nem egyértelmű a következőhöz: \\\"%s\\\""
 msgid "Valid arguments are:"
 msgstr "Az érvényes argumentumok a következők:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Ismeretlen rendszerhiba"
 
@@ -133,46 +133,46 @@ msgstr "^[iIyY]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Használat: %s [-H] [-L] [-P][útvonal...] [kifejezés]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Használat: %s [útvonal...] [kifejezés]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "figyelmeztetés: ismeretlen escape: \"\\%c\""
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -398,7 +398,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "érvénytelen mód: \"%s\""
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -407,42 +407,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "érvénytelen null argumentum a -size kapcsolónál"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "a -size típusa (\"%c\") érvénytelen"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find %s verzió\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Engedélyezett szolgáltatások: "
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "figyelmeztetés: ismeretlen escape: \"\\%c\""
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "figyelmeztetés: ismeretlen formátumelőírás: \"%%%c\""
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -455,7 +455,7 @@ msgstr ""
 "könyvtárat a $PATH változóból (azaz a pontot vagy a kezdő/záró "
 "pontosvesszőt)."
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -463,12 +463,12 @@ msgstr ""
 "A {} jel nem használható a -execdir és -okdir segédprogramjának nevében, "
 "mivel ez egy lehetséges biztonsági probléma."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "Csak egyetlen {} példány támogatott a -exec%s ... + esetén"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "a környezet túl nagy az exec-hez"
@@ -478,16 +478,16 @@ msgstr "a környezet túl nagy az exec-hez"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "fork() rendszerhívás sikertelen"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "hiba a következőre várakozás közben: %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s leállítva %d szignállal"
@@ -603,7 +603,7 @@ msgstr ""
 "Használat: %s [--version | --help]\n"
 "vagy %s most_common_bigrams < fájllista > locate-adatbázis\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -616,31 +616,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils %s verzió\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "nap"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "a(z) \"%s\" locate adatbázis sérült vagy érvénytelen"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "A locate adatbázis mérete: %s bájt\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Fájlnevek: %s "
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Fájlnevek: %s "
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "összesített hossz: %s bájt"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -649,7 +654,7 @@ msgstr ""
 "\n"
 "\tamelyből %s tartalmaz üreshely-, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -658,7 +663,7 @@ msgstr ""
 "\n"
 "\t%s tartalmaz új sor karaktereket, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -667,32 +672,55 @@ msgstr ""
 "\n"
 "\tés %s tartalmaz beállított magas bittel rendelkező karaktereket.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "Tömörítési arány: %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "Tömörítési arány: %4.2f%%\n"
+
+#: locate/locate.c:938
+#, c-format
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
 msgstr ""
-"figyelmeztetés: a locate adatbázis csak egyszer olvasható a szabvány "
-"bemenetről."
 
-#: locate/locate.c:883
+#: locate/locate.c:1025
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "figyelmeztetés: a(z) \"%s\" adatbázis régebbi %d %s napnál"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "A(z) %s adatbázis %s formátumú.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "régi"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -714,23 +742,46 @@ msgstr ""
 "      [-version] [--help]\n"
 "      minta...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate %s verzió\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "a --limit argumentuma"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+"figyelmeztetés: a locate adatbázis csak egyszer olvasható a szabvány "
+"bemenetről."
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "figyelmeztetés: a(z) \"%s\" adatbázis régebbi %d %s napnál"
+
+#: xargs/xargs.c:301
 #, fuzzy, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 "A(z) \"%s\" escape sorozat szabálytalan a bemenet\n"
 "elhatárolójának meghatározásában"
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, fuzzy, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -740,7 +791,7 @@ msgstr ""
 "elhatárolójának meghatározásában, a karakterértékek nem léphetik túl a(z)\n"
 "%lx értéket."
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, fuzzy, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -750,7 +801,7 @@ msgstr ""
 "elhatárolójának meghatározásában, a karakterértékek nem léphetik túl a(z)\n"
 "%lo értéket."
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, fuzzy, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
@@ -760,7 +811,7 @@ msgstr ""
 "elhatárolójának meghatározásában, a(z) %s záró karaktereket a program\n"
 "nem ismerte fel."
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, fuzzy, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
@@ -770,46 +821,46 @@ msgstr ""
 "az elhatárolt vagy egy karakternek, vagy egy \\ kezdetű escape sorozatnak\n"
 "kell lennie."
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "a környezet túl nagy az exec-hez"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs %s verzió\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "A(z) \"%s\" bemeneti fájl nem nyitható meg"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "A környezeti változói %ld bájtot foglalnak\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "A POSIX alsó és felső korlátai az arumentum hosszára: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "A ténylegesen használható parancs maximális hossza: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "A ténylegesen használt parancspuffer hossza: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -818,53 +869,53 @@ msgstr ""
 "pár nélküli %s idézőjel; alapértelmezésben az idézőjelek speciálisak az "
 "xargs számára, hacsak nem használja a -0 kapcsolót"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "kettős"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "egyszeres"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "az argumentumsor túl hosszú"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "hiba a gyermekfolyamatra való várakozás közben"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: kilépési értéke 255; megszakítás"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: %d szignállal leállítva (stopped)"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: %d szignállal leállítva (terminated)"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: érvénytelen szám a -%c kapcsolóhoz\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: a -%c kapcsoló értéke >= %ld kell legyen\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: a -%c kapcsoló értéke < %ld kell legyen\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -887,6 +938,9 @@ msgstr ""
 "       [--verbose] [--exit] [--no-run-if-empty] [--arg-file=fájl]\n"
 "       [--version] [--help] [parancs [induló-argumentumok]]\n"
 
+#~ msgid "old"
+#~ msgstr "régi"
+
 #, fuzzy
 #~ msgid "Reducing arg_max (%lu) to arg_size (%lu)\n"
 #~ msgstr "Az arg_max (%ld) csökkentése az arg_size (%ld) értékére\n"
diff --git a/po/id.po b/po/id.po
index c513691a..40b6ea35 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.1.7\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2002-03-21 00:24GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -30,7 +30,7 @@ msgstr "argumen %s ambigu untuk %s"
 msgid "Valid arguments are:"
 msgstr "Valid argumen adalah:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Kesalahan sistem tidak dikenal"
 
@@ -130,46 +130,46 @@ msgstr "^[yY]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Pemakaian: %s [path...] [ekspresi]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Pemakaian: %s [path...] [ekspresi]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "PERINGATAN: escape `\\%c' tidak dikenal"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -356,7 +356,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "Mode `%s' tidak valid"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -365,42 +365,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "Null argument tidak valid untuk -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "Type `%c' -size tidak valid"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find versi %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "PERINGATAN: escape `\\%c' tidak dikenal"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "PERINGATAN: format direktif `%%%c' tidak dikenal"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -409,18 +409,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "environment terlalu besar untuk exec"
@@ -430,16 +430,16 @@ msgstr "environment terlalu besar untuk exec"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "tidak dapat mem-fork"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "Kesalahan waiting untuk %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s di-terminate oleh sinyal %d"
@@ -552,7 +552,7 @@ msgid ""
 "or     %s most_common_bigrams < file-list > locate-database\n"
 msgstr "Pemakaian: %s most_common_bigrams < list > coded_list\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 #, fuzzy
 msgid ""
 "\n"
@@ -566,75 +566,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU find versi %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "hari"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr ""
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "peringatan: database `%s' berumur lebih dari %d %s"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -647,142 +677,163 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate versi %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "argumen baris terlalu panjang"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "peringatan: database `%s' berumur lebih dari %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "environment terlalu besar untuk exec"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs versi %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "ganda"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "tunggal"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "argumen baris terlalu panjang"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "kesalahan waiting untuk proses anak"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: keluar dengan status 255; batal"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: dihentikan oleh sinyal %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: di-terminate oleh sinyal %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: kesalahan bilangan untuk pilihan -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: nilai untuk pilihan -%c harus >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: nilai untuk pilihan -%c harus < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/it.po b/po/it.po
index f84dc1cd..a323a7cf 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.10\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2004-12-23 12:44+0100\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -30,7 +30,7 @@ msgstr "l'argomento %s � ambiguo per %s"
 msgid "Valid arguments are:"
 msgstr "Gli argomenti validi sono:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Errore di sistema sconosciuto"
 
@@ -130,46 +130,46 @@ msgstr "^[yYsS]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Uso: %s [-H] [-L] [-P] [percorso...] [espressione]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Uso: %s [percorso...] [espressione]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "attenzione: sequenza di escape `\\%c' non riconosciuta"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -393,7 +393,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "il modo `%s' non � valido"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -402,42 +402,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "-size non pu� avere un argomento nullo"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "il tipo di -size `%c' non � valido"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find versione %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "attenzione: sequenza di escape `\\%c' non riconosciuta"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "attenzione: direttiva di formattazione `%%%c' non riconosciuta"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -446,18 +446,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "l'ambiente � troppo grande per fare exec"
@@ -467,16 +467,16 @@ msgstr "l'ambiente � troppo grande per fare exec"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "impossibile fare fork"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "errore aspettando %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s terminato dal segnale %d"
@@ -591,7 +591,7 @@ msgstr ""
 "Uso: %s [--version | --help]\n"
 "     %s bigrammi_pi�_comuni < lista-di-file > database-di-locate\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -604,75 +604,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils versione %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "giorni"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "il database di locate '%s' � danneggiato o non valido"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "attenzione: il database `%s' ha pi� di %d %s"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -688,89 +718,110 @@ msgstr ""
 "    [-i | --ignore-case] [--wholepath] [--basename] [--limit=N | -l N]\n"
 "    [--version] [--help] modello...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate versione %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "argomento di --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "attenzione: il database `%s' ha pi� di %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "l'ambiente � troppo grande per fare exec"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs versione %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "Impossibile aprire il file di input `%s'"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Il tuo ambiente richiede fino a %ld byte\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 "Limiti di POSIX massimo e minimo della lunghezza degli argomenti: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Lunghezza massima di un comando effettivamente usabile: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Lunghezza del buffer del comando che effettivamente useremo: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -779,53 +830,53 @@ msgstr ""
 "carattere %s non accoppiato; le virgolette hanno un significato speciale per "
 "xargs, a meno che si usi l'opzione -0"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "doppie"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "singole"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "la riga dell'argomento � troppo lunga"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "errore aspettando il processo figlio"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: uscito con stato 255; termina"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: fermato dal segnale %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: terminato dal segnale %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: il numero per l'opzione -%c non � valido\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: il valore per l'opzione -%c dovrebbe essere >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: il valore per l'opzione -%c dovrebbe essere < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/ja.po b/po/ja.po
index efda2bdd..626b3e58 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.1.7\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2001-11-05 00:45+0900\n"
 "Last-Translator: GOTO Masanori <gotom@debian.or.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -29,7 +29,7 @@ msgstr "`%2$s' ���Ф��������Ƥʰ��� %1$s"
 msgid "Valid arguments are:"
 msgstr "ͭ���ʰ�����:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "̤�ΤΥ����ƥ२�顼"
 
@@ -129,46 +129,46 @@ msgstr "^[yY]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "����ˡ: %s [�ѥ�...] [ɾ����]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "����ˡ: %s [�ѥ�...] [ɾ����]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "�ٹ�: ǧ���Ǥ��ʤ����������� `\\%c' �Ǥ�"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -357,7 +357,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "�����ʥ⡼�� `%s' �Ǥ�"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -366,42 +366,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "-size ���Ф��������ʶ��ΰ����Ǥ�"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "������ -size ������ `%c' �Ǥ�"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find version %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "�ٹ�: ǧ���Ǥ��ʤ����������� `\\%c' �Ǥ�"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "�ٹ�: ǧ���Ǥ��ʤ��ե����ޥåȤλؼ� `%%%c' �Ǥ�"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -410,18 +410,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "�¹Ԥ���ˤϴĶ����礭�����ޤ�"
@@ -431,16 +431,16 @@ msgstr "�¹Ԥ���ˤϴĶ����礭�����ޤ�"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "fork �Ǥ��ޤ���"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "%s �ؤ��Ԥ��ǥ��顼"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s �ϥ����ʥ� %d �ǽ�λ"
@@ -553,7 +553,7 @@ msgid ""
 "or     %s most_common_bigrams < file-list > locate-database\n"
 msgstr "����ˡ: %s most_common_bigrams < list > coded_list\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 #, fuzzy
 msgid ""
 "\n"
@@ -567,75 +567,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU find version %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "��"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr ""
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "�ٹ�: �ǡ����١���`%s'�� %d %s�ʾ�Ť�"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -648,142 +678,163 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate version %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "�����Ԥ�Ĺ�����ޤ�"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "�ٹ�: �ǡ����١���`%s'�� %d %s�ʾ�Ť�"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "�¹Ԥ���ˤϴĶ����礭�����ޤ�"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs version %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "���֥�"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "���󥰥�"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "�����Ԥ�Ĺ�����ޤ�"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "�ҥץ������ؤ��Ԥ��ǥ��顼"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: ���ơ�����255�ǽ�λ; ����"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: �����ʥ� %d �ˤ�ä���ߤ��ޤ���"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: �����ʥ� %d �ˤ�äƽ�λ���ޤ���"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: -%c ���ץ������Ф����������ֹ�\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: -%c ���ץ������Ф����ͤ� >= %ld �Ǥʤ���Фʤ�ޤ���\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: -%c ���ץ������Ф����ͤ� < %ld �Ǥʤ���Фʤ�ޤ���\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/ko.po b/po/ko.po
index fc454da1..80c4e783 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.1\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 1996-10-07 22:13+0900\n"
 "Last-Translator: Bang Jun-Young <bangjy@nownuri.nowcom.co.kr>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr "-size�� �������� �� �μ��� �־���"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""
 
@@ -129,46 +129,46 @@ msgstr ""
 msgid "^[nN]"
 msgstr ""
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "����: %s [���...] [����]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "����: %s [���...] [����]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "���: �ν��� �� ���� �̽������� `\\%c'"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -350,7 +350,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "�������� ��� `%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -359,42 +359,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "-size�� �������� �� �μ��� �־���"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "�������� -size �� `%c'"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find ���� %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "���: �ν��� �� ���� �̽������� `\\%c'"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "���: ��� �� ���� ���� ������ `%%%c'"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -403,18 +403,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "ȯ���� ����(exec)�ϱ⿡ �ʹ� Ů�ϴ�"
@@ -424,16 +424,16 @@ msgstr "ȯ���� ����(exec)�ϱ⿡ �ʹ� Ů�ϴ�"
 msgid "< %s ... %s > ? "
 msgstr ""
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr ""
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "%s�� ��ٸ��� ���� ���� �߻�"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s�� ��ȣ %d�� ���� �����"
@@ -546,7 +546,7 @@ msgid ""
 "or     %s most_common_bigrams < file-list > locate-database\n"
 msgstr "����: %s most_common_bigrams < list > coded_list\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -557,75 +557,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU find ���� %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr ""
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, fuzzy, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "���: �����ͺ��̽� `%s'�� %s �̻� �����Ǿ����ϴ�"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
-#, fuzzy, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "���: �����ͺ��̽� `%s'�� %s �̻� �����Ǿ����ϴ�"
+#: locate/locate.c:938
+#, c-format
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -638,142 +668,163 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate ���� %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "�μ� ���� �ʹ� ��ϴ�"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, fuzzy, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "���: �����ͺ��̽� `%s'�� %s �̻� �����Ǿ����ϴ�"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "ȯ���� ����(exec)�ϱ⿡ �ʹ� Ů�ϴ�"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs ���� %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "�ι�"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "����"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "�μ� ���� �ʹ� ��ϴ�"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "�ڽ� ���μ����� ��ٸ��� ���� ���� �߻�"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: ���� 255�� ������ �����; �ߴ���"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: ��ȣ %d�� ���� ������"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: ��ȣ %d�� ���� �����"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: -%c �ɼǿ� �������� ���ڰ� �־���\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: -%c �ɼ��� ���� %ld���� ũ�ų� ���ƾ� �մϴ�\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: -%c �ɼ��� ���� %ld���� �۾ƾ� �մϴ�\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/lg.po b/po/lg.po
index 697cd6e7..41c899b6 100644
--- a/po/lg.po
+++ b/po/lg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.1.20\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2004-04-02 18:57GMT\n"
 "Last-Translator: K.Birabwa <kompyuta@kizito.freeuk.com>\n"
 "Language-Team: Luganda <kompyuta@kizito.freeuk.com>\n"
@@ -31,7 +31,7 @@ msgstr "agumenti %s ku %s ebuzabuza"
 msgid "Valid arguments are:"
 msgstr "Augumenti z'oyinza okukozesa ziri:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Kiremya atategeerese mu sisitemu"
 
@@ -131,47 +131,47 @@ msgstr "^[yY]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Nkozesa eri: %s [kubo...] [mboozi]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Nkozesa eri: %s [kubo...] [mboozi]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr ""
 "kulabula: akabonero akufuula enneyisa ya bunnaako, `\\%c', tekategeerekese"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -367,7 +367,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "enkola `%s' tekola wano"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -376,43 +376,43 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "towadde agumenti eyetaagibwa ku kawayiro -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr " -size eweereddwa ekika, `%c', ekitakola wano "
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find ey'omutindo %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr ""
 "kulabula: akabonero akufuula enneyisa ya bunnaako, `\\%c', tekategeerekese"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "kulabula: ekiragiro ekifuga entereeza, `%%%c', tekitegeerekese"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -421,18 +421,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "exec esanze nga enviromenti esukkiridde obunene"
@@ -442,16 +442,16 @@ msgstr "exec esanze nga enviromenti esukkiridde obunene"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "ekilagiro ekya sisitemu ekya`fork()' kigaanye"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "wazzewo kiremya nga nnindirira %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "omulimu %s guyimirizidwa ekiragiro %d"
@@ -568,7 +568,7 @@ msgstr ""
 "Nkozesa eri: %s bigulamu_ezisinga_okusangibwa < lukalala > "
 "lukalala_olutegeke\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 #, fuzzy
 msgid ""
 "\n"
@@ -583,75 +583,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU find ey'omutindo %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "ennaku"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr ""
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "kulabula: olukalala `%s' emaze %d %s nga tezzibwanga buggya"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -664,142 +694,163 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate ey'omutindo %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "agumenti eyitiridde obuwanvu"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "kulabula: olukalala `%s' emaze %d %s nga tezzibwanga buggya"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "exec esanze nga enviromenti esukkiridde obunene"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs ey'omutindo %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "nakabirye"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "sekinnomu"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "agumenti eyitiridde obuwanvu"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "wazzewo kiremya nga nnindirira omulimu oguzaalukusiddwa mu gunnaagwo"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: omulimu gumaliddwa nga gulina embeera eya 255, mbivuddeko"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: omulimu guyimiriziddwa ekiragiro %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: omulimu gukomekkerezedwa ekiragiro %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: omuwendo guno tegukola ku kawayiro -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: akawayiro -%c kateekwa okubeera nga >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: akawayiro -%c kateekwa okubeera nga < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/ms.po b/po/ms.po
index 2681cbcf..59604952 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils-4.1.7\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2003-01-19 14:42+0800\n"
 "Last-Translator: Nik Ramadhan Nik Idris <toknix@yahoo.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -29,7 +29,7 @@ msgstr "hujah %s adalah kabur untuk `%s'"
 msgid "Valid arguments are:"
 msgstr "Hujah yang sah ialah:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "ralat sistem tidak diketahui"
 
@@ -129,46 +129,46 @@ msgstr "^[yY]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr ""
 
-#: find/util.c:159
+#: find/util.c:160
 #, c-format
 msgid "] [path...] [expression]\n"
 msgstr ""
 
-#: find/util.c:595
+#: find/util.c:596
 #, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr ""
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -337,7 +337,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "mod yang salah `%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -346,42 +346,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr ""
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "jenis saiz tidak sah `%c'"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "versi find GNU  %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr ""
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr ""
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -390,18 +390,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 msgid "The environment is too large for exec()."
 msgstr ""
 
@@ -410,16 +410,16 @@ msgstr ""
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr ""
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "ralat menunggu untuk %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr ""
@@ -527,7 +527,7 @@ msgid ""
 "or     %s most_common_bigrams < file-list > locate-database\n"
 msgstr ""
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 #, fuzzy
 msgid ""
 "\n"
@@ -541,75 +541,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "versi find GNU  %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "hari"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr ""
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
 msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -622,142 +652,163 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "versi locate GNU %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "baris hujah terlalu panjang"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr ""
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr ""
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr ""
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "berganda"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "tunggal"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "baris hujah terlalu panjang"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "ralat menunggu untuk proses anak"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: keluar dengan status; abaikan"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: di berhentikan oleh signal %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: diputuskan oleh signal %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr ""
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: nilai untuk pilihan -%c mesti >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s:nilai untuk pilihan -%c mesti < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/nl.po b/po/nl.po
index f54c4ecb..6732d0ae 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.27\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2006-05-20 13:25+0200\n"
 "Last-Translator: Benno Schulenberg <benno@nietvergeten.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -33,7 +33,7 @@ msgstr "argument %s van %s is niet eenduidig"
 msgid "Valid arguments are:"
 msgstr "Geldige argumenten zijn:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Onbekende systeemfout"
 
@@ -133,46 +133,46 @@ msgstr "^[jJ]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Gebruik:  %s [-H] [-L] [-P] [pad...] [expressie]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Gebruik:  %s [pad...] [expressie]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "waarschuwing: onbekende stuurcode '\\%c'"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -397,7 +397,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "ongeldige modus '%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -410,42 +410,42 @@ msgstr ""
 "binnenkort veranderen.  Op dit moment komt dit patroon met geen enkel "
 "bestand overeen, maar zal binnenkort overeenkomen met alle bestanden."
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "ongeldig leeg argument van -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "ongeldige aanduiding '%c' bij optie -size"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find versie %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Aangezette mogelijkheden: "
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "waarschuwing: onbekende stuurcode '\\%c'"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "waarschuwing: onbekende opmaakcode '%%%c'"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -457,7 +457,7 @@ msgstr ""
 "combinatie met de actie %s van find.  Verwijder de huidige map uit uw PATH-"
 "variabele (oftewel: verwijder \".\" of dubbele punten aan begin en eind)."
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -465,12 +465,12 @@ msgstr ""
 "Om veiligheidsredenen mag {} bij '-execdir' en '-okdir' niet gebruikt worden "
 "binnen de naam van het hulpprogramma."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "Bij '-exec%s ... +' mag {} slechts één keer voorkomen."
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "omgeving is te groot voor exec"
@@ -480,16 +480,16 @@ msgstr "omgeving is te groot voor exec"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "kan geen nieuw proces starten"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "fout tijdens wachten op %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s afgebroken door signaal %d"
@@ -601,7 +601,7 @@ msgstr ""
 "Gebruik:  %s [ --version | --help ]\n"
 "     of:  %s meest_gebruikte_bigrams <bestandenlijst> locate-gegevensbank\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -615,31 +615,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils versie %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "dagen"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "locate-gegevensbank '%s' is beschadigd of ongeldig"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "Grootte van locate-gegevensbank: %s bytes\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Bestandsnamen: %s"
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Bestandsnamen: %s"
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "met een totale lengte van %s bytes"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -648,7 +653,7 @@ msgstr ""
 "\n"
 "\twaarvan %s witruimte bevatten, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -657,7 +662,7 @@ msgstr ""
 "\n"
 "\t%s LF-tekens bevatten, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -666,32 +671,55 @@ msgstr ""
 "\n"
 "\ten %s tekens bevatten met het hoogste bit gezet.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "Compressieverhouding %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "Compressieverhouding %4.2f%%\n"
+
+#: locate/locate.c:938
+#, c-format
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
 msgstr ""
-"waarschuwing: de locate-gegevensbank kan slechts één keer van "
-"standaardinvoer gelezen worden"
 
-#: locate/locate.c:883
+#: locate/locate.c:1025
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "waarschuwing: gegevensbank '%s' is meer dan %d %s oud"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "Gegevensbank %s is in de %s-indeling.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "oud"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -711,21 +739,44 @@ msgstr ""
 "          [-r | --regex]  [--regextype=SOORT]  [--version]  [--help]\n"
 "          PATROON...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate versie %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "argument van --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+"waarschuwing: de locate-gegevensbank kan slechts één keer van "
+"standaardinvoer gelezen worden"
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "waarschuwing: gegevensbank '%s' is meer dan %d %s oud"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr "Ongeldige stuurcode %s in specificatie van scheidingsteken."
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -734,7 +785,7 @@ msgstr ""
 "Ongeldige stuurcode %s in specificatie van scheidingsteken; tekenwaardes "
 "mogen niet groter zijn dan %lx."
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -743,7 +794,7 @@ msgstr ""
 "Ongeldige stuurcode %s in specificatie van scheidingsteken; tekenwaardes "
 "mogen niet groter zijn dan %lo."
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
@@ -752,7 +803,7 @@ msgstr ""
 "Ongeldige stuurcode %s in specificatie van scheidingsteken; onbegrepen "
 "nakomende tekens %s."
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
@@ -761,46 +812,46 @@ msgstr ""
 "Ongeldige specificatie %s van scheidingsteken; het scheidingsteken dient een "
 "enkel teken te zijn of een stuurcode beginnend met \\."
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "omgeving is te groot voor exec"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs versie %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "Kan invoerbestand '%s' niet openen"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "De omgevingsvariabelen nemen %ld bytes in beslag\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "POSIX minimum en maximum grenzen aan argumentlengte: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Maximum lengte van een verwerkbaar commando: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Grootte van het werkelijk gebruikte commandobuffer: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -809,53 +860,53 @@ msgstr ""
 "ongepaard %s aanhalingsteken; aanhalingstekens worden door xargs speciaal "
 "behandeld tenzij u de optie -0 gebruikt"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "dubbel"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "enkel"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "argumentregel is te lang"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "fout tijdens wachten op kindproces"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: eindigde met afsluitwaarde 255; xargs breekt af"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: gestopt door signaal %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: afgebroken door signaal %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: ongeldig nummer bij optie -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: waarde bij optie -%c moet >= %ld zijn\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: waarde bij optie -%c moet < %ld zijn\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -879,6 +930,9 @@ msgstr ""
 "          [--exit]  [--verbose]  [--no-run-if-empty]  [--arg-file=bestand]\n"
 "          [--version]  [--help]  [COMMANDO [eerste_argumenten]]\n"
 
+#~ msgid "old"
+#~ msgstr "oud"
+
 #, fuzzy
 #~ msgid "Reducing arg_max (%lu) to arg_size (%lu)\n"
 #~ msgstr "arg_max (%ld) teruggebracht tot arg_size (%ld)\n"
diff --git a/po/pl.po b/po/pl.po
index b36adb3d..7092dfef 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.27\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2006-05-20 09:28+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -30,7 +30,7 @@ msgstr "niejednoznaczny argument %s dla %s"
 msgid "Valid arguments are:"
 msgstr "Poprawne argumenty to:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Nieznany b��d systemowy"
 
@@ -130,46 +130,46 @@ msgstr "^[yYtT]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Sk�adnia: %s [-H] [-L] [-P] [�cie�ka...] [wyra�enie]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Sk�adnia: %s [�cie�ka...] [wyra�enie]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "uwaga: nierozpoznany znak steruj�cy `\\%c'"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -392,7 +392,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "niew�a�ciwe uprawnienia `%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -405,42 +405,42 @@ msgstr ""
 "�e w tej chwili nie pasuje do �adnych plik�w, ale wkr�tce zmieni si� tak, �e "
 "b�dzie pasowa�o do wszystkich plik�w."
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "b��dny zerowy argument dla -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "b��dny typ -size `%c'"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find wersja %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "W��czone w�a�ciwo�ci: "
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "uwaga: nierozpoznany znak steruj�cy `\\%c'"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "uwaga: nierozpoznana dyrektywa formatuj�ca `%%%c'"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -453,7 +453,7 @@ msgstr ""
 "katalog ze zmiennej $PATH (tzn. usun�� \".\" albo wiod�ce lub ko�cowe "
 "dwukropki)"
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -461,12 +461,12 @@ msgstr ""
 "Nie mo�na u�ywa� {} wewn�trz nazwy narz�dzia dla opcji -execdir i -okdir, "
 "poniewa� jest to potencjalny problem z bezpiecze�stwem."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "Obs�ugiwane jest tylko jedno wyst�pienie {} przy -exec%s ... +"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "�rodowisko jest zbyt du�e, aby wykona� exec"
@@ -476,16 +476,16 @@ msgstr "�rodowisko jest zbyt du�e, aby wykona� exec"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "nie mo�na wykona� fork"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "b��d podczas czekania na %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s zako�czony sygna�em %d"
@@ -597,7 +597,7 @@ msgstr ""
 "Sk�adnia: %s [--version | --help]\n"
 "lub       %s najpopularniejsze_bigramy < lista-plik�w > baza-danych-locate\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -610,31 +610,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils wersja %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "dni"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "baza danych locate `%s' jest uszkodzona lub niepoprawna"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "Rozmiar bazy danych locate: %s bajt�w\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Nazwy plik�w: %s "
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Nazwy plik�w: %s "
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "o ��cznej d�ugo�ci %s bajt�w"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -643,7 +648,7 @@ msgstr ""
 "\n"
 "\tz kt�rych %s zawiera odst�py, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -652,7 +657,7 @@ msgstr ""
 "\n"
 "\t%s zawiera znaki nowej linii, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -661,32 +666,55 @@ msgstr ""
 "\n"
 "\ta %s zawiera znaki z ustawionym najstarszym bitem.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "Wsp�czynnik kompresji %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "Wsp�czynnik kompresji %4.2f%%\n"
+
+#: locate/locate.c:938
+#, c-format
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
 msgstr ""
-"uwaga: baza danych locate mo�e by� odczytana ze standardowego wej�cia tylko "
-"raz."
 
-#: locate/locate.c:883
+#: locate/locate.c:1025
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "uwaga: baza danych `%s' ma ju� ponad %d %s"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "Baza danych %s jest w formacie %s.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "starym"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -707,22 +735,45 @@ msgstr ""
 "      [--version] [--help]\n"
 "      wzorzec...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate wersja %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "argument dla --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+"uwaga: baza danych locate mo�e by� odczytana ze standardowego wej�cia tylko "
+"raz."
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "uwaga: baza danych `%s' ma ju� ponad %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 "Nieprawid�owa sekwencja steruj�ca %s w okre�leniu ogranicznika wej�cia."
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -731,7 +782,7 @@ msgstr ""
 "Nieprawid�owa sekwencja steruj�ca %s w okre�leniu ogranicznika wej�cia; "
 "warto�ci znak�w nie mog� przekracza� %lx."
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -740,7 +791,7 @@ msgstr ""
 "Nieprawid�owa sekwencja steruj�ca %s w okre�leniu ogranicznika wej�cia; "
 "warto�ci znak�w nie mog� przekracza� %lo."
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
@@ -749,7 +800,7 @@ msgstr ""
 "Nieprawid�owa sekwencja steruj�ca %s w okre�leniu ogranicznika wej�cia; "
 "ko�cowe znaki %s nie zosta�y rozpoznane."
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
@@ -758,46 +809,46 @@ msgstr ""
 "Nieprawid�owe okre�lenie ogranicznika wej�cia %s: ogranicznik musi by� "
 "pojedynczym znakiem lub sekwencj� steruj�c� zaczynaj�c� si� od \\."
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "�rodowisko jest zbyt du�e, aby wykona� exec"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs wersja %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "Nie mo�na otworzy� pliku wej�ciowego `%s'"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Zmienne �rodowiskowe zajmuj� %ld bajt�w\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "POSIX-owy dolny i g�rny limit na d�ugo�� argument�w: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Maksymalna d�ugo�� polecenia, kt�re mo�na u�y�: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Rozmiar u�ywanego bufora polecenia: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -806,53 +857,53 @@ msgstr ""
 "niedopasowany %s znak cytowania; domy�lnie znaki cytowania s� specjalnymi "
 "dla xargs o ile nie u�yto opcji -0"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "podw�jny"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "pojedynczy"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "za d�uga linia argument�w"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "b��d podczas oczekiwania na proces potomny"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: wyszed� ze stanem 255; zaniechanie"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: zatrzymany sygna�em %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: zako�czony sygna�em %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: b��dna liczba dla opcji -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: warto�� dla opcji -%c powinna by� >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: warto�� dla opcji -%c powinna by� < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -875,6 +926,9 @@ msgstr ""
 "       [--verbose] [--exit] [--no-run-if-empty] [--arg-file=plik]\n"
 "       [--version] [--help] [polecenie [pocz�tkowe-argumenty]]\n"
 
+#~ msgid "old"
+#~ msgstr "starym"
+
 #, fuzzy
 #~ msgid "Reducing arg_max (%lu) to arg_size (%lu)\n"
 #~ msgstr "Zmniejszanie arg_max (%ld) do arg_size (%ld)\n"
diff --git a/po/pt.po b/po/pt.po
index 788666b3..395784d0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.26\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2005-11-28 17:34+0000\n"
 "Last-Translator: Helder Correia <helder.pereira.correia@gmail.com>\n"
 "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
@@ -30,7 +30,7 @@ msgstr "argumento %s ambíguo para %s"
 msgid "Valid arguments are:"
 msgstr "Argumentos válidos são:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Erro de sistema desconhecido"
 
@@ -130,46 +130,46 @@ msgstr "^[yY]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Utilização: %s [-H] [-L] [-P] [caminho...] [expressão]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Utilização: %s [caminho...] [expressão]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "aviso: escape '\\%c' não reconhecido"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -393,7 +393,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "modo '%s0 inválido"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -402,42 +402,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "argumento vazio para -size inválido"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "Tipo -size '%c' inválido"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find versão %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Funcionalidades activadas: "
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "aviso: escape '\\%c' não reconhecido"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "aviso: directiva de formatação '%%%c' não reconhecida"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -449,7 +449,7 @@ msgstr ""
 "inseguro quando combinado com a acção %s do 'find'. Por favor, remova a "
 "pasta corrente do seu '$PATH' (isto é, remova \".\")"
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -457,12 +457,12 @@ msgstr ""
 "Pode não usar {} no nome do utilitário para '-execdir' e '-okdir', uma vez "
 "que se trata de um potencial problema de segurança."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "Apenas uma instância de {} é suportada com -exec%s ... +"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "o ambiente é demasiado grande para o exec"
@@ -472,16 +472,16 @@ msgstr "o ambiente é demasiado grande para o exec"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "não é possível bifurcar (fork)"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "erro ao aguardar por %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s terminado pelo sinal %d"
@@ -593,7 +593,7 @@ msgstr ""
 "Utilização: %s [--version | --help]\n"
 "ou          %s bigramas_mais_comuns < ficheiro-lista > base-de-dados-locate\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -606,31 +606,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils versão %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "dias"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "a base de dados do locate '%s' está corrompida ou é inválida"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "Tamanho da base de dados 'locate': %s bytes\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Nomes dos ficheiros: %s"
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Nomes dos ficheiros: %s"
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "com um tamanho acumulado de %s B"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -639,7 +644,7 @@ msgstr ""
 "\n"
 "\tdos quais %s contêm espaços em branco, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -648,7 +653,7 @@ msgstr ""
 "\n"
 "\t%s contêm caracteres de nova linha, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -657,31 +662,55 @@ msgstr ""
 "\n"
 "\te %s contêm caracteres com o 'bit' alto a '1'.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "Taxa de compressão %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "Taxa de compressão %4.2f%%\n"
+
+#: locate/locate.c:938
+#, c-format
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
 msgstr ""
-"aviso: a base de dados locate pode ser lida da entrada padrão apenas uma vez."
 
-#: locate/locate.c:883
+#: locate/locate.c:1025
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "aviso: a base de dados '%s' tem mais de %d %s"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "A base de dados %s está no formato %s.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "velho"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -704,22 +733,44 @@ msgstr ""
 "            [-version] [--help]\n"
 "            padrão...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate versão %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "argumento para --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+"aviso: a base de dados locate pode ser lida da entrada padrão apenas uma vez."
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "aviso: a base de dados '%s' tem mais de %d %s"
+
+#: xargs/xargs.c:301
 #, fuzzy, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 "Sequência de escape %s ilegal na especificação de delimitador de entrada."
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, fuzzy, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -728,7 +779,7 @@ msgstr ""
 "Sequência de escape %s ilegal na especificação de delimitador de entrada; os "
 "valores de carácter não devem exceder %lx."
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, fuzzy, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -737,7 +788,7 @@ msgstr ""
 "Sequência de escape %s ilegal na especificação de delimitador de entrada; os "
 "valores de carácter não devem exceder %lo."
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, fuzzy, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
@@ -746,7 +797,7 @@ msgstr ""
 "Sequência de escape %s ilegal na especificação de delimitador de entrada; "
 "caracteres finais %s não reconhecidos."
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, fuzzy, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
@@ -755,47 +806,47 @@ msgstr ""
 "Especificação de delimitador de entrada %s ilegal: o delimitador deve ser um "
 "carácter simples ou uma sequência de escape iniciada por \\."
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "o ambiente é demasiado grande para o exec"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs versão %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "Não é possível abrir o ficheiro de entrada '%s'"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "As variáveis de ambiente ocupam %ld bytes\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 "Limites inferior e superior POSIX do tamanho dos argumentos: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "tamanho máximo do comando possível de usar: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "tamanho da memória de comandos actual: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -804,53 +855,53 @@ msgstr ""
 "citação %s não correspondida; por omissão, as citações são especiais para lo "
 "xargs, a não ser que use a opção -0"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "duplo"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "simples"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "linha de argumentos demasiado longa"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "erro ao esperar pelo processo filho"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: saída com estado 255; a abortar"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: parado pelo sinal %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: terminado pelo sinal %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: número inválido para a opção -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: valor para a opção -%c deveria ser >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: vaor para a opção -%c deveria ser < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -873,6 +924,9 @@ msgstr ""
 "       [--verbose] [--exit] [--no-run-if-empty] [--arg-file=ficheiro]\n"
 "       [--version] [--help] [comando [argumentos-iniciais]]\n"
 
+#~ msgid "old"
+#~ msgstr "velho"
+
 #, fuzzy
 #~ msgid "Reducing arg_max (%lu) to arg_size (%lu)\n"
 #~ msgstr "a reduzir arg_max (%ld) para arg_size (%ld)\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cd30ccde..dbc705ec 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.1.20\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2004-02-08 18:00-0200\n"
 "Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -34,7 +34,7 @@ msgstr "argumento %s amb�guo para %s"
 msgid "Valid arguments are:"
 msgstr "Argumentos v�lidos s�o:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Erro de sistema desconhecido"
 
@@ -134,46 +134,46 @@ msgstr "^[sS]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Uso: %s [caminho...] [express�o]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Uso: %s [caminho...] [express�o]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "aviso: controle (escape) n�o reconhecido `\\%c'"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -363,7 +363,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "modo inv�lido `%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -372,42 +372,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "argumento nulo inv�lido para -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "tipo inv�lido `%c' para -size"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find vers�o %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "aviso: controle (escape) n�o reconhecido `\\%c'"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "aviso: diretiva de formata��o desconhecida `%%%c'"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -416,18 +416,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "ambiente de execu��o � muito grande"
@@ -437,16 +437,16 @@ msgstr "ambiente de execu��o � muito grande"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "n�o consigo duplicar o processo (fork())"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "erro esperando por %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s terminado pelo sinal %d"
@@ -559,7 +559,7 @@ msgid ""
 "or     %s most_common_bigrams < file-list > locate-database\n"
 msgstr "Uso: %s bigrams_mais_comuns < lista > lista_codificada\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 #, fuzzy
 msgid ""
 "\n"
@@ -573,75 +573,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU find vers�o %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "dias"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr ""
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "aviso: banco de dados `%s' � mais antigo que %d %s"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -654,142 +684,163 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate vers�o %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "linha com argumentos muito longa"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "aviso: banco de dados `%s' � mais antigo que %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "ambiente de execu��o � muito grande"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs vers�o %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "duplo"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "simples"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "linha com argumentos muito longa"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "erro esperando por processo filho"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: saiu com status 255; abortando"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: desativado pelo sinal %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: terminado pelo sinal %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: n�mero inv�lido para op��o -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: valor para op��o -%c deve ser >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: valor para op��o -%c deve ser < que %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/ro.po b/po/ro.po
index a4f98d3b..35f0c8a2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.24\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2005-08-01 12:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -33,7 +33,7 @@ msgstr "argument ambiguu %s pentru %s"
 msgid "Valid arguments are:"
 msgstr "Argumente valide sunt:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Eroare de sistem necunoscut�"
 
@@ -133,46 +133,46 @@ msgstr "^[yY]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Folosire : %s [-H] [-L] [-P] [cale...] [expresie]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Folosire : %s [cale...] [expresie]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "avertisment: escape nerecunoscut `\\%c'"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -397,7 +397,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "mod invalid `%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -406,42 +406,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "argument null invalid pentru -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "tip -size invalid `%c'"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find versiunea %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Capabilit��i activate: "
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "avertisment: escape nerecunoscut `\\%c'"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "avertisment: directiv� format nerecunoscut� `%%%c'"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -454,7 +454,7 @@ msgstr ""
 "�ndep�rta�i directorul curent din $PATH (adic� �ndep�rta�i \".\" sau primul "
 "sau ultimul \":\")"
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -462,12 +462,12 @@ msgstr ""
 "Nu pute�i folosi {} �n cadrul numelui utilitarului pentru -execdir �i -"
 "okdir, pentru c� aceasta este o poten�ial� problem� de securitate."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "Numai o singur� instan�� de {} este suportat� cu -exec%s ... +"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "mediul (environment) este prea larg pentru exec"
@@ -477,16 +477,16 @@ msgstr "mediul (environment) este prea larg pentru exec"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "nu pot executa fork"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "eroare a�tept�nd pentru %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s terminat de semnal %d"
@@ -600,7 +600,7 @@ msgstr ""
 "Folosire: %s [--version | --help]\n"
 "sau       %s cele_mai_comune_bigrame < list�-fisiere > baza-de-date-locate\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -613,31 +613,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils versiunea %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "zile"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "baza de date locate `%s' este corupt� sau invalid�"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "Dimensiune baza de date locate: %s octe�i\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Nume fi�iere: %s "
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Nume fi�iere: %s "
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "cu o lungime cumulativ� de %s octe�i"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -646,7 +651,7 @@ msgstr ""
 "\n"
 "\tdin care %s con�in spa�ii albe, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -655,7 +660,7 @@ msgstr ""
 "\n"
 "\t%s con�in caractele linie-nou�, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -664,31 +669,55 @@ msgstr ""
 "\n"
 "\t�i %s con�in caractere cu bitul �nalt setat.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "Raport de compresie %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "Raport de compresie %4.2f%%\n"
+
+#: locate/locate.c:938
+#, c-format
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
 msgstr ""
-"avertisment: baza de date locate poate fi doar citit� de la stdin o dat�."
 
-#: locate/locate.c:883
+#: locate/locate.c:1025
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "avertisment: baza de date `%s' este mai veche de %d %s"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "Baza de date %s este �n formatul %s.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "vechi"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -709,88 +738,110 @@ msgstr ""
 "      [--version] [--help]\n"
 "      pattern...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate versiunea %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "argument pentru --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+"avertisment: baza de date locate poate fi doar citit� de la stdin o dat�."
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "avertisment: baza de date `%s' este mai veche de %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "mediul (environment) este prea larg pentru exec"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs versiunea %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "Nu pot deschide fi�ierul de intrare `%s'"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Variabile dvs. de mediu ocup� %ld octe�i\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "limitele POSIX min �i max pentru lungimea unui argument: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Lungimea mazim� a unei comenzi pe care o putem �n fapt folosi: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Dimensiune unui bufer pe care o folosim de fapt: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -799,53 +850,53 @@ msgstr ""
 "ghilimele %s f�r� pereche; �n mod implicit ghilimelele sunt speciale pentru "
 "xargs, �n afar� de cazul �n care folosi�i op�iunea -0"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "dublu"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "singur"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "linie argumente prea lung�"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "eroare a�tept�nd pentru procese copil"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: a terminat cu starea 255; renun�"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: oprit de semnalul %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: terminat de semnalul %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: num�r invalid pentru op�iunea -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: valoarea pentru op�iunea -%c ar trebui s� fie >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: valoarea pentru op�iunea -%c ar trebui s� fie < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -867,6 +918,9 @@ msgstr ""
 "     [--max-args=max-arg] [--no-run-if-empty] [--arg-file=file]\n"
 "     [--version] [--help] [command [argumente-ini�iale]]\n"
 
+#~ msgid "old"
+#~ msgstr "vechi"
+
 #, fuzzy
 #~ msgid "Reducing arg_max (%lu) to arg_size (%lu)\n"
 #~ msgstr "Reducem arg_max (%ld) la arg_size (%ld)\n"
diff --git a/po/ru.po b/po/ru.po
index 268c2308..a52bc5df 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.1.7\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2002-01-07 18:43GMT+06\n"
 "Last-Translator: Denis Perchine <dyp@perchine.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -30,7 +30,7 @@ msgstr "�������� �������� %s � `%s'"
 msgid "Valid arguments are:"
 msgstr "������ ���������:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "����������� ��������� ������"
 
@@ -130,46 +130,46 @@ msgstr "^[yY��]"
 msgid "^[nN]"
 msgstr "^[nN��]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "�������������: %s [����...] [���������]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "�������������: %s [����...] [���������]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "��������������: ���������������� ������������������ '\\%c'"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -358,7 +358,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "�������� ����� '%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -367,42 +367,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "����������� �������� � -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "�������� ��� '%c' ��� -size"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find ������ %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "��������������: ���������������� ������������������ '\\%c'"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "����y���������: ���������������� ������ ��������� '%%%c'"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -411,18 +411,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "��������� ������� ������ ��� ����������"
@@ -432,16 +432,16 @@ msgstr "��������� ������� ������ ��� ����������"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "�� ���� ������� �������"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "������ �������� %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s ������� �� ������� %d"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 "�������������: %s most_common_bigrams < ������ > �������������_������\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 #, fuzzy
 msgid ""
 "\n"
@@ -569,75 +569,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU find ������ %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "����"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr ""
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "��������������: ���� ������ '%s' �������� ����� ��� �� %d %s"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -650,142 +680,163 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate ������ %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "������ ���������� ������� ������"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "��������������: ���� ������ '%s' �������� ����� ��� �� %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "��������� ������� ������ ��� ����������"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs ������ %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "�������"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "���������"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "������ ���������� ������� ������"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "������ �������� ��������� ��������"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: �������� �� �������� 255; ����������"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: ���������� �� ������� %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: �������� �� ������� %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: �������� ����� ��� ����� -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: �������� ��� ����� -%c ������ ���� >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: �������� ��� ����� -%c ������ ���� < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/rw.po b/po/rw.po
index b46e59e5..53625bec 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.6\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -39,7 +39,7 @@ msgstr "kugirango"
 msgid "Valid arguments are:"
 msgstr "ingingo"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 #, fuzzy
 msgid "Unknown system error"
 msgstr "Sisitemu Ikosa"
@@ -143,46 +143,46 @@ msgstr ""
 msgid "^[nN]"
 msgstr ""
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "H Inzira imvugo"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Inzira imvugo"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "Iburira"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 #, fuzzy
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
@@ -373,7 +373,7 @@ msgstr "Iburira i ni Bitemewe. Gukoresha"
 msgid "invalid mode `%s'"
 msgstr "Sibyo Ubwoko"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -382,43 +382,43 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 #, fuzzy
 msgid "invalid null argument to -size"
 msgstr "Sibyo NTAGIHARI Kuri Ingano"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, fuzzy, c-format
 msgid "invalid -size type `%c'"
 msgstr "Sibyo Ingano Ubwoko"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, fuzzy, c-format
 msgid "GNU find version %s\n"
 msgstr "Gushaka Verisiyo"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, fuzzy, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "Iburira"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, fuzzy, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "Iburira Imiterere"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -427,18 +427,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "ni Binini kugirango"
@@ -448,16 +448,16 @@ msgstr "ni Binini kugirango"
 msgid "< %s ... %s > ? "
 msgstr "<%s...%s>CYOSE"
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr ""
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, fuzzy, c-format
 msgid "error waiting for %s"
 msgstr "Ikosa Tegereza kugirango"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, fuzzy, c-format
 msgid "%s terminated by signal %d"
 msgstr "%sku"
@@ -578,7 +578,7 @@ msgid ""
 "or     %s most_common_bigrams < file-list > locate-database\n"
 msgstr "Verisiyo Ifashayobora Cyangwa IDOSIYE Urutonde"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 #, fuzzy
 msgid ""
 "\n"
@@ -590,75 +590,105 @@ msgstr "org."
 msgid "GNU findutils version %s\n"
 msgstr "Verisiyo"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "iminsi"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, fuzzy, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "Ububikoshingiro ni Cyangwa Sibyo"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
-#, fuzzy, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "Iburira Ububikoshingiro ni Birenzeho ki/ bishaje"
+#: locate/locate.c:938
+#, c-format
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -673,90 +703,111 @@ msgstr ""
 "D Inzira Ububikoshingiro Inzira E i Kwirengagiza L Verisiyo Ifashayobora "
 "Ishusho"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, fuzzy, c-format
 msgid "GNU locate version %s\n"
 msgstr "Verisiyo"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "Kuri"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, fuzzy, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "Iburira Ububikoshingiro ni Birenzeho ki/ bishaje"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 #, fuzzy
 msgid "environment is too large for exec"
 msgstr "ni Binini kugirango"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, fuzzy, c-format
 msgid "GNU xargs version %s\n"
 msgstr "Verisiyo"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Ibihinduka Hejuru"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "Ntoya Na Nkuru Imbibi ku Uburebure"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, fuzzy, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Uburebure Bya Komandi: Twebwe Gukoresha"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Bya Komandi: Twebwe ikoresha"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, fuzzy, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -768,7 +819,7 @@ msgstr ""
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Font.UnderLine..2.text
 # #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Font.Strikeout..2.text
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 #, fuzzy
 msgid "double"
 msgstr "MAHARAKUBIRI"
@@ -777,52 +828,52 @@ msgstr "MAHARAKUBIRI"
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Font.UnderLine..1.text
 # #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Font.Strikeout..1.text
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 #, fuzzy
 msgid "single"
 msgstr "UMWE"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 #, fuzzy
 msgid "argument line too long"
 msgstr "Umurongo"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 #, fuzzy
 msgid "error waiting for child process"
 msgstr "Ikosa Tegereza kugirango"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, fuzzy, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s:Na: Imimerere"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, fuzzy, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s:Kyahagariswe ku"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, fuzzy, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s:ku"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, fuzzy, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s:Sibyo Umubare kugirango"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s:Agaciro kugirango Ihitamo"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s:Agaciro kugirango Ihitamo"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/sk.po b/po/sk.po
index 56b7db83..53c863f9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.24\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2005-08-02 05:56+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -29,7 +29,7 @@ msgstr "nejednoznačný parameter %s pre %s"
 msgid "Valid arguments are:"
 msgstr "Platné parametre sú:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Neznáma systémova chyba"
 
@@ -129,46 +129,46 @@ msgstr "^[yYaAáÁ]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Použitie: %s [-H] [-L] [-P] [cesta...] [výraz]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Použitie: %s [cesta...] [výraz]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "upozornenie: nerozlíšený prepínací znak `\\%c'"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -393,7 +393,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "neplatný mód `%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -402,42 +402,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "neplatný prázdny parameter pre -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "neplatný typ -size `%c'"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find verzia %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Povolené vlastnosti: "
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "upozornenie: nerozlíšený prepínací znak `\\%c'"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "upozornenie: nerozpoznaná formátovacia direktíva '%%%c'"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -450,7 +450,7 @@ msgstr ""
 "vašej premennej $PATH (to znamená, že odstráňte \".\" alebo začiatočné alebo "
 "koncové dvojbodky)"
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -458,12 +458,12 @@ msgstr ""
 "Nemôžete použiť {} vo vnútri názvu nástroja pre -execdir a -okdir, pretože "
 "toto je potenciálny bezpečnostný problém."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "Len jeden výskyt {} je podporovaný s -exec%s ... +"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "prostredie je príliš veľké na vykonanie"
@@ -473,16 +473,16 @@ msgstr "prostredie je príliš veľké na vykonanie"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "nemôžem vykonať fork"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "chyba pri čakaní na %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s ukončený signálom %d"
@@ -594,7 +594,7 @@ msgstr ""
 "Použitie: %s [--version | --help]\n"
 "alebo     %s most_common_bigrams < zoznam-súborov > databáza-umiestnení\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -610,31 +610,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils verzia %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "dní"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "databáza pre locate `%s' je poškodená alebo neplatná"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "Veľkosť databázy vyhľadávania: %s bajtov\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Názvy súborov: %s "
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Názvy súborov: %s "
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "s celkovou dĺžkou %s bajtov"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -643,7 +648,7 @@ msgstr ""
 "\n"
 "\tz ktorých %s obsahuje medzery, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -652,7 +657,7 @@ msgstr ""
 "\n"
 "\t%s obsahuje znak konca riadku, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -661,32 +666,55 @@ msgstr ""
 "\n"
 "\ta %s obsahujú znaky s nastaveným najvyšším bitom.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "Kompresný pomer %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "Kompresný pomer %4.2f%%\n"
+
+#: locate/locate.c:938
+#, c-format
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
 msgstr ""
-"upozornenie: databáza umiestnení môže byť načítaná len raz zo štandardného "
-"vstupu."
 
-#: locate/locate.c:883
+#: locate/locate.c:1025
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "upozornenie: databáza `%s' je staršia ako %d %s"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "Databáza %s je vo formáte %s.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "staré"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -707,88 +735,111 @@ msgstr ""
 "      [--version] [--help]\n"
 "      vzor...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locale verzia %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "parameter pre --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+"upozornenie: databáza umiestnení môže byť načítaná len raz zo štandardného "
+"vstupu."
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "upozornenie: databáza `%s' je staršia ako %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "prostredie je príliš veľké na vykonanie"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs verzia %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "Nepodarilo sa otvoriť vstupný súbor `%s'"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Vaše premenné prostredia zaberajú %ld byjtov\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "Dolné a horné POSIX limity pre dĺžku parametrov: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Maximálna dĺžka príkazu, ktorú môžeme momentálne používať: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Veľkosť vyrovnávacej pamäte príkazov, ktorú práve používame: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -797,53 +848,53 @@ msgstr ""
 "nezodpovedajúce úvodzovky %s; štandardne sú úvodzovky špeciálne pre xargs, "
 "pokiaľ nepoužijete voľbu -0"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "dvojitý"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "jednoduchý"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "riadok s parametrom je príliš dlhý"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "chyba pri zápise do procesu potomka"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: ukončený so stavom 255; prerušujem"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: zastavený signálom %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: ukončený signálom %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: neplatné číslo pre voľbu -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: hodnota pre voľbu -%c by mala byť >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: hodnota pre voľbu -%c by mala byť < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -864,6 +915,9 @@ msgstr ""
 "       [--max-args=max-param] [--no-run-if-empty] [--arg-file=súbor]\n"
 "       [--version] [--help] [príkaz [počiatočné-parametre]]\n"
 
+#~ msgid "old"
+#~ msgstr "staré"
+
 #, fuzzy
 #~ msgid "Reducing arg_max (%lu) to arg_size (%lu)\n"
 #~ msgstr "Zmenšenie arg_max (%ld) na arg_size (%ld)\n"
diff --git a/po/sl.po b/po/sl.po
index 98d2fb54..7dfcfff3 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.26\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2005-11-29 09:39+0100\n"
 "Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -30,7 +30,7 @@ msgstr "dvoumen argument %s za %s"
 msgid "Valid arguments are:"
 msgstr "Veljavni argumenti so:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Neznana sistemska napaka"
 
@@ -130,46 +130,46 @@ msgstr "^[DdJj]"
 msgid "^[nN]"
 msgstr "^[Nn]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Uporaba: %s [-H] [-L] [-P] [POT...] [IZRAZ]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Uporaba: %s [POT]... [IZRAZ]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "opozorilo: neprepoznano ubežno zaporedje »\\%c«"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "neveljave način »%s«"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -403,42 +403,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "neveljaven prazni argument pri -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "neveljaven tip -size: »%c«"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find, različica %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Omogočene možnosti: "
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "opozorilo: neprepoznano ubežno zaporedje »\\%c«"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "opozorilo: neprepoznano formatno določilo »%%%c»"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -450,7 +450,7 @@ msgstr ""
 "kombinaciji z dejanjem %s programa find. Prosim, odstranite trenutni imenik "
 "iz spremenljivke $PATH - odstranite ».« ter uvodna ali zaključna dvopičja."
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -458,12 +458,12 @@ msgstr ""
 "Raba {} znotraj imena pomožnega programa za -execdir in -okdir zaradi "
 "mogočih varnostnih problemov ni dovoljena."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "Podprta je le enkratna navedba {} v kombinaciji z -exec%s ... +"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "okolje je preobsežno za klic exec"
@@ -473,16 +473,16 @@ msgstr "okolje je preobsežno za klic exec"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "vejitev ni mogoča"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "napaka pri čakanju na %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s zaključen s signalom %d"
@@ -595,7 +595,7 @@ msgstr ""
 "Uporaba: %s [--version | --help]\n"
 "ali      %s najpogostejši_bigrami < seznam > kodiran_seznam\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -608,31 +608,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils, različica %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "dni"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "datoteka locate »%s« je poškodovana ali neveljavna"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "Velikost datoteke locate: %s bajtov\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Imena datotek: %s "
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Imena datotek: %s "
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "s skupno dolžino %s bajtov"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -641,7 +646,7 @@ msgstr ""
 "\n"
 "        med katerimi %s vsebuje presledke, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -650,7 +655,7 @@ msgstr ""
 "\n"
 "        %s vsebuje znake za novo vrstico, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -659,31 +664,55 @@ msgstr ""
 "\n"
 "        in %s vsebuje znake s postavljenim osmim bitom.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "Razmerje stisnjenja %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "Razmerje stisnjenja %4.2f%%\n"
+
+#: locate/locate.c:938
+#, c-format
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
 msgstr ""
-"opozorilo: datoteko locate lahko preberemo s standardnega vhoda le enkrat."
 
-#: locate/locate.c:883
+#: locate/locate.c:1025
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "opozorilo: zbirka »%s« je starejša od %d %s"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "Zbirka %s je v %s obliki.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "stari"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -704,21 +733,43 @@ msgstr ""
 "        [--version] [--help] \n"
 "        vzorec...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate, izdaja %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "argument za --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+"opozorilo: datoteko locate lahko preberemo s standardnega vhoda le enkrat."
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "opozorilo: zbirka »%s« je starejša od %d %s"
+
+#: xargs/xargs.c:301
 #, fuzzy, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr "Nedovoljeno ubežno zaporedje %s v specifikaciji vhodnega razmejilnika."
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, fuzzy, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -727,7 +778,7 @@ msgstr ""
 "Nedovoljeno ubežno zaporedje %s v specifikaciji vhodnega razmejilnika; "
 "vrednost znaka ne sme presegati %lx."
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, fuzzy, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -736,7 +787,7 @@ msgstr ""
 "Nedovoljeno ubežno zaporedje %s v specifikaciji vhodnega razmejilnika; "
 "vrednost znaka ne sme presegati %lo."
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, fuzzy, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
@@ -745,7 +796,7 @@ msgstr ""
 "Nedovoljeno ubežno zaporedje %s v specifikaciji vhodnega razmejilnika; "
 "neprepoznan sledilni znak %s."
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, fuzzy, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
@@ -754,46 +805,46 @@ msgstr ""
 "Nedovoljena specifikacija vhodnega razmejilnika %s: razmejilnim mora biti "
 "bodisi en sam znak, bodisi ubežno zaporedje, ki se začenja z \\."
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "okolje je preobsežno za klic exec"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs, izdaja %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "Vhodne datoteke »%s« ni mogoče odpreti"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Spremenljivke okolja zasedajo %ld bajtov\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "Zgornja in spodnja meja POSIX za dolžino argumenta: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Največja dolžina ukaza, ki ga lahko uporabimo: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Velikost ukaznega medpomnilnika, ki ga dejansko uporabljamo: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -802,53 +853,53 @@ msgstr ""
 "%s narekovaj brez para; privzeto so narekovaji za xargs posebni, razen če "
 "vključite izbiro -O"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "dvojni"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "enojni"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "vrstica z argumenti je predolga"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "napaka pri čakanju na proces naslednik"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: izhod s statusom 255; prekinjamo"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: ustavljeno s signalom %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: zaključeno s signalom %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: neveljavno število za izbiro -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: vrednost za izbiro -%c mora biti >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: vrednost za izbiro -%c mora biti < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -872,6 +923,9 @@ msgstr ""
 "       [--verbose] [--exit] [--no-run-if-empty] [--arg-file=datoteka]\n"
 "       [--version] [--help] [ukaz [začetni-argumenti]]\n"
 
+#~ msgid "old"
+#~ msgstr "stari"
+
 #, fuzzy
 #~ msgid "Reducing arg_max (%lu) to arg_size (%lu)\n"
 #~ msgstr "Zmanjšujemo arg_max (%ld) na vrednost arg_size (%ld)\n"
diff --git a/po/sr.po b/po/sr.po
index f0eba344..f27405e6 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.6\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2004-11-24 14:16+0100\n"
 "Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"
@@ -29,7 +29,7 @@ msgstr "неједнозначан аргумент %s за %s"
 msgid "Valid arguments are:"
 msgstr "Допуштени аргументи су:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Непозната системска грешка"
 
@@ -129,46 +129,46 @@ msgstr "^[yYдДdD]"
 msgid "^[nN]"
 msgstr "^[nNнН]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Употреба: %s [-H] [-L] [-P] [путања...] [израз]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Употреба: %s [путања...] [израз]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "упозорење: непознато истицање „\\%c“"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -379,7 +379,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "неисправан режим „%s“"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -388,42 +388,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "неисправан нула-аргумент за -size"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "неисправна врста „%c“ за -size"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "ГНУ find издање %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "упозорење: непознато истицање „\\%c“"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "упозорење: непозната директива форматирања „%%%c“"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -432,18 +432,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "окружење је превелико за извршење"
@@ -453,16 +453,16 @@ msgstr "окружење је превелико за извршење"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "не могу да расцепим"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "грешка при чекању %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s окончан сигналом %d"
@@ -577,7 +577,7 @@ msgstr ""
 "Употреба: %s [--version | --help]\n"
 "или       %s најчешћи_биграми < списак-датотека > locate-база\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -591,76 +591,105 @@ msgid "GNU findutils version %s\n"
 msgstr "ГНУ findutils издање %s\n"
 
 # bug: plural-forms
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "дана"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "locate база „%s“ је покварена или неисправна"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-# bug: plural-forms
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "упозорење: база „%s“ је стара више од %d %s"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -676,89 +705,111 @@ msgstr ""
 "      [-i | --ignore-case] [--wholepath] [--basename] [--limit=N | -l N]\n"
 "      [--version] [--help] шаблон...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "ГНУ locate издање %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "аргумент за --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+# bug: plural-forms
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "упозорење: база „%s“ је стара више од %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "окружење је превелико за извршење"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "ГНУ xargs издање %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
 # bug: plural-forms
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Ваше променљиве окружења заузимају %ld бајтова\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "Горње и доње POSIX границе за дужину аргумента: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Највећа дужина наредбе коју заправо можемо користити: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Величина бафера наредби који заправо користимо: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -767,53 +818,53 @@ msgstr ""
 "неупарен наводник %s; уобичајено су наводници нарочити за xargs осим ако "
 "користите опцију -0"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "двоструки"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "једноструки"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "ред аргумената предугачак"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "грешка при чекању на подређени процес"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: завршио са стањем 255; обустављам"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: заустављен сигналом %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: окончан сигналом %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: неисправан број за опцију -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: вредност за опцију -%c мора бити >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: вредност за опцију -%c мора бити < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/sv.po b/po/sv.po
index 9e3c01cc..e57d9591 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.27\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2006-05-23 22:33+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -31,7 +31,7 @@ msgstr "tvetydigt argument %s f�r %s"
 msgid "Valid arguments are:"
 msgstr "Giltiga argument �r:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Ok�nt systemfel"
 
@@ -131,46 +131,46 @@ msgstr "^[jJyY]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Anv�ndning: %s [-H] [-L] [-P] [s�kv�g...] [uttryck]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Anv�ndning: %s [s�kv�g...] [uttryck]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "varning: ok�nd kontrollsekvens \"\\%c\""
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -397,7 +397,7 @@ msgstr "varning: predikatet -ipath �r f�r�ldrat; anv�nd -iwholename ist�llet."
 msgid "invalid mode `%s'"
 msgstr "ogiltig r�ttighet \"%s\""
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -410,42 +410,42 @@ msgstr ""
 "000; allts�, f�r tillf�llet matchar det inga filer men kommer snart att "
 "�ndras f�r att matcha alla filer."
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "tomt argument till -size ogiltigt"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "ogiltig typ \"%c\" f�r -size"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find version %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Aktiverade funktioner: "
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "varning: ok�nd kontrollsekvens \"\\%c\""
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "varning: ok�nt formatdirektiv \"%%%c\""
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -457,7 +457,7 @@ msgstr ""
 "os�kert i kombination med �tg�rden %s f�r find. Ta bort aktuell katalog fr�n "
 "din $PATH (allts�, ta bort \".\", inledande eller avslutande kolon)"
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -465,12 +465,12 @@ msgstr ""
 "Du kan inte anv�nda {} inom verktygsnamnet f�r -execdir och -okdir, p� grund "
 "av att det inneb�r en m�jlig s�kerhetsrisk."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "Endast en instans av {} st�ds med -exec%s ... +"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "milj�n �r f�r stor f�r exec"
@@ -480,16 +480,16 @@ msgstr "milj�n �r f�r stor f�r exec"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "kan inte grena"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "fel vid v�ntande p� %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s avslutades av signal %d"
@@ -606,7 +606,7 @@ msgstr ""
 "Anv�ndning: %s [--version | --help]\n"
 "eller       %s vanligaste_bigram < fillista > locate-databas\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -620,31 +620,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils version %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "dagar"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "locate-databasen \"%s\" �r trasig eller ogiltig"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "Storlek p� locate-databasen: %s byte\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Filnamn: %s "
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Filnamn: %s "
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "med en sammanlagd l�ngd p� %s byte"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -653,7 +658,7 @@ msgstr ""
 "\n"
 "\tav vilken %s inneh�ller blanksteg, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -662,7 +667,7 @@ msgstr ""
 "\n"
 "\t%s inneh�ller nyradstecken, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -671,30 +676,55 @@ msgstr ""
 "\n"
 "\toch %s inneh�ller tecken med den h�ga biten satt.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "Komprimeringsratio %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
-msgstr "varning: locate-databasen kan endast l�sas en g�ng fr�n standard in."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "Komprimeringsratio %4.2f%%\n"
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "varning: databasen \"%s\" �r mer �n %d %s gammal"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
+
+#: locate/locate.c:1025
+#, c-format
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "Databasen %s �r i formatet %s.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "gammalt"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -715,21 +745,42 @@ msgstr ""
 "      [-version] [--help]\n"
 "      m�nster...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate version %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "argument till --limit"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr "varning: locate-databasen kan endast l�sas en g�ng fr�n standard in."
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "varning: databasen \"%s\" �r mer �n %d %s gammal"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr "Ogiltig specialsekvens %s i inmatningsavskiljarspecifikationen."
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -738,7 +789,7 @@ msgstr ""
 "Ogiltig specialsekvens %s i inmatningsavskiljarspecifikationen; teckenv�rden "
 "f�r inte �verstiga %lx."
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -747,7 +798,7 @@ msgstr ""
 "Ogiltig specialsekvens %s i inmatningsavskiljarspecifikationen; teckenv�rden "
 "f�r inte �verstiga %lo."
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
@@ -756,7 +807,7 @@ msgstr ""
 "Ogiltig specialsekvens %s i inmatningsavskiljarspecifikationen; "
 "efterf�ljande tecknen %s �r ok�nda."
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
@@ -765,46 +816,46 @@ msgstr ""
 "Ogiltig inmatningsavskiljarspecifikation %s: avskiljaren m�ste vara antingen "
 "ett enstaka tecken eller en specialsekvens som b�rjar med \\."
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "milj�n �r f�r stor f�r exec"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs version %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "Kan inte �ppna inmatningsfil \"%s\""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Dina milj�variabler upptar %ld byte\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "Undre och �vre POSIX-gr�nser f�r argumentl�ngd: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Maximal l�ngd p� kommando som vi faktiskt kan anv�nda: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Storlek p� kommandobufferten som vi faktiskt anv�nder: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -813,53 +864,53 @@ msgstr ""
 "citattecknet %s �r oavslutat; som standard �r citattecken speciella f�r "
 "xargs s�vida du inte anv�nder flaggan -0"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "dubbelt"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "enkelt"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "argumentraden �r f�r l�ng"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "fel vid v�ntande p� barnprocess"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: avslutades med status 255; avbryter"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: stoppades av signal %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: avslutades av signal %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: ogiltigt tal f�r flaggan -%c\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: v�rdet p� flaggan -%c ska vara >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: v�rdet p� flaggan -%c ska vara < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -884,6 +935,9 @@ msgstr ""
 "       [--verbose] [--exit] [--no-run-if-empty] [--arg-file=fil]\n"
 "       [--version] [--help] [kommando [initiala argument]]\n"
 
+#~ msgid "old"
+#~ msgstr "gammalt"
+
 #, fuzzy
 #~ msgid "Reducing arg_max (%lu) to arg_size (%lu)\n"
 #~ msgstr "Reducerar arg_max (%ld) till arg_size (%ld)\n"
diff --git a/po/tr.po b/po/tr.po
index ba6c6ea8..ebd253eb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.27\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2006-05-20 13:06+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -31,7 +31,7 @@ msgstr "%2$s için %1$s argümanı anlamsız"
 msgid "Valid arguments are:"
 msgstr "Geçerli argümanlar:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatası"
 
@@ -131,46 +131,46 @@ msgstr "^[eE]"
 msgid "^[nN]"
 msgstr "^[hH]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Kullanımı: %s [-H] [-L] [-P] [dosyaYolu...] [ifade]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Kullanımı: %s [dosyaYolu...] [ifade]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "uyarı: tanınmayan öncelem `\\%c'"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -397,7 +397,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "geçersiz kip `%s'"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -409,42 +409,42 @@ msgstr ""
 "olarak  -perm -000 ile değiştirilmiş olacaktır; yani, şu an hiçbir dosya ile "
 "eşleşmiyorsa bile ileride bütün dosyalarla eşleşiyor olacaktır."
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "-size için boş (null) argüman geçersiz"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "-size türü `%c' geçersiz"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find sürüm %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Etkin özellikler:"
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "uyarı: tanınmayan öncelem `\\%c'"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "uyarı: tanınmayan biçem yönergesi `%%%c'"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -457,7 +457,7 @@ msgstr ""
 "kaldırın (yani, \".\" ile bunun önündeki ve ardındaki iki nokta üstüste "
 "işaretlerini kaldırın)"
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -465,12 +465,12 @@ msgstr ""
 "-execdir ve -okdir seçeneklerinde uygulama ismi içinde {} kullanmamalısınız, "
 "çünkü bu potensiyel bir güvenlik açığıdır."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "-exec%s ... + ile sadece bir {} desteklenmektedir"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "icra edilebilir olarak ortam çok geniş"
@@ -480,16 +480,16 @@ msgstr "icra edilebilir olarak ortam çok geniş"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "ayrılamaz"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "%s beklenirken hata oluştu"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s, %d sinyali ile sonlandırıldı"
@@ -601,7 +601,7 @@ msgstr ""
 "Kullanımı: %s [--version | --help]\n"
 "veya       %s most_common_bigrams < dosya-listesi > konum-veritabanı\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -615,31 +615,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils sürüm %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "gün"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "`%s' veritabanı ya bozuk ya da geçersiz"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "Locate veritabanı boyu: %s bayt\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Dosya isimleri: %s"
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Dosya isimleri: %s"
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "%s baytlık bir birikimli uzunluk ile"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -648,7 +653,7 @@ msgstr ""
 "\n"
 "\t%s boşluk içeriyor, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -657,7 +662,7 @@ msgstr ""
 "\n"
 "\t%s satırsonu karakteri içeriyor, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -666,30 +671,55 @@ msgstr ""
 "\n"
 "\tve %s yüksek bitli karakterler içeriyor.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "Sıkıştırma oranı %%%4.2f\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
-msgstr "Uyarı: locate veritabanı standart girdiden sadece bir kere okunabilir"
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "Sıkıştırma oranı %%%4.2f\n"
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "uyarı: `%s' veritabanı %d den %s daha eski"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
+
+#: locate/locate.c:1025
+#, c-format
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "%s veritabanı %s biçiminde.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "eski"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -712,21 +742,42 @@ msgstr ""
 "       [--regextype=TÜR] [--version] [--help]\n"
 "       KALIP...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate sürüm %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "--limit argümanı"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr "Uyarı: locate veritabanı standart girdiden sadece bir kere okunabilir"
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "uyarı: `%s' veritabanı %d den %s daha eski"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr "Girdi sınırlayıcı belirtimindeki %s önceleme dizgesi geçersiz."
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -735,7 +786,7 @@ msgstr ""
 "Girdi sınırlayıcı belirtimindeki %s önceleme dizgesi geçersiz; karakter "
 "değerleri %lx değerini aşmamalı."
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -744,7 +795,7 @@ msgstr ""
 "Girdi sınırlayıcı belirtimindeki %s önceleme dizgesi geçersiz; karakter "
 "değerleri %lo değerini aşmamalı."
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
@@ -753,7 +804,7 @@ msgstr ""
 "Girdi sınırlayıcı belirtimindeki %s önceleme dizgesi geçersiz; ardındaki %s "
 "karakterleri tanınmıyor."
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
@@ -762,46 +813,46 @@ msgstr ""
 "Girdi sınırlayıcı belirtimi %s geçersiz: sınırlanan şey ya tek bir karakter "
 "ya da \\ ile öncelenmiş bir dizge olmalı."
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "icra edilebilir olarak ortam çok geniş"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs sürüm %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "Girdi dosyası `%s' açılamıyor"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Ortam değişkenleriniz %ld bayt tutuyor\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "Argüman uzunluğu için POSIX alt ve üst sınırları: %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Kullanabileceğimiz asgari komut uzunluğu: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Kullanmakta olduğumuz komut tamponunun boyu: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -810,53 +861,53 @@ msgstr ""
 "%s karşılığı ile eşleşmiyor; -0 seçeneği ile belirtilmedikçe öntanımlı "
 "olarak sarmalayıcı karakterler xarg'lara özeldir"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "çift"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "tek"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "argüman satırı çok uzun"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "ast süreç beklenirken hata oluştu"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: durum 255 ile çıkıldı; bırakılıyor"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: %d sinyali ile durduruldu"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: %d sinyali ile sonlandırıldı"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: -%c seçeneği için geçersiz sayı\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: -%c seçeneği için değer >= %ld olmalı\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: -%c seçeneği için değer < %ld olmalı\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -880,6 +931,9 @@ msgstr ""
 "       [--verbose] [--exit] [--no-run-if-empty] [--arg-file=dosya]\n"
 "       [--version] [--help] [komut [ilk-argümanlar]]\n"
 
+#~ msgid "old"
+#~ msgstr "eski"
+
 #, fuzzy
 #~ msgid "Reducing arg_max (%lu) to arg_size (%lu)\n"
 #~ msgstr "arg_max (%ld), arg_size'a (%ld) düşürülüyor\n"
diff --git a/po/vi.po b/po/vi.po
index 7aa45e7e..1dfdf828 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.27\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2006-07-11 22:58+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -32,7 +32,7 @@ msgstr "đối số %s mơ hồ cho %s"
 msgid "Valid arguments are:"
 msgstr "Các đối số hợp lệ:"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Không biết lỗi hệ thống"
 
@@ -132,46 +132,46 @@ msgstr "^[cC]"
 msgid "^[nN]"
 msgstr "^[kK]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "Cách sử dụng: %s [-H] [-L] [-P] [đường_dẫn...] [biểu_thức]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "Cách sử dụng: %s [đường_dẫn...] [biểu_thức]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "cảnh báo : không nhận diện ký tự thoát « \\%c »"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -455,7 +455,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "chế độ không hợp lệ « %s »"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -468,42 +468,42 @@ msgstr ""
 "này nó không khớp với tập tin nào nhưng nó sắp được thay đổi để khớp với mọi "
 "tập tin."
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "đối số rỗng không hợp lệ đối với tùy chọn « -size » (kích cỡ)"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "kiểu « -size » (kích cỡ) không hợp lệ « %c »"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "Trình find (tìm) phiên bản %s của GNU\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "Các tính năng hoạt động: "
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "cảnh báo : không nhận diện ký tự thoát « \\%c »"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "cảnh báo : không nhận diện chỉ thị định dạng « %%%c »"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -516,7 +516,7 @@ msgstr ""
 "mục hiện thời ra « $PATH » của bạn (tức là hãy gỡ bỏ dấu chấm « . » hay ký "
 "tự hai chấm nào « : » nằm trước hay nằm theo)."
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -524,12 +524,12 @@ msgstr ""
 "Không cho phép bạn dùng ký tự « {} » bên trong tên tiện ích cho đối số « -"
 "execdir » và « -okdir », vì có thể rủi ro bảo mật."
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "Hỗ trợ chỉ một thể hiện « {} » với đối số « -exec%s ... + »"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "môi trường quá lớn đối với « exec » (thì hành)"
@@ -539,16 +539,16 @@ msgstr "môi trường quá lớn đối với « exec » (thì hành)"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "không thể tạo tiến trình con"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "gặp lỗi khi đời %s"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s bị chấm dứt bởi tín hiệu %d"
@@ -664,7 +664,7 @@ msgstr ""
 "hoặc\n"
 "%s gần_hết_chữ_đôi_thường < danh_sách_tập_tin > cơ_sở_dữ_liệu_định_vị\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -677,31 +677,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "Trình findutils phiên bản %s của GNU\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "ngày"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "cơ sở dữ liệu định vị « %s » bị hỏng hay không hợp lệ"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "Kích cỡ của cơ sở dữ liệu định vị: %s bytes\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "Tên tập tin: %s "
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "Tên tập tin: %s "
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "có độ dài lũy tích là %s byte"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -710,7 +715,7 @@ msgstr ""
 "\n"
 "\ttrong đó có %s chứa dấu cách, "
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -719,7 +724,7 @@ msgstr ""
 "\n"
 "\t%s chứa ký tự dòng mới, "
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -728,32 +733,55 @@ msgstr ""
 "\n"
 "\tvà %s chứa ký tự đặt bộ bit cao.\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "Tỷ lệ nén %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "Tỷ lệ nén %4.2f%%\n"
+
+#: locate/locate.c:938
+#, c-format
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
 msgstr ""
-"cảnh báo : cơ sở dữ liệu định vị có thể được đọc từ thiết bị xuất chuẩn chỉ "
-"một lần thôi."
 
-#: locate/locate.c:883
+#: locate/locate.c:1025
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "cảnh báo : cơ sở dữ liệu « %s » cũ hơn %d %s"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "Cơ sở dư liệu %s có dạng thức %s.\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "cũ"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -786,21 +814,44 @@ msgstr ""
 "[--help] mẫu... \t\t(trợ giúp)\n"
 "pattern...\t\t\t\t(mẫu)\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "Trình locate (định vị) phiên bản %s cua GNU\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr "đối số đối với « --limit » (giới hạn)"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+"cảnh báo : cơ sở dữ liệu định vị có thể được đọc từ thiết bị xuất chuẩn chỉ "
+"một lần thôi."
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "cảnh báo : cơ sở dữ liệu « %s » cũ hơn %d %s"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr "Gặp dãy thoát không hợp lệ « %s » trong đặc tả giới hạn dữ liệu nhập"
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -809,7 +860,7 @@ msgstr ""
 "Gặp dãy thoát không hợp lệ « %s » trong đặc tả giới hạn dữ liệu nhập: không "
 "cho phép giá trị ký tự vượt trội %lx."
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
@@ -818,7 +869,7 @@ msgstr ""
 "Gặp dãy thoát không hợp lệ « %s » trong đặc tả giới hạn dữ liệu nhập: không "
 "cho phép giá trị ký tự vượt trội %lo."
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
@@ -827,7 +878,7 @@ msgstr ""
 "Gặp dãy thoát không hợp lệ « %s » trong đặc tả giới hạn dữ liệu nhập: không "
 "nhận diện ký tự « %s » nằm theo."
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
@@ -836,46 +887,46 @@ msgstr ""
 "Gặp đặc tả giới hận dữ liệu nhập không hợp lệ « %s »: dấu giới hạn phải là "
 "hoặc một ký tự đơn hoặc một dãy thoát bắt đầu với « \\ »."
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "môi trường quá lớn đối với « exec » (thì hành)"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "Trình xargs (đối số x) phiên bản %s của GNU\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "Không thể mở tập tin nhập « %s »"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "Các biến môi trường của bạn chiếm %ld byte\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "Giới hạn POSIX trên và dưới độ dài của đối số : %ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "Độ dài lệnh tối đa mà thật có thể dùng: %ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "Kích cỡ của bộ đệm lệnh mà thật đang dùng: %ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -884,53 +935,53 @@ msgstr ""
 "chưa khớp với dấu trích dẫn %s; mặc định là mọi dấu trích dẫn là đặc biệt "
 "với xargs nếu không dùng tùy chọn « -0 »"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "đôi"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "đơn"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "dòng đối số quá dài"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "gặp lỗi khi đời tiến trình con"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: đã thoát với trạng thái 255; nên hủy bỏ"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: bị ngừng bởi tín hiệu %d"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: bị chấm dứt bởi tín hiệu %d"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: số không hợp lệ đối với tùy chọn « -%c »\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: giá trị cho tùy chọn « -%c » nên là ≥ %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: giá trị cho tùy chọn « -%c » nên là < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -963,6 +1014,9 @@ msgstr ""
 "[--help]\t\t\t\t\t\t\t(trợ giúp)\n"
 "[lệnh [các_đối_số_đầu]]\n"
 
+#~ msgid "old"
+#~ msgstr "cũ"
+
 #~ msgid "Reducing arg_max (%ld) to arg_size (%ld)\n"
 #~ msgstr ""
 #~ "Đang rút gọn « arg_max » (đối số tối đa) (%ld) thành « arg-size » (kích "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6312f82c..40b672eb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.1.7\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2002-09-03 14:29+0800\n"
 "Last-Translator: Wang Li <charles@linux.net.cn>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -29,7 +29,7 @@ msgstr "��%2$s���IJ��� %1$s �����"
 msgid "Valid arguments are:"
 msgstr "�Ϸ��IJ���Ϊ��"
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "δ֪��ϵͳ����"
 
@@ -129,46 +129,46 @@ msgstr "^[yY]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "�÷���%s [·��...] [����ʽ]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "�÷���%s [·��...] [����ʽ]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "���棺�޷�ʶ���ת���ַ���\\%c��"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -358,7 +358,7 @@ msgstr ""
 msgid "invalid mode `%s'"
 msgstr "�Ƿ�ģʽ��%s��"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -367,42 +367,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "-size �� null ������Ч"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "��Ч�� -size ���͡�%c��"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find �汾 %s\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr ""
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "���棺�޷�ʶ���ת���ַ���\\%c��"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr "���棺����ʶ��ĸ�ʽָ�%%%c��"
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -411,18 +411,18 @@ msgid ""
 "trailing colons)"
 msgstr ""
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
 msgstr ""
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr ""
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "�� exec ��˵��������"
@@ -432,16 +432,16 @@ msgstr "�� exec ��˵��������"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "�޷� fork"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "�ȴ� %s ʱ����"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s �����ź� %d ����ֹ"
@@ -554,7 +554,7 @@ msgid ""
 "or     %s most_common_bigrams < file-list > locate-database\n"
 msgstr ""
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 #, fuzzy
 msgid ""
 "\n"
@@ -568,75 +568,105 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU find �汾 %s\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "��"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr ""
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr ""
 
-#: locate/locate.c:796
+#: locate/locate.c:845
+#, c-format
+msgid "Matching Filenames: %s "
+msgstr ""
+
+#: locate/locate.c:846
 #, c-format
-msgid "Filenames: %s "
+msgid "All Filenames: %s "
 msgstr ""
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr ""
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
 "\tof which %s contain whitespace, "
 msgstr ""
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
 "\t%s contain newline characters, "
 msgstr ""
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
 "\tand %s contain characters with the high bit set.\n"
 msgstr ""
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr ""
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
+#: locate/locate.c:881
+#, c-format
+msgid "Compression ratio is undefined\n"
 msgstr ""
 
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "���棺���ݿ⡰%s���� %d %s ���¾�"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1025
 #, c-format
-msgid "Database %s is in the %s format.\n"
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
+
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
 msgstr ""
 
-#: locate/locate.c:1062
-msgid "old"
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
+#, c-format
+msgid "Database %s is in the %s format.\n"
 msgstr ""
 
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -649,142 +679,163 @@ msgid ""
 "      pattern...\n"
 msgstr ""
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate �汾 %s\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 #, fuzzy
 msgid "argument to --limit"
 msgstr "�������"
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr ""
+
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "���棺���ݿ⡰%s���� %d %s ���¾�"
+
+#: xargs/xargs.c:301
 #, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr ""
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr ""
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr ""
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr ""
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
 "single character or an escape sequence starting with \\."
 msgstr ""
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "�� exec ��˵��������"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs �汾 %s\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr ""
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr ""
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr ""
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr ""
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
 "the -0 option"
 msgstr ""
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "˫"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "��"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "�������"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "�ȴ��ӽ���ʱ����"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s����״̬ 255 �˳�����ֹ"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s�����ź� %d ��ֹͣ"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s�����ź� %d ����ֹ"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s��ѡ�� -%c ����ֵ��Ч\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s��ѡ�� -%c ��ֵ���� >= %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, fuzzy, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s��ѡ�� -%c ��ֵ���� < %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5b34e038..5ed38147 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: findutils 4.2.26\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
-"POT-Creation-Date: 2006-08-06 18:30+0100\n"
+"POT-Creation-Date: 2006-08-20 19:17+0100\n"
 "PO-Revision-Date: 2005-12-06 11:30+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -29,7 +29,7 @@ msgstr "%2$s 的參數 %1$s 不明確"
 msgid "Valid arguments are:"
 msgstr "有效的參數為："
 
-#: gnulib/lib/error.c:121
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "不明的系統錯誤"
 
@@ -129,46 +129,46 @@ msgstr "^[yY]"
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: find/util.c:157
+#: find/util.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [-H] [-L] [-P] [-Olevel] [-D "
 msgstr "用法: %s [-H] [-L] [-P] [路徑...] [表達式]\n"
 
-#: find/util.c:159
+#: find/util.c:160
 #, fuzzy, c-format
 msgid "] [path...] [expression]\n"
 msgstr "用法：%s [路徑...] [表達式]\n"
 
-#: find/util.c:595
+#: find/util.c:596
 #, fuzzy, c-format
 msgid "Ignoring unrecognised debug flag %s"
 msgstr "警告：無效辨認轉義控制序列 (escape sequence) ‘\\%c’"
 
-#: find/util.c:602
+#: find/util.c:603
 msgid "Empty argument to the -D option."
 msgstr ""
 
-#: find/util.c:616
+#: find/util.c:617
 msgid "The -O option must be immediately followed by a decimal integer"
 msgstr ""
 
-#: find/util.c:625 find/util.c:635
+#: find/util.c:626 find/util.c:636
 msgid "Please specify a decimal number immediately after -O"
 msgstr ""
 
-#: find/util.c:640 find/util.c:644
+#: find/util.c:641 find/util.c:645
 #, c-format
 msgid "Invalid optimisation level %s"
 msgstr ""
 
-#: find/util.c:651
+#: find/util.c:652
 #, c-format
 msgid ""
 "Optimisation level %lu is too high.  If you want to find files very quickly, "
 "consider using GNU locate."
 msgstr ""
 
-#: find/util.c:762
+#: find/util.c:763
 msgid ""
 "The environment variable FIND_BLOCK_SIZE is not supported, the only thing "
 "that affects the block size is the POSIXLY_CORRECT environment variable"
@@ -375,7 +375,7 @@ msgstr "警告：-ipath 選項已過時，請改用 -iwholename。"
 msgid "invalid mode `%s'"
 msgstr "模式 ‘%s’ 無效"
 
-#: find/parser.c:1507
+#: find/parser.c:1508
 #, c-format
 msgid ""
 "warning: you have specified a mode pattern %s which is equivalent to 000. "
@@ -384,42 +384,42 @@ msgid ""
 "to match all files."
 msgstr ""
 
-#: find/parser.c:1663
+#: find/parser.c:1664
 msgid "invalid null argument to -size"
 msgstr "-size 後是無效的空白參數"
 
-#: find/parser.c:1709
+#: find/parser.c:1710
 #, c-format
 msgid "invalid -size type `%c'"
 msgstr "-size 指定的檔案大小單位 ‘%c’ 無效"
 
-#: find/parser.c:1758
+#: find/parser.c:1759
 msgid ""
 "The -show-control-chars option takes a single argument which must be "
 "'literal' or 'safe'"
 msgstr ""
 
-#: find/parser.c:1902
+#: find/parser.c:1903
 #, c-format
 msgid "GNU find version %s\n"
 msgstr "GNU find %s 版本\n"
 
-#: find/parser.c:1903
+#: find/parser.c:1904
 #, c-format
 msgid "Features enabled: "
 msgstr "啟用了的功能："
 
-#: find/parser.c:2171
+#: find/parser.c:2172
 #, c-format
 msgid "warning: unrecognized escape `\\%c'"
 msgstr "警告：無效辨認轉義控制序列 (escape sequence) ‘\\%c’"
 
-#: find/parser.c:2218
+#: find/parser.c:2219
 #, c-format
 msgid "warning: unrecognized format directive `%%%c'"
 msgstr ""
 
-#: find/parser.c:2347
+#: find/parser.c:2348
 #, c-format
 msgid ""
 "The current directory is included in the PATH environment variable, which is "
@@ -430,7 +430,7 @@ msgstr ""
 "PATH 環境變數中包括了當前目錄，當配合 find 的 %s 操作模式時會令系統安全產生漏"
 "洞。請在 $PATH 變數中移除當前目錄 (即是 “.”，或者最前或最後的冒號)"
 
-#: find/parser.c:2447
+#: find/parser.c:2448
 msgid ""
 "You may not use {} within the utility name for -execdir and -okdir, because "
 "this is a potential security problem."
@@ -438,12 +438,12 @@ msgstr ""
 "您不應該在 -execdir 和 -okdir 中使用 {} 作為程式名稱，因為這樣做可能會造成安"
 "全漏洞。"
 
-#: find/parser.c:2470
+#: find/parser.c:2471
 #, c-format
 msgid "Only one instance of {} is supported with -exec%s ... +"
 msgstr "在 -exec%s ... + 裡面只可以使用一次 {}"
 
-#: find/parser.c:2483
+#: find/parser.c:2484
 #, fuzzy
 msgid "The environment is too large for exec()."
 msgstr "執行 exec 時的環境變數太大"
@@ -453,16 +453,16 @@ msgstr "執行 exec 時的環境變數太大"
 msgid "< %s ... %s > ? "
 msgstr "< %s ... %s > ? "
 
-#: find/pred.c:1567 xargs/xargs.c:1034
+#: find/pred.c:1569 xargs/xargs.c:1031
 msgid "cannot fork"
 msgstr "fork 失敗"
 
-#: find/pred.c:1607
+#: find/pred.c:1609
 #, c-format
 msgid "error waiting for %s"
 msgstr "等待 %s 時出現錯誤"
 
-#: find/pred.c:1615
+#: find/pred.c:1617
 #, c-format
 msgid "%s terminated by signal %d"
 msgstr "%s 因訊號 %d 而終止"
@@ -574,7 +574,7 @@ msgstr ""
 "用法: %s [--version | --help]\n"
 "或     %s most_common_bigrams < 檔案清單 > locate資料庫\n"
 
-#: locate/code.c:131 locate/locate.c:1115 xargs/xargs.c:1232
+#: locate/code.c:131 locate/locate.c:1307 xargs/xargs.c:1229
 msgid ""
 "\n"
 "Report bugs to <bug-findutils@gnu.org>.\n"
@@ -587,31 +587,36 @@ msgstr ""
 msgid "GNU findutils version %s\n"
 msgstr "GNU findutils %s 版本\n"
 
-#: locate/locate.c:155
+#: locate/locate.c:160
 msgid "days"
 msgstr "日"
 
-#: locate/locate.c:524
+#: locate/locate.c:562
 #, c-format
 msgid "locate database `%s' is corrupt or invalid"
 msgstr "locate 資料庫 ‘%s’ 內容已損壞或無效"
 
-#: locate/locate.c:792
+#: locate/locate.c:840
 #, c-format
 msgid "Locate database size: %s bytes\n"
 msgstr "locate 資料庫大小：%s 位元組\n"
 
-#: locate/locate.c:796
-#, c-format
-msgid "Filenames: %s "
+#: locate/locate.c:845
+#, fuzzy, c-format
+msgid "Matching Filenames: %s "
+msgstr "檔案總數: %s，"
+
+#: locate/locate.c:846
+#, fuzzy, c-format
+msgid "All Filenames: %s "
 msgstr "檔案總數: %s，"
 
-#: locate/locate.c:799
+#: locate/locate.c:849
 #, c-format
 msgid "with a cumulative length of %s bytes"
 msgstr "總長度共 %s 位元組"
 
-#: locate/locate.c:803
+#: locate/locate.c:853
 #, c-format
 msgid ""
 "\n"
@@ -620,7 +625,7 @@ msgstr ""
 "\n"
 "\t其中 %s 個有空白字元，"
 
-#: locate/locate.c:806
+#: locate/locate.c:856
 #, c-format
 msgid ""
 "\n"
@@ -629,7 +634,7 @@ msgstr ""
 "\n"
 "\t%s 個有換行字元，"
 
-#: locate/locate.c:809
+#: locate/locate.c:859
 #, c-format
 msgid ""
 "\n"
@@ -638,31 +643,55 @@ msgstr ""
 "\n"
 "\t和 %s 個含有不是 7 bit 的字元。\n"
 
-#: locate/locate.c:814
+#: locate/locate.c:867
+#, c-format
+msgid ""
+"Some filenames may have been filtered out, so we cannot compute the "
+"compression ratio.\n"
+msgstr ""
+
+#: locate/locate.c:874
 #, c-format
 msgid "Compression ratio %4.2f%%\n"
 msgstr "壓縮比率 %4.2f%%\n"
 
-#: locate/locate.c:862
-msgid "warning: the locate database can only be read from stdin once."
-msgstr "警告：locate 資料庫只可以由標準輸入讀取一次。"
+#: locate/locate.c:881
+#, fuzzy, c-format
+msgid "Compression ratio is undefined\n"
+msgstr "壓縮比率 %4.2f%%\n"
 
-# e.g. database `%s' is more than 8 days old
-#: locate/locate.c:883
+#: locate/locate.c:938
 #, c-format
-msgid "warning: database `%s' is more than %d %s old"
-msgstr "警告：資料庫 ‘%s’ 是超過 %d %s前產生的"
+msgid ""
+"locate database `%s' looks like an slocate database but it seems to have "
+"security level %c, which GNU findutils does not currently support"
+msgstr ""
+
+#: locate/locate.c:1025
+#, c-format
+msgid ""
+"`%s' is an slocate database.  Support for these is new, expect problems for "
+"now (you are, after all, using the CVS code)."
+msgstr ""
 
-#: locate/locate.c:1060
+#: locate/locate.c:1053
+msgid ""
+"You specified the -E option, but that option cannot be used with slocate-"
+"format databases with a non-zero security level.  No results will be "
+"generated for this database.\n"
+msgstr ""
+
+#: locate/locate.c:1064
+#, c-format
+msgid "`%s' is an slocate database.  Turning on the '-e' option."
+msgstr ""
+
+#: locate/locate.c:1257
 #, c-format
 msgid "Database %s is in the %s format.\n"
 msgstr "資料庫 %s 使用了%s格式。\n"
 
-#: locate/locate.c:1062
-msgid "old"
-msgstr "舊的"
-
-#: locate/locate.c:1106
+#: locate/locate.c:1298
 #, c-format
 msgid ""
 "Usage: %s [-d path | --database=path] [-e | -E | --[non-]existing]\n"
@@ -683,42 +712,64 @@ msgstr ""
 "      [-version] [--help]\n"
 "      檔案名稱樣式...\n"
 
-#: locate/locate.c:1232
+#: locate/locate.c:1355
+msgid "failed to drop group privileges"
+msgstr ""
+
+#: locate/locate.c:1362
+msgid "failed to drop setuid privileges"
+msgstr ""
+
+#: locate/locate.c:1373
+msgid "Failed to drop privileges"
+msgstr ""
+
+#: locate/locate.c:1506
 #, c-format
 msgid "GNU locate version %s\n"
 msgstr "GNU locate %s 版本\n"
 
-#: locate/locate.c:1271
+#: locate/locate.c:1545
 msgid "argument to --limit"
 msgstr ""
 
-#: xargs/xargs.c:304
+#: locate/locate.c:1628
+msgid "warning: the locate database can only be read from stdin once."
+msgstr "警告：locate 資料庫只可以由標準輸入讀取一次。"
+
+# e.g. database `%s' is more than 8 days old
+#: locate/locate.c:1697
+#, c-format
+msgid "warning: database `%s' is more than %d %s old"
+msgstr "警告：資料庫 ‘%s’ 是超過 %d %s前產生的"
+
+#: xargs/xargs.c:301
 #, fuzzy, c-format
 msgid "Invalid escape sequence %s in input delimiter specification."
 msgstr "轉義控制序列 (escape sequence) ‘%s’ 不合法。"
 
-#: xargs/xargs.c:322
+#: xargs/xargs.c:319
 #, fuzzy, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lx."
 msgstr "轉義控制序列 (escape sequence) ‘%s’ 不合法：字元值不可以超過 %lx。"
 
-#: xargs/xargs.c:328
+#: xargs/xargs.c:325
 #, fuzzy, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; character "
 "values must not exceed %lo."
 msgstr "轉義控制序列 (escape sequence) ‘%s’ 不合法：字元值不可以超過 %lo。"
 
-#: xargs/xargs.c:337
+#: xargs/xargs.c:334
 #, fuzzy, c-format
 msgid ""
 "Invalid escape sequence %s in input delimiter specification; trailing "
 "characters %s not recognised."
 msgstr "轉義控制序列 (escape sequence) ‘%s’ 不合法：無法辨認最後的字元 ‘%s’。"
 
-#: xargs/xargs.c:382
+#: xargs/xargs.c:379
 #, fuzzy, c-format
 msgid ""
 "Invalid input delimiter specification %s: the delimiter must be either a "
@@ -727,46 +778,46 @@ msgstr ""
 "分隔字元 ‘%s’ 不合法：分隔字元必須是一個 ASCII 字元或以反斜號 \\ 開始的轉義控"
 "制序列 (escape sequence)。"
 
-#: xargs/xargs.c:399
+#: xargs/xargs.c:396
 msgid "environment is too large for exec"
 msgstr "執行 exec 時的環境變數太大"
 
-#: xargs/xargs.c:541
+#: xargs/xargs.c:538
 #, c-format
 msgid "warning: value %ld for -s option is too large, using %ld instead"
 msgstr ""
 
-#: xargs/xargs.c:580
+#: xargs/xargs.c:577
 #, c-format
 msgid "GNU xargs version %s\n"
 msgstr "GNU xargs %s 版本\n"
 
-#: xargs/xargs.c:610
+#: xargs/xargs.c:607
 #, c-format
 msgid "Cannot open input file `%s'"
 msgstr "無法開啟檔案 ‘%s’ 作為輸入資料"
 
-#: xargs/xargs.c:646
+#: xargs/xargs.c:643
 #, fuzzy, c-format
 msgid "Your environment variables take up %lu bytes\n"
 msgstr "環境變數總共用了 %ld 位元組\n"
 
-#: xargs/xargs.c:649
+#: xargs/xargs.c:646
 #, fuzzy, c-format
 msgid "POSIX lower and upper limits on argument length: %lu, %lu\n"
 msgstr "POSIX 標準中參數長度上下限為：%ld, %ld\n"
 
-#: xargs/xargs.c:653
+#: xargs/xargs.c:650
 #, c-format
 msgid "Maximum length of command we could actually use: %ld\n"
 msgstr "實際上可用的指令列長度上限：%ld\n"
 
-#: xargs/xargs.c:657
+#: xargs/xargs.c:654
 #, fuzzy, c-format
 msgid "Size of command buffer we are actually using: %lu\n"
 msgstr "實際上使用的指令列緩衝區大小：%ld\n"
 
-#: xargs/xargs.c:780 xargs/xargs.c:861
+#: xargs/xargs.c:777 xargs/xargs.c:858
 #, c-format
 msgid ""
 "unmatched %s quote; by default quotes are special to xargs unless you use "
@@ -775,53 +826,53 @@ msgstr ""
 "%s引號不配合；除非使用 -0 選項，否則在預設模式下引號對於 xargs 來說是有特別意"
 "義的"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "double"
 msgstr "雙"
 
-#: xargs/xargs.c:781 xargs/xargs.c:862
+#: xargs/xargs.c:778 xargs/xargs.c:859
 msgid "single"
 msgstr "單"
 
-#: xargs/xargs.c:879 xargs/xargs.c:936
+#: xargs/xargs.c:876 xargs/xargs.c:933
 msgid "argument line too long"
 msgstr "參數太長"
 
-#: xargs/xargs.c:1109
+#: xargs/xargs.c:1106
 msgid "error waiting for child process"
 msgstr "等待子進程時出現錯誤"
 
-#: xargs/xargs.c:1125
+#: xargs/xargs.c:1122
 #, c-format
 msgid "%s: exited with status 255; aborting"
 msgstr "%s: 回傳碼為 255；中止"
 
-#: xargs/xargs.c:1127
+#: xargs/xargs.c:1124
 #, c-format
 msgid "%s: stopped by signal %d"
 msgstr "%s: 因訊號 %d 而停止"
 
-#: xargs/xargs.c:1129
+#: xargs/xargs.c:1126
 #, c-format
 msgid "%s: terminated by signal %d"
 msgstr "%s: 因訊號 %d 而中止"
 
-#: xargs/xargs.c:1182
+#: xargs/xargs.c:1179
 #, c-format
 msgid "%s: invalid number for -%c option\n"
 msgstr "%s: -%c 選項後的數值無效\n"
 
-#: xargs/xargs.c:1189
+#: xargs/xargs.c:1186
 #, c-format
 msgid "%s: value for -%c option should be >= %ld\n"
 msgstr "%s: -%c 選項後的數值必須不小於 %ld\n"
 
-#: xargs/xargs.c:1203
+#: xargs/xargs.c:1200
 #, c-format
 msgid "%s: value for -%c option should be < %ld\n"
 msgstr "%s: -%c 選項後的數值必須小於 %ld\n"
 
-#: xargs/xargs.c:1221
+#: xargs/xargs.c:1218
 #, c-format
 msgid ""
 "Usage: %s [-0prtx] [--interactive] [--null] [-d|--delimiter=delim]\n"
@@ -843,3 +894,6 @@ msgstr ""
 "       [-P max-procs]  [--max-procs=max-procs]\n"
 "       [--verbose] [--exit] [--no-run-if-empty] [--arg-file=file]\n"
 "       [--version] [--help] [指令 [指令的參數]]\n"
+
+#~ msgid "old"
+#~ msgstr "舊的"