summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog94
-rw-r--r--elf/dl-deps.c2
-rw-r--r--elf/ldconfig.c8
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in9
-rw-r--r--libio/vswprintf.c2
-rw-r--r--locale/programs/charmap.c2
-rw-r--r--locale/programs/ld-collate.c4
-rw-r--r--locale/programs/repertoire.c2
-rwxr-xr-xmalloc/memusage.sh2
-rw-r--r--malloc/memusagestat.c4
-rw-r--r--manual/argp.texi2
-rw-r--r--manual/charset.texi6
-rw-r--r--manual/errno.texi4
-rw-r--r--manual/filesys.texi10
-rw-r--r--manual/lang.texi2
-rw-r--r--manual/maint.texi2
-rw-r--r--manual/memory.texi8
-rw-r--r--manual/message.texi4
-rw-r--r--manual/resource.texi10
-rw-r--r--manual/search.texi6
-rw-r--r--manual/signal.texi2
-rw-r--r--manual/startup.texi2
-rw-r--r--manual/stdio.texi4
-rw-r--r--manual/sysinfo.texi2
-rw-r--r--manual/syslog.texi2
-rw-r--r--manual/time.texi8
-rw-r--r--nis/nis_print_group_entry.c2
-rw-r--r--nscd/cache.c2
-rw-r--r--nss/nss_files/files-alias.c6
-rw-r--r--nss/nss_files/files-hosts.c34
-rw-r--r--po/nl.po8515
-rw-r--r--sunrpc/auth_unix.c2
-rw-r--r--sunrpc/rpc_main.c2
-rw-r--r--sysdeps/x86_64/fpu/s_copysign.S5
-rw-r--r--sysdeps/x86_64/fpu/s_copysignf.S3
-rw-r--r--time/tzfile.c114
-rw-r--r--timezone/africa73
-rw-r--r--timezone/antarctica32
-rw-r--r--timezone/asia315
-rw-r--r--timezone/australasia52
-rw-r--r--timezone/backward3
-rw-r--r--timezone/checktab.awk2
-rw-r--r--timezone/europe254
-rw-r--r--timezone/ialloc.c7
-rw-r--r--timezone/iso3166.tab12
-rw-r--r--timezone/northamerica614
-rw-r--r--timezone/private.h83
-rw-r--r--timezone/scheck.c7
-rw-r--r--timezone/southamerica193
-rw-r--r--timezone/tzfile.h23
-rw-r--r--timezone/tzselect.ksh2
-rw-r--r--timezone/zdump.c37
-rw-r--r--timezone/zic.c709
-rw-r--r--timezone/zone.tab43
55 files changed, 6482 insertions, 4871 deletions
diff --git a/ChangeLog b/ChangeLog
index 791b786cb0..966a3581df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,99 @@
+2006-11-19  Ulrich Drepper  <drepper@redhat.com>
+
+	* nss/nss_files/files-hosts.c (LINE_PARSER): Support IPv6-style
+	addresses for IPv4 queries if they can be mapped.
+
+2006-11-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/x86_64/fpu/s_copysignf.S (__copysignf): Switch to .text.
+	* sysdeps/x86_64/fpu/s_copysign.S (__copysign): Likewise.
+	(signmask): Add .size directive.
+	(othermask): Add .type directive.
+
+2006-11-14  Ulrich Drepper  <drepper@redhat.com>
+
+	* po/nl.po: Update from translation team.
+
+	* timezone/zdump.c: Redo fix for BZ #3137.
+2006-11-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* nss/nss_files/files-alias.c (get_next_alias): Set line back
+	to first_unused after parsing :include: file.
+
 2006-11-10  Ulrich Drepper  <drepper@redhat.com>
 
+	* timezone/africa: Update from tzdata2006o.
+	* timezone/antarctica: Likewise.
+	* timezone/asia: Likewise.
+	* timezone/australasia: Likewise.
+	* timezone/backward: Likewise.
+	* timezone/europe: Likewise.
+	* timezone/iso3166.tab: Likewise.
+	* timezone/northamerica: Likewise.
+	* timezone/southamerica: Likewise.
+	* timezone/zone.tab: Likewise.
+
+	* time/tzfile.c (__tzfile_read): Extend to handle new file format
+	on machines with 64-bit time_t.
+
+	* timezone/checktab.awk: Update from tzcode2006o.
+	* timezone/ialloc.c: Likewise.
+	* timezone/private.h: Likewise.
+	* timezone/scheck.c: Likewise.
+	* timezone/tzfile.h: Likewise.
+	* timezone/tzselect.ksh: Likewise.
+	* timezone/zdump.c: Likewise.
+	* timezone/zic.c: Likewise.
+
+	[BZ #3483]
+	* elf/ldconfig.c (main): Call setlocale and textdomain.
+	Patch mostly by Benno Schulenberg <bensberg@justemail.net>.
+
+	[BZ #3480]
+	* manual/argp.texi: Fix typos.
+	* manual/charset.texi: Likewise.
+	* manual/errno.texi: Likewise.
+	* manual/filesys.texi: Likewise.
+	* manual/lang.texi: Likewise.
+	* manual/maint.texi: Likewise.
+	* manual/memory.texi: Likewise.
+	* manual/message.texi: Likewise.
+	* manual/resource.texi: Likewise.
+	* manual/search.texi: Likewise.
+	* manual/signal.texi: Likewise.
+	* manual/startup.texi: Likewise.
+	* manual/stdio.texi: Likewise.
+	* manual/sysinfo.texi: Likewise.
+	* manual/syslog.texi: Likewise.
+	* manual/time.texi: Likewise.
+	Patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.
+
+	[BZ #3465]
+	* sunrpc/clnt_raw.c: Minimal message improvements.
+	* sunrpc/pm_getmaps.c: Likewise.
+	* nis/nss_nisplus/nisplus-publickey.c: Likewise.
+	* nis/nis_print_group_entry.c: Likewise.
+	* locale/programs/repertoire.c: Likewise.
+	* locale/programs/charmap.c: Likewise.
+	* malloc/memusage.sh: Likewise.
+	* elf/dl-deps.c: Likewise.
+	* locale/programs/ld-collate.c: Likewise.
+	* libio/vswprintf.c: Likewise.
+	* malloc/memusagestat.c: Likewise.
+	* sunrpc/auth_unix.c: Likewise.
+	* sunrpc/rpc_main.c: Likewise.
+	* nscd/cache.c: Likewise.
+	* locale/programs/repertoire.c: Unify output messages.
+	* locale/programs/charmap.c: Likewise.
+	* locale/programs/ld-ctype.c: Likewise.
+	* locale/programs/ld-monetary.c: Likewise.
+	* locale/programs/ld-numeric.c: Likewise.
+	* locale/programs/ld-time.c: Likewise.
+	* elf/ldconfig.c: Likewise.
+	* nscd/selinux.c: Likewise.
+	* elf/cache.c: Likewise.
+	Patch mostly by Benno Schulenberg <bensberg@justemail.net>.
+
 	[BZ #3451]
 	* sysdeps/i386/fpu/bits/mathinline.h (floor): Make rounding mode
 	change atomic.
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index c35cc977fa..4ec984e15b 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -123,7 +123,7 @@ DST not allowed in SUID/SGID programs"));				      \
 	       processed.  */						      \
 	    if (fatal)							      \
 	      _dl_signal_error (0, __str, NULL, N_("\
-empty dynamics string token substitution"));				      \
+empty dynamic string token substitution"));				      \
 	    else							      \
 	      {								      \
 		/* This is for DT_AUXILIARY.  */			      \
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 3f6aabbc26..45a622288e 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <libintl.h>
+#include <locale.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdio_ext.h>
@@ -1175,11 +1176,16 @@ set_hwcap (void)
 int
 main (int argc, char **argv)
 {
-  int remaining;
+  /* Set locale via LC_ALL.  */
+  setlocale (LC_ALL, "");
+
+  /* Set the text message domain.  */
+  textdomain (_libc_intl_domainname);
 
   arch_startup (argc, argv);
 
   /* Parse and process arguments.  */
+  int remaining;
   argp_parse (&argp, argc, argv, 0, &remaining, NULL);
 
   /* Remaining arguments are additional directories if opt_manual_link
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 22d6a26f35..2896206bcb 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
 glibc-base := HEAD
 DIST_BRANCH := devel
 COLLECTION := dist-fc4
-fedora-sync-date := 2006-11-10 20:49 UTC
-fedora-sync-tag := fedora-glibc-20061110T2049
+fedora-sync-date := 2006-11-20 10:00 UTC
+fedora-sync-tag := fedora-glibc-20061120T1000
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 0b99a9e00e..bd8a7c3120 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 6
+%define glibcrelease 7
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1529,6 +1529,13 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Nov 20 2006 Jakub Jelinek <jakub@redhat.com> 2.5.90-7
+- handle IPv6 addresses in /etc/hosts that are mappable to
+  IPv4 addresses in IPv4 host lookups (#215283)
+- fix :include: /etc/alias handling (#215572)
+- handle new tzdata format to cope with year > 2037 transitions
+  on 64-bit architectures
+
 * Fri Nov 10 2006 Jakub Jelinek <jakub@redhat.com> 2.5.90-6
 - fix strxfrm fix
 - fix i?86 floor and ceil inlines (BZ#3451)
diff --git a/libio/vswprintf.c b/libio/vswprintf.c
index 5bbd20227b..e9a316a01c 100644
--- a/libio/vswprintf.c
+++ b/libio/vswprintf.c
@@ -119,7 +119,7 @@ _IO_vswprintf (string, maxlen, format, args)
 
   if (sf.f._sbf._f._wide_data->_IO_buf_base == sf.overflow_buf)
     /* ISO C99 requires swprintf/vswprintf to return an error if the
-       output does not fit int he provided buffer.  */
+       output does not fit in the provided buffer.  */
     return -1;
 
   /* Terminate the string.  */
diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index 592d29e916..dbc1101fd0 100644
--- a/locale/programs/charmap.c
+++ b/locale/programs/charmap.c
@@ -1025,7 +1025,7 @@ hexadecimal range format should use only capital characters"));
 
   if (from_nr > to_nr)
     {
-      lr_error (lr, _("upper limit in range is not higher then lower limit"));
+      lr_error (lr, _("upper limit in range is smaller than lower limit"));
       return;
     }
 
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index cf1bff130f..af47279958 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -1146,7 +1146,7 @@ handle_ellipsis (struct linereader *ldfile, const char *symstr, size_t symlen,
 	    {
 	      if (ret > 0)
 		lr_error (ldfile, _("%s: byte sequence of first character of \
-sequence is not lower than that of the last character"), "LC_COLLATE");
+range is not lower than that of the last character"), "LC_COLLATE");
 	      return;
 	    }
 
@@ -1164,7 +1164,7 @@ sequence is not lower than that of the last character"), "LC_COLLATE");
 		  struct element_t *elem;
 		  size_t namelen;
 
-		  /* I don't this this can ever happen.  */
+		  /* I don't think this can ever happen.  */
 		  assert (seq->name != NULL);
 		  namelen = strlen (seq->name);
 
diff --git a/locale/programs/repertoire.c b/locale/programs/repertoire.c
index c96cf0425a..b6c0a6ad58 100644
--- a/locale/programs/repertoire.c
+++ b/locale/programs/repertoire.c
@@ -453,7 +453,7 @@ hexadecimal range format should use only capital characters"));
 
   if (from_nr > to_nr)
     {
-      lr_error (lr, _("upper limit in range is not smaller then lower limit"));
+      lr_error (lr, _("upper limit in range is smaller than lower limit"));
       return;
     }
 
diff --git a/malloc/memusage.sh b/malloc/memusage.sh
index ecc935d037..ad833523f2 100755
--- a/malloc/memusage.sh
+++ b/malloc/memusage.sh
@@ -44,7 +44,7 @@ Profile memory usage of PROGRAM.
    -d,--data=FILE         Generate binary data file and store it in FILE
    -u,--unbuffered        Don't buffer output
    -b,--buffer=SIZE       Collect SIZE entries before writing them out
-      --no-timer          Don't collect additional information though timer
+      --no-timer          Don't collect additional information through timer
    -m,--mmap              Also trace mmap & friends
 
    -?,--help              Print this help and exit
diff --git a/malloc/memusagestat.c b/malloc/memusagestat.c
index 5d35ee0236..d8fc71b729 100644
--- a/malloc/memusagestat.c
+++ b/malloc/memusagestat.c
@@ -55,8 +55,8 @@ static const struct argp_option options[] =
   { "time", 't', NULL, 0, N_("Generate output linear to time (default is linear to number of function calls)") },
   { "total", 'T', NULL, 0,
     N_("Also draw graph for total memory consumption") },
-  { "x-size", 'x', "VALUE", 0, N_("make output graphic VALUE pixel wide") },
-  { "y-size", 'y', "VALUE", 0, N_("make output graphic VALUE pixel high") },
+  { "x-size", 'x', "VALUE", 0, N_("Make output graphic VALUE pixels wide") },
+  { "y-size", 'y', "VALUE", 0, N_("Make output graphic VALUE pixels high") },
   { NULL, 0, NULL, 0, NULL }
 };
 
diff --git a/manual/argp.texi b/manual/argp.texi
index 090d49f7a5..b37232306b 100644
--- a/manual/argp.texi
+++ b/manual/argp.texi
@@ -832,7 +832,7 @@ Don't exit on errors, although they may still result in error messages.
 @item ARGP_LONG_ONLY
 Use the gnu getopt `long-only' rules for parsing arguments.  This allows
 long-options to be recognized with only a single @samp{-}
-(i.e.  @samp{-help}).  This results in a less useful interface, and its
+(i.e., @samp{-help}).  This results in a less useful interface, and its
 use is discouraged as it conflicts with the way most GNU programs work
 as well as the GNU coding standards.
 
diff --git a/manual/charset.texi b/manual/charset.texi
index 5063246d61..8b2c09ca79 100644
--- a/manual/charset.texi
+++ b/manual/charset.texi
@@ -207,7 +207,7 @@ and transmittal.  Because each single wide character consists of more
 than one byte, they are effected by byte-ordering.  Thus, machines with
 different endianesses would see different values when accessing the same
 data.  This byte ordering concern also applies for communication protocols
-that are all byte-based and, thereforet require that the sender has to
+that are all byte-based and therefore require that the sender has to
 decide about splitting the wide character in bytes.  A last (but not least
 important) point is that wide characters often require more storage space
 than a customized byte-oriented character set.
@@ -737,7 +737,7 @@ the return value is @math{0}.  If the next @var{n} bytes form a valid
 multibyte character, the number of bytes belonging to this multibyte
 character byte sequence is returned.
 
-If the the first @var{n} bytes possibly form a valid multibyte
+If the first @var{n} bytes possibly form a valid multibyte
 character but the character is incomplete, the return value is
 @code{(size_t) -2}.  Otherwise the multibyte character sequence is invalid
 and the return value is @code{(size_t) -1}.
@@ -2231,7 +2231,7 @@ ordering of the processor (or at least the running process) is not the
 same as the one required for UCS-4.  This is done for performance reasons
 as one does not want to perform unnecessary byte-swapping operations if
 one is not interested in actually seeing the result in UCS-4.  To avoid
-trouble with endianess, the internal representation consistently is named
+trouble with endianness, the internal representation consistently is named
 @code{INTERNAL} even on big-endian systems where the representations are
 identical.
 
diff --git a/manual/errno.texi b/manual/errno.texi
index e230506427..dd9f861dc8 100644
--- a/manual/errno.texi
+++ b/manual/errno.texi
@@ -1434,7 +1434,7 @@ like those given to the @code{printf} family of functions.  The
 arguments required for the format can follow the @var{format} parameter.
 Just like @code{perror}, @code{error} also can report an error code in
 textual form.  But unlike @code{perror} the error value is explicitly
-passed to the function in the @var{errnum} parameter.  This elimintates
+passed to the function in the @var{errnum} parameter.  This eliminates
 the problem mentioned above that the error reporting function must be
 called immediately after the function causing the error since otherwise
 @code{errno} might have a different value.
@@ -1479,7 +1479,7 @@ in an input file (like a programming language source code file etc).
 
 If the global variable @code{error_one_per_line} is set to a non-zero
 value @code{error_at_line} will avoid printing consecutive messages for
-the same file anem line.  Repetition which are not directly following
+the same file and line.  Repetition which are not directly following
 each other are not caught.
 
 Just like @code{error} this function only returned if @var{status} is
diff --git a/manual/filesys.texi b/manual/filesys.texi
index 2436f22e88..9719d41946 100644
--- a/manual/filesys.texi
+++ b/manual/filesys.texi
@@ -131,7 +131,7 @@ this function is deprecated.
 @comment GNU
 @deftypefun {char *} get_current_dir_name (void)
 @vindex PWD
-This @code{get_current_dir_name} function is bascially equivalent to
+This @code{get_current_dir_name} function is basically equivalent to
 @w{@code{getcwd (NULL, 0)}}.  The only difference is that the value of
 the @code{PWD} variable is returned if this value is correct.  This is a
 subtle difference which is visible if the path described by the
@@ -917,7 +917,7 @@ function returns a value other than @math{0} this value is returned as
 the return value of @code{ftw}.
 
 When the sources are compiled with @code{_FILE_OFFSET_BITS == 64} on a
-32-bit system this function is in fact @code{ftw64}, i.e. the LFS
+32-bit system this function is in fact @code{ftw64}, i.e., the LFS
 interface transparently replaces the old interface.
 @end deftypefun
 
@@ -990,7 +990,7 @@ accordingly.  If the return value of a callback invocation was non-zero
 then that value is returned.
 
 When the sources are compiled with @code{_FILE_OFFSET_BITS == 64} on a
-32-bit system this function is in fact @code{nftw64}, i.e. the LFS
+32-bit system this function is in fact @code{nftw64}, i.e., the LFS
 interface transparently replaces the old interface.
 @end deftypefun
 
@@ -1434,7 +1434,7 @@ the existing directory named @var{newname} is deleted first.  The name
 
 One useful feature of @code{rename} is that the meaning of @var{newname}
 changes ``atomically'' from any previously existing file by that name to
-its new meaning (i.e. the file that was called @var{oldname}).  There is
+its new meaning (i.e., the file that was called @var{oldname}).  There is
 no instant at which @var{newname} is non-existent ``in between'' the old
 meaning and the new meaning.  If there is a system crash during the
 operation, it is possible for both names to still exist; but
@@ -3104,7 +3104,7 @@ terminates abnormally).
 This function is reentrant.
 
 When the sources are compiled with @code{_FILE_OFFSET_BITS == 64} on a
-32-bit system this function is in fact @code{tmpfile64}, i.e. the LFS
+32-bit system this function is in fact @code{tmpfile64}, i.e., the LFS
 interface transparently replaces the old interface.
 @end deftypefun
 
diff --git a/manual/lang.texi b/manual/lang.texi
index 96f6d9df55..82c5e962a0 100644
--- a/manual/lang.texi
+++ b/manual/lang.texi
@@ -1274,7 +1274,7 @@ type of a particular structure member.
 @comment ISO
 @deftypefn {Macro} size_t offsetof (@var{type}, @var{member})
 This expands to a integer constant expression that is the offset of the
-structure member named @var{member} in a the structure type @var{type}.
+structure member named @var{member} in the structure type @var{type}.
 For example, @code{offsetof (struct s, elem)} is the offset, in bytes,
 of the member @code{elem} in a @code{struct s}.
 
diff --git a/manual/maint.texi b/manual/maint.texi
index 2b9221233a..567db981a3 100644
--- a/manual/maint.texi
+++ b/manual/maint.texi
@@ -156,7 +156,7 @@ subdirectories under it intended to be new specific categories.
 to look for a system-dependent version of a file that's not in
 @file{generic}.  This means that any system-dependent source file must
 have an analogue in @file{generic}, even if the routines defined by that
-file are not implemented on other platforms.  Second. the @file{generic}
+file are not implemented on other platforms.  Second, the @file{generic}
 version of a system-dependent file is used if the makefiles do not find
 a version specific to the system you're compiling for.
 
diff --git a/manual/memory.texi b/manual/memory.texi
index 91b9d84eb2..cbe147b712 100644
--- a/manual/memory.texi
+++ b/manual/memory.texi
@@ -31,7 +31,7 @@ One of the most basic resources a process has available to it is memory.
 There are a lot of different ways systems organize memory, but in a
 typical one, each process has one linear virtual address space, with
 addresses running from zero to some huge maximum.  It need not be
-contiguous; i.e.  not all of these addresses actually can be used to
+contiguous; i.e., not all of these addresses actually can be used to
 store data.
 
 The virtual memory is divided into pages (4 kilobytes is typical).
@@ -1065,7 +1065,7 @@ This is the total size of memory occupied by free (not in use) chunks.
 
 @item int keepcost
 This is the size of the top-most releasable chunk that normally
-borders the end of the heap (i.e. the high end of the virtual address
+borders the end of the heap (i.e., the high end of the virtual address
 space's data segment).
 
 @end table
@@ -2407,7 +2407,7 @@ of the data segment is.
 @cindex paging
 
 You can tell the system to associate a particular virtual memory page
-with a real page frame and keep it that way --- i.e. cause the page to
+with a real page frame and keep it that way --- i.e., cause the page to
 be paged in if it isn't already and mark it so it will never be paged
 out and consequently will never cause a page fault.  This is called
 @dfn{locking} a page.
@@ -2467,7 +2467,7 @@ A memory lock is associated with a virtual page, not a real frame.  The
 paging rule is: If a frame backs at least one locked page, don't page it
 out.
 
-Memory locks do not stack.  I.e. you can't lock a particular page twice
+Memory locks do not stack.  I.e., you can't lock a particular page twice
 so that it has to be unlocked twice before it is truly unlocked.  It is
 either locked or it isn't.
 
diff --git a/manual/message.texi b/manual/message.texi
index 1507a6d04a..e772b2de1f 100644
--- a/manual/message.texi
+++ b/manual/message.texi
@@ -1810,8 +1810,8 @@ help to understand the input better.
 
 Other programs help to manage development cycle when new messages appear
 in the source files or when a new translation of the messages appear.
-here it should only be noted that using all the tools in GNU gettext it
-is possible to @emph{completely} automize the handling of message
+Here it should only be noted that using all the tools in GNU gettext it
+is possible to @emph{completely} automate the handling of message
 catalog.  Beside marking the translatable string in the source code and
 generating the translations the developers do not have anything to do
 themselves.
diff --git a/manual/resource.texi b/manual/resource.texi
index df77408e68..aabd28976a 100644
--- a/manual/resource.texi
+++ b/manual/resource.texi
@@ -584,7 +584,7 @@ to}, but doesn't @emph{need to} run occupies the CPU.
 @cindex preemptive scheduling
 When two processes are in contention to use the CPU at any instant, the
 one with the higher absolute priority always gets it.  This is true even if the
-process with the lower priority is already using the CPU (i.e. the
+process with the lower priority is already using the CPU (i.e., the
 scheduling is preemptive).  Of course, we're only talking about
 processes that are running or ``ready to run,'' which means they are
 ready to execute instructions right now.  When a process blocks to wait
@@ -819,7 +819,7 @@ existing policy is not @code{SCHED_OTHER}.
 
 @item
 The calling process does not have @code{CAP_SYS_NICE} permission and its
-owner is not the target process' owner.  I.e.  the effective uid of the
+owner is not the target process' owner.  I.e., the effective uid of the
 calling process is neither the effective nor the real uid of process
 @var{pid}.
 @c We need a cross reference to the capabilities section, when written.
@@ -1185,7 +1185,7 @@ The value of @var{class} is not valid.
 
 @item EPERM
 The call would set the nice value of a process which is owned by a different
-user than the calling process (i.e. the target process' real or effective
+user than the calling process (i.e., the target process' real or effective
 uid does not match the calling process' effective uid) and the calling
 process does not have @code{CAP_SYS_NICE} permission.
 
@@ -1215,7 +1215,7 @@ a process group ID (pgid).
 @comment sys/resource.h
 @comment BSD
 @item PRIO_USER
-All the processes owned by a particular user (i.e. whose real uid
+All the processes owned by a particular user (i.e., whose real uid
 indicates the user).  The argument @var{id} is a user ID (uid).
 @end vtable
 
@@ -1272,7 +1272,7 @@ other process or thread is allowed to use.
 @item
 The access to certain resources (RAM, I/O ports) has different costs
 from different CPUs.  This is the case in NUMA (Non-Uniform Memory
-Architecture) machines.  Preferrably memory should be accessed locally
+Architecture) machines.  Preferably memory should be accessed locally
 but this requirement is usually not visible to the scheduler.
 Therefore forcing a process or thread to the CPUs which have local
 access to the mostly used memory helps to significantly boost the
diff --git a/manual/search.texi b/manual/search.texi
index b98fca9b35..0afd0aecd0 100644
--- a/manual/search.texi
+++ b/manual/search.texi
@@ -368,9 +368,9 @@ necessary for the @code{struct hsearch_data} object can be allocated
 dynamically.  It must be initialized with zero before calling this
 function.
 
-The return value is non-zero if the operation were successful.  if the
-return value is zero something went wrong which probably means the
-programs runs out of memory.
+The return value is non-zero if the operation was successful.  If the
+return value is zero, something went wrong, which probably means the
+programs ran out of memory.
 @end deftypefun
 
 @comment search.h
diff --git a/manual/signal.texi b/manual/signal.texi
index cbf746639a..dfaaa88950 100644
--- a/manual/signal.texi
+++ b/manual/signal.texi
@@ -2567,7 +2567,7 @@ The prototype for the @code{sigprocmask} function is in @file{signal.h}.
 Note that you must not use @code{sigprocmask} in multi-threaded processes,
 because each thread has its own signal mask and there is no single process
 signal mask. According to POSIX, the behavior of @code{sigprocmask} in a
-multi-threaded process is ``unspeficied''.
+multi-threaded process is ``unspecified''.
 Instead, use @code{pthread_sigmask}.
 @ifset linuxthreads
 @xref{Threads and Signal Handling}.
diff --git a/manual/startup.texi b/manual/startup.texi
index 5ccb78b958..79c79683f7 100644
--- a/manual/startup.texi
+++ b/manual/startup.texi
@@ -830,7 +830,7 @@ mean that there was difficulty in opening the files.
 Don't confuse a program's exit status with a process' termination status.
 There are lots of ways a process can terminate besides having it's program
 finish.  In the event that the process termination @emph{is} caused by program
-termination (i.e. @code{exit}), though, the program's exit status becomes
+termination (i.e., @code{exit}), though, the program's exit status becomes
 part of the process' termination status.
 
 @node Cleanups on Exit
diff --git a/manual/stdio.texi b/manual/stdio.texi
index 977989d95e..30a6e6ebe0 100644
--- a/manual/stdio.texi
+++ b/manual/stdio.texi
@@ -433,7 +433,7 @@ see @ref{Stream Buffering}.
 @cindex multi-threaded application
 Streams can be used in multi-threaded applications in the same way they
 are used in single-threaded applications.  But the programmer must be
-aware of a the possible complications.  It is important to know about
+aware of the possible complications.  It is important to know about
 these also if the program one writes never use threads since the design
 and implementation of many stream functions is heavily influenced by the
 requirements added by multi-threaded programming.
@@ -1992,7 +1992,7 @@ the precision.  The exponent always contains at least two digits.  The
 The @samp{%g} and @samp{%G} conversions print the argument in the style
 of @samp{%e} or @samp{%E} (respectively) if the exponent would be less
 than -4 or greater than or equal to the precision; otherwise they use
-the @samp{%f} style.  A precision of @code{0}, is taken as 1. is
+the @samp{%f} style.  A precision of @code{0}, is taken as 1.
 Trailing zeros are removed from the fractional portion of the result and
 a decimal-point character appears only if it is followed by a digit.
 
diff --git a/manual/sysinfo.texi b/manual/sysinfo.texi
index 0a44830359..8f2dd451be 100644
--- a/manual/sysinfo.texi
+++ b/manual/sysinfo.texi
@@ -872,7 +872,7 @@ shall be accessible while the filesystem is mounted.
 
 @item MS_SYNCHRONOUS
 This bit on specifies that all writes to the filesystem while it is
-mounted shall be synchronous; i.e. data shall be synced before each
+mounted shall be synchronous; i.e., data shall be synced before each
 write completes rather than held in the buffer cache.
 
 @item MS_MANDLOCK
diff --git a/manual/syslog.texi b/manual/syslog.texi
index df4179e27a..3d7def83f7 100644
--- a/manual/syslog.texi
+++ b/manual/syslog.texi
@@ -370,7 +370,7 @@ The message is only for debugging purposes.
 
 Results are undefined if the priority code is anything else.
 
-If the process does not presently have a Syslog connection open (i.e.
+If the process does not presently have a Syslog connection open (i.e.,
 it did not call @code{openlog}), @code{syslog} implicitly opens the
 connection the same as @code{openlog} would, with the following defaults
 for information that would otherwise be included in an @code{openlog}
diff --git a/manual/time.texi b/manual/time.texi
index 9b87d3eed0..a3e8438bce 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -193,7 +193,7 @@ total amount of time a process has actively used a CPU since some
 arbitrary event.  On the GNU system, that event is the creation of the
 process.  While arbitrary in general, the event is always the same event
 for any particular process, so you can always measure how much time on
-the CPU a particular computation takes by examinining the process' CPU
+the CPU a particular computation takes by examining the process' CPU
 time before and after the computation.
 @cindex CPU time
 @cindex clock ticks
@@ -447,7 +447,7 @@ current calendar time is not available, the value
 @comment time.h
 @comment SVID, XPG
 @deftypefun int stime (time_t *@var{newtime})
-@code{stime} sets the system clock, i.e.  it tells the system that the
+@code{stime} sets the system clock, i.e., it tells the system that the
 current calendar time is @var{newtime}, where @code{newtime} is
 interpreted as described in the above definition of @code{time_t}.
 
@@ -1470,7 +1470,7 @@ widely available.
 @node Low-Level Time String Parsing
 @subsubsection Interpret string according to given format
 
-he first function is rather low-level.  It is nevertheless frequently
+The first function is rather low-level.  It is nevertheless frequently
 used in software since it is better known.  Its interface and
 implementation are heavily influenced by the @code{getdate} function,
 which is defined and implemented in terms of calls to @code{strptime}.
@@ -1790,7 +1790,7 @@ process.  If the input string contains more characters than required by
 the format string the return value points right after the last consumed
 input character.  If the whole input string is consumed the return value
 points to the @code{NULL} byte at the end of the string.  If an error
-occurs, i.e. @code{strptime} fails to match all of the format string,
+occurs, i.e., @code{strptime} fails to match all of the format string,
 the function returns @code{NULL}.
 @end deftypefun
 
diff --git a/nis/nis_print_group_entry.c b/nis/nis_print_group_entry.c
index 91e6399b90..11680ae7dc 100644
--- a/nis/nis_print_group_entry.c
+++ b/nis/nis_print_group_entry.c
@@ -162,7 +162,7 @@ nis_print_group_entry (const_nis_name group)
 	fputs (_("    No implicit nonmembers\n"), stdout);
       if (nomem_rec_cnt)
 	{
-	  fputs (_("    Explicit nonmembers:\n"), stdout);
+	  fputs (_("    Recursive nonmembers:\n"), stdout);
 	  for (i = 0; i < nomem_rec_cnt; ++i)
 	    printf ("\t%s=n", &nomem_rec[i][2]);
 	}
diff --git a/nscd/cache.c b/nscd/cache.c
index be9be2aa4f..ef986f374a 100644
--- a/nscd/cache.c
+++ b/nscd/cache.c
@@ -125,7 +125,7 @@ cache_add (int type, const void *key, size_t len, struct datahead *packet,
 
       dbg_log (_("add new entry \"%s\" of type %s for %s to cache%s"),
 	       str, serv2str[type], dbnames[table - dbs],
-	       first ? " (first)" : "");
+	       first ? _(" (first)") : "");
     }
 
   unsigned long int hash = __nis_hash (key, len) % table->head->module;
diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c
index 8ee54f121f..c4717e1242 100644
--- a/nss/nss_files/files-alias.c
+++ b/nss/nss_files/files-alias.c
@@ -1,5 +1,5 @@
 /* Mail alias file parser in nss_files module.
-   Copyright (C) 1996,97,98,99,2002 Free Software Foundation, Inc.
+   Copyright (C) 1996,97,98,99,2002,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -298,8 +298,8 @@ get_next_alias (const char *match, struct aliasent *result,
 			  first_unused[room_left - 1] = '\0';
 			  strncpy (first_unused, old_line, room_left);
 
-			  if (old_line != NULL)
-			    free (old_line);
+			  free (old_line);
+			  line = first_unused;
 
 			  if (first_unused[room_left - 1] != '\0')
 			    goto no_more_room;
diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c
index 8d1a8ee588..6daafdeeed 100644
--- a/nss/nss_files/files-hosts.c
+++ b/nss/nss_files/files-hosts.c
@@ -1,5 +1,5 @@
 /* Hosts file parser in nss_files module.
-   Copyright (C) 1996-2001, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1996-2001, 2003, 2004, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -55,14 +55,30 @@ LINE_PARSER
    STRING_FIELD (addr, isspace, 1);
 
    /* Parse address.  */
-   if (inet_pton (af, addr, entdata->host_addr) <= 0
-       && (af != AF_INET6 || (flags & AI_V4MAPPED) == 0
-	   || inet_pton (AF_INET, addr, entdata->host_addr) <= 0
-	   || (map_v4v6_address ((char *) entdata->host_addr,
-				 (char *) entdata->host_addr),
-	       0)))
-     /* Illegal address: ignore line.  */
-     return 0;
+   if (inet_pton (af, addr, entdata->host_addr) <= 0)
+     {
+       if (af == AF_INET6 && (flags & AI_V4MAPPED) != 0
+	   && inet_pton (AF_INET, addr, entdata->host_addr) > 0)
+	 map_v4v6_address ((char *) entdata->host_addr,
+			   (char *) entdata->host_addr);
+       else if (af == AF_INET
+		&& inet_pton (AF_INET6, addr, entdata->host_addr) > 0)
+	 {
+	   if (IN6_IS_ADDR_V4MAPPED (entdata->host_addr))
+	     memcpy (entdata->host_addr, entdata->host_addr + 12, INADDRSZ);
+	   else if (IN6_IS_ADDR_LOOPBACK (entdata->host_addr))
+	     {
+	       in_addr_t localhost = htonl (INADDR_LOOPBACK);
+	       memcpy (entdata->host_addr, &localhost, sizeof (localhost));
+	     }
+	   else
+	     /* Illegal address: ignore line.  */
+	     return 0;
+	 }
+       else
+	 /* Illegal address: ignore line.  */
+	 return 0;
+     }
 
    /* We always return entries of the requested form.  */
    result->h_addrtype = af;
diff --git a/po/nl.po b/po/nl.po
index 69c479514e..2ce78d8e6e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,344 +1,1311 @@
-# Dutch translation of libc.
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Translation of libc-2.5 to Dutch.
+# Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
-# 
-# 
+# Benno Schulenberg <benno@nietvergeten.nl>, 2006.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.3.3\n"
+"Project-Id-Version: libc 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-05 09:16+0200\n"
-"PO-Revision-Date: 2004-08-05 15:52+0200\n"
-"Last-Translator: Elros Cyriatan <cyriatan@fastmail.fm>\n"
-"Language-Team: Dutch <vertaling@nl.linux.org>\n"
+"POT-Creation-Date: 2006-09-29 11:38-0700\n"
+"PO-Revision-Date: 2006-11-14 19:50+0100\n"
+"Last-Translator: Benno Schulenberg <benno@nietvergeten.nl>\n"
+"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: sysdeps/generic/siglist.h:29 stdio-common/../sysdeps/unix/siglist.c:27
-msgid "Hangup"
-msgstr "Ophangen"
+#: argp/argp-help.c:227
+#, c-format
+msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
+msgstr "%.*s: Parameter van ARGP_HELP_FMT vereist een waarde"
 
-#: sysdeps/generic/siglist.h:30 stdio-common/../sysdeps/unix/siglist.c:28
-msgid "Interrupt"
-msgstr "Onderbreken"
+#: argp/argp-help.c:237
+#, c-format
+msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
+msgstr "%.*s: Onbekende parameter van ARGP_HELP_FMT"
 
-#: sysdeps/generic/siglist.h:31 stdio-common/../sysdeps/unix/siglist.c:29
-msgid "Quit"
-msgstr "Afsluiten"
+#: argp/argp-help.c:250
+#, c-format
+msgid "Garbage in ARGP_HELP_FMT: %s"
+msgstr "Rommel in ARGP_HELP_FMT: %s"
 
-#: sysdeps/generic/siglist.h:32 stdio-common/../sysdeps/unix/siglist.c:30
-msgid "Illegal instruction"
-msgstr "Ongeldige instructie"
+#: argp/argp-help.c:1214
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr ""
+"Een argument dat verplicht of optioneel is voor een lange optie, is dat\n"
+"ook voor de overeenkomstige korte optie."
 
-#: sysdeps/generic/siglist.h:33 stdio-common/../sysdeps/unix/siglist.c:31
-msgid "Trace/breakpoint trap"
-msgstr "Traceer/breekpunt val"
+#: argp/argp-help.c:1600
+msgid "Usage:"
+msgstr "Gebruik: "
 
-#: sysdeps/generic/siglist.h:34
-msgid "Aborted"
-msgstr "Geannuleerd"
+#: argp/argp-help.c:1604
+msgid "  or: "
+msgstr "     of: "
 
-#: sysdeps/generic/siglist.h:35 stdio-common/../sysdeps/unix/siglist.c:34
-msgid "Floating point exception"
-msgstr "Zwevende-punt uitzondering"
+#: argp/argp-help.c:1616
+msgid " [OPTION...]"
+msgstr " [OPTIE...]"
 
-#: sysdeps/generic/siglist.h:36 stdio-common/../sysdeps/unix/siglist.c:35
-msgid "Killed"
-msgstr "Gedood"
+#: argp/argp-help.c:1643
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "Probeer '%s --help' of '%s --usage' voor meer informatie.\n"
 
-#: sysdeps/generic/siglist.h:37 stdio-common/../sysdeps/unix/siglist.c:36
-msgid "Bus error"
-msgstr "Bus fout"
+#: argp/argp-help.c:1671
+#, c-format
+msgid "Report bugs to %s.\n"
+msgstr ""
+"Rapporteer fouten in het programma aan %s,\n"
+"en gebreken in de vertaling aan <vertaling@vrijschrift.org>.\n"
 
-#: sysdeps/generic/siglist.h:38 stdio-common/../sysdeps/unix/siglist.c:37
-msgid "Segmentation fault"
-msgstr "Segmentatie fout"
+#: argp/argp-parse.c:102
+msgid "Give this help list"
+msgstr "deze hulptekst tonen"
 
-#. TRANS Broken pipe; there is no process reading from the other end of a pipe.
-#. TRANS Every library function that returns this error code also generates a
-#. TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
-#. TRANS or blocked.  Thus, your program will never actually see @code{EPIPE}
-#. TRANS unless it has handled or blocked @code{SIGPIPE}.
-#: sysdeps/generic/siglist.h:39 stdio-common/../sysdeps/gnu/errlist.c:351
-#: stdio-common/../sysdeps/unix/siglist.c:39
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:62
-msgid "Broken pipe"
-msgstr "Gebroken pijp"
+#: argp/argp-parse.c:103
+msgid "Give a short usage message"
+msgstr "een kort gebruiksbericht tonen"
 
-#: sysdeps/generic/siglist.h:40 stdio-common/../sysdeps/unix/siglist.c:40
-msgid "Alarm clock"
-msgstr "Alarmklok"
+#: argp/argp-parse.c:104
+msgid "Set the program name"
+msgstr "de programmanaam instellen"
 
-#: sysdeps/generic/siglist.h:41 stdio-common/../sysdeps/unix/siglist.c:41
-msgid "Terminated"
-msgstr "Afgebroken"
+#: argp/argp-parse.c:106
+msgid "Hang for SECS seconds (default 3600)"
+msgstr "dit aantal seconden pauzeren (standaard 3600)"
 
-#: sysdeps/generic/siglist.h:42 stdio-common/../sysdeps/unix/siglist.c:42
-msgid "Urgent I/O condition"
-msgstr "Spoedeisende I/O-omstandigheid"
+#: argp/argp-parse.c:167
+msgid "Print program version"
+msgstr "programmaversie tonen"
 
-#: sysdeps/generic/siglist.h:43 stdio-common/../sysdeps/unix/siglist.c:43
-msgid "Stopped (signal)"
-msgstr "Gestopt (signaal)"
+#: argp/argp-parse.c:183
+msgid "(PROGRAM ERROR) No version known!?"
+msgstr "**Interne programmafout**: geen versie bekend!?"
 
-#: sysdeps/generic/siglist.h:44 stdio-common/../sysdeps/unix/siglist.c:44
-msgid "Stopped"
-msgstr "Gestopt"
+#: argp/argp-parse.c:623
+#, c-format
+msgid "%s: Too many arguments\n"
+msgstr "%s: Te veel argumenten\n"
 
-#: sysdeps/generic/siglist.h:45 stdio-common/../sysdeps/unix/siglist.c:45
-msgid "Continued"
-msgstr "Doorgegaan"
+#: argp/argp-parse.c:766
+msgid "(PROGRAM ERROR) Option should have been recognized!?"
+msgstr "**Interne programmafout**: optie had herkend moeten worden!?"
 
-#: sysdeps/generic/siglist.h:46 stdio-common/../sysdeps/unix/siglist.c:46
-msgid "Child exited"
-msgstr "Kind is afgesloten"
+#: assert/assert-perr.c:57
+#, c-format
+msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
+msgstr "%s%s%s:%u: %s%sOnverwachte fout: %s.\n"
 
-#: sysdeps/generic/siglist.h:47 stdio-common/../sysdeps/unix/siglist.c:47
-msgid "Stopped (tty input)"
-msgstr "Gestopt (tty invoer)"
+#: assert/assert.c:57
+#, c-format
+msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
+msgstr "%s%s%s:%u: %s%sControletest '%s' faalt.\n"
 
-#: sysdeps/generic/siglist.h:48 stdio-common/../sysdeps/unix/siglist.c:48
-msgid "Stopped (tty output)"
-msgstr "Gestopt (tty uitvoer)"
+#: catgets/gencat.c:109 catgets/gencat.c:113 nscd/nscd.c:96 nss/makedb.c:61
+msgid "NAME"
+msgstr "NAAM"
 
-#: sysdeps/generic/siglist.h:49 stdio-common/../sysdeps/unix/siglist.c:49
-msgid "I/O possible"
-msgstr "I/O mogelijk"
+#: catgets/gencat.c:110
+msgid "Create C header file NAME containing symbol definitions"
+msgstr "headerbestand met symbooldefinities aanmaken"
 
-#: sysdeps/generic/siglist.h:50 stdio-common/../sysdeps/unix/siglist.c:50
-msgid "CPU time limit exceeded"
-msgstr "Grens processortijd overschreden"
+#: catgets/gencat.c:112
+msgid "Do not use existing catalog, force new output file"
+msgstr "bestaande catalogus niet gebruiken; een nieuw uitvoerbestand afdwingen"
 
-#: sysdeps/generic/siglist.h:51 stdio-common/../sysdeps/unix/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "Grens bestandsgrootte overschreden"
+#: catgets/gencat.c:113 nss/makedb.c:61
+msgid "Write output to file NAME"
+msgstr "uitvoer naar dit bestand schrijven"
 
-#: sysdeps/generic/siglist.h:52 stdio-common/../sysdeps/unix/siglist.c:52
-msgid "Virtual timer expired"
-msgstr "Virtuele tijdopnemer verlopen"
+#: catgets/gencat.c:118
+msgid ""
+"Generate message catalog.If INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n"
+"is -, output is written to standard output.\n"
+msgstr ""
+"Een berichtencatalogus genereren.\n"
+"\n"
+"Als INVOERBESTAND '-' is, wordt van standaardinvoer gelezen.\n"
+"Als UITVOERBESTAND '-' is, wordt naar standaarduitvoer geschreven.\n"
 
-#: sysdeps/generic/siglist.h:53 stdio-common/../sysdeps/unix/siglist.c:53
-msgid "Profiling timer expired"
-msgstr "Profilerende tijdopnemer verlopen"
+#: catgets/gencat.c:123
+msgid ""
+"-o OUTPUT-FILE [INPUT-FILE]...\n"
+"[OUTPUT-FILE [INPUT-FILE]...]"
+msgstr ""
+"-o UITVOERBESTAND [INVOERBESTAND...]\n"
+"[UITVOERBESTAND [INVOERBESTAND...]]"
 
-#: sysdeps/generic/siglist.h:54 stdio-common/../sysdeps/unix/siglist.c:54
-msgid "Window changed"
-msgstr "Venster veranderd"
+#: catgets/gencat.c:231 debug/pcprofiledump.c:199 iconv/iconv_prog.c:410
+#: iconv/iconvconfig.c:379 locale/programs/localedef.c:370
+#: login/programs/pt_chown.c:88 malloc/memusagestat.c:525 nss/makedb.c:231
+msgid ""
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+"Voor het rapporteren van fouten, zie:\n"
+"  <http://www.gnu.org/software/libc/bugs.html>.\n"
+
+#: catgets/gencat.c:245 debug/xtrace.sh:64 elf/ldconfig.c:285
+#: elf/ldd.bash.in:39 elf/sprof.c:355 iconv/iconv_prog.c:425
+#: iconv/iconvconfig.c:394 locale/programs/locale.c:274
+#: locale/programs/localedef.c:386 login/programs/pt_chown.c:59
+#: malloc/memusage.sh:71 nscd/nscd.c:401 nss/getent.c:83 nss/makedb.c:245
+#: posix/getconf.c:1007
+#, c-format
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"This is free software; see the source for copying conditions.  There is NO\n"
+"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Dit is vrije software; zie de brontekst voor de kopieervoorwaarden.\n"
+"Er is GEEN garantie; zelfs niet van VERKOOPBAARHEID of GESCHIKTHEID\n"
+"VOOR EEN BEPAALD DOEL.\n"
 
-#: sysdeps/generic/siglist.h:55 stdio-common/../sysdeps/unix/siglist.c:56
-msgid "User defined signal 1"
-msgstr "Door gebruiker gedefinieerd signaal 1"
+#: catgets/gencat.c:250 debug/xtrace.sh:68 elf/ldconfig.c:290 elf/sprof.c:361
+#: iconv/iconv_prog.c:430 iconv/iconvconfig.c:399 locale/programs/locale.c:279
+#: locale/programs/localedef.c:391 malloc/memusage.sh:75 nscd/nscd.c:406
+#: nss/getent.c:88 nss/makedb.c:250 posix/getconf.c:1012
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Geschreven door %s.\n"
 
-#: sysdeps/generic/siglist.h:56 stdio-common/../sysdeps/unix/siglist.c:57
-msgid "User defined signal 2"
-msgstr "Door gebruiker gedefinieerd signaal 2"
+#: catgets/gencat.c:281
+msgid "*standard input*"
+msgstr "*standaardinvoer*"
 
-#: sysdeps/generic/siglist.h:60 stdio-common/../sysdeps/unix/siglist.c:33
-msgid "EMT trap"
-msgstr "EMT-val"
+#: catgets/gencat.c:287 iconv/iconv_charmap.c:157 iconv/iconv_prog.c:297
+#: nss/makedb.c:170
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "kan invoerbestand '%s' niet openen"
 
-#: sysdeps/generic/siglist.h:63 stdio-common/../sysdeps/unix/siglist.c:38
-msgid "Bad system call"
-msgstr "Slechte systeemaanroep"
+#: catgets/gencat.c:416 catgets/gencat.c:493
+msgid "illegal set number"
+msgstr "ongeldig verzamelingsnummer"
 
-#: sysdeps/generic/siglist.h:66
-msgid "Stack fault"
-msgstr "Stack fout"
+#: catgets/gencat.c:443
+msgid "duplicate set definition"
+msgstr "dubbele verzamelingsdefinitie"
 
-#: sysdeps/generic/siglist.h:69
-msgid "Information request"
-msgstr "Verzoek om informatie"
+#: catgets/gencat.c:445 catgets/gencat.c:622 catgets/gencat.c:676
+msgid "this is the first definition"
+msgstr "dit is de eerste definitie"
 
-#: sysdeps/generic/siglist.h:71
-msgid "Power failure"
-msgstr "Stroomstoring"
+#: catgets/gencat.c:521
+#, c-format
+msgid "unknown set `%s'"
+msgstr "onbekende verzameling '%s'"
 
-#: sysdeps/generic/siglist.h:74 stdio-common/../sysdeps/unix/siglist.c:55
-msgid "Resource lost"
-msgstr "Bron verloren"
+#: catgets/gencat.c:562
+msgid "invalid quote character"
+msgstr "ongeldig aanhalingsteken"
 
-#: sysdeps/mach/hurd/mips/dl-machine.c:68
-#: string/../sysdeps/mach/_strerror.c:57
-msgid "Error in unknown error system: "
-msgstr "Fout in onbekende-fout systeem: "
+#: catgets/gencat.c:575
+#, c-format
+msgid "unknown directive `%s': line ignored"
+msgstr "onbekende richting '%s'; regel is genegeerd"
 
-#: sysdeps/mach/hurd/mips/dl-machine.c:83
-#: string/../sysdeps/generic/_strerror.c:44
-#: string/../sysdeps/mach/_strerror.c:87
-msgid "Unknown error "
-msgstr "Onbekende fout "
+#: catgets/gencat.c:620
+msgid "duplicated message number"
+msgstr "dubbel berichtnummer"
 
-#: sysdeps/unix/sysv/linux/lddlibc4.c:64
+#: catgets/gencat.c:673
+msgid "duplicated message identifier"
+msgstr "dubbele berichtnaam"
+
+#: catgets/gencat.c:730
+msgid "invalid character: message ignored"
+msgstr "ongeldig teken; bericht is genegeerd"
+
+#: catgets/gencat.c:773
+msgid "invalid line"
+msgstr "ongeldige regel"
+
+#: catgets/gencat.c:827
+msgid "malformed line ignored"
+msgstr "ongeldige regel is genegeerd"
+
+#: catgets/gencat.c:991 catgets/gencat.c:1032 nss/makedb.c:183
 #, c-format
-msgid "cannot open `%s'"
-msgstr "kan `%s' niet openen"
+msgid "cannot open output file `%s'"
+msgstr "kan uitvoerbestand '%s' niet openen"
 
-#: sysdeps/unix/sysv/linux/lddlibc4.c:68
+#: catgets/gencat.c:1194 locale/programs/linereader.c:559
+msgid "invalid escape sequence"
+msgstr "ongeldige stuurcode"
+
+#: catgets/gencat.c:1216
+msgid "unterminated message"
+msgstr "onafgesloten bericht"
+
+#: catgets/gencat.c:1240
 #, c-format
-msgid "cannot read header from `%s'"
-msgstr "kan kop van `%s' niet lezen"
+msgid "while opening old catalog file"
+msgstr "bij openen van oude catalogusbestand"
 
-#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:295 catgets/gencat.c:288
+#: catgets/gencat.c:1331
 #, c-format
-msgid "cannot open input file `%s'"
-msgstr "kan invoerbestand `%s' niet openen"
+msgid "conversion modules not available"
+msgstr "conversiemodules zijn niet beschikbaar"
+
+#: catgets/gencat.c:1357
+#, c-format
+msgid "cannot determine escape character"
+msgstr "kan niet bepalen wat het escapeteken is"
+
+#: debug/pcprofiledump.c:52
+msgid "Don't buffer output"
+msgstr "uitvoer niet bufferen"
+
+#: debug/pcprofiledump.c:57
+msgid "Dump information generated by PC profiling."
+msgstr "Door prestatie-analyse gegenereerde informatie weergeven."
+
+#: debug/pcprofiledump.c:60
+msgid "[FILE]"
+msgstr "[BESTAND]"
+
+#: debug/pcprofiledump.c:100
+#, c-format
+msgid "cannot open input file"
+msgstr "kan invoerbestand niet openen"
+
+#: debug/pcprofiledump.c:106
+#, c-format
+msgid "cannot read header"
+msgstr "kan kop van bestand niet lezen"
+
+#: debug/pcprofiledump.c:170
+#, c-format
+msgid "invalid pointer size"
+msgstr "ongeldige pointergrootte"
+
+#: debug/xtrace.sh:27 debug/xtrace.sh:45
+msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
+msgstr "Gebruik:  xtrace [OPTIE]... PROGRAMMA [PROGRAMMA-OPTIE]...\\n"
+
+#: debug/xtrace.sh:33
+msgid "Try `xtrace --help' for more information.\\n"
+msgstr "Probeer 'xtrace --help' voor meer informatie.\\n"
+
+#: debug/xtrace.sh:39
+msgid "xtrace: option `$1' requires an argument.\\n"
+msgstr "xtrace: optie '$1' vereist een argument\\n"
+
+#: debug/xtrace.sh:46
+msgid ""
+"Trace execution of program by printing currently executed function.\n"
+"\n"
+"     --data=FILE          Don't run the program, just print the data from FILE.\n"
+"\n"
+"   -?,--help              Print this help and exit\n"
+"      --usage             Give a short usage message\n"
+"   -V,--version           Print version information and exit\n"
+"\n"
+"Mandatory arguments to long options are also mandatory for any corresponding\n"
+"short options.\n"
+"\n"
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\\n"
+msgstr ""
+"De uitvoering van een programma volgen door steeds de naam van\n"
+"de uitgevoerde functie te printen.\n"
+"\n"
+"     --data=BESTAND  geen programma uitvoeren; gegevens uit BESTAND printen\n"
+"\n"
+"  -?,--help          deze hulptekst tonen\n"
+"     --usage         een kort gebruiksbericht tonen\n"
+"  -V,--version       versie-informatie tonen\n"
+"\n"
+"Voor het rapporteren van fouten in dit programma, zie:\n"
+"  <http://www.gnu.org/software/libc/bugs.html>.\\n"
+
+#: debug/xtrace.sh:125
+msgid "xtrace: unrecognized option `$1'\\n"
+msgstr "xtrace: onbekende optie '$1'\\n"
+
+#: debug/xtrace.sh:138
+msgid "No program name given\\n"
+msgstr "Geen programmanaam gegeven\\n"
+
+#: debug/xtrace.sh:146
+#, sh-format
+msgid "executable `$program' not found\\n"
+msgstr "Geen uitvoerbaar bestand '$program' gevonden\\n"
+
+#: debug/xtrace.sh:150
+#, sh-format
+msgid "`$program' is no executable\\n"
+msgstr "'$program' is niet uitvoerbaar\\n"
+
+#: dlfcn/dlinfo.c:67
+msgid "RTLD_SELF used in code not dynamically loaded"
+msgstr "RTLD_SELF is gebruikt in code die niet dynamisch geladen is"
+
+#: dlfcn/dlinfo.c:76
+msgid "unsupported dlinfo request"
+msgstr "niet-ondersteund 'dlinfo'-verzoek"
+
+#: dlfcn/dlmopen.c:64
+msgid "invalid namespace"
+msgstr "ongeldige naamsruimte"
+
+#: dlfcn/dlmopen.c:69
+msgid "invalid mode"
+msgstr "ongeldige modus"
+
+#: dlfcn/dlopen.c:64
+msgid "invalid mode parameter"
+msgstr "ongeldige modusparameter"
+
+#: elf/cache.c:67
+msgid "unknown"
+msgstr "onbekend"
+
+#: elf/cache.c:110
+msgid "Unknown OS"
+msgstr "onbekend besturingssysteem"
+
+#: elf/cache.c:115
+#, c-format
+msgid ", OS ABI: %s %d.%d.%d"
+msgstr ", OS-ABI: %s %d.%d.%d"
+
+#: elf/cache.c:141 elf/ldconfig.c:1231
+#, c-format
+msgid "Can't open cache file %s\n"
+msgstr "Kan cachebestand %s niet openen\n"
+
+#: elf/cache.c:153
+#, c-format
+msgid "mmap of cache file failed.\n"
+msgstr "mmap() van cachebestand is mislukt\n"
+
+#: elf/cache.c:157 elf/cache.c:167
+#, c-format
+msgid "File is not a cache file.\n"
+msgstr "Bestand is geen cachebestand\n"
+
+#: elf/cache.c:200 elf/cache.c:210
+#, c-format
+msgid "%d libs found in cache `%s'\n"
+msgstr "%d bibliotheken gevonden in cache '%s'\n"
+
+#: elf/cache.c:409
+#, c-format
+msgid "Can't remove old temporary cache file %s"
+msgstr "Kan oud tijdelijk cachebestand %s niet verwijderen"
+
+#: elf/cache.c:416
+#, c-format
+msgid "Can't create temporary cache file %s"
+msgstr "Kan tijdelijk cachebestand %s niet aanmaken"
+
+#: elf/cache.c:424 elf/cache.c:434 elf/cache.c:438
+#, c-format
+msgid "Writing of cache data failed"
+msgstr "Schrijven van cachegegevens is mislukt"
+
+#: elf/cache.c:442
+#, c-format
+msgid "Writing of cache data failed."
+msgstr "Schrijven van cachegegevens is mislukt"
+
+#: elf/cache.c:449
+#, c-format
+msgid "Changing access rights of %s to %#o failed"
+msgstr "Wijzigen van toegangsrechten van %s naar %#o is mislukt"
+
+#: elf/cache.c:454
+#, c-format
+msgid "Renaming of %s to %s failed"
+msgstr "Naamswijziging van %s naar %s is mislukt"
+
+#: elf/dl-close.c:116
+msgid "shared object not open"
+msgstr "gedeeld object is niet open"
+
+#: elf/dl-deps.c:112
+msgid "DST not allowed in SUID/SGID programs"
+msgstr "DST is niet toegestaan in SUID/SGID-programma's"
+
+#: elf/dl-deps.c:125
+msgid "empty dynamics string token substitution"
+msgstr "lege vervanging van DST"
+
+#: elf/dl-deps.c:131
+#, c-format
+msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
+msgstr "kan helper '%s' niet laden vanwege lege DST-vervanging\n"
+
+#: elf/dl-deps.c:472
+msgid "cannot allocate dependency list"
+msgstr "kan geen geheugen reserveren voor afhankelijkhedenlijst"
+
+#: elf/dl-deps.c:505 elf/dl-deps.c:560
+msgid "cannot allocate symbol search list"
+msgstr "kan geen geheugen reserveren voor symbolenzoeklijst"
+
+#: elf/dl-deps.c:545
+msgid "Filters not supported with LD_TRACE_PRELINKING"
+msgstr "Met LD_TRACE_PRELINKING worden filters niet ondersteund"
+
+#: elf/dl-error.c:77
+msgid "DYNAMIC LINKER BUG!!!"
+msgstr "FOUT IN DYNAMISCHE LINKER!!!"
+
+#: elf/dl-error.c:124
+msgid "error while loading shared libraries"
+msgstr "fout bij laden van gedeelde bibliotheken"
+
+#: elf/dl-fptr.c:88
+msgid "cannot map pages for fdesc table"
+msgstr "kan pagina's voor 'fdesc'-tabel niet in het geheugen plaatsen"
+
+#: elf/dl-fptr.c:192
+msgid "cannot map pages for fptr table"
+msgstr "kan pagina's voor 'fptr'-tabel niet in het geheugen plaatsen"
+
+#: elf/dl-fptr.c:221
+msgid "internal error: symidx out of range of fptr table"
+msgstr "**interne fout**: 'symidx' buiten bereik van 'fptr'-tabel"
+
+#: elf/dl-load.c:372
+msgid "cannot allocate name record"
+msgstr "kan geen geheugen reserveren voor naamrecord"
+
+#: elf/dl-load.c:474 elf/dl-load.c:553 elf/dl-load.c:673 elf/dl-load.c:786
+msgid "cannot create cache for search path"
+msgstr "kan cache voor zoekpad niet aanmaken"
+
+#: elf/dl-load.c:576
+msgid "cannot create RUNPATH/RPATH copy"
+msgstr "kan geen kopie van RUNPATH/RPATH maken"
+
+#: elf/dl-load.c:659
+msgid "cannot create search path array"
+msgstr "kan zoekpad-array niet aanmaken"
+
+#: elf/dl-load.c:870
+msgid "cannot stat shared object"
+msgstr "kan gedeeld object niet vinden"
+
+#: elf/dl-load.c:940
+msgid "cannot open zero fill device"
+msgstr "kan nullenapparaat niet openen"
+
+#: elf/dl-load.c:985 elf/dl-load.c:2215
+msgid "cannot create shared object descriptor"
+msgstr "kan descriptor voor gedeeld object niet aanmaken"
+
+#: elf/dl-load.c:1004 elf/dl-load.c:1663 elf/dl-load.c:1755
+msgid "cannot read file data"
+msgstr "kan bestandsgegevens niet lezen"
+
+#: elf/dl-load.c:1048
+msgid "ELF load command alignment not page-aligned"
+msgstr "uitlijning in ELF-laadopdracht ligt niet op een paginagrens"
+
+#: elf/dl-load.c:1055
+msgid "ELF load command address/offset not properly aligned"
+msgstr "adres/positie in ELF-laadopdracht is niet correct uitgelijnd"
+
+#: elf/dl-load.c:1139
+msgid "cannot allocate TLS data structures for initial thread"
+msgstr "kan geen geheugen reserveren voor TLS-gegevensstructuren van initiële thread"
+
+#: elf/dl-load.c:1163
+msgid "cannot handle TLS data"
+msgstr "kan TLS-gegevens niet verwerken"
+
+#: elf/dl-load.c:1182
+msgid "object file has no loadable segments"
+msgstr "objectbestand heeft geen laadbare segmenten"
+
+#: elf/dl-load.c:1218
+msgid "failed to map segment from shared object"
+msgstr "kan segment van gedeeld object niet in het geheugen plaatsen"
+
+#: elf/dl-load.c:1242
+msgid "cannot dynamically load executable"
+msgstr "kan uitvoerbaar bestand niet dynamisch laden"
+
+#: elf/dl-load.c:1303
+msgid "cannot change memory protections"
+msgstr "kan geheugenbeschermingen niet veranderen"
+
+#: elf/dl-load.c:1322
+msgid "cannot map zero-fill pages"
+msgstr "kan nul-gevulde pagina's niet in het geheugen plaatsen"
+
+#: elf/dl-load.c:1336
+msgid "object file has no dynamic section"
+msgstr "objectbestand heeft geen dynamische sectie"
+
+#: elf/dl-load.c:1359
+msgid "shared object cannot be dlopen()ed"
+msgstr "gedeeld object kan niet met dlopen() geopend worden -- heeft DF_1_NOOPEN-vlag"
+
+#: elf/dl-load.c:1372
+msgid "cannot allocate memory for program header"
+msgstr "kan geen geheugen reserveren voor programmakop"
+
+#: elf/dl-load.c:1389 elf/dl-open.c:174
+msgid "invalid caller"
+msgstr "ongeldige aanroeper"
+
+#: elf/dl-load.c:1428
+msgid "cannot enable executable stack as shared object requires"
+msgstr "kan uitvoerbare stack niet aanzetten zoals gedeeld object vereist"
+
+#: elf/dl-load.c:1443
+msgid "cannot close file descriptor"
+msgstr "kan bestandsdescriptor niet sluiten"
+
+#: elf/dl-load.c:1485
+msgid "cannot create searchlist"
+msgstr "kan zoeklijst niet aanmaken"
+
+#: elf/dl-load.c:1663
+msgid "file too short"
+msgstr "bestand is te kort"
+
+#: elf/dl-load.c:1692
+msgid "invalid ELF header"
+msgstr "ongeldige ELF-header"
+
+#: elf/dl-load.c:1704
+msgid "ELF file data encoding not big-endian"
+msgstr "gegevenscodering van ELF-bestand is niet big-endian"
+
+#: elf/dl-load.c:1706
+msgid "ELF file data encoding not little-endian"
+msgstr "gegevenscodering van ELF-bestand is niet little-endian"
+
+#: elf/dl-load.c:1710
+msgid "ELF file version ident does not match current one"
+msgstr "ELF-bestands-identversie komt niet overeen met huidige"
+
+#: elf/dl-load.c:1714
+msgid "ELF file OS ABI invalid"
+msgstr "OS-ABI van ELF-bestand is ongeldig"
+
+#: elf/dl-load.c:1716
+msgid "ELF file ABI version invalid"
+msgstr "ABI-versie van ELF-bestand is ongeldig"
+
+#: elf/dl-load.c:1719
+msgid "internal error"
+msgstr "**interne fout**"
+
+#: elf/dl-load.c:1726
+msgid "ELF file version does not match current one"
+msgstr "ELF-bestandsversie komt niet overeen met huidige"
+
+#: elf/dl-load.c:1734
+msgid "only ET_DYN and ET_EXEC can be loaded"
+msgstr "alleen ET_DYN en ET_EXEC kunnen worden geladen"
+
+#: elf/dl-load.c:1740
+msgid "ELF file's phentsize not the expected size"
+msgstr "'phentsize' van ELF-bestand heeft niet de verwachte grootte"
+
+#: elf/dl-load.c:2231
+msgid "wrong ELF class: ELFCLASS64"
+msgstr "verkeerde ELF-klasse: ELFCLASS64"
+
+#: elf/dl-load.c:2232
+msgid "wrong ELF class: ELFCLASS32"
+msgstr "verkeerde ELF-klasse: ELFCLASS32"
+
+#: elf/dl-load.c:2235
+msgid "cannot open shared object file"
+msgstr "kan gedeeld objectbestand niet openen"
+
+#: elf/dl-lookup.c:261
+msgid "relocation error"
+msgstr "verplaatsingsfout"
+
+#: elf/dl-lookup.c:289
+msgid "symbol lookup error"
+msgstr "opzoekfout voor symbool"
+
+#: elf/dl-open.c:112
+msgid "cannot extend global scope"
+msgstr "kan globaal geldigheidsbereik niet uitbreiden"
+
+#: elf/dl-open.c:237
+msgid "empty dynamic string token substitution"
+msgstr "lege vervanging van DST"
+
+#: elf/dl-open.c:406 elf/dl-open.c:417 elf/dl-open.c:425
+msgid "cannot create scope list"
+msgstr "kan lijst voor geldigheidsbereik niet aanmaken"
+
+#: elf/dl-open.c:470
+msgid "TLS generation counter wrapped!  Please report this."
+msgstr ""
+"De TLS-generatieteller is opnieuw bij nul begonnen!\n"
+"Rapporteer deze programmafout met het 'glibcbug' script."
+
+#: elf/dl-open.c:508
+msgid "invalid mode for dlopen()"
+msgstr "ongeldige modus voor dlopen()"
+
+#: elf/dl-open.c:525
+msgid "no more namespaces available for dlmopen()"
+msgstr "geen naamsruimten meer beschikbaar voor dlmopen()"
+
+#: elf/dl-open.c:538
+msgid "invalid target namespace in dlmopen()"
+msgstr "ongeldige doelnaamsruimte in dlmopen()"
+
+#: elf/dl-reloc.c:55
+msgid "cannot allocate memory in static TLS block"
+msgstr "kan geen geheugen reserveren binnen statisch TLS-blok"
+
+#: elf/dl-reloc.c:198
+msgid "cannot make segment writable for relocation"
+msgstr "kan segment niet schrijfbaar maken voor verplaatsing"
+
+#: elf/dl-reloc.c:279
+#, c-format
+msgid "%s: no PLTREL found in object %s\n"
+msgstr "%s: geen PLTREL in object %s gevonden\n"
+
+#: elf/dl-reloc.c:290
+#, c-format
+msgid "%s: out of memory to store relocation results for %s\n"
+msgstr "%s: onvoldoende geheugen om verplaatsingsresultaten van %s op te slaan\n"
+
+#: elf/dl-reloc.c:306
+msgid "cannot restore segment prot after reloc"
+msgstr "kan segmentbescherming niet herstellen na verplaatsing"
+
+#: elf/dl-reloc.c:331
+msgid "cannot apply additional memory protection after relocation"
+msgstr "kan extra geheugenbescherming niet toepassen na verplaatsing"
+
+#: elf/dl-sym.c:98
+msgid "RTLD_NEXT used in code not dynamically loaded"
+msgstr "RTLD_NEXT is gebruikt in code die niet dynamisch geladen is"
+
+#: elf/dl-sysdep.c:495
+msgid "cannot create capability list"
+msgstr "kan privilegeslijst niet aanmaken"
+
+#: elf/dl-tls.c:829
+msgid "cannot create TLS data structures"
+msgstr "kan TLS-gegevensstructuren niet aanmaken"
+
+#: elf/dl-version.c:303
+msgid "cannot allocate version reference table"
+msgstr "kan geen geheugen reserveren voor tabel met versieverwijzingen"
+
+#: elf/ldconfig.c:133
+msgid "Print cache"
+msgstr "inhoud van de cache weergeven"
+
+#: elf/ldconfig.c:134
+msgid "Generate verbose messages"
+msgstr "breedsprakige uitvoer"
+
+#: elf/ldconfig.c:135
+msgid "Don't build cache"
+msgstr "geen cache opbouwen"
+
+#: elf/ldconfig.c:136
+msgid "Don't generate links"
+msgstr "geen koppelingen genereren"
+
+#: elf/ldconfig.c:137
+msgid "Change to and use ROOT as root directory"
+msgstr "naar deze map gaan en als hoofdmap gebruiken"
+
+#: elf/ldconfig.c:137
+msgid "ROOT"
+msgstr "BASISMAP"
+
+#: elf/ldconfig.c:138
+msgid "CACHE"
+msgstr "CACHE-BESTAND"
+
+#: elf/ldconfig.c:138
+msgid "Use CACHE as cache file"
+msgstr "dit cachebestand gebruiken"
+
+#: elf/ldconfig.c:139
+msgid "CONF"
+msgstr "CONFIG-BESTAND"
+
+#: elf/ldconfig.c:139
+msgid "Use CONF as configuration file"
+msgstr "dit configuratiebestand gebruiken"
+
+#: elf/ldconfig.c:140
+msgid "Only process directories specified on the command line.  Don't build cache."
+msgstr "alleen de mappen op de opdrachtregel verwerken; geen cache opbouwen"
+
+#: elf/ldconfig.c:141
+msgid "Manually link individual libraries."
+msgstr "individuele bibliotheken handmatig koppelen"
+
+#: elf/ldconfig.c:142
+msgid "FORMAT"
+msgstr "INDELING"
+
+#: elf/ldconfig.c:142
+msgid "Format to use: new, old or compat (default)"
+msgstr "te gebruiken indeling: 'compat' (standaard), 'new', of 'old'"
+
+#: elf/ldconfig.c:150
+msgid "Configure Dynamic Linker Run Time Bindings."
+msgstr "Configureren van de dynamische linker."
+
+#: elf/ldconfig.c:308
+#, c-format
+msgid "Path `%s' given more than once"
+msgstr "Pad '%s' is meerdere malen opgegeven"
+
+#: elf/ldconfig.c:348
+#, c-format
+msgid "%s is not a known library type"
+msgstr "%s is geen bekende bibliotheeksoort"
 
-#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:313
+#: elf/ldconfig.c:373
+#, c-format
+msgid "Can't stat %s"
+msgstr "Kan status van %s niet opvragen"
+
+#: elf/ldconfig.c:447
+#, c-format
+msgid "Can't stat %s\n"
+msgstr "Kan status van %s niet opvragen\n"
+
+#: elf/ldconfig.c:457
+#, c-format
+msgid "%s is not a symbolic link\n"
+msgstr "%s is geen symbolische koppeling\n"
+
+#: elf/ldconfig.c:476
+#, c-format
+msgid "Can't unlink %s"
+msgstr "Kan %s niet ontkoppelen"
+
+#: elf/ldconfig.c:482
+#, c-format
+msgid "Can't link %s to %s"
+msgstr "Kan %s niet aan %s koppelen"
+
+#: elf/ldconfig.c:488
+msgid " (changed)\n"
+msgstr " (gewijzigd)\n"
+
+#: elf/ldconfig.c:490
+msgid " (SKIPPED)\n"
+msgstr " (OVERGESLAGEN)\n"
+
+#: elf/ldconfig.c:545
+#, c-format
+msgid "Can't find %s"
+msgstr "Kan %s niet vinden"
+
+#: elf/ldconfig.c:561
+#, c-format
+msgid "Can't lstat %s"
+msgstr "Kan status van link %s niet opvragen"
+
+#: elf/ldconfig.c:568
+#, c-format
+msgid "Ignored file %s since it is not a regular file."
+msgstr "Bestand %s wordt genegeerd omdat het geen gewoon bestand is."
+
+#: elf/ldconfig.c:576
+#, c-format
+msgid "No link created since soname could not be found for %s"
+msgstr ""
+"Geen koppeling aangemaakt, want kan van %s de 'soname'\n"
+"(de naam van het gedeelde object) niet vinden"
+
+#: elf/ldconfig.c:667
+#, c-format
+msgid "Can't open directory %s"
+msgstr "Kan map %s niet openen"
+
+#: elf/ldconfig.c:735 elf/ldconfig.c:782
+#, c-format
+msgid "Cannot lstat %s"
+msgstr "Kan status van link %s niet opvragen"
+
+#: elf/ldconfig.c:747
+#, c-format
+msgid "Cannot stat %s"
+msgstr "Kan status van %s niet opvragen"
+
+#: elf/ldconfig.c:804 elf/readlib.c:90
+#, c-format
+msgid "Input file %s not found.\n"
+msgstr "Kan invoerbestand %s niet vinden\n"
+
+#: elf/ldconfig.c:855
+#, c-format
+msgid "libc5 library %s in wrong directory"
+msgstr "libc5-bibliotheek %s zit in verkeerde map"
+
+#: elf/ldconfig.c:858
+#, c-format
+msgid "libc6 library %s in wrong directory"
+msgstr "libc6-bibliotheek %s zit in verkeerde map"
+
+#: elf/ldconfig.c:861
+#, c-format
+msgid "libc4 library %s in wrong directory"
+msgstr "libc4-bibliotheek %s zit in verkeerde map"
+
+#: elf/ldconfig.c:888
+#, c-format
+msgid "libraries %s and %s in directory %s have same soname but different type."
+msgstr "Bibliotheken %s en %s in map %s hebben dezelfde 'soname' maar een verschillende soort"
+
+#: elf/ldconfig.c:995
+#, c-format
+msgid "Can't open configuration file %s"
+msgstr "Kan configuratiebestand %s niet openen"
+
+#: elf/ldconfig.c:1059
+#, c-format
+msgid "%s:%u: bad syntax in hwcap line"
+msgstr "%s:%u: onjuiste syntax in 'hwcap'-regel"
+
+#: elf/ldconfig.c:1065
+#, c-format
+msgid "%s:%u: hwcap index %lu above maximum %u"
+msgstr "%s:%u: 'hwcap'-index %lu overschrijdt maximum %u"
+
+#: elf/ldconfig.c:1072 elf/ldconfig.c:1080
+#, c-format
+msgid "%s:%u: hwcap index %lu already defined as %s"
+msgstr "%s:%u: 'hwcap'-index %lu is al gedefinieerd als %s"
+
+#: elf/ldconfig.c:1083
+#, c-format
+msgid "%s:%u: duplicate hwcap %lu %s"
+msgstr "%s:%u: dubbele 'hwcap' %lu %s"
+
+#: elf/ldconfig.c:1105
+#, c-format
+msgid "need absolute file name for configuration file when using -r"
+msgstr "bij gebruik van '-r' is voor het configuratiebestand een absoluut pad vereist"
+
+#: elf/ldconfig.c:1112 locale/programs/xmalloc.c:69 malloc/obstack.c:434
+#: malloc/obstack.c:436 posix/getconf.c:980 posix/getconf.c:1158
+#, c-format
+msgid "memory exhausted"
+msgstr "onvoldoende geheugen"
+
+#: elf/ldconfig.c:1142
+#, c-format
+msgid "%s:%u: cannot read directory %s"
+msgstr "%s:%u: kan map %s niet lezen"
+
+#: elf/ldconfig.c:1182
+#, c-format
+msgid "relative path `%s' used to build cache"
+msgstr "relatief pad '%s' wordt gebruikt bij opbouwen van cache"
+
+#: elf/ldconfig.c:1210
+#, c-format
+msgid "Can't chdir to /"
+msgstr "Kan niet naar hoofdmap ('/') gaan"
+
+#: elf/ldconfig.c:1252
+#, c-format
+msgid "Can't open cache file directory %s\n"
+msgstr "Kan map %s voor cachebestand niet openen\n"
+
+#: elf/ldd.bash.in:43
+msgid "Written by %s and %s.\n"
+msgstr "Geschreven door %s en %s.\n"
+
+#: elf/ldd.bash.in:48
+msgid ""
+"Usage: ldd [OPTION]... FILE...\n"
+"      --help              print this help and exit\n"
+"      --version           print version information and exit\n"
+"  -d, --data-relocs       process data relocations\n"
+"  -r, --function-relocs   process data and function relocations\n"
+"  -u, --unused            print unused direct dependencies\n"
+"  -v, --verbose           print all information\n"
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>."
+msgstr ""
+"Gebruik:  ldd [OPTIE]... BESTAND...\n"
+"\n"
+"  -d, --data-relocs       dataverplaatsingen verwerken\n"
+"  -r, --function-relocs   data- en functieverplaatsingen verwerken\n"
+"  -u, --unused            ongebruikte directe afhankelijkheden tonen\n"
+"  -v, --verbose           breedsprakige uitvoer\n"
+"\n"
+"      --version           versie-informatie tonen\n"
+"      --help              deze hulptekst tonen\n"
+"\n"
+"Voor het rapporteren van fouten, zie:\n"
+"  <http://www.gnu.org/software/libc/bugs.html>."
+
+#: elf/ldd.bash.in:80
+msgid "ldd: option `$1' is ambiguous"
+msgstr "ldd: optie '$1' is niet eenduidig"
+
+#: elf/ldd.bash.in:87
+msgid "unrecognized option"
+msgstr "onbekende optie"
+
+#: elf/ldd.bash.in:88 elf/ldd.bash.in:126
+msgid "Try `ldd --help' for more information."
+msgstr "Probeer 'ldd --help' voor meer informatie."
+
+#: elf/ldd.bash.in:125
+msgid "missing file arguments"
+msgstr "ontbrekende bestandsargumenten"
+
+#. TRANS No such file or directory.  This is a ``file doesn't exist'' error
+#. TRANS for ordinary files that are referenced in contexts where they are
+#. TRANS expected to already exist.
+#: elf/ldd.bash.in:148 sysdeps/gnu/errlist.c:36
+msgid "No such file or directory"
+msgstr "Bestand of map bestaat niet"
+
+#: elf/ldd.bash.in:151 inet/rcmd.c:483
+msgid "not regular file"
+msgstr "niet een normaal bestand"
+
+#: elf/ldd.bash.in:154
+msgid "warning: you do not have execution permission for"
+msgstr "waarschuwing: u hebt geen uitvoeringsrechten voor"
+
+#: elf/ldd.bash.in:183
+msgid "\tnot a dynamic executable"
+msgstr "\tgeen dynamisch uitvoerbaar bestand"
+
+#: elf/ldd.bash.in:191
+msgid "exited with unknown exit code"
+msgstr "eindigde met een onbekende afsluitwaarde"
+
+#: elf/ldd.bash.in:196
+msgid "error: you do not have read permission for"
+msgstr "fout: u hebt geen leesrechten voor"
+
+#: elf/readelflib.c:35
+#, c-format
+msgid "file %s is truncated\n"
+msgstr "bestand %s is afgekapt\n"
+
+#: elf/readelflib.c:67
+#, c-format
+msgid "%s is a 32 bit ELF file.\n"
+msgstr "%s is een 32-bits ELF-bestand\n"
+
+#: elf/readelflib.c:69
+#, c-format
+msgid "%s is a 64 bit ELF file.\n"
+msgstr "%s is een 64-bits ELF-bestand\n"
+
+#: elf/readelflib.c:71
+#, c-format
+msgid "Unknown ELFCLASS in file %s.\n"
+msgstr "Onbekende ELFCLASS in bestand %s\n"
+
+#: elf/readelflib.c:78
+#, c-format
+msgid "%s is not a shared object file (Type: %d).\n"
+msgstr "%s is niet een gedeeld objectbestand (type = %d)\n"
+
+#: elf/readelflib.c:109
+#, c-format
+msgid "more than one dynamic segment\n"
+msgstr "meer dan één dynamisch segment\n"
+
+#: elf/readlib.c:96
+#, c-format
+msgid "Cannot fstat file %s.\n"
+msgstr "Kan status van %s niet opvragen\n"
+
+#: elf/readlib.c:107
+#, c-format
+msgid "File %s is empty, not checked."
+msgstr "Bestand %s is leeg; niet gecontroleerd"
+
+#: elf/readlib.c:113
+#, c-format
+msgid "File %s is too small, not checked."
+msgstr "Bestand %s is te klein; niet gecontroleerd"
+
+#: elf/readlib.c:123
+#, c-format
+msgid "Cannot mmap file %s.\n"
+msgstr "Kan bestand %s niet geheel in het geheugen plaatsen\n"
+
+#: elf/readlib.c:161
+#, c-format
+msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
+msgstr "%s is geen ELF-bestand -- het heeft de verkeerde magische bytes aan het begin\n"
+
+#: elf/sprof.c:77
+msgid "Output selection:"
+msgstr "Uitvoerselectie:"
+
+#: elf/sprof.c:79
+msgid "print list of count paths and their number of use"
+msgstr "een lijst weergeven met telpaden en hoe vaak ze gebruikt worden"
+
+#: elf/sprof.c:81
+msgid "generate flat profile with counts and ticks"
+msgstr "een lineaire tabel met aantal aanroepen en tikken genereren"
+
+#: elf/sprof.c:82
+msgid "generate call graph"
+msgstr "een aanroepengrafiek genereren"
+
+#: elf/sprof.c:89
+msgid ""
+"Read and display shared object profiling data.For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+"Gegevens van prestatie-analyse inlezen en afbeelden.Voor het rapporteren van fouten, zie:\n"
+"  <http://www.gnu.org/software/libc/bugs.html>.\n"
+
+#: elf/sprof.c:94
+msgid "SHOBJ [PROFDATA]"
+msgstr "GEDEELD_OBJECT [ANALYSEGEGEVENS]"
+
+#: elf/sprof.c:400
+#, c-format
+msgid "failed to load shared object `%s'"
+msgstr "laden van gedeeld object '%s' is mislukt"
+
+# ###dubbel
+#: elf/sprof.c:409
+#, c-format
+msgid "cannot create internal descriptors"
+msgstr "kan interne descriptor niet aanmaken"
+
+#: elf/sprof.c:528
+#, c-format
+msgid "Reopening shared object `%s' failed"
+msgstr "heropenen van gedeeld object '%s' is mislukt"
+
+#: elf/sprof.c:535 elf/sprof.c:629
+#, c-format
+msgid "reading of section headers failed"
+msgstr "lezen van sectiekoppen is mislukt"
+
+#: elf/sprof.c:543 elf/sprof.c:637
+#, c-format
+msgid "reading of section header string table failed"
+msgstr "lezen van tekenreekstabel in sectiekop is mislukt"
+
+#: elf/sprof.c:569
+#, c-format
+msgid "*** Cannot read debuginfo file name: %m\n"
+msgstr "*** Kan naam van debuginfobestand niet lezen: %m\n"
+
+#: elf/sprof.c:589
+#, c-format
+msgid "cannot determine file name"
+msgstr "kan bestandsnaam niet bepalen"
+
+#: elf/sprof.c:622
+#, c-format
+msgid "reading of ELF header failed"
+msgstr "lezen van ELF-header is mislukt"
+
+#: elf/sprof.c:658
+#, c-format
+msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
+msgstr "*** Het bestand '%s' is gestript: gedetailleerde analyse is niet mogelijk\n"
+
+#: elf/sprof.c:688
+#, c-format
+msgid "failed to load symbol data"
+msgstr "laden van symboolgegevens is mislukt"
+
+#: elf/sprof.c:755
+#, c-format
+msgid "cannot load profiling data"
+msgstr "kan analysegegevens niet laden"
+
+#: elf/sprof.c:764
+#, c-format
+msgid "while stat'ing profiling data file"
+msgstr "bij opvragen van status van analysegegevensbestand"
+
+#: elf/sprof.c:772
+#, c-format
+msgid "profiling data file `%s' does not match shared object `%s'"
+msgstr "analysegegevensbestand '%s' komt niet overeen met gedeeld object '%s'"
+
+#: elf/sprof.c:783
+#, c-format
+msgid "failed to mmap the profiling data file"
+msgstr "kan analysegegevensbestand niet geheel in het geheugen plaatsen"
+
+#: elf/sprof.c:791
+#, c-format
+msgid "error while closing the profiling data file"
+msgstr "fout bij sluiten van analysegegevensbestand"
+
+# ###dubbel
+#: elf/sprof.c:800 elf/sprof.c:870
+#, c-format
+msgid "cannot create internal descriptor"
+msgstr "kan interne descriptor niet aanmaken"
+
+#: elf/sprof.c:846
+#, c-format
+msgid "`%s' is no correct profile data file for `%s'"
+msgstr "'%s' is geen correct bestand met analysegegevens voor '%s'"
+
+#: elf/sprof.c:1027 elf/sprof.c:1085
+#, c-format
+msgid "cannot allocate symbol data"
+msgstr "kan geen geheugen reserveren voor symboolgegevens"
+
+#: iconv/iconv_charmap.c:175 iconv/iconv_prog.c:315
 #, c-format
 msgid "error while closing input `%s'"
-msgstr "fout bij sluiten invoer `%s'"
+msgstr "fout bij sluiten van invoer '%s'"
 
-#: iconv/iconv_charmap.c:443
+#: iconv/iconv_charmap.c:449
 #, c-format
 msgid "illegal input sequence at position %Zd"
 msgstr "ongeldige invoerreeks op positie %Zd"
 
-#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:506
+#: iconv/iconv_charmap.c:468 iconv/iconv_prog.c:525
+#, c-format
 msgid "incomplete character or shift sequence at end of buffer"
-msgstr "onvolledig teken en schuifreeks op einde van buffer"
+msgstr "onvolledige teken- of schuifreeks aan einde van buffer"
 
-#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:549
-#: iconv/iconv_prog.c:585
+#: iconv/iconv_charmap.c:513 iconv/iconv_charmap.c:549 iconv/iconv_prog.c:568
+#: iconv/iconv_prog.c:604
+#, c-format
 msgid "error while reading the input"
 msgstr "fout bij lezen van de invoer"
 
-#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:567
+#: iconv/iconv_charmap.c:531 iconv/iconv_prog.c:586
+#, c-format
 msgid "unable to allocate buffer for input"
-msgstr "kan geen buffer toewijzen voor invoer"
+msgstr "kan geen geheugen reserveren voor invoerbuffer"
 
-#: iconv/iconv_prog.c:61
+#: iconv/iconv_prog.c:59
 msgid "Input/Output format specification:"
-msgstr "Invoer/Uitvoer formaatopgave:"
+msgstr "Specificatie van in- en uitvoercodering:"
 
-#: iconv/iconv_prog.c:62
+#: iconv/iconv_prog.c:60
 msgid "encoding of original text"
 msgstr "codering van oorspronkelijke tekst"
 
-#: iconv/iconv_prog.c:63
+#: iconv/iconv_prog.c:61
 msgid "encoding for output"
 msgstr "codering van uitvoer"
 
-#: iconv/iconv_prog.c:64
+#: iconv/iconv_prog.c:62
 msgid "Information:"
 msgstr "Informatie:"
 
-#: iconv/iconv_prog.c:65
+#: iconv/iconv_prog.c:63
 msgid "list all known coded character sets"
-msgstr "alle bekende, gecodeerde tekensets opsommen"
+msgstr "alle bekende gecodeerde tekensets opsommen"
 
-#: iconv/iconv_prog.c:66 locale/programs/localedef.c:128
+#: iconv/iconv_prog.c:64 locale/programs/localedef.c:126
 msgid "Output control:"
 msgstr "Uitvoerbeheer:"
 
-#: iconv/iconv_prog.c:67
+#: iconv/iconv_prog.c:65
 msgid "omit invalid characters from output"
-msgstr "ongeldige tekens overslaan in uitvoer"
+msgstr "ongeldige tekens in uitvoer overslaan"
 
-#: iconv/iconv_prog.c:68
+#: iconv/iconv_prog.c:66
 msgid "output file"
 msgstr "uitvoerbestand"
 
-#: iconv/iconv_prog.c:69
+#: iconv/iconv_prog.c:67
 msgid "suppress warnings"
 msgstr "waarschuwingen onderdrukken"
 
-#: iconv/iconv_prog.c:70
+#: iconv/iconv_prog.c:68
 msgid "print progress information"
-msgstr "voortgangsinformatie weergeven"
+msgstr "voortgangsinformatie tonen"
 
-#: iconv/iconv_prog.c:75
+#: iconv/iconv_prog.c:73
 msgid "Convert encoding of given files from one encoding to another."
-msgstr "Gegeven bestanden converteren van ene codering naar andere."
+msgstr "Bestanden converteren van ene codering naar andere."
 
-#: iconv/iconv_prog.c:79
+#: iconv/iconv_prog.c:77
 msgid "[FILE...]"
 msgstr "[BESTAND...]"
 
-#: iconv/iconv_prog.c:201
+#: iconv/iconv_prog.c:199
+#, c-format
 msgid "cannot open output file"
 msgstr "kan uitvoerbestand niet openen"
 
-#: iconv/iconv_prog.c:243
+#: iconv/iconv_prog.c:241
 #, c-format
 msgid "conversions from `%s' and to `%s' are not supported"
-msgstr "conversie van `%s' en naar `%s' wordt niet ondersteund"
+msgstr "conversie vanuit '%s' en conversie naar '%s' worden niet ondersteund"
 
-#: iconv/iconv_prog.c:248
+#: iconv/iconv_prog.c:246
 #, c-format
 msgid "conversion from `%s' is not supported"
-msgstr "conversie van `%s' wordt niet ondersteund"
+msgstr "conversie vanuit '%s' wordt niet ondersteund"
 
-#: iconv/iconv_prog.c:255
+#: iconv/iconv_prog.c:253
 #, c-format
 msgid "conversion to `%s' is not supported"
-msgstr "conversie naar `%s' wordt niet ondersteund"
+msgstr "conversie naar '%s' wordt niet ondersteund"
 
-#: iconv/iconv_prog.c:259
+#: iconv/iconv_prog.c:257
 #, c-format
 msgid "conversion from `%s' to `%s' is not supported"
-msgstr "conversie van `%s' naar `%s' wordt niet ondersteund"
+msgstr "conversie van '%s' naar '%s' wordt niet ondersteund"
 
-#: iconv/iconv_prog.c:265
+#: iconv/iconv_prog.c:267
+#, c-format
 msgid "failed to start conversion processing"
-msgstr "beginnen conversieproces mislukt"
-
-#: iconv/iconv_prog.c:360
-msgid "error while closing output file"
-msgstr "fout bij sluiten uitvoerbestand"
+msgstr "beginnen van conversieproces is mislukt"
 
-#: iconv/iconv_prog.c:409 iconv/iconvconfig.c:357 locale/programs/locale.c:279
-#: locale/programs/localedef.c:372 catgets/gencat.c:233
-#: malloc/memusagestat.c:602 debug/pcprofiledump.c:199
-msgid "Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"
-msgstr ""
-"Rapporteer fouten met het `glibcbug' script aan <bugs@gnu.org>.\n"
-"Neem voor fouten in de vertaling contact op met <vertaling@nl.linux.org>.\n"
-
-#: iconv/iconv_prog.c:423 iconv/iconvconfig.c:371 locale/programs/locale.c:292
-#: locale/programs/localedef.c:386 catgets/gencat.c:246 posix/getconf.c:913
-#: nss/getent.c:74 nscd/nscd.c:355 nscd/nscd_nischeck.c:90 elf/ldconfig.c:274
-#: elf/sprof.c:349
+#: iconv/iconv_prog.c:361
 #, c-format
-msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions.  There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Dit is vrije software; zie de broncode voor kopieervoorwaarden.  Er is GEEN\n"
-"garantie; zelfs niet van VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD\n"
-"DOEL.\n"
+msgid "error while closing output file"
+msgstr "fout bij sluiten van uitvoerbestand"
 
-#: iconv/iconv_prog.c:428 iconv/iconvconfig.c:376 locale/programs/locale.c:297
-#: locale/programs/localedef.c:391 catgets/gencat.c:251 posix/getconf.c:918
-#: nss/getent.c:79 nscd/nscd.c:360 nscd/nscd_nischeck.c:95 elf/ldconfig.c:279
-#: elf/sprof.c:355
+#: iconv/iconv_prog.c:470 iconv/iconv_prog.c:496
 #, c-format
-msgid "Written by %s.\n"
-msgstr ""
-"Geschreven door %s.\n"
-"Vertaald door Elros Cyriatan.\n"
-
-#: iconv/iconv_prog.c:458 iconv/iconv_prog.c:484
 msgid "conversion stopped due to problem in writing the output"
-msgstr "conversie gestopt vanwege probleem bij schrijven van uitvoer"
+msgstr "conversie is gestopt vanwege probleem bij schrijven van de uitvoer"
 
-#: iconv/iconv_prog.c:502
+#: iconv/iconv_prog.c:521
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr "ongeldige invoerreeks op positie %ld"
 
-#: iconv/iconv_prog.c:510
+#: iconv/iconv_prog.c:529
+#, c-format
 msgid "internal error (illegal descriptor)"
-msgstr "interne fout (ongeldige beschrijver)"
+msgstr "**interne fout**: ongeldige descriptor"
 
-#: iconv/iconv_prog.c:513
+#: iconv/iconv_prog.c:532
 #, c-format
 msgid "unknown iconv() error %d"
-msgstr "onbekende iconv() fout %d"
+msgstr "onbekende iconv()-fout %d"
 
-#: iconv/iconv_prog.c:756
+# ###XXX ->contains
+#: iconv/iconv_prog.c:778
 msgid ""
 "The following list contain all the coded character sets known.  This does\n"
 "not necessarily mean that all combinations of these names can be used for\n"
@@ -347,56 +1314,160 @@ msgid ""
 "\n"
 "  "
 msgstr ""
-"De volgende lijst bevat alle bekende, gecodeerde tekensets.  Dit betekent\n"
+"De volgende lijst bevat alle bekende gecodeerde tekensets.  Dit betekent\n"
 "niet noodzakelijkerwijs dat alle combinaties van deze namen kunnen worden\n"
-"gebruikt als parameters voor VAN en NAAR.  Eén gecodeerde tekenset kan\n"
-"worden genoemd met verschillende namen (aliasen).\n"
+"gebruikt als parameters van VAN en NAAR.  Eén enkele gecodeerde tekenset\n"
+"kan met verschillende namen (aliassen) vermeld staan.\n"
 "\n"
 "  "
 
-#: iconv/iconvconfig.c:110
+#: iconv/iconvconfig.c:109
 msgid "Create fastloading iconv module configuration file."
-msgstr "Snelladende iconv-module configuratiebestand maken."
+msgstr "Een snelladend configuratiebestand voor een iconv-module maken."
 
-#: iconv/iconvconfig.c:114
+#: iconv/iconvconfig.c:113
 msgid "[DIR...]"
 msgstr "[MAP...]"
 
 #: iconv/iconvconfig.c:126
 msgid "Prefix used for all file accesses"
-msgstr "Voorvoegsel gebruikt voor alle bestandstoegang"
+msgstr "te gebruiken voorvoegsel voor alle bestandstoegangen"
 
-#: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
+#: iconv/iconvconfig.c:127
+msgid "Put output in FILE instead of installed location (--prefix does not apply to FILE)"
+msgstr "uitvoer in BESTAND opslaan in plaats van op eigen locatie (--prefix geldt niet voor BESTAND)"
+
+#: iconv/iconvconfig.c:131
+msgid "Do not search standard directories, only those on the command line"
+msgstr "standaardmappen niet doorzoeken, alleen die op de opdrachtregel"
+
+#: iconv/iconvconfig.c:300
+#, c-format
+msgid "Directory arguments required when using --nostdlib"
+msgstr "Mapargumenten zijn vereist bij gebruik van '--nostdlib'"
+
+#: iconv/iconvconfig.c:342 locale/programs/localedef.c:290
+#, c-format
 msgid "no output file produced because warnings were issued"
-msgstr "geen uitvoerbestand gemaakt omdat waarschuwing is gegeven"
+msgstr "geen uitvoerbestand aangemaakt omdat er waarschuwingen werden gegeven"
 
-#: iconv/iconvconfig.c:405
+#: iconv/iconvconfig.c:428
+#, c-format
 msgid "while inserting in search tree"
 msgstr "bij invoegen in zoekboom"
 
-#: iconv/iconvconfig.c:1204
+#: iconv/iconvconfig.c:1236
+#, c-format
 msgid "cannot generate output file"
 msgstr "kan geen uitvoerbestand genereren"
 
-#: locale/programs/charmap-dir.c:59
+#: inet/rcmd.c:157
+msgid "rcmd: Cannot allocate memory\n"
+msgstr "rcmd: Kan geen geheugen reserveren\n"
+
+#: inet/rcmd.c:172
+msgid "rcmd: socket: All ports in use\n"
+msgstr "rcmd: socket: Alle poorten zijn in gebruik\n"
+
+#: inet/rcmd.c:200
+#, c-format
+msgid "connect to address %s: "
+msgstr "verbinden met adres %s: "
+
+#: inet/rcmd.c:213
+#, c-format
+msgid "Trying %s...\n"
+msgstr "Proberen van %s...\n"
+
+#: inet/rcmd.c:249
+#, c-format
+msgid "rcmd: write (setting up stderr): %m\n"
+msgstr "rcmd: schrijven (instellen van standaardfoutuitvoer): %m\n"
+
+#: inet/rcmd.c:265
+#, c-format
+msgid "rcmd: poll (setting up stderr): %m\n"
+msgstr "rcmd: polsen (instellen van standaardfoutuitvoer): %m\n"
+
+#: inet/rcmd.c:268
+msgid "poll: protocol failure in circuit setup\n"
+msgstr "polsen: protocolfout bij opzetten van circuit\n"
+
+#: inet/rcmd.c:301
+msgid "socket: protocol failure in circuit setup\n"
+msgstr "socket: protocolfout bij opzetten van circuit\n"
+
+#: inet/rcmd.c:325
+#, c-format
+msgid "rcmd: %s: short read"
+msgstr "rcmd: %s: te weinig gelezen"
+
+#: inet/rcmd.c:481
+msgid "lstat failed"
+msgstr "lstat() is mislukt"
+
+#: inet/rcmd.c:488
+msgid "cannot open"
+msgstr "kan niet openen"
+
+#: inet/rcmd.c:490
+msgid "fstat failed"
+msgstr "fstat() is mislukt"
+
+#: inet/rcmd.c:492
+msgid "bad owner"
+msgstr "verkeerde eigenaar"
+
+#: inet/rcmd.c:494
+msgid "writeable by other than owner"
+msgstr "schrijfbaar door anderen dan eigenaar"
+
+#: inet/rcmd.c:496
+msgid "hard linked somewhere"
+msgstr "ergens hard gekoppeld"
+
+#: inet/ruserpass.c:170 inet/ruserpass.c:193
+msgid "out of memory"
+msgstr "onvoldoende geheugen"
+
+#: inet/ruserpass.c:184
+msgid "Error: .netrc file is readable by others."
+msgstr "Fout: .netrc-bestand is leesbaar voor anderen."
+
+#: inet/ruserpass.c:185
+msgid "Remove password or make file unreadable by others."
+msgstr "Verwijder het wachtwoord of maak het bestand onleesbaar voor anderen."
+
+#: inet/ruserpass.c:277
+#, c-format
+msgid "Unknown .netrc keyword %s"
+msgstr "Onbekend .netrc-sleutelwoord %s"
+
+#: libidn/nfkc.c:464
+msgid "Character out of range for UTF-8"
+msgstr "Teken ligt buiten bereik voor UTF-8"
+
+#: locale/programs/charmap-dir.c:57
 #, c-format
 msgid "cannot read character map directory `%s'"
-msgstr "kan tekenafbeelding-map `%s' niet lezen"
+msgstr "kan tekenskaartmap '%s' niet lezen"
 
-#: locale/programs/charmap.c:136
+#: locale/programs/charmap.c:137
 #, c-format
 msgid "character map file `%s' not found"
-msgstr "tekenafbeelding-bestand `%s' niet gevonden"
+msgstr "kan tekenskaartbestand '%s' niet vinden"
 
 #: locale/programs/charmap.c:194
 #, c-format
 msgid "default character map file `%s' not found"
-msgstr "standaard tekenafbeelding-bestand `%s' niet gevonden"
+msgstr "kan standaard-tekenskaartbestand '%s' niet vinden"
 
 #: locale/programs/charmap.c:257
 #, c-format
 msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
-msgstr "tekenafbeelding `%s' is niet ASCII-compatible, locale voldoet niet aan ISO C\n"
+msgstr ""
+"tekenskaart '%s' is niet ASCII-compatibel;\n"
+"de locale voldoet niet aan ISO C\n"
 
 #: locale/programs/charmap.c:336
 #, c-format
@@ -404,19 +1475,19 @@ msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max> moet groter zijn dan <mb_cur_min>\n"
 
 #: locale/programs/charmap.c:356 locale/programs/charmap.c:373
-#: locale/programs/repertoire.c:175
+#: locale/programs/repertoire.c:174
 #, c-format
 msgid "syntax error in prolog: %s"
-msgstr "syntaxisfout in proloog: %s"
+msgstr "syntaxfout in proloog: %s"
 
 #: locale/programs/charmap.c:357
 msgid "invalid definition"
 msgstr "ongeldige definitie"
 
-#: locale/programs/charmap.c:374 locale/programs/locfile.c:126
-#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
+#: locale/programs/charmap.c:374 locale/programs/locfile.c:125
+#: locale/programs/locfile.c:152 locale/programs/repertoire.c:175
 msgid "bad argument"
-msgstr "fout argument"
+msgstr "onjuist argument"
 
 #: locale/programs/charmap.c:402
 #, c-format
@@ -426,17 +1497,17 @@ msgstr "dubbele definitie van <%s>"
 #: locale/programs/charmap.c:409
 #, c-format
 msgid "value for <%s> must be 1 or greater"
-msgstr "waarde voor <%s> moet 1 of groter zijn"
+msgstr "waarde van <%s> moet groter of gelijk aan 1 zijn"
 
 #: locale/programs/charmap.c:421
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
-msgstr "waarde voor <%s> moet groter dan of gelijk zijn aan de waarde van <%s>"
+msgstr "waarde van <%s> moet groter of gelijk aan de waarde van <%s> zijn"
 
-#: locale/programs/charmap.c:444 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:444 locale/programs/repertoire.c:183
 #, c-format
 msgid "argument to <%s> must be a single character"
-msgstr "argument voor <%s> moet een enkel teken zijn"
+msgstr "argument van <%s> moet een enkel teken zijn"
 
 #: locale/programs/charmap.c:470
 msgid "character sets with locking states are not supported"
@@ -448,10 +1519,10 @@ msgstr "tekensets met blokkerende toestanden worden niet ondersteund"
 #: locale/programs/charmap.c:814
 #, c-format
 msgid "syntax error in %s definition: %s"
-msgstr "syntaxisfout in definitie %s: %s"
+msgstr "syntaxfout in definitie van %s: %s"
 
 #: locale/programs/charmap.c:498 locale/programs/charmap.c:678
-#: locale/programs/charmap.c:774 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:774 locale/programs/repertoire.c:230
 msgid "no symbolic name given"
 msgstr "geen symbolische naam gegeven"
 
@@ -465,886 +1536,900 @@ msgstr "te weinig bytes in tekencodering"
 
 #: locale/programs/charmap.c:563
 msgid "too many bytes in character encoding"
-msgstr "teveel bytes in tekencodering"
+msgstr "te veel bytes in tekencodering"
 
 #: locale/programs/charmap.c:585 locale/programs/charmap.c:733
-#: locale/programs/charmap.c:816 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:816 locale/programs/repertoire.c:296
 msgid "no symbolic name given for end of range"
 msgstr "geen symbolische naam gegeven voor einde-van-bereik"
 
 #: locale/programs/charmap.c:609 locale/programs/locfile.c:818
-#: locale/programs/repertoire.c:314
+#: locale/programs/repertoire.c:313
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
-msgstr "`%1$s' definitie eindigt niet met `END %1$s'"
+msgstr "%1$s: definitie eindigt niet met 'END %1$s'"
 
 #: locale/programs/charmap.c:642
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
-msgstr "slechts WIDTH (breedte) definities zijn toegestaan opvolgend op de CHARMAP (tekenafbeelding) definitie"
+msgstr "na de definitie van CHARMAP zijn alleen definities van WIDTH toegestaan"
 
 #: locale/programs/charmap.c:650 locale/programs/charmap.c:713
 #, c-format
 msgid "value for %s must be an integer"
-msgstr "waarde voor %s moet een geheel getal zijn"
+msgstr "de waarde van %s moet een geheel getal zijn"
 
 #: locale/programs/charmap.c:841
 #, c-format
 msgid "%s: error in state machine"
-msgstr "%s: fout in toestandenmachine"
-
-#: locale/programs/charmap.c:849 locale/programs/ld-address.c:605
-#: locale/programs/ld-collate.c:2650 locale/programs/ld-collate.c:3818
-#: locale/programs/ld-ctype.c:2225 locale/programs/ld-ctype.c:2994
-#: locale/programs/ld-identification.c:469
-#: locale/programs/ld-measurement.c:255 locale/programs/ld-messages.c:349
-#: locale/programs/ld-monetary.c:958 locale/programs/ld-name.c:324
-#: locale/programs/ld-numeric.c:392 locale/programs/ld-paper.c:258
-#: locale/programs/ld-telephone.c:330 locale/programs/ld-time.c:1219
-#: locale/programs/locfile.c:825 locale/programs/repertoire.c:325
+msgstr "%s: **interne fout** in toestandsmachine"
+
+#: locale/programs/charmap.c:849 locale/programs/ld-address.c:615
+#: locale/programs/ld-collate.c:2650 locale/programs/ld-collate.c:3820
+#: locale/programs/ld-ctype.c:2224 locale/programs/ld-ctype.c:2996
+#: locale/programs/ld-identification.c:467
+#: locale/programs/ld-measurement.c:253 locale/programs/ld-messages.c:347
+#: locale/programs/ld-monetary.c:956 locale/programs/ld-name.c:322
+#: locale/programs/ld-numeric.c:383 locale/programs/ld-paper.c:256
+#: locale/programs/ld-telephone.c:328 locale/programs/ld-time.c:1236
+#: locale/programs/locfile.c:825 locale/programs/repertoire.c:324
 #, c-format
 msgid "%s: premature end of file"
-msgstr "%s: vroegtijdig einde-van-bestand"
+msgstr "%s: voortijdig einde van bestand"
 
 #: locale/programs/charmap.c:868 locale/programs/charmap.c:879
 #, c-format
 msgid "unknown character `%s'"
-msgstr "onbekend teken `%s'"
+msgstr "onbekend teken '%s'"
 
 #: locale/programs/charmap.c:887
 #, c-format
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
-msgstr "aantal bytes voor bytereeks zijn voor begin en einde van bereik niet hetzelfde: %d tegenover %d"
+msgstr "het aantal bytes in de bytereeks is voor begin en einde van het bereik niet hetzelfde: %d tegenover %d"
 
-#: locale/programs/charmap.c:991 locale/programs/ld-collate.c:2930
-#: locale/programs/repertoire.c:420
+#: locale/programs/charmap.c:992 locale/programs/ld-collate.c:2933
+#: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr "ongeldige namen voor tekenbereik"
 
-#: locale/programs/charmap.c:1003 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1004 locale/programs/repertoire.c:431
 msgid "hexadecimal range format should use only capital characters"
-msgstr "hexadecimaal bereikformaat moet alleen hoofdletters gebruiken"
+msgstr "hexadecimale bereikopgave mag alleen hoofdletters bevatten"
 
-#: locale/programs/charmap.c:1021
+#: locale/programs/charmap.c:1022
 #, c-format
 msgid "<%s> and <%s> are illegal names for range"
-msgstr "<%s> en <%s> zijn ongeldige namen voor bereik"
+msgstr "<%s> en <%s> zijn ongeldige namen voor een bereik"
 
-#: locale/programs/charmap.c:1027
+#: locale/programs/charmap.c:1028
 msgid "upper limit in range is not higher then lower limit"
-msgstr "bovengrens in bereik is niet hoger dan ondergrens"
+msgstr "bovengrens in bereik is kleiner dan ondergrens"
 
-#: locale/programs/charmap.c:1085
+#: locale/programs/charmap.c:1086
 msgid "resulting bytes for range not representable."
-msgstr "resulterende bytes voor bereik zijn niet te representeren."
+msgstr "resulterende bytes voor bereik zijn niet te representeren"
 
-#: locale/programs/ld-address.c:134 locale/programs/ld-collate.c:1534
-#: locale/programs/ld-ctype.c:421 locale/programs/ld-identification.c:134
-#: locale/programs/ld-measurement.c:95 locale/programs/ld-messages.c:98
-#: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:95
-#: locale/programs/ld-numeric.c:99 locale/programs/ld-paper.c:92
-#: locale/programs/ld-telephone.c:95 locale/programs/ld-time.c:160
+#: locale/programs/ld-address.c:132 locale/programs/ld-collate.c:1532
+#: locale/programs/ld-ctype.c:419 locale/programs/ld-identification.c:132
+#: locale/programs/ld-measurement.c:93 locale/programs/ld-messages.c:96
+#: locale/programs/ld-monetary.c:192 locale/programs/ld-name.c:93
+#: locale/programs/ld-numeric.c:97 locale/programs/ld-paper.c:90
+#: locale/programs/ld-telephone.c:93 locale/programs/ld-time.c:158
 #, c-format
 msgid "No definition for %s category found"
-msgstr "Geen definitie gevonden voor categorie %s"
-
-#: locale/programs/ld-address.c:145 locale/programs/ld-address.c:183
-#: locale/programs/ld-address.c:201 locale/programs/ld-address.c:228
-#: locale/programs/ld-address.c:290 locale/programs/ld-address.c:309
-#: locale/programs/ld-address.c:322 locale/programs/ld-identification.c:147
-#: locale/programs/ld-measurement.c:106 locale/programs/ld-monetary.c:206
-#: locale/programs/ld-monetary.c:250 locale/programs/ld-monetary.c:266
-#: locale/programs/ld-monetary.c:278 locale/programs/ld-name.c:106
-#: locale/programs/ld-name.c:143 locale/programs/ld-numeric.c:113
-#: locale/programs/ld-numeric.c:127 locale/programs/ld-paper.c:103
-#: locale/programs/ld-paper.c:112 locale/programs/ld-telephone.c:106
-#: locale/programs/ld-telephone.c:163 locale/programs/ld-time.c:176
-#: locale/programs/ld-time.c:197
+msgstr "Geen definitie gevonden voor %s-categorie"
+
+#: locale/programs/ld-address.c:143 locale/programs/ld-address.c:181
+#: locale/programs/ld-address.c:199 locale/programs/ld-address.c:228
+#: locale/programs/ld-address.c:300 locale/programs/ld-address.c:319
+#: locale/programs/ld-address.c:332 locale/programs/ld-identification.c:145
+#: locale/programs/ld-measurement.c:104 locale/programs/ld-monetary.c:204
+#: locale/programs/ld-monetary.c:248 locale/programs/ld-monetary.c:264
+#: locale/programs/ld-monetary.c:276 locale/programs/ld-name.c:104
+#: locale/programs/ld-name.c:141 locale/programs/ld-numeric.c:111
+#: locale/programs/ld-numeric.c:125 locale/programs/ld-paper.c:101
+#: locale/programs/ld-paper.c:110 locale/programs/ld-telephone.c:104
+#: locale/programs/ld-telephone.c:161 locale/programs/ld-time.c:174
+#: locale/programs/ld-time.c:195
 #, c-format
 msgid "%s: field `%s' not defined"
-msgstr "%s: veld `%s' niet gedefinieerd"
+msgstr "%s: het veld '%s' is niet gedefinieerd"
 
-#: locale/programs/ld-address.c:157 locale/programs/ld-address.c:209
-#: locale/programs/ld-address.c:235 locale/programs/ld-address.c:265
-#: locale/programs/ld-name.c:118 locale/programs/ld-telephone.c:118
+#: locale/programs/ld-address.c:155 locale/programs/ld-address.c:207
+#: locale/programs/ld-address.c:237 locale/programs/ld-address.c:275
+#: locale/programs/ld-name.c:116 locale/programs/ld-telephone.c:116
 #, c-format
 msgid "%s: field `%s' must not be empty"
-msgstr "%s: veld `%s' mag niet leeg zijn"
+msgstr "%s: het veld '%s' mag niet leeg zijn"
 
-#: locale/programs/ld-address.c:169
+#: locale/programs/ld-address.c:167
 #, c-format
 msgid "%s: invalid escape `%%%c' sequence in field `%s'"
-msgstr "%s: ongeldige stuurcode `%%%c' in veld `%s'"
+msgstr "%s: ongeldige stuurcode '%%%c' in het veld '%s'"
 
-#: locale/programs/ld-address.c:220
+#: locale/programs/ld-address.c:218
 #, c-format
 msgid "%s: terminology language code `%s' not defined"
-msgstr "%s: terminologie taalcode `%s' niet gedefinieerd"
+msgstr "%s: terminologiecode '%s' is niet gedefinieerd"
 
-#: locale/programs/ld-address.c:247 locale/programs/ld-address.c:276
+#: locale/programs/ld-address.c:243
+#, c-format
+msgid "%s: field `%s' must not be defined"
+msgstr "%s: het veld '%s' mag niet gedefinieerd zijn"
+
+#: locale/programs/ld-address.c:257 locale/programs/ld-address.c:286
 #, c-format
 msgid "%s: language abbreviation `%s' not defined"
-msgstr "%s: taal afkorting `%s' niet gedefinieerd"
+msgstr "%s: taalafkorting '%s' is niet gedefinieerd"
 
-#: locale/programs/ld-address.c:254 locale/programs/ld-address.c:282
-#: locale/programs/ld-address.c:316 locale/programs/ld-address.c:328
+#: locale/programs/ld-address.c:264 locale/programs/ld-address.c:292
+#: locale/programs/ld-address.c:326 locale/programs/ld-address.c:338
 #, c-format
 msgid "%s: `%s' value does not match `%s' value"
-msgstr "%s: `%s' waarde komt niet overeen met `%s' waarde"
+msgstr "%s: waarde van '%s' komt niet overeen met waarde van '%s'"
 
-#: locale/programs/ld-address.c:301
+#: locale/programs/ld-address.c:311
 #, c-format
 msgid "%s: numeric country code `%d' not valid"
-msgstr "%s: numerieke landcode `%d' niet geldig"
-
-#: locale/programs/ld-address.c:497 locale/programs/ld-address.c:534
-#: locale/programs/ld-address.c:572 locale/programs/ld-ctype.c:2601
-#: locale/programs/ld-identification.c:365
-#: locale/programs/ld-measurement.c:222 locale/programs/ld-messages.c:302
-#: locale/programs/ld-monetary.c:700 locale/programs/ld-monetary.c:735
-#: locale/programs/ld-monetary.c:776 locale/programs/ld-name.c:281
-#: locale/programs/ld-numeric.c:264 locale/programs/ld-paper.c:225
-#: locale/programs/ld-telephone.c:289 locale/programs/ld-time.c:1108
-#: locale/programs/ld-time.c:1150
+msgstr "%s: numerieke landcode '%d' is ongeldig"
+
+#: locale/programs/ld-address.c:507 locale/programs/ld-address.c:544
+#: locale/programs/ld-address.c:582 locale/programs/ld-ctype.c:2603
+#: locale/programs/ld-identification.c:363
+#: locale/programs/ld-measurement.c:220 locale/programs/ld-messages.c:300
+#: locale/programs/ld-monetary.c:698 locale/programs/ld-monetary.c:733
+#: locale/programs/ld-monetary.c:774 locale/programs/ld-name.c:279
+#: locale/programs/ld-numeric.c:262 locale/programs/ld-paper.c:223
+#: locale/programs/ld-telephone.c:287 locale/programs/ld-time.c:1125
+#: locale/programs/ld-time.c:1167
 #, c-format
 msgid "%s: field `%s' declared more than once"
-msgstr "%s: veld `%s' meerdere keren gedeclareerd"
+msgstr "%s: het veld '%s' is meerdere keren gedeclareerd"
 
-#: locale/programs/ld-address.c:501 locale/programs/ld-address.c:539
-#: locale/programs/ld-identification.c:369 locale/programs/ld-messages.c:312
-#: locale/programs/ld-monetary.c:704 locale/programs/ld-monetary.c:739
-#: locale/programs/ld-name.c:285 locale/programs/ld-numeric.c:268
-#: locale/programs/ld-telephone.c:293 locale/programs/ld-time.c:1002
-#: locale/programs/ld-time.c:1071 locale/programs/ld-time.c:1113
+#: locale/programs/ld-address.c:511 locale/programs/ld-address.c:549
+#: locale/programs/ld-identification.c:367 locale/programs/ld-messages.c:310
+#: locale/programs/ld-monetary.c:702 locale/programs/ld-monetary.c:737
+#: locale/programs/ld-name.c:283 locale/programs/ld-numeric.c:266
+#: locale/programs/ld-telephone.c:291 locale/programs/ld-time.c:1019
+#: locale/programs/ld-time.c:1088 locale/programs/ld-time.c:1130
 #, c-format
 msgid "%s: unknown character in field `%s'"
-msgstr "%s: onbekend teken in veld `%s'"
+msgstr "%s: onbekend teken in het veld '%s'"
 
-#: locale/programs/ld-address.c:586 locale/programs/ld-collate.c:3800
-#: locale/programs/ld-ctype.c:2974 locale/programs/ld-identification.c:450
-#: locale/programs/ld-measurement.c:236 locale/programs/ld-messages.c:331
-#: locale/programs/ld-monetary.c:940 locale/programs/ld-name.c:306
-#: locale/programs/ld-numeric.c:374 locale/programs/ld-paper.c:240
-#: locale/programs/ld-telephone.c:312 locale/programs/ld-time.c:1201
+#: locale/programs/ld-address.c:596 locale/programs/ld-collate.c:3802
+#: locale/programs/ld-ctype.c:2976 locale/programs/ld-identification.c:448
+#: locale/programs/ld-measurement.c:234 locale/programs/ld-messages.c:329
+#: locale/programs/ld-monetary.c:938 locale/programs/ld-name.c:304
+#: locale/programs/ld-numeric.c:365 locale/programs/ld-paper.c:238
+#: locale/programs/ld-telephone.c:310 locale/programs/ld-time.c:1218
 #, c-format
 msgid "%s: incomplete `END' line"
-msgstr "%s: onvolledige `END'-regel"
+msgstr "%s: onvolledige 'END'-regel"
 
-#: locale/programs/ld-address.c:589 locale/programs/ld-collate.c:2653
-#: locale/programs/ld-collate.c:3802 locale/programs/ld-ctype.c:2228
-#: locale/programs/ld-ctype.c:2977 locale/programs/ld-identification.c:453
-#: locale/programs/ld-measurement.c:239 locale/programs/ld-messages.c:333
-#: locale/programs/ld-monetary.c:942 locale/programs/ld-name.c:308
-#: locale/programs/ld-numeric.c:376 locale/programs/ld-paper.c:242
-#: locale/programs/ld-telephone.c:314 locale/programs/ld-time.c:1203
+#: locale/programs/ld-address.c:599 locale/programs/ld-collate.c:2653
+#: locale/programs/ld-collate.c:3804 locale/programs/ld-ctype.c:2227
+#: locale/programs/ld-ctype.c:2979 locale/programs/ld-identification.c:451
+#: locale/programs/ld-measurement.c:237 locale/programs/ld-messages.c:331
+#: locale/programs/ld-monetary.c:940 locale/programs/ld-name.c:306
+#: locale/programs/ld-numeric.c:367 locale/programs/ld-paper.c:240
+#: locale/programs/ld-telephone.c:312 locale/programs/ld-time.c:1220
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
-msgstr "%1$s: definitie eindigt niet met `END %1$s'"
-
-#: locale/programs/ld-address.c:596 locale/programs/ld-collate.c:523
-#: locale/programs/ld-collate.c:575 locale/programs/ld-collate.c:871
-#: locale/programs/ld-collate.c:884 locale/programs/ld-collate.c:2640
-#: locale/programs/ld-collate.c:3809 locale/programs/ld-ctype.c:1956
-#: locale/programs/ld-ctype.c:2215 locale/programs/ld-ctype.c:2799
-#: locale/programs/ld-ctype.c:2985 locale/programs/ld-identification.c:460
-#: locale/programs/ld-measurement.c:246 locale/programs/ld-messages.c:340
-#: locale/programs/ld-monetary.c:949 locale/programs/ld-name.c:315
-#: locale/programs/ld-numeric.c:383 locale/programs/ld-paper.c:249
-#: locale/programs/ld-telephone.c:321 locale/programs/ld-time.c:1210
+msgstr "%1$s: definitie eindigt niet met 'END %1$s'"
+
+#: locale/programs/ld-address.c:606 locale/programs/ld-collate.c:521
+#: locale/programs/ld-collate.c:573 locale/programs/ld-collate.c:869
+#: locale/programs/ld-collate.c:882 locale/programs/ld-collate.c:2640
+#: locale/programs/ld-collate.c:3811 locale/programs/ld-ctype.c:1955
+#: locale/programs/ld-ctype.c:2214 locale/programs/ld-ctype.c:2801
+#: locale/programs/ld-ctype.c:2987 locale/programs/ld-identification.c:458
+#: locale/programs/ld-measurement.c:244 locale/programs/ld-messages.c:338
+#: locale/programs/ld-monetary.c:947 locale/programs/ld-name.c:313
+#: locale/programs/ld-numeric.c:374 locale/programs/ld-paper.c:247
+#: locale/programs/ld-telephone.c:319 locale/programs/ld-time.c:1227
 #, c-format
 msgid "%s: syntax error"
-msgstr "%s: syntaxisfout"
+msgstr "%s: syntaxfout"
 
-#: locale/programs/ld-collate.c:398
+#: locale/programs/ld-collate.c:396
 #, c-format
 msgid "`%.*s' already defined in charmap"
-msgstr "`%.*s' reeds gedefinieerd in tekenafbeelding"
+msgstr "'%.*s' is al gedefinieerd in tekenskaart"
 
-#: locale/programs/ld-collate.c:407
+#: locale/programs/ld-collate.c:405
 #, c-format
 msgid "`%.*s' already defined in repertoire"
-msgstr "`%.*s' reeds gedefinieerd in repertoire"
+msgstr "`%.*s' is al gedefinieerd in repertoire"
 
-#: locale/programs/ld-collate.c:414
+#: locale/programs/ld-collate.c:412
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
-msgstr "`%.*s' reeds gedefinieerd als sorteersymbool"
+msgstr "'%.*s' is al gedefinieerd als sorteringssymbool"
 
-#: locale/programs/ld-collate.c:421
+#: locale/programs/ld-collate.c:419
 #, c-format
 msgid "`%.*s' already defined as collating element"
-msgstr "`%.*s' reeds gedefinieerd als sorteerelement"
+msgstr "'%.*s' is al gedefinieerd als sorteringselement"
 
-#: locale/programs/ld-collate.c:452 locale/programs/ld-collate.c:478
+#: locale/programs/ld-collate.c:450 locale/programs/ld-collate.c:476
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
-msgstr "%s: `forward' (voorwaards) en `backward' (achterwaards) sluiten elkaar uit"
+msgstr "%s: 'forward' en 'backward' sluiten elkaar uit"
 
-#: locale/programs/ld-collate.c:462 locale/programs/ld-collate.c:488
-#: locale/programs/ld-collate.c:504
+#: locale/programs/ld-collate.c:460 locale/programs/ld-collate.c:486
+#: locale/programs/ld-collate.c:502
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
-msgstr "%s: `%s' meerdere keren genoemd in definitie van gewicht %d"
+msgstr "%s: '%s' wordt meerdere keren genoemd in definitie van gewicht %d"
 
-#: locale/programs/ld-collate.c:560
+#: locale/programs/ld-collate.c:558
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
-msgstr "%s: teveel regels; eerste ingang had slechts %d"
+msgstr "%s: te veel voorschriften; het eerste item had er slechts %d"
 
-#: locale/programs/ld-collate.c:596
+#: locale/programs/ld-collate.c:594
 #, c-format
 msgid "%s: not enough sorting rules"
-msgstr "%s: niet genoeg sorteerregels"
+msgstr "%s: niet genoeg sorteervoorschriften"
 
-#: locale/programs/ld-collate.c:761
+#: locale/programs/ld-collate.c:759
 #, c-format
 msgid "%s: empty weight string not allowed"
-msgstr "%s: lege gewichtstekenreeks niet toegestaan"
+msgstr "%s: lege gewichtstekenreeks is niet toegestaan"
 
-#: locale/programs/ld-collate.c:856
+#: locale/programs/ld-collate.c:854
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
-msgstr "%s: gewichten moeten hetzelfde weglatingssymbool (ellipsis) gebruiken als de naam"
+msgstr "%s: gewichten moeten hetzelfde beletselteken gebruiken als de naam"
 
-#: locale/programs/ld-collate.c:912
+#: locale/programs/ld-collate.c:910
 #, c-format
 msgid "%s: too many values"
-msgstr "%s: teveel waarden"
+msgstr "%s: te veel waarden"
 
-#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
+#: locale/programs/ld-collate.c:1029 locale/programs/ld-collate.c:1204
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
-msgstr "volgorde voor `%.*s' reeds gedefinieerd bij %s:%Zu"
+msgstr "sorteervolgorde voor '%.*s' is al gedefinieerd in %s:%Zu"
 
-#: locale/programs/ld-collate.c:1081
+#: locale/programs/ld-collate.c:1079
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
-msgstr "%s: het symbool van begin en einde van reeks moet staan voor tekens"
+msgstr "%s: het begin- en eindsymbool van een bereik moeten enkele tekens aanduiden"
 
-#: locale/programs/ld-collate.c:1108
+#: locale/programs/ld-collate.c:1106
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
-msgstr "%s: bytereeksen van eerste en laatste teken moeten dezelfde lengte hebben"
+msgstr "%s: de bytereeksen van het eerste en laatste bereikteken moeten dezelfde lengte hebben"
 
-#: locale/programs/ld-collate.c:1150
+#: locale/programs/ld-collate.c:1148
 #, c-format
 msgid "%s: byte sequence of first character of sequence is not lower than that of the last character"
-msgstr "%s: bytereeks van eerste teken van reeks is niet lager dan bytereeks van het laatste teken"
+msgstr "%s: de bytereeks van het eerste bereikteken is niet kleiner dan de bytereeks van het laatste bereikteken"
 
-#: locale/programs/ld-collate.c:1275
+#: locale/programs/ld-collate.c:1273
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
-msgstr "%s: weglatingsteken van symbolisch bereik mag niet direct `order_start' (volgorde begin) opvolgen"
+msgstr "%s: beletselteken van symbolenbereik mag niet direct na 'order_start' staan"
 
-#: locale/programs/ld-collate.c:1279
+#: locale/programs/ld-collate.c:1277
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
-msgstr "%s: weglatingsteken van symbolisch bereik mag niet direct gevolgd worden door `order_end' (volgorde einde)"
+msgstr "%s: beletselteken van symbolenbereik mag niet direct voor 'order_end' staan"
 
-#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
+#: locale/programs/ld-collate.c:1297 locale/programs/ld-ctype.c:1475
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
-msgstr "`%s' en `%.*s' zijn geen geldige namen voor een symbolisch bereik"
+msgstr "'%s' en '%.*s' zijn geen geldige namen voor een symbolenbereik"
 
-#: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
+#: locale/programs/ld-collate.c:1346 locale/programs/ld-collate.c:3739
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
-msgstr "%s: volgorde voor `%.*s' reeds gedefinieerd bij %s:%Zu"
+msgstr "%s: sorteervolgorde van '%.*s' is al gedefinieerd in %s:%Zu"
 
-#: locale/programs/ld-collate.c:1357
+#: locale/programs/ld-collate.c:1355
 #, c-format
 msgid "%s: `%s' must be a character"
-msgstr "%s: `%s' moet een teken zijn"
+msgstr "%s: '%s' moet een teken zijn"
 
-#: locale/programs/ld-collate.c:1550
+#: locale/programs/ld-collate.c:1548
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
-msgstr "%s: `position' (positie) moet ofwel voor een specifiek niveau in alle secties worden gebruikt ofwel voor geen"
+msgstr "%s: 'position' moet voor een specifiek niveau gebruikt worden ofwel in alle secties ofwel in geen"
 
-#: locale/programs/ld-collate.c:1575
+#: locale/programs/ld-collate.c:1573
 #, c-format
 msgid "symbol `%s' not defined"
-msgstr "symbool `%s' niet gedefinieerd"
+msgstr "symbool '%s' is niet gedefinieerd"
 
-#: locale/programs/ld-collate.c:1651 locale/programs/ld-collate.c:1757
+#: locale/programs/ld-collate.c:1649 locale/programs/ld-collate.c:1755
 #, c-format
 msgid "symbol `%s' has the same encoding as"
-msgstr "symbool `%s' heeft dezelfde codering als"
+msgstr "symbool '%s' heeft dezelfde codering als"
 
-#: locale/programs/ld-collate.c:1655 locale/programs/ld-collate.c:1761
+#: locale/programs/ld-collate.c:1653 locale/programs/ld-collate.c:1759
 #, c-format
 msgid "symbol `%s'"
-msgstr "symbool `%s'"
+msgstr "symbool '%s'"
 
-#: locale/programs/ld-collate.c:1803
+#: locale/programs/ld-collate.c:1801
+#, c-format
 msgid "no definition of `UNDEFINED'"
-msgstr "geen definitie van `UNDEFINED' (ongedefinieerd)"
+msgstr "geen definitie van 'UNDEFINED'"
 
-#: locale/programs/ld-collate.c:1832
+#: locale/programs/ld-collate.c:1830
+#, c-format
 msgid "too many errors; giving up"
-msgstr "teveel fouten; ik geef het op"
+msgstr "te veel fouten -- gestopt"
 
-#: locale/programs/ld-collate.c:2735
+#: locale/programs/ld-collate.c:2738
 #, c-format
 msgid "%s: duplicate definition of `%s'"
-msgstr "%s: dubbele definitie van `%s'"
+msgstr "%s: dubbele definitie van '%s'"
 
-#: locale/programs/ld-collate.c:2771
+#: locale/programs/ld-collate.c:2774
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
-msgstr "%s: dubbele declaratie van sectie `%s'"
+msgstr "%s: dubbele declaratie van sectie '%s'"
 
-#: locale/programs/ld-collate.c:2910
+#: locale/programs/ld-collate.c:2913
 #, c-format
 msgid "%s: unknown character in collating symbol name"
-msgstr "%s: onbekend teken in naam sorteersymbool"
+msgstr "%s: onbekend teken in naam van sorteringssymbool"
 
-#: locale/programs/ld-collate.c:3042
+#: locale/programs/ld-collate.c:3045
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
-msgstr "%s: onbekend teken in equivalente definitienaam"
+msgstr "%s: onbekend teken in naam van equivalentiedefinitie"
 
-#: locale/programs/ld-collate.c:3055
+#: locale/programs/ld-collate.c:3058
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
-msgstr "%s: onbekend teken in equivalente definitiewaarde"
+msgstr "%s: onbekend teken in waarde van equivalentiedefinitie"
 
-#: locale/programs/ld-collate.c:3065
+#: locale/programs/ld-collate.c:3068
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
-msgstr "%s: onbekend symbool `%s' in equivalente definitie"
+msgstr "%s: onbekend symbool '%s' in equivalentiedefinitie"
 
-#: locale/programs/ld-collate.c:3074
+#: locale/programs/ld-collate.c:3077
 msgid "error while adding equivalent collating symbol"
-msgstr "fout bij toevoegen equivalent sorteersymbool"
+msgstr "fout bij toevoegen van equivalent sorteringssymbool"
 
-#: locale/programs/ld-collate.c:3104
+#: locale/programs/ld-collate.c:3107
 #, c-format
 msgid "duplicate definition of script `%s'"
-msgstr "dubbele definitie voor schrift `%s'"
+msgstr "dubbele definitie van script '%s'"
 
-#: locale/programs/ld-collate.c:3152
+#: locale/programs/ld-collate.c:3155
 #, c-format
 msgid "%s: unknown section name `%s'"
-msgstr "%s: onbekende sectienaam `%s'"
+msgstr "%s: onbekende sectienaam '%s'"
 
-#: locale/programs/ld-collate.c:3180
+#: locale/programs/ld-collate.c:3183
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
-msgstr "%s: meerdere sorteerdefinities voor sectie `%s'"
+msgstr "%s: meerdere sorteervolgorde-definities voor sectie '%s'"
 
-#: locale/programs/ld-collate.c:3205
+#: locale/programs/ld-collate.c:3208
 #, c-format
 msgid "%s: invalid number of sorting rules"
-msgstr "%s: ongeldig aantal sorteerregels"
+msgstr "%s: ongeldig aantal sorteervoorschriften"
 
-#: locale/programs/ld-collate.c:3232
+#: locale/programs/ld-collate.c:3235
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
-msgstr "%s: meerdere sorteerdefinities voor naamloze sectie"
+msgstr "%s: meerdere sorteervolgorde-definities voor naamloze sectie"
 
-#: locale/programs/ld-collate.c:3286 locale/programs/ld-collate.c:3414
-#: locale/programs/ld-collate.c:3778
+#: locale/programs/ld-collate.c:3289 locale/programs/ld-collate.c:3417
+#: locale/programs/ld-collate.c:3780
 #, c-format
 msgid "%s: missing `order_end' keyword"
-msgstr "%s: ontbrekend `order_end' (volgorde einde) sleutelwoord"
+msgstr "%s: ontbrekend sleutelwoord 'order_end'"
 
-#: locale/programs/ld-collate.c:3347
+#: locale/programs/ld-collate.c:3350
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
-msgstr "%s: volgorde voor sorteersymbool %.*s nog niet gedefinieerd"
+msgstr "%s: sorteervolgorde voor symbool '%.*s' is nog niet gedefinieerd"
 
-#: locale/programs/ld-collate.c:3365
+#: locale/programs/ld-collate.c:3368
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
-msgstr "%s: volgorde voor sorteerelement %.*s nog niet gedefinieerd"
+msgstr "%s: sorteervolgorde voor element '%.*s' is nog niet gedefinieerd"
 
-#: locale/programs/ld-collate.c:3376
+#: locale/programs/ld-collate.c:3379
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
-msgstr "%s: kan niet opnieuw ordenen na %.*s: symbool niet bekend"
+msgstr "%s: kan niet herordenen na '%.*s': dit symbool is onbekend"
 
-#: locale/programs/ld-collate.c:3428 locale/programs/ld-collate.c:3790
+#: locale/programs/ld-collate.c:3431 locale/programs/ld-collate.c:3792
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
-msgstr "%s: ontbrekend `reorder-end' (opnieuw ordenen einde) sleutelwoord"
+msgstr "%s: ontbrekend sleutelwoord 'reorder-end'"
 
-#: locale/programs/ld-collate.c:3462 locale/programs/ld-collate.c:3662
+#: locale/programs/ld-collate.c:3465 locale/programs/ld-collate.c:3664
 #, c-format
 msgid "%s: section `%.*s' not known"
-msgstr "%s: sectie `%.*s' niet bekend"
+msgstr "%s: sectie '%.*s' is onbekend"
 
-#: locale/programs/ld-collate.c:3527
+#: locale/programs/ld-collate.c:3530
 #, c-format
 msgid "%s: bad symbol <%.*s>"
-msgstr "%s: fout symbool <%.*s>"
+msgstr "%s: onjuist symbool <%.*s>"
 
-#: locale/programs/ld-collate.c:3725
+#: locale/programs/ld-collate.c:3727
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
-msgstr "%s: kan `%s' niet hebben als einde van weglatingsbereik"
+msgstr "%s: '%s' kan geen einde van bereik zijn"
 
-#: locale/programs/ld-collate.c:3774
+#: locale/programs/ld-collate.c:3776
 #, c-format
 msgid "%s: empty category description not allowed"
-msgstr "%s: lege categoriebeschrijving niet toegestaan"
+msgstr "%s: lege categoriebeschrijving is niet toegestaan"
 
-#: locale/programs/ld-collate.c:3793
+#: locale/programs/ld-collate.c:3795
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
-msgstr "%s: ontbrekend `reorder-sections-end' (opnieuw ordenen secties einde) sleutelwoord"
+msgstr "%s: ontbrekend sleutelwoord 'reorder-sections-end'"
 
-#: locale/programs/ld-ctype.c:440
+#: locale/programs/ld-ctype.c:438
+#, c-format
 msgid "No character set name specified in charmap"
-msgstr "Geen tekenset naam aangegeven in tekenafbeelding"
+msgstr "Geen tekensetnaam aangegeven in tekenskaart"
 
-#: locale/programs/ld-ctype.c:469
+#: locale/programs/ld-ctype.c:467
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
-msgstr "teken L'\\u%0*x' in klasse `%s' moet in klasse `%s' zijn"
+msgstr "teken L'\\u%0*x' in klasse '%s' moet in klasse '%s' zitten"
 
-#: locale/programs/ld-ctype.c:484
+#: locale/programs/ld-ctype.c:482
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
-msgstr "teken L'\\u%0*x' in klasse `%s' mag niet in klasse `%s' zijn"
+msgstr "teken L'\\u%0*x' in klasse '%s' mag niet in klasse '%s' zitten"
 
-#: locale/programs/ld-ctype.c:498 locale/programs/ld-ctype.c:556
+#: locale/programs/ld-ctype.c:496 locale/programs/ld-ctype.c:554
 #, c-format
 msgid "internal error in %s, line %u"
-msgstr "interne fout in %s, regel %u"
+msgstr "**interne fout** in %s, regel %u"
 
-#: locale/programs/ld-ctype.c:527
+#: locale/programs/ld-ctype.c:525
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
-msgstr "teken '%s' in klasse `%s' moet in klasse `%s' zijn"
+msgstr "teken '%s' in klasse '%s' moet in klasse '%s' zitten"
 
-#: locale/programs/ld-ctype.c:543
+#: locale/programs/ld-ctype.c:541
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
-msgstr "teken '%s' in klasse `%s' mag niet in klasse `%s' zijn"
+msgstr "teken '%s' in klasse '%s' mag niet in klasse '%s' zitten"
 
-#: locale/programs/ld-ctype.c:573 locale/programs/ld-ctype.c:611
+#: locale/programs/ld-ctype.c:571 locale/programs/ld-ctype.c:609
 #, c-format
 msgid "<SP> character not in class `%s'"
-msgstr "<SP> teken niet in klasse `%s'"
+msgstr "<SP>-teken zit niet in klasse '%s'"
 
-#: locale/programs/ld-ctype.c:585 locale/programs/ld-ctype.c:622
+#: locale/programs/ld-ctype.c:583 locale/programs/ld-ctype.c:620
 #, c-format
 msgid "<SP> character must not be in class `%s'"
-msgstr "<SP> teken mag niet in klasse `%s' zijn"
+msgstr "<SP>-teken mag niet in klasse '%s' zitten"
 
-#: locale/programs/ld-ctype.c:600
+#: locale/programs/ld-ctype.c:598
+#, c-format
 msgid "character <SP> not defined in character map"
-msgstr "teken <SP> niet gedefinieerd in tekenafbeelding"
+msgstr "<SP>-teken is niet gedefinieerd in tekenskaart"
 
-#: locale/programs/ld-ctype.c:714
+#: locale/programs/ld-ctype.c:712
+#, c-format
 msgid "`digit' category has not entries in groups of ten"
-msgstr "`digit' (cijfer) categorie heeft ingangen niet in groepen van 10"
+msgstr "het aantal items in de cijferscategorie is geen veelvoud van tien"
 
-#: locale/programs/ld-ctype.c:763
+#: locale/programs/ld-ctype.c:761
+#, c-format
 msgid "no input digits defined and none of the standard names in the charmap"
-msgstr "geen invoercijfers gedefinieerd en geen van de standaardnamen in de tekenafbeelding"
+msgstr "er zijn geen invoercijfers gedefinieerd en geen van de standaardnamen zit in de tekenskaart"
 
-#: locale/programs/ld-ctype.c:828
+#: locale/programs/ld-ctype.c:826
+#, c-format
 msgid "not all characters used in `outdigit' are available in the charmap"
-msgstr "niet alle tekens gebruikt in `outdigit' zijn beschikbaar in de tekenafbeelding"
+msgstr "niet alle tekens gebruikt in 'outdigit' zijn beschikbaar in de tekenskaart"
 
-#: locale/programs/ld-ctype.c:845
+#: locale/programs/ld-ctype.c:843
+#, c-format
 msgid "not all characters used in `outdigit' are available in the repertoire"
-msgstr "niet alle tekens gebruikt in `outdigit' zijn beschikbaar in het repertoire"
+msgstr "niet alle tekens gebruikt in 'outdigit' zijn beschikbaar in het repertoire"
 
-#: locale/programs/ld-ctype.c:1244
+#: locale/programs/ld-ctype.c:1243
 #, c-format
 msgid "character class `%s' already defined"
-msgstr "tekenklasse `%s' reeds gedefinieerd"
+msgstr "tekenklasse '%s' is al gedefinieerd"
 
-#: locale/programs/ld-ctype.c:1250
+#: locale/programs/ld-ctype.c:1249
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
-msgstr "implementatie grens: niet meer dan %Zd tekenklasses toegestaan"
+msgstr "implementatiegrens: er zijn niet meer dan %Zd tekenklasses toegestaan"
 
-#: locale/programs/ld-ctype.c:1276
+#: locale/programs/ld-ctype.c:1275
 #, c-format
 msgid "character map `%s' already defined"
-msgstr "tekenafbeelding `%s' reeds gedefinieerd"
+msgstr "tekenskaart '%s' is al gedefinieerd"
 
-#: locale/programs/ld-ctype.c:1282
+#: locale/programs/ld-ctype.c:1281
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
-msgstr "implementatie grens: niet meer dan %d tekenafbeeldingen toegestaan"
+msgstr "implementatiegrens: er zijn niet meer dan %d tekenskaarten toegestaan"
 
-#: locale/programs/ld-ctype.c:1547 locale/programs/ld-ctype.c:1672
-#: locale/programs/ld-ctype.c:1778 locale/programs/ld-ctype.c:2464
-#: locale/programs/ld-ctype.c:3460
+#: locale/programs/ld-ctype.c:1546 locale/programs/ld-ctype.c:1671
+#: locale/programs/ld-ctype.c:1777 locale/programs/ld-ctype.c:2466
+#: locale/programs/ld-ctype.c:3462
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
-msgstr "%s: veld `%s' bevat niet precies 10 ingangen"
+msgstr "%s: het veld '%s' bevat niet precies tien items"
 
-#: locale/programs/ld-ctype.c:1575 locale/programs/ld-ctype.c:2146
+#: locale/programs/ld-ctype.c:1574 locale/programs/ld-ctype.c:2145
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
-msgstr "tot-waarde <U%0*X> van bereik is kleiner dan van-waarde <U%0*X>"
+msgstr "eindwaarde <U%0*X> van bereik is kleiner dan beginwaarde <U%0*X>"
 
-#: locale/programs/ld-ctype.c:1702
+#: locale/programs/ld-ctype.c:1701
 msgid "start and end character sequence of range must have the same length"
-msgstr "begin en einde tekenreeks van bereik moeten dezelfde lengte hebben"
+msgstr "begin- en eindbytereeks van bereik moeten dezelfde lengte hebben"
 
-#: locale/programs/ld-ctype.c:1709
+#: locale/programs/ld-ctype.c:1708
 msgid "to-value character sequence is smaller than from-value sequence"
-msgstr "tot-waarde tekenreeks is kleiner dan van-waarde reeks"
+msgstr "eindwaarde is kleiner dan beginwaarde"
 
-#: locale/programs/ld-ctype.c:2066 locale/programs/ld-ctype.c:2117
+#: locale/programs/ld-ctype.c:2065 locale/programs/ld-ctype.c:2116
 msgid "premature end of `translit_ignore' definition"
-msgstr "vroegtijdig einde van `translit_ignore' (translitereren negeren) definitie"
+msgstr "voortijdig einde van definitie van 'translit_ignore'"
 
-#: locale/programs/ld-ctype.c:2072 locale/programs/ld-ctype.c:2123
-#: locale/programs/ld-ctype.c:2165
+#: locale/programs/ld-ctype.c:2071 locale/programs/ld-ctype.c:2122
+#: locale/programs/ld-ctype.c:2164
 msgid "syntax error"
-msgstr "syntaxisfout"
+msgstr "syntaxfout"
 
-#: locale/programs/ld-ctype.c:2296
+#: locale/programs/ld-ctype.c:2298
 #, c-format
 msgid "%s: syntax error in definition of new character class"
-msgstr "%s: syntaxisfout in definitie van nieuwe tekenklasse"
+msgstr "%s: syntaxfout in definitie van nieuwe tekenklasse"
 
-#: locale/programs/ld-ctype.c:2311
+#: locale/programs/ld-ctype.c:2313
 #, c-format
 msgid "%s: syntax error in definition of new character map"
-msgstr "%s: syntaxisfout in definitie van nieuwe tekenafbeelding"
+msgstr "%s: syntaxfout in definitie van nieuwe tekenskaart"
 
-#: locale/programs/ld-ctype.c:2486
+#: locale/programs/ld-ctype.c:2488
 msgid "ellipsis range must be marked by two operands of same type"
-msgstr "weglatingsbereik moet worden gemarkeerd door twee operands van dezelfde soort"
+msgstr "een bereik met een beletselteken moet twee parameters van dezelfde soort bevatten"
 
-#: locale/programs/ld-ctype.c:2495
+#: locale/programs/ld-ctype.c:2497
 msgid "with symbolic name range values the absolute ellipsis `...' must not be used"
-msgstr "het absolute weglatingsteken `...' moet niet gebruikt worden met symbolische naambereik waarden"
+msgstr "in een bereik met symbolische namen mag het absolute beletselteken '...' niet gebruikt worden"
 
-#: locale/programs/ld-ctype.c:2510
+#: locale/programs/ld-ctype.c:2512
 msgid "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
-msgstr "met UCS bereikwaarden moet het hexadecimale symbolische weglatingsteken `..' worden gebruikt"
+msgstr "in een bereik met UCS-waarden moet het hexadecimale symbolische beletselsteken '..' gebruikt worden"
 
-#: locale/programs/ld-ctype.c:2524
+#: locale/programs/ld-ctype.c:2526
 msgid "with character code range values one must use the absolute ellipsis `...'"
-msgstr "met tekencode bereikwaarden moet het absolute weglatingsteken `...' worden gebruikt"
+msgstr "in een bereik met tekencodes moet het absolute beletselteken '...' gebruikt worden"
 
-#: locale/programs/ld-ctype.c:2675
+#: locale/programs/ld-ctype.c:2677
 #, c-format
 msgid "duplicated definition for mapping `%s'"
-msgstr "dubbele definitie voor afbeelding `%s'"
+msgstr "dubbele definitie van afbeelding '%s'"
 
-#: locale/programs/ld-ctype.c:2761 locale/programs/ld-ctype.c:2905
+#: locale/programs/ld-ctype.c:2763 locale/programs/ld-ctype.c:2907
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
-msgstr "%s: `translit_start' (translitereren begin) sectie eindigt niet met `translit_end' (translitereren einde)"
+msgstr "%s: sectie 'translit_start' eindigt niet met 'translit_end'"
 
-#: locale/programs/ld-ctype.c:2856
+#: locale/programs/ld-ctype.c:2858
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
-msgstr "%s: dubbele `default_missing' (standaard ontbrekend) definitie"
+msgstr "%s: dubbele definitie van 'default_missing'"
 
-#: locale/programs/ld-ctype.c:2861
+#: locale/programs/ld-ctype.c:2863
 msgid "previous definition was here"
-msgstr "vorige definitie was hier"
+msgstr "de vorige definitie was hier"
 
-#: locale/programs/ld-ctype.c:2883
+#: locale/programs/ld-ctype.c:2885
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
-msgstr "%s: niet representeerbare `default_missing' (standaard ontbrekend) definitie gevonden"
+msgstr "%s: geen representeerbare definitie van 'default_missing' gevonden"
 
-#: locale/programs/ld-ctype.c:3036
+#: locale/programs/ld-ctype.c:3038
 #, c-format
 msgid "%s: character `%s' not defined in charmap while needed as default value"
-msgstr "%s: teken `%s' niet gedefinieerd in tekenafbeelding maar nodig als standaardwaarde"
+msgstr "%s: teken '%s' is niet gedefinieerd maar is nodig als standaardwaarde"
 
-#: locale/programs/ld-ctype.c:3041 locale/programs/ld-ctype.c:3125
-#: locale/programs/ld-ctype.c:3145 locale/programs/ld-ctype.c:3166
-#: locale/programs/ld-ctype.c:3187 locale/programs/ld-ctype.c:3208
-#: locale/programs/ld-ctype.c:3229 locale/programs/ld-ctype.c:3269
-#: locale/programs/ld-ctype.c:3290 locale/programs/ld-ctype.c:3357
+#: locale/programs/ld-ctype.c:3043 locale/programs/ld-ctype.c:3127
+#: locale/programs/ld-ctype.c:3147 locale/programs/ld-ctype.c:3168
+#: locale/programs/ld-ctype.c:3189 locale/programs/ld-ctype.c:3210
+#: locale/programs/ld-ctype.c:3231 locale/programs/ld-ctype.c:3271
+#: locale/programs/ld-ctype.c:3292 locale/programs/ld-ctype.c:3359
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
-msgstr "%s: teken `%s' in tekenafbeelding niet te representeren met één byte"
+msgstr "%s: teken '%s' in de tekenskaart is niet te representeren met één byte"
 
-#: locale/programs/ld-ctype.c:3120 locale/programs/ld-ctype.c:3140
-#: locale/programs/ld-ctype.c:3182 locale/programs/ld-ctype.c:3203
-#: locale/programs/ld-ctype.c:3224 locale/programs/ld-ctype.c:3264
-#: locale/programs/ld-ctype.c:3285 locale/programs/ld-ctype.c:3352
-#: locale/programs/ld-ctype.c:3394 locale/programs/ld-ctype.c:3419
+#: locale/programs/ld-ctype.c:3122 locale/programs/ld-ctype.c:3142
+#: locale/programs/ld-ctype.c:3184 locale/programs/ld-ctype.c:3205
+#: locale/programs/ld-ctype.c:3226 locale/programs/ld-ctype.c:3266
+#: locale/programs/ld-ctype.c:3287 locale/programs/ld-ctype.c:3354
+#: locale/programs/ld-ctype.c:3396 locale/programs/ld-ctype.c:3421
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
-msgstr "%s: teken `%s' niet gedefinieerd maar nodig als standaardwaarde"
+msgstr "%s: teken '%s' is niet gedefinieerd maar is nodig als standaardwaarde"
 
-#: locale/programs/ld-ctype.c:3161
+#: locale/programs/ld-ctype.c:3163
 #, c-format
 msgid "character `%s' not defined while needed as default value"
-msgstr "teken `%s' niet gedefinieerd maar nodig als standaardwaarde"
+msgstr "teken '%s' is niet gedefinieerd maar is nodig als standaardwaarde"
 
-#: locale/programs/ld-ctype.c:3401 locale/programs/ld-ctype.c:3426
+#: locale/programs/ld-ctype.c:3403 locale/programs/ld-ctype.c:3428
 #, c-format
 msgid "%s: character `%s' needed as default value not representable with one byte"
-msgstr "%s: teken `%s', nodig als standaardwaarde, niet te representeren met één byte"
+msgstr "%s: teken '%s' is nodig als standaardwaarde maar niet te representeren met één byte"
 
-#: locale/programs/ld-ctype.c:3481
+#: locale/programs/ld-ctype.c:3483
+#, c-format
 msgid "no output digits defined and none of the standard names in the charmap"
-msgstr "geen uitvoercijfers gedefinieerd en geen van de standaardnamen in tekenafbeelding"
+msgstr "er zijn geen uitvoercijfers gedefinieerd en geen van de standaardnamen zit in de tekenskaart"
 
-#: locale/programs/ld-ctype.c:3772
+#: locale/programs/ld-ctype.c:3774
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
-msgstr "%s: transliteratie gegevens van locale `%s' niet beschikbaar"
+msgstr "%s: transliteratiegegevens van locale '%s' zijn niet beschikbaar"
 
-#: locale/programs/ld-ctype.c:3868
+#: locale/programs/ld-ctype.c:3875
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes\n"
 msgstr "%s: tabel voor klasse \"%s\": %lu bytes\n"
 
-#: locale/programs/ld-ctype.c:3937
+#: locale/programs/ld-ctype.c:3944
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes\n"
-msgstr "%s: tabel voor afbeelding \"%s\": %lu bytes\n"
+msgstr "%s: tabel voor kaart \"%s\": %lu bytes\n"
 
-#: locale/programs/ld-ctype.c:4070
+#: locale/programs/ld-ctype.c:4077
 #, c-format
 msgid "%s: table for width: %lu bytes\n"
 msgstr "%s: tabel voor breedte: %lu bytes\n"
 
-#: locale/programs/ld-identification.c:171
+#: locale/programs/ld-identification.c:169
 #, c-format
 msgid "%s: no identification for category `%s'"
-msgstr "%s: geen identificatie voor categorie `%s'"
+msgstr "%s: geen identificatie voor categorie '%s'"
 
-#: locale/programs/ld-identification.c:436
+#: locale/programs/ld-identification.c:434
 #, c-format
 msgid "%s: duplicate category version definition"
-msgstr "%s: dubbele definitie categorieversie"
+msgstr "%s: dubbele definitie van categorieversie"
 
-#: locale/programs/ld-measurement.c:114
+#: locale/programs/ld-measurement.c:112
 #, c-format
 msgid "%s: invalid value for field `%s'"
-msgstr "%s: ongeldige waarde voor veld `%s'"
+msgstr "%s: ongeldige waarde voor het veld '%s'"
 
-#: locale/programs/ld-messages.c:115 locale/programs/ld-messages.c:149
+#: locale/programs/ld-messages.c:113 locale/programs/ld-messages.c:147
 #, c-format
 msgid "%s: field `%s' undefined"
-msgstr "%s: veld `%s' ongedefinieerd"
+msgstr "%s: het veld '%s' is ongedefinieerd"
 
-#: locale/programs/ld-messages.c:122 locale/programs/ld-messages.c:156
+#: locale/programs/ld-messages.c:120 locale/programs/ld-messages.c:154
 #, c-format
 msgid "%s: value for field `%s' must not be an empty string"
-msgstr "%s: waarde voor veld `%s' mag geen lege tekenreeks zijn"
+msgstr "%s: de waarde voor het veld '%s' mag geen lege tekenreeks zijn"
 
-#: locale/programs/ld-messages.c:138 locale/programs/ld-messages.c:172
+#: locale/programs/ld-messages.c:136 locale/programs/ld-messages.c:170
 #, c-format
 msgid "%s: no correct regular expression for field `%s': %s"
-msgstr "%s: geen juiste reguliere uitdrukking voor veld `%s': %s"
+msgstr "%s: geen juiste reguliere expressie voor het veld '%s': %s"
 
-#: locale/programs/ld-monetary.c:224
+#: locale/programs/ld-monetary.c:222
 #, c-format
 msgid "%s: value of field `int_curr_symbol' has wrong length"
-msgstr "%s: waarde van veld `int_curr_symbol' heeft verkeerde lengte"
+msgstr "%s: de waarde van het veld 'int_curr_symbol' heeft een verkeerde lengte"
 
-#: locale/programs/ld-monetary.c:237
+#: locale/programs/ld-monetary.c:235
 #, c-format
 msgid "%s: value of field `int_curr_symbol' does not correspond to a valid name in ISO 4217"
-msgstr "%s: waarde van veld `int_curr_symbol' komt niet overeen met een geldige naam in ISO 4217"
+msgstr "%s: de waarde van het veld 'int_curr_symbol' is geen geldige naam uit ISO 4217"
 
-#: locale/programs/ld-monetary.c:256 locale/programs/ld-numeric.c:119
+#: locale/programs/ld-monetary.c:254 locale/programs/ld-numeric.c:117
 #, c-format
 msgid "%s: value for field `%s' must not be the empty string"
-msgstr "%s: waarde voor veld `%s' mag geen lege tekenreeks zijn"
+msgstr "%s: de waarde voor het veld '%s' mag geen lege tekenreeks zijn"
 
-#: locale/programs/ld-monetary.c:284 locale/programs/ld-monetary.c:314
+#: locale/programs/ld-monetary.c:282 locale/programs/ld-monetary.c:312
 #, c-format
 msgid "%s: value for field `%s' must be in range %d...%d"
-msgstr "%s: waarde voor veld `%s' moet binnen bereik %d...%d liggen"
+msgstr "%s: de waarde voor het veld '%s' moet binnen het bereik %d...%d liggen"
 
-#: locale/programs/ld-monetary.c:746 locale/programs/ld-numeric.c:275
+#: locale/programs/ld-monetary.c:744 locale/programs/ld-numeric.c:273
 #, c-format
 msgid "%s: value for field `%s' must be a single character"
-msgstr "%s: waarde voor veld `%s' moet een enkel teken zijn"
+msgstr "%s: de waarde voor het veld '%s' moet een enkel teken zijn"
 
-#: locale/programs/ld-monetary.c:843 locale/programs/ld-numeric.c:319
+#: locale/programs/ld-monetary.c:841 locale/programs/ld-numeric.c:317
 #, c-format
 msgid "%s: `-1' must be last entry in `%s' field"
-msgstr "%s: `-1' moet de laatste ingang in veld `%s' zijn"
+msgstr "%s: '-1' moet het laatste item in het veld '%s' zijn"
 
-#: locale/programs/ld-monetary.c:865 locale/programs/ld-numeric.c:340
+#: locale/programs/ld-monetary.c:863 locale/programs/ld-numeric.c:334
 #, c-format
 msgid "%s: values for field `%s' must be smaller than 127"
-msgstr "%s: waarden voor veld `%s' moeten kleiner zijn dan 127"
+msgstr "%s: de waarden in het veld '%s' moeten kleiner zijn dan 127"
 
-#: locale/programs/ld-monetary.c:908
+#: locale/programs/ld-monetary.c:906
 msgid "conversion rate value cannot be zero"
-msgstr "conversiekoers waarde kan niet nul zijn"
+msgstr "waarde van conversiekoers kan niet nul zijn"
 
-#: locale/programs/ld-name.c:130 locale/programs/ld-telephone.c:127
-#: locale/programs/ld-telephone.c:150
+#: locale/programs/ld-name.c:128 locale/programs/ld-telephone.c:125
+#: locale/programs/ld-telephone.c:148
 #, c-format
 msgid "%s: invalid escape sequence in field `%s'"
-msgstr "%s: ongeldige stuurcode in veld `%s'"
+msgstr "%s: ongeldige stuurcode in het veld '%s'"
 
-#: locale/programs/ld-time.c:248
+#: locale/programs/ld-time.c:246
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'"
-msgstr "%s: richtingsaanduiding in tekenreeks %Zd in `era' veld is niet '+' of '-'"
+msgstr "%s: de richtingsaanduiding in tekenreeks %Zd in het veld 'era' is niet '+' of '-'"
 
-#: locale/programs/ld-time.c:259
+#: locale/programs/ld-time.c:257
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not a single character"
-msgstr "%s: richtingsaanduiding in tekenreeks %Zd in `era' veld is niet een enkel teken"
+msgstr "%s: de richtingsaanduiding in tekenreeks %Zd in het veld 'era' is niet een enkel teken"
 
-#: locale/programs/ld-time.c:272
+#: locale/programs/ld-time.c:270
 #, c-format
 msgid "%s: invalid number for offset in string %Zd in `era' field"
-msgstr "%s: ongeldig getal voor verplaatsing in tekenreeks %Zd in `era' veld"
+msgstr "%s: ongeldig getal voor verplaatsing in tekenreeks %Zd in het veld 'era'"
 
-#: locale/programs/ld-time.c:280
+#: locale/programs/ld-time.c:278
 #, c-format
 msgid "%s: garbage at end of offset value in string %Zd in `era' field"
-msgstr "%s: troep aan einde van verplaatsingswaarde in tekenreeks %Zd in `era' veld"
+msgstr "%s: rommel aan het einde van verplaatsingswaarde in tekenreeks %Zd in het veld 'era'"
 
-#: locale/programs/ld-time.c:331
+#: locale/programs/ld-time.c:329
 #, c-format
 msgid "%s: invalid starting date in string %Zd in `era' field"
-msgstr "%s: ongeldige begindatum in tekenreeks %Zd in `era' veld"
+msgstr "%s: ongeldige begindatum in tekenreeks %Zd in het veld 'era'"
 
-#: locale/programs/ld-time.c:340
+#: locale/programs/ld-time.c:338
 #, c-format
 msgid "%s: garbage at end of starting date in string %Zd in `era' field "
-msgstr "%s: troep aan einde van begindatum in tekenreeks %Zd in `era' veld"
+msgstr "%s: rommel aan het einde van de begindatum in tekenreeks %Zd in het veld 'era'"
 
-#: locale/programs/ld-time.c:359
+#: locale/programs/ld-time.c:357
 #, c-format
 msgid "%s: starting date is invalid in string %Zd in `era' field"
-msgstr "%s: begindatum is ongeldig in tekenreeks %Zd in `era' veld"
+msgstr "%s: begindatum is ongeldig in tekenreeks %Zd in het veld 'era'"
 
-#: locale/programs/ld-time.c:408
+#: locale/programs/ld-time.c:406
 #, c-format
 msgid "%s: invalid stopping date in string %Zd in `era' field"
-msgstr "%s: ongeldige einddatum in tekenreeks %Zd in `era' veld"
+msgstr "%s: ongeldige einddatum in tekenreeks %Zd in het veld 'era'"
 
-#: locale/programs/ld-time.c:417
+#: locale/programs/ld-time.c:415
 #, c-format
 msgid "%s: garbage at end of stopping date in string %Zd in `era' field"
-msgstr "%s: troep aan einde van einddatum in tekenreeks %Zd in `era' veld"
+msgstr "%s: rommel aan het einde van de einddatum in tekenreeks %Zd in het veld 'era'"
 
-#: locale/programs/ld-time.c:436
+#: locale/programs/ld-time.c:434
 #, c-format
 msgid "%s: stopping date is invalid in string %Zd in `era' field"
-msgstr "%s: einddatum is ongeldig in tekenreeks %Zd in `era' veld"
+msgstr "%s: einddatum is ongeldig in tekenreeks %Zd in het veld 'era'"
 
-#: locale/programs/ld-time.c:445
+#: locale/programs/ld-time.c:443
 #, c-format
 msgid "%s: missing era name in string %Zd in `era' field"
-msgstr "%s: ontbrekende tijdperknaam in tekenreeks %Zd in `era' veld"
+msgstr "%s: ontbrekende tijdperknaam in tekenreeks %Zd in het veld 'era'"
 
-#: locale/programs/ld-time.c:457
+#: locale/programs/ld-time.c:455
 #, c-format
 msgid "%s: missing era format in string %Zd in `era' field"
-msgstr "%s: ontbrekend tijdperkformaat in tekenreeks %Zd in `era' veld"
+msgstr "%s: ontbrekende tijdperk-opmaak in tekenreeks %Zd in het veld 'era'"
 
-#: locale/programs/ld-time.c:486
+#: locale/programs/ld-time.c:496
 #, c-format
 msgid "%s: third operand for value of field `%s' must not be larger than %d"
-msgstr "%s: derde operand voor waarde van veld `%s' mag niet groter zijn dan %d"
+msgstr "%s: derde parameter voor de waarde van het veld '%s' mag niet groter zijn dan %d"
 
-#: locale/programs/ld-time.c:494 locale/programs/ld-time.c:502
+#: locale/programs/ld-time.c:504 locale/programs/ld-time.c:512
 #, c-format
 msgid "%s: values of field `%s' must not be larger than %d"
-msgstr "%s: waarden voor veld `%s' mogen niet groter zijn dan %d"
+msgstr "%s: waarden in het veld '%s' mogen niet groter zijn dan %d"
 
-#: locale/programs/ld-time.c:510
+#: locale/programs/ld-time.c:520
 #, c-format
 msgid "%s: values for field `%s' must not be larger than %d"
-msgstr "%s: waarden voor veld `%s' mogen niet groter zijn dan %d"
+msgstr "%s: waarden in het veld '%s' mogen niet groter zijn dan %d"
 
-#: locale/programs/ld-time.c:986
+#: locale/programs/ld-time.c:1003
 #, c-format
 msgid "%s: too few values for field `%s'"
-msgstr "%s: te weinig waarden voor veld `%s'"
+msgstr "%s: te weinig waarden voor het veld '%s'"
 
-#: locale/programs/ld-time.c:1031
+#: locale/programs/ld-time.c:1048
 msgid "extra trailing semicolon"
-msgstr "extra punt-komma aan einde"
+msgstr "een extra puntkomma aan het einde"
 
-#: locale/programs/ld-time.c:1034
+#: locale/programs/ld-time.c:1051
 #, c-format
 msgid "%s: too many values for field `%s'"
-msgstr "%s: teveel waarden voor veld `%s'"
+msgstr "%s: te veel waarden voor het veld '%s'"
 
-#: locale/programs/linereader.c:130
+#: locale/programs/linereader.c:129
 msgid "trailing garbage at end of line"
-msgstr "troep aan einde van regel"
+msgstr "rommel aan het einde van de regel"
 
-#: locale/programs/linereader.c:304
+#: locale/programs/linereader.c:297
 msgid "garbage at end of number"
-msgstr "troep aan einde van getal"
+msgstr "rommel aan het einde van getal"
 
-#: locale/programs/linereader.c:416
+#: locale/programs/linereader.c:409
 msgid "garbage at end of character code specification"
-msgstr "troep aan einde van tekencode specificatie"
+msgstr "rommel aan het einde van tekencode-specificatie"
 
-#: locale/programs/linereader.c:502
+#: locale/programs/linereader.c:495
 msgid "unterminated symbolic name"
 msgstr "onafgesloten symbolische naam"
 
-#: locale/programs/linereader.c:566 catgets/gencat.c:1195
-msgid "invalid escape sequence"
-msgstr "ongeldige stuurcode"
-
-#: locale/programs/linereader.c:629
+#: locale/programs/linereader.c:622
 msgid "illegal escape sequence at end of string"
-msgstr "ongeldige stuurcode aan einde van tekenreeks"
+msgstr "ongeldige stuurcode aan het einde van tekenreeks"
 
-#: locale/programs/linereader.c:633 locale/programs/linereader.c:861
+#: locale/programs/linereader.c:626 locale/programs/linereader.c:854
 msgid "unterminated string"
 msgstr "onafgesloten tekenreeks"
 
-#: locale/programs/linereader.c:675
+#: locale/programs/linereader.c:668
 msgid "non-symbolic character value should not be used"
-msgstr "niet-symbolische tekenwaarde mag niet worden gebruikt"
+msgstr "niet-symbolische tekenwaarden zouden niet gebruikt moeten worden"
 
-#: locale/programs/linereader.c:822
+#: locale/programs/linereader.c:815
 #, c-format
 msgid "symbol `%.*s' not in charmap"
-msgstr "symbool `%.*s' niet in tekenafbeelding"
+msgstr "symbool '%.*s' zit niet in de tekenskaart"
 
-#: locale/programs/linereader.c:843
+#: locale/programs/linereader.c:836
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
-msgstr "symbool `%.*s' niet in repertoire-afbeelding"
+msgstr "symbool '%.*s' zit niet in de repertoire-kaart"
 
-#: locale/programs/locale.c:75
+#: locale/programs/locale.c:73
 msgid "System information:"
 msgstr "Systeeminformatie:"
 
-#: locale/programs/locale.c:77
+#: locale/programs/locale.c:75
 msgid "Write names of available locales"
-msgstr "Namen van beschikbare locales schrijven"
+msgstr "namen van beschikbare locales tonen"
 
-#: locale/programs/locale.c:79
+#: locale/programs/locale.c:77
 msgid "Write names of available charmaps"
-msgstr "Namen van beschikbare tekenafbeeldingen schrijven"
+msgstr "namen van beschikbare tekenskaarten tonen"
 
-#: locale/programs/locale.c:80
+#: locale/programs/locale.c:78
 msgid "Modify output format:"
-msgstr "Uitvoerformaat aanpassen:"
+msgstr "Aanpassing van uitvoer:"
 
-#: locale/programs/locale.c:81
+#: locale/programs/locale.c:79
 msgid "Write names of selected categories"
-msgstr "Namen van geselecteerde categorieen schrijven"
+msgstr "namen van geselecteerde categorieën tonen"
 
-#: locale/programs/locale.c:82
+#: locale/programs/locale.c:80
 msgid "Write names of selected keywords"
-msgstr "Namen van geselecteerde sleutelwoorden schrijven"
+msgstr "namen van geselecteerde sleutelwoorden tonen"
 
-#: locale/programs/locale.c:83
+#: locale/programs/locale.c:81
 msgid "Print more information"
-msgstr "Meer informatie weergeven"
+msgstr "breedsprakige uitvoer"
 
-#: locale/programs/locale.c:88
-msgid "Get locale-specific information."
-msgstr "Locale-specifieke informatie opvragen."
+#: locale/programs/locale.c:86
+msgid ""
+"Get locale-specific information.For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+"Informatie over locales weergeven.Voor het rapporteren van fouten, zie:\n"
+"  <http://www.gnu.org/software/libc/bugs.html>.\n"
 
 #: locale/programs/locale.c:91
 msgid ""
@@ -1354,99 +2439,104 @@ msgstr ""
 "NAAM\n"
 "[-a|-m]"
 
-#: locale/programs/locale.c:195
+#: locale/programs/locale.c:192
+#, c-format
 msgid "Cannot set LC_CTYPE to default locale"
-msgstr "Kan LC_TYPE niet instellen op standaard locale"
+msgstr "Kan LC_TYPE niet op de standaard-locale instellen"
 
-#: locale/programs/locale.c:197
+#: locale/programs/locale.c:194
+#, c-format
 msgid "Cannot set LC_MESSAGES to default locale"
-msgstr "Kan LC_MESSAGES niet instellen op standaard locale"
+msgstr "Kan LC_MESSAGES niet op de standaard-locale instellen"
 
-#: locale/programs/locale.c:210
+#: locale/programs/locale.c:207
+#, c-format
 msgid "Cannot set LC_COLLATE to default locale"
-msgstr "Kan LC_COLLATE niet instellen op standaard locale"
+msgstr "Kan LC_COLLATE niet op de standaard-locale instellen"
 
-#: locale/programs/locale.c:226
+#: locale/programs/locale.c:223
+#, c-format
 msgid "Cannot set LC_ALL to default locale"
-msgstr "Kan LC_ALL niet instellen op standaard locale"
+msgstr "Kan LC_ALL niet op de standaard-locale instellen"
 
-#: locale/programs/locale.c:517
+#: locale/programs/locale.c:499
+#, c-format
 msgid "while preparing output"
 msgstr "tijdens voorbereiden van uitvoer"
 
-#: locale/programs/localedef.c:121
+#: locale/programs/localedef.c:119
 msgid "Input Files:"
 msgstr "Invoerbestanden:"
 
-#: locale/programs/localedef.c:123
+#: locale/programs/localedef.c:121
 msgid "Symbolic character names defined in FILE"
-msgstr "Symbolische tekennamen gedefinieerd in BESTAND"
+msgstr "bestand dat tekennamen op codes afbeeldt"
 
-#: locale/programs/localedef.c:124
+#: locale/programs/localedef.c:122
 msgid "Source definitions are found in FILE"
-msgstr "Brondefinities zijn gevonden in BESTAND"
+msgstr "bestand met brondefinities"
 
-#: locale/programs/localedef.c:126
+#: locale/programs/localedef.c:124
 msgid "FILE contains mapping from symbolic names to UCS4 values"
-msgstr "BESTAND bevat afbeelding van symbolische namen naar UCS4 waarden"
+msgstr "bestand dat tekennamen op UCS4-waarden afbeeldt"
 
-#: locale/programs/localedef.c:130
+#: locale/programs/localedef.c:128
 msgid "Create output even if warning messages were issued"
-msgstr "Zelfs uitvoer geven als waarschuwingen zijn uitgegeven"
+msgstr "ook uitvoer genereren na waarschuwingen"
 
-#: locale/programs/localedef.c:131
+#: locale/programs/localedef.c:129
 msgid "Create old-style tables"
-msgstr "Oude-stijl tabellen maken"
+msgstr "tabellen in oude stijl maken"
 
-#: locale/programs/localedef.c:132
+#: locale/programs/localedef.c:130
 msgid "Optional output file prefix"
-msgstr "Optioneel voorvoegsel uitvoerbestand"
+msgstr "optioneel voorvoegsel voor uitvoerbestand"
 
-#: locale/programs/localedef.c:133
+#: locale/programs/localedef.c:131
 msgid "Be strictly POSIX conform"
-msgstr "Strict gedragen volgens POSIX"
+msgstr "strict de POSIX-voorschriften volgen"
 
-#: locale/programs/localedef.c:135
+#: locale/programs/localedef.c:133
 msgid "Suppress warnings and information messages"
-msgstr "Waarschuwingen en informatieve berichten onderdrukken"
+msgstr "waarschuwingen en meldingen onderdrukken"
 
-#: locale/programs/localedef.c:136
+#: locale/programs/localedef.c:134
 msgid "Print more messages"
-msgstr "Meer berichten weergeven"
+msgstr "breedsprakige uitvoer"
 
-#: locale/programs/localedef.c:137
+#: locale/programs/localedef.c:135
 msgid "Archive control:"
 msgstr "Archiefbeheer:"
 
-#: locale/programs/localedef.c:139
+#: locale/programs/localedef.c:137
 msgid "Don't add new data to archive"
-msgstr "Geen nieuwe gegevens aan archief toevoegen"
+msgstr "geen nieuwe gegevens aan archief toevoegen"
 
-#: locale/programs/localedef.c:141
+#: locale/programs/localedef.c:139
 msgid "Add locales named by parameters to archive"
-msgstr "Locales genoemd door parameters aan archief toevoegen"
+msgstr "genoemde locales aan archief toevoegen"
 
-#: locale/programs/localedef.c:142
+#: locale/programs/localedef.c:140
 msgid "Replace existing archive content"
-msgstr "Bestaande inhoud van archief vervangen"
+msgstr "bestaande inhoud van archief vervangen"
 
-#: locale/programs/localedef.c:144
+#: locale/programs/localedef.c:142
 msgid "Remove locales named by parameters from archive"
-msgstr "Locales genoemd door parameters verwijderen uit archief"
+msgstr "genoemde locales uit archief verwijderen"
 
-#: locale/programs/localedef.c:145
+#: locale/programs/localedef.c:143
 msgid "List content of archive"
-msgstr "Inhoud van archief opsommen"
+msgstr "inhoud van archief weergeven"
 
-#: locale/programs/localedef.c:147
+#: locale/programs/localedef.c:145
 msgid "locale.alias file to consult when making archive"
-msgstr "locale.alias bestand om te raadplegen bij het maken van een archief"
+msgstr "te raadplegen aliassenbestand"
 
-#: locale/programs/localedef.c:152
+#: locale/programs/localedef.c:150
 msgid "Compile locale specification"
-msgstr "Locale specificatie compileren"
+msgstr "Een locale-specificatie compileren."
 
-#: locale/programs/localedef.c:155
+#: locale/programs/localedef.c:153
 msgid ""
 "NAME\n"
 "[--add-to-archive|--delete-from-archive] FILE...\n"
@@ -1456,26 +2546,28 @@ msgstr ""
 "[--add-to-archive|--delete-from-archive] BESTAND...\n"
 "--list-archive [BESTAND]"
 
-#: locale/programs/localedef.c:233
+#: locale/programs/localedef.c:231
+#, c-format
 msgid "cannot create directory for output files"
 msgstr "kan map voor uitvoerbestanden niet aanmaken"
 
-#: locale/programs/localedef.c:244
+#: locale/programs/localedef.c:242
+#, c-format
 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
-msgstr "FATAAL: systeem definieert `_POSIX2_LOCALEDEF' niet"
+msgstr "FATAAL: systeem definieert '_POSIX2_LOCALEDEF' niet"
 
-#: locale/programs/localedef.c:258 locale/programs/localedef.c:274
-#: locale/programs/localedef.c:599 locale/programs/localedef.c:619
+#: locale/programs/localedef.c:256 locale/programs/localedef.c:272
+#: locale/programs/localedef.c:598 locale/programs/localedef.c:618
 #, c-format
 msgid "cannot open locale definition file `%s'"
-msgstr "kan locale definitiebestand `%s' niet openen"
+msgstr "kan locale-definitiebestand '%s' niet openen"
 
-#: locale/programs/localedef.c:286
+#: locale/programs/localedef.c:284
 #, c-format
 msgid "cannot write output files to `%s'"
-msgstr "kan uitvoerbestanden niet schrijven naar `%s'"
+msgstr "kan uitvoerbestanden niet naar '%s' schrijven"
 
-#: locale/programs/localedef.c:367
+#: locale/programs/localedef.c:365
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
@@ -1483,2243 +2575,1904 @@ msgid ""
 "                       locale path    : %s\n"
 "%s"
 msgstr ""
-"Systeemmap voor tekenafbeeldingen : %s\n"
-"                       repertoire afbeeldingen: %s\n"
-"                       locale pad    : %s\n"
+"Systeemmap voor tekenskaarten      : %s\n"
+"                repertoire-kaarten : %s\n"
+"                locale-pad         : %s\n"
+"\n"
 "%s"
 
-#: locale/programs/localedef.c:567
+#: locale/programs/localedef.c:566
+#, c-format
 msgid "circular dependencies between locale definitions"
-msgstr "circulaire afhankelijkheid tussen locale definities"
+msgstr "circulaire afhankelijkheid tussen locale-definities"
 
-#: locale/programs/localedef.c:573
+#: locale/programs/localedef.c:572
 #, c-format
 msgid "cannot add already read locale `%s' a second time"
-msgstr "kan al gelezen locale `%s' niet nogmaals toevoegen"
+msgstr "kan de reeds gelezen locale '%s' niet nogmaals toevoegen"
 
-#: locale/programs/locarchive.c:89 locale/programs/locarchive.c:259
+#: locale/programs/locarchive.c:87 locale/programs/locarchive.c:256
+#, c-format
 msgid "cannot create temporary file"
 msgstr "kan tijdelijk bestand niet aanmaken"
 
-#: locale/programs/locarchive.c:118 locale/programs/locarchive.c:305
+#: locale/programs/locarchive.c:116 locale/programs/locarchive.c:302
+#, c-format
 msgid "cannot initialize archive file"
 msgstr "kan archiefbestand niet initialiseren"
 
-#: locale/programs/locarchive.c:125 locale/programs/locarchive.c:312
+#: locale/programs/locarchive.c:123 locale/programs/locarchive.c:309
+#, c-format
 msgid "cannot resize archive file"
 msgstr "kan grootte van archiefbestand niet aanpassen"
 
-#: locale/programs/locarchive.c:134 locale/programs/locarchive.c:321
-#: locale/programs/locarchive.c:511
+#: locale/programs/locarchive.c:132 locale/programs/locarchive.c:318
+#: locale/programs/locarchive.c:506
+#, c-format
 msgid "cannot map archive header"
-msgstr "kan archiekop niet afbeelden"
+msgstr "kan archiefkop niet in het geheugen plaatsen"
 
-#: locale/programs/locarchive.c:156
+#: locale/programs/locarchive.c:154
+#, c-format
 msgid "failed to create new locale archive"
-msgstr "maken nieuw locale-archief mislukt"
+msgstr "aanmaken van een nieuw locale-archief is mislukt"
 
-#: locale/programs/locarchive.c:168
+#: locale/programs/locarchive.c:166
+#, c-format
 msgid "cannot change mode of new locale archive"
-msgstr "kan modus van nieuwe locale-archief niet wijzigen"
+msgstr "kan modus van het nieuwe locale-archief niet wijzigen"
 
-#: locale/programs/locarchive.c:253
+#: locale/programs/locarchive.c:250
+#, c-format
 msgid "cannot map locale archive file"
-msgstr "kan lokaal archiefbestand niet afbeelden"
+msgstr "kan locale-archief niet in het geheugen plaatsen"
 
-#: locale/programs/locarchive.c:329
+#: locale/programs/locarchive.c:326
+#, c-format
 msgid "cannot lock new archive"
-msgstr "kan nieuw archief niet blokkeren"
+msgstr "kan nieuwe archief niet vergrendelen"
 
-#: locale/programs/locarchive.c:380
+#: locale/programs/locarchive.c:375
+#, c-format
 msgid "cannot extend locale archive file"
 msgstr "kan locale-archiefbestand niet uitbreiden"
 
-#: locale/programs/locarchive.c:389
+#: locale/programs/locarchive.c:384
+#, c-format
 msgid "cannot change mode of resized locale archive"
-msgstr "kan modus van van grootte aangepast locale-archief niet wijzigen"
+msgstr "kan modus van aangepast locale-archief niet wijzigen"
 
-#: locale/programs/locarchive.c:397
+#: locale/programs/locarchive.c:392
+#, c-format
 msgid "cannot rename new archive"
 msgstr "kan nieuwe archief niet hernoemen"
 
-#: locale/programs/locarchive.c:450
+#: locale/programs/locarchive.c:445
 #, c-format
 msgid "cannot open locale archive \"%s\""
-msgstr "kan locale-archief \"%s\" niet openen"
+msgstr "kan locale-archief '%s' niet openen"
 
-#: locale/programs/locarchive.c:455
+#: locale/programs/locarchive.c:450
 #, c-format
 msgid "cannot stat locale archive \"%s\""
-msgstr "kan lokale archief \"%s\" niet vinden"
+msgstr "kan status van locale-archief '%s' niet opvragen"
 
-#: locale/programs/locarchive.c:474
+#: locale/programs/locarchive.c:469
 #, c-format
 msgid "cannot lock locale archive \"%s\""
-msgstr "kan locale-archief \"%s\" niet blokkeren"
+msgstr "kan locale-archief '%s' niet vergrendelen"
 
-#: locale/programs/locarchive.c:497
+#: locale/programs/locarchive.c:492
+#, c-format
 msgid "cannot read archive header"
 msgstr "kan archiefkop niet lezen"
 
-#: locale/programs/locarchive.c:557
+#: locale/programs/locarchive.c:552
 #, c-format
 msgid "locale '%s' already exists"
 msgstr "locale '%s' bestaat al"
 
-#: locale/programs/locarchive.c:788 locale/programs/locarchive.c:803
-#: locale/programs/locarchive.c:815 locale/programs/locarchive.c:827
+#: locale/programs/locarchive.c:783 locale/programs/locarchive.c:798
+#: locale/programs/locarchive.c:810 locale/programs/locarchive.c:822
 #: locale/programs/locfile.c:343
+#, c-format
 msgid "cannot add to locale archive"
-msgstr "kan niet toevoegen aan locale-archief"
+msgstr "kan niet aan locale-archief toevoegen"
 
-#: locale/programs/locarchive.c:982
+#: locale/programs/locarchive.c:977
 #, c-format
 msgid "locale alias file `%s' not found"
-msgstr "locale alias bestand `%s' niet gevonden"
+msgstr "kan locale-aliassenbestand '%s' niet vinden"
 
-#: locale/programs/locarchive.c:1126
+#: locale/programs/locarchive.c:1121
 #, c-format
 msgid "Adding %s\n"
-msgstr "Bezig met toevoegen %s\n"
+msgstr "Toevoegen van %s\n"
 
-#: locale/programs/locarchive.c:1132
+#: locale/programs/locarchive.c:1127
 #, c-format
 msgid "stat of \"%s\" failed: %s: ignored"
-msgstr "vinden van \"%s\" mislukt: %s: genegeerd"
+msgstr "kan status van '%s' niet opvragen: %s -- genegeerd"
 
-#: locale/programs/locarchive.c:1138
+#: locale/programs/locarchive.c:1133
 #, c-format
 msgid "\"%s\" is no directory; ignored"
-msgstr "\"%s\" is geen map; genegeerd"
+msgstr "'%s' is geen map -- genegeerd"
 
-#: locale/programs/locarchive.c:1145
+#: locale/programs/locarchive.c:1140
 #, c-format
 msgid "cannot open directory \"%s\": %s: ignored"
-msgstr "kan map \"%s\" niet openen; %s: genegeerd"
+msgstr "kan map '%s' niet openen: %s -- genegeerd"
 
-#: locale/programs/locarchive.c:1217
+#: locale/programs/locarchive.c:1212
 #, c-format
 msgid "incomplete set of locale files in \"%s\""
-msgstr "onvolledige verzameling van localebestanden in \"%s\""
+msgstr "onvolledige verzameling van locale-bestanden in '%s'"
 
-#: locale/programs/locarchive.c:1281
+#: locale/programs/locarchive.c:1276
 #, c-format
 msgid "cannot read all files in \"%s\": ignored"
-msgstr "kan niet alle bestanden in \"%s\" lezen; genegeerd"
+msgstr "kan niet alle bestanden in '%s' lezen -- genegeerd"
 
-#: locale/programs/locarchive.c:1351
+#: locale/programs/locarchive.c:1346
 #, c-format
 msgid "locale \"%s\" not in archive"
-msgstr "locale \"%s\" niet in archief"
+msgstr "locale '%s' zit niet in archief"
 
-#: locale/programs/locfile.c:132
+#: locale/programs/locfile.c:131
 #, c-format
 msgid "argument to `%s' must be a single character"
-msgstr "argument aan `%s' moet een enkel teken zijn"
+msgstr "argument van '%s' moet een enkel teken zijn"
 
 #: locale/programs/locfile.c:251
 msgid "syntax error: not inside a locale definition section"
-msgstr "syntaxisfout: niet in localedefinitie-sectie"
+msgstr "syntaxfout: niet binnen een locale-definitie-sectie"
 
 #: locale/programs/locfile.c:625
 #, c-format
 msgid "cannot open output file `%s' for category `%s'"
-msgstr "kan uitvoerbestand `%s' niet openen voor categorie `%s'"
+msgstr "kan uitvoerbestand '%s' niet openen voor categorie '%s'"
 
 #: locale/programs/locfile.c:649
 #, c-format
 msgid "failure while writing data for category `%s'"
-msgstr "fout bij schrijven gegevens voor categorie `%s'"
+msgstr "fout bij schrijven van gegevens voor categorie '%s'"
 
 #: locale/programs/locfile.c:745
 #, c-format
 msgid "cannot create output file `%s' for category `%s'"
-msgstr "kan uitvoerbestand `%s' niet maken voor categorie `%s'"
+msgstr "kan uitvoerbestand '%s' niet aanmaken voor categorie '%s'"
 
 #: locale/programs/locfile.c:781
 msgid "expect string argument for `copy'"
-msgstr "verwacht tekenreeks-argument voor `copy'"
+msgstr "argument van 'copy' dient een tekenreeks te zijn"
 
 #: locale/programs/locfile.c:785
 msgid "locale name should consist only of portable characters"
-msgstr "localenaam moet slechts bestaan uit portable tekens"
+msgstr "een locale-naam mag alleen uit overdraagbare tekens bestaan"
 
 #: locale/programs/locfile.c:804
 msgid "no other keyword shall be specified when `copy' is used"
-msgstr "geen ander sleutelwoord zal worden opgegeven als `copy' wordt gebruikt"
+msgstr "als 'copy' gebruikt wordt, zijn geen andere sleutelwoorden toegestaan"
 
-#: locale/programs/repertoire.c:230 locale/programs/repertoire.c:271
-#: locale/programs/repertoire.c:296
+#: locale/programs/repertoire.c:229 locale/programs/repertoire.c:270
+#: locale/programs/repertoire.c:295
 #, c-format
 msgid "syntax error in repertoire map definition: %s"
-msgstr "syntaxisfout in repertoire afbeeldingsdefinitie: %s"
+msgstr "syntaxfout in repertoire-kaart-definitie: %s"
 
-#: locale/programs/repertoire.c:272
+#: locale/programs/repertoire.c:271
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
-msgstr "geen <Uxxxx> of <Uxxxxxxxx> waarde gegeven"
+msgstr "geen waarde <Uxxxx> of <Uxxxxxxxx> gegeven"
 
-#: locale/programs/repertoire.c:332
+#: locale/programs/repertoire.c:331
+#, c-format
 msgid "cannot save new repertoire map"
-msgstr "kan nieuwe repertoire afbeelding niet opslaan"
+msgstr "kan nieuwe repertoire-kaart niet opslaan"
 
-#: locale/programs/repertoire.c:343
+#: locale/programs/repertoire.c:342
 #, c-format
 msgid "repertoire map file `%s' not found"
-msgstr "repertoire afbeeldingsbestand `%s' niet gevonden"
+msgstr "kan repertoire-kaart '%s' niet vinden"
 
-#: locale/programs/repertoire.c:450
+#: locale/programs/repertoire.c:449
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
-msgstr "<%s> en <%s> zijn ongeldige namen voor bereik"
+msgstr "<%s> en <%s> zijn ongeldige namen voor een bereik"
 
-#: locale/programs/repertoire.c:457
+#: locale/programs/repertoire.c:456
 msgid "upper limit in range is not smaller then lower limit"
-msgstr "bovengrens in bereik is niet kleiner dan ondergrens"
+msgstr "bovengrens in bereik is kleiner dan ondergrens"
 
-#: locale/programs/xmalloc.c:70 malloc/obstack.c:505 malloc/obstack.c:508
-#: posix/getconf.c:1007
-msgid "memory exhausted"
-msgstr "geheugen uitgeput"
+# ###XXX slaaf/meester?
+#: login/programs/pt_chown.c:74
+#, c-format
+msgid "Set the owner, group and access permission of the slave pseudo terminal corresponding to the master pseudo terminal passed on file descriptor `%d'.  This is the helper program for the `grantpt' function.  It is not intended to be run directly from the command line.\n"
+msgstr ""
+"De eigenaar, groep en toegangsrechten van een pseudoterminal-slaaf instellen\n"
+"overeenkomstig de pseudoterminal-meester gegeven in bestandsdescriptor '%d'.\n"
+"Dit is een hulpprogramma voor de grantpt()-functie, niet bedoeld om direct\n"
+"vanaf de opdrachtregel uitgevoerd te worden.\n"
 
-#: assert/assert-perr.c:57
+#: login/programs/pt_chown.c:84
 #, c-format
-msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
-msgstr "%s%s%s:%u: %s%sOnverwachte fout: %s.\n"
+msgid ""
+"The owner is set to the current user, the group is set to `%s', and the access permission is set to `%o'.\n"
+"\n"
+"%s"
+msgstr ""
+"De eigenaar is ingesteld op de huidige gebruiker,\n"
+"de groep is ingesteld op '%s',\n"
+"en de toegangsrechten zijn ingesteld op '%o'.\n"
+"\n"
+"%s"
 
-#: assert/assert.c:56
+#: login/programs/pt_chown.c:161
 #, c-format
-msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
-msgstr "%s%s%s:%u: %s%sBewering `%s' mislukt.\n"
+msgid "too many arguments"
+msgstr "te veel argumenten"
 
-#: intl/tst-codeset.c:40 intl/tst-codeset.c:50
-msgid "cheese"
-msgstr "kaas"
+#: login/programs/pt_chown.c:169
+#, c-format
+msgid "needs to be installed setuid `root'"
+msgstr "moet als setuid(root) geïnstalleerd zijn"
 
-#: intl/tst-gettext2.c:37
-msgid "First string for testing."
-msgstr "Eerste tekenreeks om te testen."
+#: malloc/mcheck.c:324
+msgid "memory is consistent, library is buggy\n"
+msgstr "geheugentoestand is wel consistent -- **programmafout** in de bibliotheek\n"
 
-#: intl/tst-gettext2.c:38
-msgid "Another string for testing."
-msgstr "Een andere tekenreeks om te testen."
+#: malloc/mcheck.c:327
+msgid "memory clobbered before allocated block\n"
+msgstr "geheugen vóór toegewezen blok is overschreven\n"
 
-#: catgets/gencat.c:111 catgets/gencat.c:115 nscd/nscd.c:88
-msgid "NAME"
-msgstr "NAAM"
+#: malloc/mcheck.c:330
+msgid "memory clobbered past end of allocated block\n"
+msgstr "geheugen na toegewezen blok is overschreven\n"
 
-#: catgets/gencat.c:112
-msgid "Create C header file NAME containing symbol definitions"
-msgstr "C-headerbestand NAAM maken met daarin symbooldefinities"
+#: malloc/mcheck.c:333
+msgid "block freed twice\n"
+msgstr "blok is tweemaal vrijgegeven\n"
 
-#: catgets/gencat.c:114
-msgid "Do not use existing catalog, force new output file"
-msgstr "Niet bestaande catalogus gebruiken, maar een nieuw uitvoerbestand forceren"
+#: malloc/mcheck.c:336
+msgid "bogus mcheck_status, library is buggy\n"
+msgstr "onjuiste 'mcheck_status' -- **programmafout** in de bibliotheek\n"
 
-#: catgets/gencat.c:115
-msgid "Write output to file NAME"
-msgstr "Uitvoer naar bestand NAAM schrijven"
+#: malloc/memusage.sh:27
+msgid "Try `memusage --help' for more information."
+msgstr "Probeer 'memusage --help' voor meer informatie."
 
-#: catgets/gencat.c:120
+#: malloc/memusage.sh:33
+msgid "memusage: option `$1' requires an argument"
+msgstr "memusage: optie '$1' vereist een argument"
+
+#: malloc/memusage.sh:39
 msgid ""
-"Generate message catalog.If INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n"
-"is -, output is written to standard output.\n"
+"Usage: memusage [OPTION]... PROGRAM [PROGRAMOPTION]...\n"
+"Profile memory usage of PROGRAM.\n"
+"\n"
+"   -n,--progname=NAME     Name of the program file to profile\n"
+"   -p,--png=FILE          Generate PNG graphic and store it in FILE\n"
+"   -d,--data=FILE         Generate binary data file and store it in FILE\n"
+"   -u,--unbuffered        Don't buffer output\n"
+"   -b,--buffer=SIZE       Collect SIZE entries before writing them out\n"
+"      --no-timer          Don't collect additional information though timer\n"
+"   -m,--mmap              Also trace mmap & friends\n"
+"\n"
+"   -?,--help              Print this help and exit\n"
+"      --usage             Give a short usage message\n"
+"   -V,--version           Print version information and exit\n"
+"\n"
+" The following options only apply when generating graphical output:\n"
+"   -t,--time-based        Make graph linear in time\n"
+"   -T,--total             Also draw graph of total memory use\n"
+"      --title=STRING      Use STRING as title of the graph\n"
+"   -x,--x-size=SIZE       Make graphic SIZE pixels wide\n"
+"   -y,--y-size=SIZE       Make graphic SIZE pixels high\n"
+"\n"
+"Mandatory arguments to long options are also mandatory for any corresponding\n"
+"short options.\n"
+"\n"
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>."
 msgstr ""
-"Berichtencatalogus genereren. Als INVOERBESTAND - is, wordt invoer gelezen van standaard invoer.\n"
-"Als UITVOERBESTAND - is wordt uitvoer geschreven naar standaard uitvoer.\n"
+"Gebruik:  memusage [OPTIE]... PROGRAMMA [PROGRAMMA-OPTIE]...\n"
+"\n"
+"Het geheugengebruik van PROGRAMMA bijhouden.\n"
+"\n"
+"  -n,--progname=NAAM     te observeren programma\n"
+"  -p,--png=BESTAND       een PNG-plaatje maken en opslaan in BESTAND\n"
+"  -d,--data=BESTAND      de verzamelde binaire gegevens opslaan in BESTAND\n"
+"  -u,--unbuffered        de uitvoer niet bufferen\n"
+"  -b,--buffer=GROOTTE    hoeveelheid te bufferen uitvoergegevens\n"
+"     --no-timer          geen extra tijdsinformatie verzamelen\n"
+"  -m,--mmap              ook mmap() en dergelijke observeren\n"
+"\n"
+"  -?,--help              deze hulptekst tonen\n"
+"     --usage             een kort gebruiksbericht tonen\n"
+"  -V,--version           versie-informatie tonen\n"
+"\n"
+" De volgende opties zijn alleen bij grafische uitvoer van toepassing:\n"
+"  -t,--time-based        de grafiek lineair in de tijd maken\n"
+"  -T,--total             ook een grafiek van totale geheugengebruik maken\n"
+"     --title=TEKST       titel van de grafiek\n"
+"  -x,--x-size=GETAL      breedte van de grafiek in pixels\n"
+"  -y,--y-size=GETAL      hoogte van de grafiek in pixels\n"
+"\n"
+"Een argument dat verplicht of optioneel is voor een lange optie, is dat\n"
+"ook voor de overeenkomstige korte optie.\n"
+"\n"
+"Voor het rapporteren van fouten in dit programma, zie:\n"
+"  <http://www.gnu.org/software/libc/bugs.html>."
 
-#: catgets/gencat.c:125
+#: malloc/memusage.sh:90
 msgid ""
-"-o OUTPUT-FILE [INPUT-FILE]...\n"
-"[OUTPUT-FILE [INPUT-FILE]...]"
+"Syntax: memusage [--data=FILE] [--progname=NAME] [--png=FILE] [--unbuffered]\n"
+"            [--buffer=SIZE] [--no-timer] [--time-based] [--total]\n"
+"            [--title=STRING] [--x-size=SIZE] [--y-size=SIZE]\n"
+"            PROGRAM [PROGRAMOPTION]..."
 msgstr ""
-"-o UITVOERBESTAND [INVOERBESTAND]...\n"
-"[UITVOERBESTAND [INVOERBESTAND]...]"
-
-#: catgets/gencat.c:282
-msgid "*standard input*"
-msgstr "*standaard invoer*"
-
-#: catgets/gencat.c:417 catgets/gencat.c:494
-msgid "illegal set number"
-msgstr "ongeldig verzamelingsgetal"
+"Gebruik:  memusage [--data=BESTAND] [--progname=NAAM] [--png=BESTAND]\n"
+"            [--unbuffered] [--buffer=GROOTTE] [--no-timer] [--time-based]\n"
+"            [--total] [--title=TEKST] [--x-size=GETAL] [--y-size=GETAL]\n"
+"            PROGRAMMA [PROGRAMMA-OPTIE]..."
 
-#: catgets/gencat.c:444
-msgid "duplicate set definition"
-msgstr "dubbele verzamelingsdefinitie"
+#: malloc/memusage.sh:182
+msgid "memusage: option `${1##*=}' is ambiguous"
+msgstr "memusage: optie '${1##*=}' is niet eenduidig"
 
-#: catgets/gencat.c:446 catgets/gencat.c:623 catgets/gencat.c:677
-msgid "this is the first definition"
-msgstr "dit is de eerste definitie"
+#: malloc/memusage.sh:191
+msgid "memusage: unrecognized option `$1'"
+msgstr "memusage: onbekende optie '$1'"
 
-#: catgets/gencat.c:522
-#, c-format
-msgid "unknown set `%s'"
-msgstr "onbekende verzameling `%s'"
+#: malloc/memusage.sh:204
+msgid "No program name given"
+msgstr "Geen programmanaam gegeven"
 
-#: catgets/gencat.c:563
-msgid "invalid quote character"
-msgstr "ongeldig aanhaalteken"
-
-#: catgets/gencat.c:576
-#, c-format
-msgid "unknown directive `%s': line ignored"
-msgstr "onbekende richting `%s': regel genegeerd"
-
-#: catgets/gencat.c:621
-msgid "duplicated message number"
-msgstr "dubbel berichtgetal"
-
-#: catgets/gencat.c:674
-msgid "duplicated message identifier"
-msgstr "dubbele berichtidentificeerder"
+#: malloc/memusagestat.c:53
+msgid "Name output file"
+msgstr "naam van uitvoerbestand"
 
-#: catgets/gencat.c:731
-msgid "invalid character: message ignored"
-msgstr "ongeldig teken: bericht genegeerd"
+#: malloc/memusagestat.c:54
+msgid "Title string used in output graphic"
+msgstr "tekenreeks gebruikt als titel van uitvoergrafiek"
 
-#: catgets/gencat.c:774
-msgid "invalid line"
-msgstr "ongeldige regel"
+#: malloc/memusagestat.c:55
+msgid "Generate output linear to time (default is linear to number of function calls)"
+msgstr "de uitvoer lineair in de tijd maken (standaard is lineair in het aantal functie-aanroepen)"
 
-#: catgets/gencat.c:828
-msgid "malformed line ignored"
-msgstr "misvormde regel genegeerd"
+#: malloc/memusagestat.c:57
+msgid "Also draw graph for total memory consumption"
+msgstr "ook een grafiek maken van totale geheugengebruik"
 
-#: catgets/gencat.c:992 catgets/gencat.c:1033
-#, c-format
-msgid "cannot open output file `%s'"
-msgstr "kan uitvoerbestand `%s' niet openen"
+#: malloc/memusagestat.c:58
+msgid "make output graphic VALUE pixel wide"
+msgstr "uitvoergrafiek dit aantal beeldpunten breed maken"
 
-#: catgets/gencat.c:1217
-msgid "unterminated message"
-msgstr "onafgesloten bericht"
+#: malloc/memusagestat.c:59
+msgid "make output graphic VALUE pixel high"
+msgstr "uitvoergrafiek dit aantal beeldpunten hoog maken"
 
-#: catgets/gencat.c:1241
-msgid "while opening old catalog file"
-msgstr "bij openen oude catalogusbestand"
+#: malloc/memusagestat.c:64
+msgid "Generate graphic from memory profiling data"
+msgstr "Een grafiek maken van geheugenanalyse-gegevens."
 
-#: catgets/gencat.c:1332
-msgid "conversion modules not available"
-msgstr "conversiemodules niet beschikbaar"
+#: malloc/memusagestat.c:67
+msgid "DATAFILE [OUTFILE]"
+msgstr "GEGEVENSBESTAND [UITVOERBESTAND]"
 
-#: catgets/gencat.c:1358
-msgid "cannot determine escape character"
-msgstr "kan stuurcode niet bepalen"
+#: misc/error.c:118 timezone/zic.c:396
+msgid "Unknown system error"
+msgstr "Onbekende systeemfout"
 
-#: stdlib/../sysdeps/unix/sysv/linux/ia64/makecontext.c:63
-#, c-format
-msgid "makecontext: does not know how to handle more than 8 arguments\n"
-msgstr "makecontext: weet niet hoe om te gaan met meer dan 8 argumenten\n"
+#: nis/nis_callback.c:189
+msgid "unable to free arguments"
+msgstr "kan geheugen van argumenten niet vrijgeven"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:12 posix/regcomp.c:147
-#: nis/nis_error.c:29 nis/ypclnt.c:778 nis/ypclnt.c:852
+#: nis/nis_error.h:1 nis/ypclnt.c:822 nis/ypclnt.c:910 posix/regcomp.c:132
+#: sysdeps/gnu/errlist.c:20
 msgid "Success"
 msgstr "Gelukt"
 
-#. TRANS Operation not permitted; only the owner of the file (or other resource)
-#. TRANS or processes with special privileges can perform the operation.
-#: stdio-common/../sysdeps/gnu/errlist.c:17
-msgid "Operation not permitted"
-msgstr "Bewerking niet toegestaan"
-
-#. TRANS No such file or directory.  This is a ``file doesn't exist'' error
-#. TRANS for ordinary files that are referenced in contexts where they are
-#. TRANS expected to already exist.
-#: stdio-common/../sysdeps/gnu/errlist.c:28
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:32
-msgid "No such file or directory"
-msgstr "Onbekend bestand of map"
-
-#. TRANS No process matches the specified process ID.
-#: stdio-common/../sysdeps/gnu/errlist.c:37
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:33
-msgid "No such process"
-msgstr "Onbekend proces"
-
-#. TRANS Interrupted function call; an asynchronous signal occurred and prevented
-#. TRANS completion of the call.  When this happens, you should try the call
-#. TRANS again.
-#. TRANS
-#. TRANS You can choose to have functions resume after a signal that is handled,
-#. TRANS rather than failing with @code{EINTR}; see @ref{Interrupted
-#. TRANS Primitives}.
-#: stdio-common/../sysdeps/gnu/errlist.c:52
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:34
-msgid "Interrupted system call"
-msgstr "Onderbroken systeemaanroep"
+#: nis/nis_error.h:2
+msgid "Probable success"
+msgstr "Waarschijnlijk gelukt"
 
-#. TRANS Input/output error; usually used for physical read or write errors.
-#: stdio-common/../sysdeps/gnu/errlist.c:61
-msgid "Input/output error"
-msgstr "Invoer/uitvoer fout"
+#: nis/nis_error.h:3
+msgid "Not found"
+msgstr "Niet gevonden"
 
-#. TRANS No such device or address.  The system tried to use the device
-#. TRANS represented by a file you specified, and it couldn't find the device.
-#. TRANS This can mean that the device file was installed incorrectly, or that
-#. TRANS the physical device is missing or not correctly attached to the
-#. TRANS computer.
-#: stdio-common/../sysdeps/gnu/errlist.c:74
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:36
-msgid "No such device or address"
-msgstr "Onbekend apparaat of adres"
+#: nis/nis_error.h:4
+msgid "Probably not found"
+msgstr "Waarschijnlijk niet gevonden"
 
-#. TRANS Argument list too long; used when the arguments passed to a new program
-#. TRANS being executed with one of the @code{exec} functions (@pxref{Executing a
-#. TRANS File}) occupy too much memory space.  This condition never arises in the
-#. TRANS GNU system.
-#: stdio-common/../sysdeps/gnu/errlist.c:86
-msgid "Argument list too long"
-msgstr "Argumentlijst te lang"
+#: nis/nis_error.h:5
+msgid "Cache expired"
+msgstr "Cache is verlopen"
 
-#. TRANS Invalid executable file format.  This condition is detected by the
-#. TRANS @code{exec} functions; see @ref{Executing a File}.
-#: stdio-common/../sysdeps/gnu/errlist.c:96
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:38
-msgid "Exec format error"
-msgstr "Uitvoerbaar formaat fout"
+#: nis/nis_error.h:6
+msgid "NIS+ servers unreachable"
+msgstr "NIS+-servers zijn onbereikbaar"
 
-#. TRANS Bad file descriptor; for example, I/O on a descriptor that has been
-#. TRANS closed or reading from a descriptor open only for writing (or vice
-#. TRANS versa).
-#: stdio-common/../sysdeps/gnu/errlist.c:107
-msgid "Bad file descriptor"
-msgstr "Slechte bestandsbeschrijver"
+#: nis/nis_error.h:7
+msgid "Unknown object"
+msgstr "Onbekend object"
 
-#. TRANS There are no child processes.  This error happens on operations that are
-#. TRANS supposed to manipulate child processes, when there aren't any processes
-#. TRANS to manipulate.
-#: stdio-common/../sysdeps/gnu/errlist.c:118
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:40
-msgid "No child processes"
-msgstr "Geen kindprocessen"
+#: nis/nis_error.h:8
+msgid "Server busy, try again"
+msgstr "Server is bezig; probeer het nog eens"
 
-#. TRANS Deadlock avoided; allocating a system resource would have resulted in a
-#. TRANS deadlock situation.  The system does not guarantee that it will notice
-#. TRANS all such situations.  This error means you got lucky and the system
-#. TRANS noticed; it might just hang.  @xref{File Locks}, for an example.
-#: stdio-common/../sysdeps/gnu/errlist.c:130
-msgid "Resource deadlock avoided"
-msgstr "Volledige blokkering van bron omzeild"
+#: nis/nis_error.h:9
+msgid "Generic system error"
+msgstr "Algemene systeemfout"
 
-#. TRANS No memory available.  The system cannot allocate more virtual memory
-#. TRANS because its capacity is full.
-#: stdio-common/../sysdeps/gnu/errlist.c:140
-msgid "Cannot allocate memory"
-msgstr "Kan geen geheugen toewijzen"
+#: nis/nis_error.h:10
+msgid "First/next chain broken"
+msgstr "De 'eerste/volgende'-ketting is gebroken"
 
 #. TRANS Permission denied; the file permissions do not allow the attempted operation.
-#: stdio-common/../sysdeps/gnu/errlist.c:149
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:43
-#: nis/nis_error.c:39 nis/ypclnt.c:808
+#: nis/nis_error.h:11 nis/ypclnt.c:867 sysdeps/gnu/errlist.c:157
 msgid "Permission denied"
 msgstr "Toegang geweigerd"
 
-#. TRANS Bad address; an invalid pointer was detected.
-#. TRANS In the GNU system, this error never happens; you get a signal instead.
-#: stdio-common/../sysdeps/gnu/errlist.c:159
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:44
-msgid "Bad address"
-msgstr "Slecht adres"
-
-#. TRANS A file that isn't a block special file was given in a situation that
-#. TRANS requires one.  For example, trying to mount an ordinary file as a file
-#. TRANS system in Unix gives this error.
-#: stdio-common/../sysdeps/gnu/errlist.c:170
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:45
-msgid "Block device required"
-msgstr "Blokapparaat vereist"
-
-#. TRANS Resource busy; a system resource that can't be shared is already in use.
-#. TRANS For example, if you try to delete a file that is the root of a currently
-#. TRANS mounted filesystem, you get this error.
-#: stdio-common/../sysdeps/gnu/errlist.c:181
-msgid "Device or resource busy"
-msgstr "Apparaat of bron bezig"
-
-#. TRANS File exists; an existing file was specified in a context where it only
-#. TRANS makes sense to specify a new file.
-#: stdio-common/../sysdeps/gnu/errlist.c:191
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:47
-msgid "File exists"
-msgstr "Bestand bestaat"
-
-#. TRANS An attempt to make an improper link across file systems was detected.
-#. TRANS This happens not only when you use @code{link} (@pxref{Hard Links}) but
-#. TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}).
-#: stdio-common/../sysdeps/gnu/errlist.c:202
-msgid "Invalid cross-device link"
-msgstr "Ongeldige koppeling tussen apparaten"
-
-#. TRANS The wrong type of device was given to a function that expects a
-#. TRANS particular sort of device.
-#: stdio-common/../sysdeps/gnu/errlist.c:212
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:49
-msgid "No such device"
-msgstr "Onbekend apparaat"
-
-#. TRANS A file that isn't a directory was specified when a directory is required.
-#: stdio-common/../sysdeps/gnu/errlist.c:221
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:50
-msgid "Not a directory"
-msgstr "Niet een map"
-
-#. TRANS File is a directory; you cannot open a directory for writing,
-#. TRANS or create or remove hard links to it.
-#: stdio-common/../sysdeps/gnu/errlist.c:231
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:51
-msgid "Is a directory"
-msgstr "Is een map"
-
-#. TRANS Invalid argument.  This is used to indicate various kinds of problems
-#. TRANS with passing the wrong argument to a library function.
-#: stdio-common/../sysdeps/gnu/errlist.c:241
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:52
-msgid "Invalid argument"
-msgstr "Ongeldig argument"
-
-#. TRANS The current process has too many files open and can't open any more.
-#. TRANS Duplicate descriptors do count toward this limit.
-#. TRANS
-#. TRANS In BSD and GNU, the number of open files is controlled by a resource
-#. TRANS limit that can usually be increased.  If you get this error, you might
-#. TRANS want to increase the @code{RLIMIT_NOFILE} limit or make it unlimited;
-#. TRANS @pxref{Limits on Resources}.
-#: stdio-common/../sysdeps/gnu/errlist.c:256
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:54
-msgid "Too many open files"
-msgstr "Teveel open bestanden"
-
-#. TRANS There are too many distinct file openings in the entire system.  Note
-#. TRANS that any number of linked channels count as just one file opening; see
-#. TRANS @ref{Linked Channels}.  This error never occurs in the GNU system.
-#: stdio-common/../sysdeps/gnu/errlist.c:267
-msgid "Too many open files in system"
-msgstr "Teveel open bestanden in systeem"
-
-#. TRANS Inappropriate I/O control operation, such as trying to set terminal
-#. TRANS modes on an ordinary file.
-#: stdio-common/../sysdeps/gnu/errlist.c:277
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:55
-msgid "Inappropriate ioctl for device"
-msgstr "Ongepaste ioctl voor apparaat"
-
-#. TRANS An attempt to execute a file that is currently open for writing, or
-#. TRANS write to a file that is currently being executed.  Often using a
-#. TRANS debugger to run a program is considered having it open for writing and
-#. TRANS will cause this error.  (The name stands for ``text file busy''.)  This
-#. TRANS is not an error in the GNU system; the text is copied as necessary.
-#: stdio-common/../sysdeps/gnu/errlist.c:290
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:56
-msgid "Text file busy"
-msgstr "Tekstbestand bezig"
-
-#. TRANS File too big; the size of a file would be larger than allowed by the system.
-#: stdio-common/../sysdeps/gnu/errlist.c:299
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:57
-msgid "File too large"
-msgstr "Bestand te groot"
-
-#. TRANS No space left on device; write operation on a file failed because the
-#. TRANS disk is full.
-#: stdio-common/../sysdeps/gnu/errlist.c:309
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:58
-msgid "No space left on device"
-msgstr "Geen ruimte over op apparaat"
-
-#. TRANS Invalid seek operation (such as on a pipe).
-#: stdio-common/../sysdeps/gnu/errlist.c:318
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:59
-msgid "Illegal seek"
-msgstr "Ongeldige zoekopdracht"
-
-#. TRANS An attempt was made to modify something on a read-only file system.
-#: stdio-common/../sysdeps/gnu/errlist.c:327
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:60
-msgid "Read-only file system"
-msgstr "Alleen-lezen bestandssysteem"
-
-#. TRANS Too many links; the link count of a single file would become too large.
-#. TRANS @code{rename} can cause this error if the file being renamed already has
-#. TRANS as many links as it can take (@pxref{Renaming Files}).
-#: stdio-common/../sysdeps/gnu/errlist.c:338
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:61
-msgid "Too many links"
-msgstr "Teveel koppelingen"
-
-#. TRANS Domain error; used by mathematical functions when an argument value does
-#. TRANS not fall into the domain over which the function is defined.
-#: stdio-common/../sysdeps/gnu/errlist.c:361
-msgid "Numerical argument out of domain"
-msgstr "Numeriek argument buiten domein"
-
-#. TRANS Range error; used by mathematical functions when the result value is
-#. TRANS not representable because of overflow or underflow.
-#: stdio-common/../sysdeps/gnu/errlist.c:371
-msgid "Numerical result out of range"
-msgstr "Numeriek resultaat buiten bereik"
-
-#. TRANS Resource temporarily unavailable; the call might work if you try again
-#. TRANS later.  The macro @code{EWOULDBLOCK} is another name for @code{EAGAIN};
-#. TRANS they are always the same in the GNU C library.
-#. TRANS
-#. TRANS This error can happen in a few different situations:
-#. TRANS
-#. TRANS @itemize @bullet
-#. TRANS @item
-#. TRANS An operation that would block was attempted on an object that has
-#. TRANS non-blocking mode selected.  Trying the same operation again will block
-#. TRANS until some external condition makes it possible to read, write, or
-#. TRANS connect (whatever the operation).  You can use @code{select} to find out
-#. TRANS when the operation will be possible; @pxref{Waiting for I/O}.
-#. TRANS
-#. TRANS @strong{Portability Note:} In many older Unix systems, this condition
-#. TRANS was indicated by @code{EWOULDBLOCK}, which was a distinct error code
-#. TRANS different from @code{EAGAIN}.  To make your program portable, you should
-#. TRANS check for both codes and treat them the same.
-#. TRANS
-#. TRANS @item
-#. TRANS A temporary resource shortage made an operation impossible.  @code{fork}
-#. TRANS can return this error.  It indicates that the shortage is expected to
-#. TRANS pass, so your program can try the call again later and it may succeed.
-#. TRANS It is probably a good idea to delay for a few seconds before trying it
-#. TRANS again, to allow time for other processes to release scarce resources.
-#. TRANS Such shortages are usually fairly serious and affect the whole system,
-#. TRANS so usually an interactive program should report the error to the user
-#. TRANS and return to its command loop.
-#. TRANS @end itemize
-#: stdio-common/../sysdeps/gnu/errlist.c:408
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:41
-msgid "Resource temporarily unavailable"
-msgstr "Bron tijdelijk onbeschikbaar"
-
-#. TRANS In the GNU C library, this is another name for @code{EAGAIN} (above).
-#. TRANS The values are always the same, on every operating system.
-#. TRANS
-#. TRANS C libraries in many older Unix systems have @code{EWOULDBLOCK} as a
-#. TRANS separate error code.
-#: stdio-common/../sysdeps/gnu/errlist.c:421
-msgid "Operation would block"
-msgstr "Bewerking zou blokkeren"
+#: nis/nis_error.h:12
+msgid "Not owner"
+msgstr "Niet de eigenaar"
 
-#. TRANS An operation that cannot complete immediately was initiated on an object
-#. TRANS that has non-blocking mode selected.  Some functions that must always
-#. TRANS block (such as @code{connect}; @pxref{Connecting}) never return
-#. TRANS @code{EAGAIN}.  Instead, they return @code{EINPROGRESS} to indicate that
-#. TRANS the operation has begun and will take some time.  Attempts to manipulate
-#. TRANS the object before the call completes return @code{EALREADY}.  You can
-#. TRANS use the @code{select} function to find out when the pending operation
-#. TRANS has completed; @pxref{Waiting for I/O}.
-#: stdio-common/../sysdeps/gnu/errlist.c:437
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:180
-msgid "Operation now in progress"
-msgstr "Bewerking is nu bezig"
+#: nis/nis_error.h:13
+msgid "Name not served by this server"
+msgstr "Naam wordt door deze server niet aangeboden"
 
-#. TRANS An operation is already in progress on an object that has non-blocking
-#. TRANS mode selected.
-#: stdio-common/../sysdeps/gnu/errlist.c:447
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:179
-msgid "Operation already in progress"
-msgstr "Bewerking reeds bezig"
+#: nis/nis_error.h:14
+msgid "Server out of memory"
+msgstr "Server heeft onvoldoende geheugen"
 
-#. TRANS A file that isn't a socket was specified when a socket is required.
-#: stdio-common/../sysdeps/gnu/errlist.c:456
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:125
-msgid "Socket operation on non-socket"
-msgstr "Socketbewerking op niet-socket"
+#: nis/nis_error.h:15
+msgid "Object with same name exists"
+msgstr "Een object met dezelfde naam bestaat al"
 
-#. TRANS The size of a message sent on a socket was larger than the supported
-#. TRANS maximum size.
-#: stdio-common/../sysdeps/gnu/errlist.c:466
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:127
-msgid "Message too long"
-msgstr "Bericht te lang"
+#: nis/nis_error.h:16
+msgid "Not master server for this domain"
+msgstr "Is niet de hoofdserver voor dit domein"
 
-#. TRANS The socket type does not support the requested communications protocol.
-#: stdio-common/../sysdeps/gnu/errlist.c:475
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:128
-msgid "Protocol wrong type for socket"
-msgstr "Protocol van verkeerde soort voor socket"
+#: nis/nis_error.h:17
+msgid "Invalid object for operation"
+msgstr "Ongeldig object voor bewerking"
 
-#. TRANS You specified a socket option that doesn't make sense for the
-#. TRANS particular protocol being used by the socket.  @xref{Socket Options}.
-#: stdio-common/../sysdeps/gnu/errlist.c:485
-msgid "Protocol not available"
-msgstr "Protocol niet beschikbaar"
+#: nis/nis_error.h:18
+msgid "Malformed name, or illegal name"
+msgstr "Naam bevat verkeerde tekens of is ongeldig"
 
-#. TRANS The socket domain does not support the requested communications protocol
-#. TRANS (perhaps because the requested protocol is completely invalid).
-#. TRANS @xref{Creating a Socket}.
-#: stdio-common/../sysdeps/gnu/errlist.c:496
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:150
-msgid "Protocol not supported"
-msgstr "Protocol niet ondersteund"
+#: nis/nis_error.h:19
+msgid "Unable to create callback"
+msgstr "Kan geen terugaanroep aanmaken"
 
-#. TRANS The socket type is not supported.
-#: stdio-common/../sysdeps/gnu/errlist.c:505
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:151
-msgid "Socket type not supported"
-msgstr "Socketsoort niet ondersteund"
+#: nis/nis_error.h:20
+msgid "Results sent to callback proc"
+msgstr "Resultaten verzonden aan terugaanroep-proces"
 
-#. TRANS The operation you requested is not supported.  Some socket functions
-#. TRANS don't make sense for all types of sockets, and others may not be
-#. TRANS implemented for all communications protocols.  In the GNU system, this
-#. TRANS error can happen for many calls when the object does not support the
-#. TRANS particular operation; it is a generic indication that the server knows
-#. TRANS nothing to do for that call.
-#: stdio-common/../sysdeps/gnu/errlist.c:519
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:78
-msgid "Operation not supported"
-msgstr "Bewerking niet ondersteund"
+#: nis/nis_error.h:21
+msgid "Not found, no such name"
+msgstr "Niet gevonden; naam bestaat niet"
 
-#. TRANS The socket communications protocol family you requested is not supported.
-#: stdio-common/../sysdeps/gnu/errlist.c:528
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:153
-msgid "Protocol family not supported"
-msgstr "Protocolfamilie niet ondersteund"
+#: nis/nis_error.h:22
+msgid "Name/entry isn't unique"
+msgstr "Naam of item is niet uniek"
 
-#. TRANS The address family specified for a socket is not supported; it is
-#. TRANS inconsistent with the protocol being used on the socket.  @xref{Sockets}.
-#: stdio-common/../sysdeps/gnu/errlist.c:538
-msgid "Address family not supported by protocol"
-msgstr "Adresfamilie niet ondersteund door protocol"
+#: nis/nis_error.h:23
+msgid "Modification failed"
+msgstr "Wijziging is mislukt"
 
-#. TRANS The requested socket address is already in use.  @xref{Socket Addresses}.
-#: stdio-common/../sysdeps/gnu/errlist.c:547
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:155
-msgid "Address already in use"
-msgstr "Adres reeds in gebruik"
+#: nis/nis_error.h:24
+msgid "Database for table does not exist"
+msgstr "Gegevensbank voor tabel bestaat niet"
 
-#. TRANS The requested socket address is not available; for example, you tried
-#. TRANS to give a socket a name that doesn't match the local host name.
-#. TRANS @xref{Socket Addresses}.
-#: stdio-common/../sysdeps/gnu/errlist.c:558
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:156
-msgid "Cannot assign requested address"
-msgstr "Kan verzochte adres niet toewijzen"
+#: nis/nis_error.h:25
+msgid "Entry/table type mismatch"
+msgstr "Item- en tabelsoort passen niet bij elkaar"
 
-#. TRANS A socket operation failed because the network was down.
-#: stdio-common/../sysdeps/gnu/errlist.c:567
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:157
-msgid "Network is down"
-msgstr "Network is down"
+#: nis/nis_error.h:26
+msgid "Link points to illegal name"
+msgstr "Koppeling wijst naar ongeldige naam"
 
-#. TRANS A socket operation failed because the subnet containing the remote host
-#. TRANS was unreachable.
-#: stdio-common/../sysdeps/gnu/errlist.c:577
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:158
-msgid "Network is unreachable"
-msgstr "Netwerk is onbereikbaar"
+#: nis/nis_error.h:27
+msgid "Partial success"
+msgstr "Gedeeltelijk gelukt"
 
-#. TRANS A network connection was reset because the remote host crashed.
-#: stdio-common/../sysdeps/gnu/errlist.c:586
-msgid "Network dropped connection on reset"
-msgstr "Netwerk liet verbinding vallen bij opnieuw instellen"
+#: nis/nis_error.h:28
+msgid "Too many attributes"
+msgstr "Te veel kenmerken"
 
-#. TRANS A network connection was aborted locally.
-#: stdio-common/../sysdeps/gnu/errlist.c:595
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:160
-msgid "Software caused connection abort"
-msgstr "Software zorgde voor onderbreken verbinding"
+#: nis/nis_error.h:29
+msgid "Error in RPC subsystem"
+msgstr "Fout in RPC-subsysteem"
 
-#. TRANS A network connection was closed for reasons outside the control of the
-#. TRANS local host, such as by the remote machine rebooting or an unrecoverable
-#. TRANS protocol violation.
-#: stdio-common/../sysdeps/gnu/errlist.c:606
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:161
-msgid "Connection reset by peer"
-msgstr "Verbinding door partner opnieuw ingesteld"
+#: nis/nis_error.h:30
+msgid "Missing or malformed attribute"
+msgstr "Ontbrekend of ongeldig kenmerk"
 
-#. TRANS The kernel's buffers for I/O operations are all in use.  In GNU, this
-#. TRANS error is always synonymous with @code{ENOMEM}; you may get one or the
-#. TRANS other from network operations.
-#: stdio-common/../sysdeps/gnu/errlist.c:617
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:162
-msgid "No buffer space available"
-msgstr "Geen bufferruimte beschikbaar"
+#: nis/nis_error.h:31
+msgid "Named object is not searchable"
+msgstr "Genoemd object is niet doorzoekbaar"
 
-#. TRANS You tried to connect a socket that is already connected.
-#. TRANS @xref{Connecting}.
-#: stdio-common/../sysdeps/gnu/errlist.c:627
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:163
-msgid "Transport endpoint is already connected"
-msgstr "Overdrachtseindpunt is al verbonden"
+#: nis/nis_error.h:32
+msgid "Error while talking to callback proc"
+msgstr "Fout bij communicatie met terugaanroep-proces"
 
-#. TRANS The socket is not connected to anything.  You get this error when you
-#. TRANS try to transmit data over a socket, without first specifying a
-#. TRANS destination for the data.  For a connectionless socket (for datagram
-#. TRANS protocols, such as UDP), you get @code{EDESTADDRREQ} instead.
-#: stdio-common/../sysdeps/gnu/errlist.c:639
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:164
-msgid "Transport endpoint is not connected"
-msgstr "Overdrachtseindpunt is niet verbonden"
+#: nis/nis_error.h:33
+msgid "Non NIS+ namespace encountered"
+msgstr "Een naamsruimte anders NIS+ tegengekomen"
 
-#. TRANS No default destination address was set for the socket.  You get this
-#. TRANS error when you try to transmit data over a connectionless socket,
-#. TRANS without first specifying a destination for the data with @code{connect}.
-#: stdio-common/../sysdeps/gnu/errlist.c:650
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:126
-msgid "Destination address required"
-msgstr "Doeladres vereist"
+#: nis/nis_error.h:34
+msgid "Illegal object type for operation"
+msgstr "Ongeldige objectsoort voor bewerking"
 
-#. TRANS The socket has already been shut down.
-#: stdio-common/../sysdeps/gnu/errlist.c:659
-msgid "Cannot send after transport endpoint shutdown"
-msgstr "Kan niet verzenden na afsluiten overdrachtseindpunt"
+#: nis/nis_error.h:35
+msgid "Passed object is not the same object on server"
+msgstr "Meegegeven object is niet hetzelfde object als op de server"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:668
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:174
-msgid "Too many references: cannot splice"
-msgstr "Teveel verwijzingen: kan niet splitsen"
+#: nis/nis_error.h:36
+msgid "Modify operation failed"
+msgstr "Wijzigingsbewerking is mislukt"
 
-#. TRANS A socket operation with a specified timeout received no response during
-#. TRANS the timeout period.
-#: stdio-common/../sysdeps/gnu/errlist.c:678
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:175
-msgid "Connection timed out"
-msgstr "Verbinding time-out"
+#: nis/nis_error.h:37
+msgid "Query illegal for named table"
+msgstr "Zoekopdracht is ongeldig voor genoemde tabel"
 
-#. TRANS A remote host refused to allow the network connection (typically because
-#. TRANS it is not running the requested service).
-#: stdio-common/../sysdeps/gnu/errlist.c:688
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:176
-msgid "Connection refused"
-msgstr "Verbinding geweigerd"
+#: nis/nis_error.h:38
+msgid "Attempt to remove a non-empty table"
+msgstr "Poging tot verwijderen van een niet-lege tabel"
 
-#. TRANS Too many levels of symbolic links were encountered in looking up a file name.
-#. TRANS This often indicates a cycle of symbolic links.
-#: stdio-common/../sysdeps/gnu/errlist.c:698
-msgid "Too many levels of symbolic links"
-msgstr "Teveel niveaus van symbolische koppelingen"
+#: nis/nis_error.h:39
+msgid "Error in accessing NIS+ cold start file.  Is NIS+ installed?"
+msgstr "Fout bij toegang tot NIS+-koude-startbestand.  Is NIS+ wel geïnstalleerd?"
 
-#. TRANS Filename too long (longer than @code{PATH_MAX}; @pxref{Limits for
-#. TRANS Files}) or host name too long (in @code{gethostname} or
-#. TRANS @code{sethostname}; @pxref{Host Identification}).
-#: stdio-common/../sysdeps/gnu/errlist.c:709
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:108
-msgid "File name too long"
-msgstr "Bestandsnaam te lang"
+#: nis/nis_error.h:40
+msgid "Full resync required for directory"
+msgstr "Volledige hersynchronisatie is nodig voor map"
 
-#. TRANS The remote host for a requested network connection is down.
-#: stdio-common/../sysdeps/gnu/errlist.c:718
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:177
-msgid "Host is down"
-msgstr "Host is onbereikbaar"
+#: nis/nis_error.h:41
+msgid "NIS+ operation failed"
+msgstr "NIS+-bewerking is mislukt"
 
-#. TRANS The remote host for a requested network connection is not reachable.
-#: stdio-common/../sysdeps/gnu/errlist.c:727
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:178
-msgid "No route to host"
-msgstr "Geen route naar host"
+#: nis/nis_error.h:42
+msgid "NIS+ service is unavailable or not installed"
+msgstr "NIS+-dienst is onbeschikbaar of niet geïnstalleerd"
 
-#. TRANS Directory not empty, where an empty directory was expected.  Typically,
-#. TRANS this error occurs when you are trying to delete a directory.
-#: stdio-common/../sysdeps/gnu/errlist.c:737
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:123
-msgid "Directory not empty"
-msgstr "Map niet leeg"
+#: nis/nis_error.h:43
+msgid "Yes, 42 is the meaning of life"
+msgstr "Dat is waar, 42 is de zin van het leven..."
 
-#. TRANS This means that the per-user limit on new process would be exceeded by
-#. TRANS an attempted @code{fork}.  @xref{Limits on Resources}, for details on
-#. TRANS the @code{RLIMIT_NPROC} limit.
-#: stdio-common/../sysdeps/gnu/errlist.c:748
-msgid "Too many processes"
-msgstr "Teveel processen"
+#: nis/nis_error.h:44
+msgid "Unable to authenticate NIS+ server"
+msgstr "Kan de NIS+-server niet authentificeren"
 
-#. TRANS The file quota system is confused because there are too many users.
-#. TRANS @c This can probably happen in a GNU system when using NFS.
-#: stdio-common/../sysdeps/gnu/errlist.c:758
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:124
-msgid "Too many users"
-msgstr "Teveel gebruikers"
+#: nis/nis_error.h:45
+msgid "Unable to authenticate NIS+ client"
+msgstr "Kan de NIS+-client niet authentificeren"
 
-#. TRANS The user's disk quota was exceeded.
-#: stdio-common/../sysdeps/gnu/errlist.c:767
-msgid "Disk quota exceeded"
-msgstr "Schijfquota overschreden"
+#: nis/nis_error.h:46
+msgid "No file space on server"
+msgstr "Geen schijfruimte meer op server"
 
-#. TRANS Stale NFS file handle.  This indicates an internal confusion in the NFS
-#. TRANS system which is due to file system rearrangements on the server host.
-#. TRANS Repairing this condition usually requires unmounting and remounting
-#. TRANS the NFS file system on the local host.
-#: stdio-common/../sysdeps/gnu/errlist.c:779
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:181
-msgid "Stale NFS file handle"
-msgstr "Achterhaald NFS-bestandshandvat"
+#: nis/nis_error.h:47
+msgid "Unable to create process on server"
+msgstr "Kan geen nieuw proces starten op server"
 
-#. TRANS An attempt was made to NFS-mount a remote file system with a file name that
-#. TRANS already specifies an NFS-mounted file.
-#. TRANS (This is an error on some operating systems, but we expect it to work
-#. TRANS properly on the GNU system, making this error code impossible.)
-#: stdio-common/../sysdeps/gnu/errlist.c:791
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:96
-msgid "Object is remote"
-msgstr "Object is op afstand"
+#: nis/nis_error.h:48
+msgid "Master server busy, full dump rescheduled."
+msgstr "Hoofdserver is bezig; volledig ophalen is uitgesteld"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:800
-msgid "RPC struct is bad"
-msgstr "RPC struct is slecht"
+#: nis/nis_local_names.c:122
+#, c-format
+msgid "LOCAL entry for UID %d in directory %s not unique\n"
+msgstr "LOCAL-item voor UID %d in map %s is niet uniek\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:809
-msgid "RPC version wrong"
-msgstr "RPC versie verkeerd"
+#: nis/nis_print.c:51
+msgid "UNKNOWN"
+msgstr "ONBEKEND"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:818
-msgid "RPC program not available"
-msgstr "RPC programma niet beschikbaar"
+#: nis/nis_print.c:109
+msgid "BOGUS OBJECT\n"
+msgstr "ONGELDIG OBJECT\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:827
-msgid "RPC program version wrong"
-msgstr "RPC programma versie verkeerd"
+#: nis/nis_print.c:112
+msgid "NO OBJECT\n"
+msgstr "GEEN OBJECT\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:836
-msgid "RPC bad procedure for program"
-msgstr "RPC slechte procedure voor programma"
+#: nis/nis_print.c:115
+msgid "DIRECTORY\n"
+msgstr "MAP\n"
 
-#. TRANS No locks available.  This is used by the file locking facilities; see
-#. TRANS @ref{File Locks}.  This error is never generated by the GNU system, but
-#. TRANS it can result from an operation to an NFS server running another
-#. TRANS operating system.
-#: stdio-common/../sysdeps/gnu/errlist.c:848
-msgid "No locks available"
-msgstr "Geen blokkeringen beschikbaar"
+#: nis/nis_print.c:118
+msgid "GROUP\n"
+msgstr "GROEP\n"
 
-#. TRANS Inappropriate file type or format.  The file was the wrong type for the
-#. TRANS operation, or a data file had the wrong format.
-#. TRANS
-#. TRANS On some systems @code{chmod} returns this error if you try to set the
-#. TRANS sticky bit on a non-directory file; @pxref{Setting Permissions}.
-#: stdio-common/../sysdeps/gnu/errlist.c:861
-msgid "Inappropriate file type or format"
-msgstr "Ongepaste bestandssoort of formaat"
+#: nis/nis_print.c:121
+msgid "TABLE\n"
+msgstr "TABEL\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:870
-msgid "Authentication error"
-msgstr "Authentificatie fout"
+#: nis/nis_print.c:124
+msgid "ENTRY\n"
+msgstr "ITEM\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:879
-msgid "Need authenticator"
-msgstr "Authentificator vereist"
+#: nis/nis_print.c:127
+msgid "LINK\n"
+msgstr "KOPPELING\n"
 
-#. TRANS Function not implemented.  This indicates that the function called is
-#. TRANS not implemented at all, either in the C library itself or in the
-#. TRANS operating system.  When you get this error, you can be sure that this
-#. TRANS particular function will always fail with @code{ENOSYS} unless you
-#. TRANS install a new version of the C library or the operating system.
-#: stdio-common/../sysdeps/gnu/errlist.c:892
-msgid "Function not implemented"
-msgstr "Functie niet geschreven"
+#: nis/nis_print.c:130
+msgid "PRIVATE\n"
+msgstr "PRIVÉ\n"
 
-#. TRANS Not supported.  A function returns this error when certain parameter
-#. TRANS values are valid, but the functionality they request is not available.
-#. TRANS This can mean that the function does not implement a particular command
-#. TRANS or option value or flag bit at all.  For functions that operate on some
-#. TRANS object given in a parameter, such as a file descriptor or a port, it
-#. TRANS might instead mean that only @emph{that specific object} (file
-#. TRANS descriptor, port, etc.) is unable to support the other parameters given;
-#. TRANS different file descriptors might support different ranges of parameter
-#. TRANS values.
-#. TRANS
-#. TRANS If the entire function is not available at all in the implementation,
-#. TRANS it returns @code{ENOSYS} instead.
-#: stdio-common/../sysdeps/gnu/errlist.c:912
-msgid "Not supported"
-msgstr "Niet ondersteund"
+#: nis/nis_print.c:133
+msgid "(Unknown object)\n"
+msgstr "(Onbekend object)\n"
 
-#. TRANS While decoding a multibyte character the function came along an invalid
-#. TRANS or an incomplete sequence of bytes or the given wide character is invalid.
-#: stdio-common/../sysdeps/gnu/errlist.c:922
-msgid "Invalid or incomplete multibyte or wide character"
-msgstr "Ongeldig of onvolledig multibyte- of breed teken"
+#: nis/nis_print.c:167
+#, c-format
+msgid "Name : `%s'\n"
+msgstr "Naam : '%s'\n"
 
-#. TRANS In the GNU system, servers supporting the @code{term} protocol return
-#. TRANS this error for certain operations when the caller is not in the
-#. TRANS foreground process group of the terminal.  Users do not usually see this
-#. TRANS error because functions such as @code{read} and @code{write} translate
-#. TRANS it into a @code{SIGTTIN} or @code{SIGTTOU} signal.  @xref{Job Control},
-#. TRANS for information on process groups and these signals.
-#: stdio-common/../sysdeps/gnu/errlist.c:936
-msgid "Inappropriate operation for background process"
-msgstr "Ongepaste bewerking voor achtergrondproces"
+#: nis/nis_print.c:168
+#, c-format
+msgid "Type : %s\n"
+msgstr "Soort : %s\n"
 
-#. TRANS In the GNU system, opening a file returns this error when the file is
-#. TRANS translated by a program and the translator program dies while starting
-#. TRANS up, before it has connected to the file.
-#: stdio-common/../sysdeps/gnu/errlist.c:947
-msgid "Translator died"
-msgstr "Vertaler is overleden"
+#: nis/nis_print.c:173
+msgid "Master Server :\n"
+msgstr "Hoofdserver :\n"
 
-#. TRANS The experienced user will know what is wrong.
-#. TRANS @c This error code is a joke.  Its perror text is part of the joke.
-#. TRANS @c Don't change it.
-#: stdio-common/../sysdeps/gnu/errlist.c:958
-msgid "?"
-msgstr "?"
+#: nis/nis_print.c:175
+msgid "Replicate :\n"
+msgstr "Replicaserver :\n"
 
-#. TRANS You did @strong{what}?
-#: stdio-common/../sysdeps/gnu/errlist.c:967
-msgid "You really blew it this time"
-msgstr "Nu heeft u het echt gedaan"
+#: nis/nis_print.c:176
+#, c-format
+msgid "\tName       : %s\n"
+msgstr "\tNaam             : %s\n"
 
-#. TRANS Go home and have a glass of warm, dairy-fresh milk.
-#: stdio-common/../sysdeps/gnu/errlist.c:976
-msgid "Computer bought the farm"
-msgstr "Ga er even rustig bij zitten"
+#: nis/nis_print.c:177
+msgid "\tPublic Key : "
+msgstr "\tOpenbare sleutel : "
 
-#. TRANS This error code has no purpose.
-#: stdio-common/../sysdeps/gnu/errlist.c:985
-msgid "Gratuitous error"
-msgstr "Zinloze fout"
+#: nis/nis_print.c:181
+msgid "None.\n"
+msgstr "Geen\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:993
-msgid "Bad message"
-msgstr "Fout bericht"
+#: nis/nis_print.c:184
+#, c-format
+msgid "Diffie-Hellmann (%d bits)\n"
+msgstr "Diffie-Hellmann (%d bits)\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1001
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:66
-msgid "Identifier removed"
-msgstr "Identificeerder verwijderd"
+#: nis/nis_print.c:189
+#, c-format
+msgid "RSA (%d bits)\n"
+msgstr "RSA (%d bits)\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1009
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:104
-msgid "Multihop attempted"
-msgstr "Multihop geprobeerd"
+#: nis/nis_print.c:192
+msgid "Kerberos.\n"
+msgstr "Kerberos\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1017
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:91
-msgid "No data available"
-msgstr "Geen gegevens beschikbaar"
+#: nis/nis_print.c:195
+#, c-format
+msgid "Unknown (type = %d, bits = %d)\n"
+msgstr "Onbekend (soort = %d, bits = %d)\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1025
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:97
-msgid "Link has been severed"
-msgstr "Koppeling bevindt zich in zwaar weer"
+#: nis/nis_print.c:206
+#, c-format
+msgid "\tUniversal addresses (%u)\n"
+msgstr "\tUniversele adressen (%u)\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1033
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:65
-msgid "No message of desired type"
-msgstr "Geen bericht van de gewenste soort"
+#: nis/nis_print.c:228
+msgid "Time to live : "
+msgstr "Levensduur : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1041
-msgid "Out of streams resources"
-msgstr "Aantal bronnen voor stromen is uitgeput"
+#: nis/nis_print.c:230
+msgid "Default Access rights :\n"
+msgstr "Standaard-toegangsrechten :\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1049
-msgid "Device not a stream"
-msgstr "Apparaat is geen stroom"
+#: nis/nis_print.c:239
+#, c-format
+msgid "\tType         : %s\n"
+msgstr "\tSoort            : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1057
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:109
-msgid "Value too large for defined data type"
-msgstr "Waarde te groot voor gedefinieerde gegevenssoort"
+#: nis/nis_print.c:240
+msgid "\tAccess rights: "
+msgstr "\tToegangsrechten  : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1065
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:101
-msgid "Protocol error"
-msgstr "Protocolfout"
+#: nis/nis_print.c:254
+msgid "Group Flags :"
+msgstr "Groepsvlaggen :"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1073
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:92
-msgid "Timer expired"
-msgstr "Tijdopnemer overschreden"
+#: nis/nis_print.c:257
+msgid ""
+"\n"
+"Group Members :\n"
+msgstr ""
+"\n"
+"Groepsleden :\n"
 
-#. TRANS Operation canceled; an asynchronous operation was canceled before it
-#. TRANS completed.  @xref{Asynchronous I/O}.  When you call @code{aio_cancel},
-#. TRANS the normal result is for the operations affected to complete with this
-#. TRANS error; @pxref{Cancel AIO Operations}.
-#: stdio-common/../sysdeps/gnu/errlist.c:1085
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:77
-msgid "Operation canceled"
-msgstr "Bewerking geannuleerd"
+#: nis/nis_print.c:269
+#, c-format
+msgid "Table Type          : %s\n"
+msgstr "Tabelsoort       : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1093
-msgid "Interrupted system call should be restarted"
-msgstr "Onderbroken systeemaanroep moet worden herstart"
+#: nis/nis_print.c:270
+#, c-format
+msgid "Number of Columns   : %d\n"
+msgstr "Aantal kolommen  : %d\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1101
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:67
-msgid "Channel number out of range"
-msgstr "Kanaalgetal buiten bereik"
+#: nis/nis_print.c:271
+#, c-format
+msgid "Character Separator : %c\n"
+msgstr "Scheidingsteken  : %c\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1109
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:68
-msgid "Level 2 not synchronized"
-msgstr "Niveau 2 niet gesynchroniseerd"
+#: nis/nis_print.c:272
+#, c-format
+msgid "Search Path         : %s\n"
+msgstr "Zoekpad          : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1117
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:69
-msgid "Level 3 halted"
-msgstr "Niveau 3 tot stilstand gekomen"
+#: nis/nis_print.c:273
+msgid "Columns             :\n"
+msgstr "Kolommen         :\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1125
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:70
-msgid "Level 3 reset"
-msgstr "Niveau 3 opnieuw instellen"
+#: nis/nis_print.c:276
+#, c-format
+msgid "\t[%d]\tName          : %s\n"
+msgstr "\t[%d]\tNaam            : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1133
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:71
-msgid "Link number out of range"
-msgstr "Koppelingsgetal buiten bereik"
+#: nis/nis_print.c:278
+msgid "\t\tAttributes    : "
+msgstr "\t\tKenmerken       : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1141
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:72
-msgid "Protocol driver not attached"
-msgstr "Protocolstuurprogramma niet verbonden"
+#: nis/nis_print.c:280
+msgid "\t\tAccess Rights : "
+msgstr "\t\tToegangsrechten : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1149
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:73
-msgid "No CSI structure available"
-msgstr "Geen CSI-structure beschikbaar"
+#: nis/nis_print.c:290
+msgid "Linked Object Type : "
+msgstr "Soort gekoppeld object: "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1157
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:74
-msgid "Level 2 halted"
-msgstr "Niveau 2 tot stilstand gekomen"
+#: nis/nis_print.c:292
+#, c-format
+msgid "Linked to : %s\n"
+msgstr "Gekoppeld aan : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1165
-msgid "Invalid exchange"
-msgstr "Ongeldige uitwisseling"
+#: nis/nis_print.c:302
+#, c-format
+msgid "\tEntry data of type %s\n"
+msgstr "\tItemgegevens van soort %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1173
-msgid "Invalid request descriptor"
-msgstr "Ongeldige verzoekbeschrijver"
+#: nis/nis_print.c:305
+#, c-format
+msgid "\t[%u] - [%u bytes] "
+msgstr "\t[%u] - [%u bytes] "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1181
-msgid "Exchange full"
-msgstr "Uitwisseling vol"
+#: nis/nis_print.c:308
+msgid "Encrypted data\n"
+msgstr "Gecodeerde gegevens\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1189
-msgid "No anode"
-msgstr "Geen anode"
+#: nis/nis_print.c:310
+msgid "Binary data\n"
+msgstr "Binaire gegevens\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1197
-msgid "Invalid request code"
-msgstr "Ongeldige verzoekcode"
+#: nis/nis_print.c:326
+#, c-format
+msgid "Object Name   : %s\n"
+msgstr "Objectnaam      : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1205
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:85
-msgid "Invalid slot"
-msgstr "Ongeldig slot"
+#: nis/nis_print.c:327
+#, c-format
+msgid "Directory     : %s\n"
+msgstr "Map             : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1213
-msgid "File locking deadlock error"
-msgstr "Bestandsblokkering fout totale blokkering"
+#: nis/nis_print.c:328
+#, c-format
+msgid "Owner         : %s\n"
+msgstr "Eigenaar        : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1221
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:87
-msgid "Bad font file format"
-msgstr "Slecht lettertype bestandsformaat"
+#: nis/nis_print.c:329
+#, c-format
+msgid "Group         : %s\n"
+msgstr "Groep           : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1229
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:94
-msgid "Machine is not on the network"
-msgstr "Machine is niet op het netwerk"
+#: nis/nis_print.c:330
+msgid "Access Rights : "
+msgstr "Toegangsrechten : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1237
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:95
-msgid "Package not installed"
-msgstr "Pakket niet geïnstalleerd"
+#: nis/nis_print.c:332
+#, c-format
+msgid ""
+"\n"
+"Time to Live  : "
+msgstr ""
+"\n"
+"Levensduur      : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1245
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:98
-msgid "Advertise error"
-msgstr "Adverteerfout"
+#: nis/nis_print.c:335
+#, c-format
+msgid "Creation Time : %s"
+msgstr "Aanmaaktijd     : %s"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1253
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:99
-msgid "Srmount error"
-msgstr "Srmount fout"
+#: nis/nis_print.c:337
+#, c-format
+msgid "Mod. Time     : %s"
+msgstr "Wijzigingstijd  : %s"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1261
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:100
-msgid "Communication error on send"
-msgstr "Communicatiefout bij verzenden"
+#: nis/nis_print.c:338
+msgid "Object Type   : "
+msgstr "Objectsoort     : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1269
-msgid "RFS specific error"
-msgstr "RFS-specifieke fout"
+#: nis/nis_print.c:358
+#, c-format
+msgid "    Data Length = %u\n"
+msgstr " Gegevenslengte = %u\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1277
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:110
-msgid "Name not unique on network"
-msgstr "Naam niet uniek op netwerk"
+#: nis/nis_print.c:372
+#, c-format
+msgid "Status            : %s\n"
+msgstr "Status          : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1285
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:111
-msgid "File descriptor in bad state"
-msgstr "Bestandsbeschrijver in slechte status"
+#: nis/nis_print.c:373
+#, c-format
+msgid "Number of objects : %u\n"
+msgstr "Aantal objecten : %u\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1293
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:112
-msgid "Remote address changed"
-msgstr "Adres op afstand is veranderd"
+#: nis/nis_print.c:377
+#, c-format
+msgid "Object #%d:\n"
+msgstr "Object #%d:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1301
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:113
-msgid "Can not access a needed shared library"
-msgstr "Kan geen toegang krijgen tot benodigde gedeelde bibliotheek"
+#: nis/nis_print_group_entry.c:117
+#, c-format
+msgid "Group entry for \"%s.%s\" group:\n"
+msgstr "Groepsitem voor \"%s.%s\"-groep:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1309
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:114
-msgid "Accessing a corrupted shared library"
-msgstr "Er wordt toegang gezocht tot een beschadigde gedeelde bibliotheek"
+#: nis/nis_print_group_entry.c:125
+msgid "    Explicit members:\n"
+msgstr "    Expliciete leden:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1317
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:115
-msgid ".lib section in a.out corrupted"
-msgstr ".lib sectie in a.out beschadigd"
+#: nis/nis_print_group_entry.c:130
+msgid "    No explicit members\n"
+msgstr "    Geen expliciete leden\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1325
-msgid "Attempting to link in too many shared libraries"
-msgstr "Er wordt geprobeerd teveel gedeelde bibliotheken in te koppelen"
+#: nis/nis_print_group_entry.c:133
+msgid "    Implicit members:\n"
+msgstr "    Impliciete leden:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1333
-msgid "Cannot exec a shared library directly"
-msgstr "Kan een gedeelde bibliotheek niet direct uitvoeren"
+#: nis/nis_print_group_entry.c:138
+msgid "    No implicit members\n"
+msgstr "    Geen impliciete leden\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1341
-msgid "Streams pipe error"
-msgstr "Pijpfout bij stromen"
+#: nis/nis_print_group_entry.c:141
+msgid "    Recursive members:\n"
+msgstr "    Recursieve leden:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1349
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:165
-msgid "Structure needs cleaning"
-msgstr "Structure moet worden opgeschoond"
+#: nis/nis_print_group_entry.c:146
+msgid "    No recursive members\n"
+msgstr "    Geen recursieve leden\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1357
-msgid "Not a XENIX named type file"
-msgstr "Niet een XENIX bestand met naam"
+#: nis/nis_print_group_entry.c:149 nis/nis_print_group_entry.c:165
+msgid "    Explicit nonmembers:\n"
+msgstr "    Expliciete niet-leden:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1365
-msgid "No XENIX semaphores available"
-msgstr "Geen XENIX-semaforen beschikbaar"
+#: nis/nis_print_group_entry.c:154
+msgid "    No explicit nonmembers\n"
+msgstr "    Geen expliciete niet-leden\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1373
-msgid "Is a named type file"
-msgstr "Is een bestand met naam"
+#: nis/nis_print_group_entry.c:157
+msgid "    Implicit nonmembers:\n"
+msgstr "    Impliciete niet-leden:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1381
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:170
-msgid "Remote I/O error"
-msgstr "Invoer/uitvoer fout op afstand"
+#: nis/nis_print_group_entry.c:162
+msgid "    No implicit nonmembers\n"
+msgstr "    Geen impliciete niet-leden\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1389
-msgid "No medium found"
-msgstr "Geen medium gevonden"
+#: nis/nis_print_group_entry.c:170
+msgid "    No recursive nonmembers\n"
+msgstr "    Geen recursieve niet-leden\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1397
-msgid "Wrong medium type"
-msgstr "Verkeerde mediumsoort"
+#: nis/nss_nisplus/nisplus-publickey.c:101
+#: nis/nss_nisplus/nisplus-publickey.c:183
+#, c-format
+msgid "DES entry for netname %s not unique\n"
+msgstr "DES-item voor netnaam %s is niet uniek\n"
 
-#: stdio-common/../sysdeps/unix/siglist.c:26
-msgid "Signal 0"
-msgstr "Signaal 0"
+#: nis/nss_nisplus/nisplus-publickey.c:220
+#, c-format
+msgid "netname2user: missing group id list in `%s'."
+msgstr "netname2user: ontbrekende groeps-ID-lijst in '%s'"
 
-#: stdio-common/../sysdeps/unix/siglist.c:32
-msgid "IOT trap"
-msgstr "IOT-val"
+#: nis/nss_nisplus/nisplus-publickey.c:302
+#: nis/nss_nisplus/nisplus-publickey.c:308
+#: nis/nss_nisplus/nisplus-publickey.c:373
+#: nis/nss_nisplus/nisplus-publickey.c:382
+#, c-format
+msgid "netname2user: (nis+ lookup): %s\n"
+msgstr "netname2user: (opzoeken in NIS+): %s\n"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:30
-msgid "Error 0"
-msgstr "Fout 0"
+#: nis/nss_nisplus/nisplus-publickey.c:321
+#, c-format
+msgid "netname2user: DES entry for %s in directory %s not unique"
+msgstr "netname2user: DES-item voor %s in map %s is niet uniek"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:31
-#: nis/nis_error.c:40
-msgid "Not owner"
-msgstr "Niet eigenaar"
+#: nis/nss_nisplus/nisplus-publickey.c:339
+#, c-format
+msgid "netname2user: principal name `%s' too long"
+msgstr "netname2user: hoofdnaam '%s' is te lang"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:35
-msgid "I/O error"
-msgstr "Invoer/Uitvoer fout"
+#: nis/nss_nisplus/nisplus-publickey.c:395
+#, c-format
+msgid "netname2user: LOCAL entry for %s in directory %s not unique"
+msgstr "netname2user: LOCAL-item voor %s in map %s is niet uniek"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:37
-msgid "Arg list too long"
-msgstr "Argumentenlijst te lang"
+#: nis/nss_nisplus/nisplus-publickey.c:402
+msgid "netname2user: should not have uid 0"
+msgstr "netname2user: UID mag niet 0 zijn"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:39
-msgid "Bad file number"
-msgstr "Slecht bestandsgetal"
+#: nis/ypclnt.c:825
+msgid "Request arguments bad"
+msgstr "Verzoeksargumenten zijn ongeldig"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:42
-msgid "Not enough space"
-msgstr "Onvoldoende ruimte"
+#: nis/ypclnt.c:828
+msgid "RPC failure on NIS operation"
+msgstr "RPC-aanroep is mislukt bij NIS-bewerking"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:46
-msgid "Device busy"
-msgstr "Apparaat bezig"
+#: nis/ypclnt.c:831
+msgid "Can't bind to server which serves this domain"
+msgstr "Kan niet binden aan de server die dit domein aanbiedt"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:48
-msgid "Cross-device link"
-msgstr "Koppeling over verschillende apparaten"
+#: nis/ypclnt.c:834
+msgid "No such map in server's domain"
+msgstr "Afbeelding bestaat niet in domein van server"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:53
-msgid "File table overflow"
-msgstr "Bestandstabel overloop"
+#: nis/ypclnt.c:837
+msgid "No such key in map"
+msgstr "Sleutel bestaat niet in afbeelding"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:63
-msgid "Argument out of domain"
-msgstr "Argument buiten domein"
+#: nis/ypclnt.c:840
+msgid "Internal NIS error"
+msgstr "**Interne NIS-fout**"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:64
-msgid "Result too large"
-msgstr "Resultaat te groot"
+#: nis/ypclnt.c:843
+msgid "Local resource allocation failure"
+msgstr "Fout bij reserveren van lokale hulpbron"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:75
-msgid "Deadlock situation detected/avoided"
-msgstr "Situatie van totale blokkering gedetecteerd/omzeild"
+#: nis/ypclnt.c:846
+msgid "No more records in map database"
+msgstr "Geen records meer in afbeeldingengegevensbank"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:76
-msgid "No record locks available"
-msgstr "Geen recordblokkeringen beschikbaar"
+#: nis/ypclnt.c:849
+msgid "Can't communicate with portmapper"
+msgstr "Kan niet communiceren met poortvertaler"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:79
-msgid "Disc quota exceeded"
-msgstr "Schijfquota overschreden"
+#: nis/ypclnt.c:852
+msgid "Can't communicate with ypbind"
+msgstr "Kan niet communiceren met ypbind()"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:80
-msgid "Bad exchange descriptor"
-msgstr "Slechte uitwisselingsbeschrijver"
+#: nis/ypclnt.c:855
+msgid "Can't communicate with ypserv"
+msgstr "Kan niet communiceren met ypserv()"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:81
-msgid "Bad request descriptor"
-msgstr "Slechte verzoekbeschrijver"
+#: nis/ypclnt.c:858
+msgid "Local domain name not set"
+msgstr "Lokale domeinnaam is niet ingesteld"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:82
-msgid "Message tables full"
-msgstr "Berichttabellen vol"
+#: nis/ypclnt.c:861
+msgid "NIS map database is bad"
+msgstr "NIS-afbeeldingengegevensbank is beschadigd"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:83
-msgid "Anode table overflow"
-msgstr "Anode-tabel overloop"
+#: nis/ypclnt.c:864
+msgid "NIS client/server version mismatch - can't supply service"
+msgstr "versies van NIS-client en -server passen niet bij elkaar -- kan dienst niet aanbieden"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:84
-msgid "Bad request code"
-msgstr "Slechte verzoekcode"
+#: nis/ypclnt.c:870
+msgid "Database is busy"
+msgstr "Gegevensbank is bezig"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:86
-msgid "File locking deadlock"
-msgstr "Bestandsblokkering totale blokkering"
+#: nis/ypclnt.c:873
+msgid "Unknown NIS error code"
+msgstr "Onbekende NIS-foutcode"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:88
-msgid "Error 58"
-msgstr "Fout 58"
+#: nis/ypclnt.c:913
+msgid "Internal ypbind error"
+msgstr "**Interne ypbind()-fout**"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:89
-msgid "Error 59"
-msgstr "Fout 59"
+#: nis/ypclnt.c:916
+msgid "Domain not bound"
+msgstr "Domein is niet gebonden"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:90
-msgid "Not a stream device"
-msgstr "Niet een stroomapparaat"
+#: nis/ypclnt.c:919
+msgid "System resource allocation failure"
+msgstr "Fout bij reserveren van systeemhulpbron"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:93
-msgid "Out of stream resources"
-msgstr "Bronnen voor stromen uitgeput"
+#: nis/ypclnt.c:922
+msgid "Unknown ypbind error"
+msgstr "Onbekende ypbind()-fout"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:102
-msgid "Error 72"
-msgstr "Fout 72"
+#: nis/ypclnt.c:963
+msgid "yp_update: cannot convert host to netname\n"
+msgstr "yp_update: kan host niet converteren naar netnaam\n"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:103
-msgid "Error 73"
-msgstr "Fout 73"
+#: nis/ypclnt.c:981
+msgid "yp_update: cannot get server address\n"
+msgstr "yp_update: kan server-adres niet opvragen\n"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:105
-msgid "Error 75"
-msgstr "Fout 75"
+#: nscd/aicache.c:76 nscd/hstcache.c:461
+#, c-format
+msgid "Haven't found \"%s\" in hosts cache!"
+msgstr "Item \"%s\" niet gevonden in hosts-cache!"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:106
-msgid "Error 76"
-msgstr "Fout 76"
+#: nscd/aicache.c:78 nscd/hstcache.c:463
+#, c-format
+msgid "Reloading \"%s\" in hosts cache!"
+msgstr "Herladen van \"%s\" in hosts-cache!"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:107
-msgid "Not a data message"
-msgstr "Niet een gegevensbericht"
+#: nscd/cache.c:126
+#, c-format
+msgid "add new entry \"%s\" of type %s for %s to cache%s"
+msgstr "toevoegen van nieuw item \"%s\" van type %s voor %s aan cache%s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:116
-msgid "Attempting to link in more shared libraries than system limit"
-msgstr "Er wordt geprobeerd meer gedeelde bibliotheken in te koppelen dan de systeemgrens"
+#: nscd/cache.c:233 nscd/connections.c:750
+#, c-format
+msgid "cannot stat() file `%s': %s"
+msgstr "kan status van bestand '%s' niet opvragen: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:117
-msgid "Can not exec a shared library directly"
-msgstr "Kan een gedeelde bibliotheek niet direct uitvoeren"
+#: nscd/cache.c:262
+#, c-format
+msgid "pruning %s cache; time %ld"
+msgstr "snoeien van cache %s; tijd %ld"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:118
-msgid "Illegal byte sequence"
-msgstr "Ongeldige bytereeks"
+#: nscd/cache.c:289
+#, c-format
+msgid "considering %s entry \"%s\", timeout %<PRIu64>"
+msgstr "overwegen van %s-item \"%s\", tijdslimiet %<PRIu64>"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:119
-msgid "Operation not applicable"
-msgstr "Bewerking niet van toepassing"
+#: nscd/connections.c:469 nscd/connections.c:481 nscd/connections.c:493
+#: nscd/connections.c:512
+#, c-format
+msgid "invalid persistent database file \"%s\": %s"
+msgstr "ongeldig persistent gegevensbestand '%s': %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:120
-msgid "Number of symbolic links encountered during path name traversal exceeds MAXSYMLINKS"
-msgstr "Het aantal symbolische koppelingen dat tijdens het doorlopen van de padnaam is tegengekomen overschrijdt het maximum MAXSYMLINKS"
+#: nscd/connections.c:483
+msgid "header size does not match"
+msgstr "grootte van de kop klopt niet"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:121
-msgid "Error 91"
-msgstr "Fout 91"
+#: nscd/connections.c:495
+msgid "file size does not match"
+msgstr "bestandsgrootte klopt niet"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:122
-msgid "Error 92"
-msgstr "Fout 92"
+#: nscd/connections.c:514
+msgid "verification failed"
+msgstr "gegevenscontrole is mislukt"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:129
-msgid "Option not supported by protocol"
-msgstr "Optie niet ondersteund door protocol"
+#: nscd/connections.c:528
+#, c-format
+msgid "suggested size of table for database %s larger than the persistent database's table"
+msgstr "de aangeraden tabelgrootte voor gegevensbestand '%s' is groter dan de tabelgrootte van het persistente gegevensbestand"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:130
-msgid "Error 100"
-msgstr "Fout 100"
+#: nscd/connections.c:538 nscd/connections.c:619
+#, c-format
+msgid "cannot create read-only descriptor for \"%s\"; no mmap"
+msgstr "kan geen alleen-lezen-descriptor voor '%s' aanmaken; geen mmap()"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:131
-msgid "Error 101"
-msgstr "Fout 101"
+#: nscd/connections.c:598
+#, c-format
+msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
+msgstr "gegevensbestand voor %s is beschadigd of wordt al gebruikt; verwijder %s zo nodig handmatig en herstart"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:132
-msgid "Error 102"
-msgstr "Fout 102"
+#: nscd/connections.c:605
+#, c-format
+msgid "cannot create %s; no persistent database used"
+msgstr "kan %s niet aanmaken; geen persistent gegevensbestand gebruikt"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:133
-msgid "Error 103"
-msgstr "Fout 103"
+#: nscd/connections.c:608
+#, c-format
+msgid "cannot create %s; no sharing possible"
+msgstr "kan %s niet aanmaken; bestandsdeling is niet mogelijk"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:134
-msgid "Error 104"
-msgstr "Fout 104"
+#: nscd/connections.c:679
+#, c-format
+msgid "cannot write to database file %s: %s"
+msgstr "kan niet naar gegevensbestand %s schrijven: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:135
-msgid "Error 105"
-msgstr "Fout 105"
+#: nscd/connections.c:713
+#, c-format
+msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
+msgstr "kan socket niet op sluiten-bij-exec instellen: %s -- paranoia-modus is uitgeschakeld"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:136
-msgid "Error 106"
-msgstr "Fout 106"
+#: nscd/connections.c:763
+#, c-format
+msgid "cannot open socket: %s"
+msgstr "kan socket niet openen: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:137
-msgid "Error 107"
-msgstr "Fout 107"
+#: nscd/connections.c:780
+#, c-format
+msgid "cannot change socket to nonblocking mode: %s"
+msgstr "kan socket niet omschakelen naar niet-blokkerende modus: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:138
-msgid "Error 108"
-msgstr "Fout 108"
+#: nscd/connections.c:788
+#, c-format
+msgid "cannot set socket to close on exec: %s"
+msgstr "kan socket niet op sluiten-bij-exec instellen: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:139
-msgid "Error 109"
-msgstr "Fout 109"
+#: nscd/connections.c:799
+#, c-format
+msgid "cannot enable socket to accept connections: %s"
+msgstr "kan socket geen verbindingen laten accepteren: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:140
-msgid "Error 110"
-msgstr "Fout 110"
+#: nscd/connections.c:892
+#, c-format
+msgid "provide access to FD %d, for %s"
+msgstr "toegang verleend aan bestandsdescriptor %d, voor %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:141
-msgid "Error 111"
-msgstr "Fout 111"
+#: nscd/connections.c:904
+#, c-format
+msgid "cannot handle old request version %d; current version is %d"
+msgstr "kan verzoek voor oude versie %d niet behandelen; huidige versie is %d"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:142
-msgid "Error 112"
-msgstr "Fout 112"
+#: nscd/connections.c:954 nscd/connections.c:1007
+#, c-format
+msgid "cannot write result: %s"
+msgstr "kan resultaat niet schrijven: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:143
-msgid "Error 113"
-msgstr "Fout 113"
+#: nscd/connections.c:1082
+#, c-format
+msgid "error getting caller's id: %s"
+msgstr "fout bij opvragen van ID van aanroeper: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:144
-msgid "Error 114"
-msgstr "Fout 114"
+#: nscd/connections.c:1140 nscd/connections.c:1154
+#, c-format
+msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
+msgstr "kan '/proc/self/cmdline' niet openen: %s -- paranoia-modus is uitgeschakeld"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:145
-msgid "Error 115"
-msgstr "Fout 115"
+#: nscd/connections.c:1194
+#, c-format
+msgid "cannot change to old UID: %s; disabling paranoia mode"
+msgstr "kan niet overschakelen naar oude UID: %s -- paranoia-modus is uitgeschakeld"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:146
-msgid "Error 116"
-msgstr "Fout 116"
+#: nscd/connections.c:1204
+#, c-format
+msgid "cannot change to old GID: %s; disabling paranoia mode"
+msgstr "kan niet overschakelen naar oude GID: %s -- paranoia-modus is uitgeschakeld"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:147
-msgid "Error 117"
-msgstr "Fout 117"
+#: nscd/connections.c:1217
+#, c-format
+msgid "cannot change to old working directory: %s; disabling paranoia mode"
+msgstr "kan niet overschakelen naar oude werkmap: %s -- paranoia-modus is uitgeschakeld"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:148
-msgid "Error 118"
-msgstr "Fout 118"
+#: nscd/connections.c:1245
+#, c-format
+msgid "re-exec failed: %s; disabling paranoia mode"
+msgstr "her-exec() is mislukt: %s -- paranoia-modus is uitgeschakeld"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:149
-msgid "Error 119"
-msgstr "Fout 119"
+#: nscd/connections.c:1254
+#, c-format
+msgid "cannot change current working directory to \"/\": %s"
+msgstr "kan huidige werkmap niet overschakelen naar '/': %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:152
-msgid "Operation not supported on transport endpoint"
-msgstr "Bewerking niet ondersteund op overdrachtseindpunt"
+#: nscd/connections.c:1372
+#, c-format
+msgid "short read while reading request: %s"
+msgstr "te weinig gelezen bij lezen van verzoek: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:154
-msgid "Address family not supported by protocol family"
-msgstr "Adresfamilie niet ondersteund door protocolfamilie"
+#: nscd/connections.c:1404
+#, c-format
+msgid "key length in request too long: %d"
+msgstr "sleutellengte in verzoek is te lang: %d"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:159
-msgid "Network dropped connection because of reset"
-msgstr "Netwerk liet verbinding vallen vanwege opnieuw instellen"
+#: nscd/connections.c:1417
+#, c-format
+msgid "short read while reading request key: %s"
+msgstr "te weinig gelezen bij lezen van verzoeksleutel: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:166
-msgid "Error 136"
-msgstr "Fout 136"
+#: nscd/connections.c:1426
+#, c-format
+msgid "handle_request: request received (Version = %d) from PID %ld"
+msgstr "handle_request(): verzoek ontvangen (versie = %d) van PID %ld"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:167
-msgid "Not a name file"
-msgstr "Niet een naambestand"
+#: nscd/connections.c:1431
+#, c-format
+msgid "handle_request: request received (Version = %d)"
+msgstr "handle_request(): verzoek ontvangen (versie = %d)"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:168
-msgid "Not available"
-msgstr "Niet beschikbaar"
+#: nscd/connections.c:1792
+#, c-format
+msgid "could only start %d threads; terminating"
+msgstr "kan slechts %d threads starten -- gestopt"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:169
-msgid "Is a name file"
-msgstr "Is een naambestand"
+#: nscd/connections.c:1840 nscd/connections.c:1841 nscd/connections.c:1858
+#: nscd/connections.c:1867 nscd/connections.c:1885 nscd/connections.c:1896
+#: nscd/connections.c:1907
+#, c-format
+msgid "Failed to run nscd as user '%s'"
+msgstr "uitvoeren van nscd als gebruiker '%s' is mislukt"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:171
-msgid "Reserved for future use"
-msgstr "Gereserveerd voor toekomstig gebruik"
+#: nscd/connections.c:1859
+#, c-format
+msgid "initial getgrouplist failed"
+msgstr "eerste getgrouplist() is mislukt"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:172
-msgid "Error 142"
-msgstr "Fout 142"
+#: nscd/connections.c:1868
+#, c-format
+msgid "getgrouplist failed"
+msgstr "getgrouplist() is mislukt"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:173
-msgid "Cannot send after socket shutdown"
-msgstr "Kan niet verzenden na afsluiten socket"
+#: nscd/connections.c:1886
+#, c-format
+msgid "setgroups failed"
+msgstr "setgroups() is mislukt"
 
-#: stdio-common/psignal.c:63
+#: nscd/grpcache.c:400 nscd/hstcache.c:411 nscd/initgrcache.c:411
+#: nscd/pwdcache.c:395
 #, c-format
-msgid "%s%sUnknown signal %d\n"
-msgstr "%s%sOnbekend signaal %d\n"
+msgid "short write in %s: %s"
+msgstr "te weinig geschreven in %s: %s"
 
-#: dlfcn/dlinfo.c:51
-msgid "RTLD_SELF used in code not dynamically loaded"
-msgstr "RTLD_SELF gebruikt in code niet dynamisch geladen"
+#: nscd/grpcache.c:443 nscd/initgrcache.c:77
+#, c-format
+msgid "Haven't found \"%s\" in group cache!"
+msgstr "Item \"%s\" niet gevonden in groeps-cache!"
 
-#: dlfcn/dlinfo.c:61
-msgid "unsupported dlinfo request"
-msgstr "niet-ondersteund dlinfo-verzoek"
+#: nscd/grpcache.c:445 nscd/initgrcache.c:79
+#, c-format
+msgid "Reloading \"%s\" in group cache!"
+msgstr "Herladen van \"%s\" in groeps-cache!"
 
-#: malloc/mcheck.c:346
-msgid "memory is consistent, library is buggy\n"
-msgstr "geheugen is consistent, er zitten fouten in de bibliotheek\n"
+#: nscd/grpcache.c:536
+#, c-format
+msgid "Invalid numeric gid \"%s\"!"
+msgstr "Ongeldig numeriek GID '%s'!"
 
-#: malloc/mcheck.c:349
-msgid "memory clobbered before allocated block\n"
-msgstr "geheugen rommelig voor toegewezen blok\n"
+#: nscd/mem.c:382
+#, c-format
+msgid "freed %zu bytes in %s cache"
+msgstr "%zu bytes in cache %s vrijgegeven"
 
-#: malloc/mcheck.c:352
-msgid "memory clobbered past end of allocated block\n"
-msgstr "geheugen rommelig na einde van toegewezen blok\n"
+#: nscd/mem.c:511
+#, c-format
+msgid "no more memory for database '%s'"
+msgstr "onvoldoende geheugen voor gegevensbank '%s'"
 
-#: malloc/mcheck.c:355
-msgid "block freed twice\n"
-msgstr "blok tweemaal vrij gegeven\n"
+#: nscd/nscd.c:97
+msgid "Read configuration data from NAME"
+msgstr "configuratiegegevens lezen uit dit bestand"
 
-#: malloc/mcheck.c:358
-msgid "bogus mcheck_status, library is buggy\n"
-msgstr "slechte mcheck_status, er zit een fout in de bibliotheek\n"
+#: nscd/nscd.c:99
+msgid "Do not fork and display messages on the current tty"
+msgstr "niet naar de achtergrond gaan; berichten op huidige TTY weergeven"
 
-#: malloc/memusagestat.c:53
-msgid "Name output file"
-msgstr "Naam uitvoerbestand"
+#: nscd/nscd.c:100
+msgid "NUMBER"
+msgstr "GETAL"
 
-#: malloc/memusagestat.c:54
-msgid "Title string used in output graphic"
-msgstr "Titeltekenreeks gebruikt in grafische uitvoer"
+#: nscd/nscd.c:100
+msgid "Start NUMBER threads"
+msgstr "dit aantal threads starten"
 
-#: malloc/memusagestat.c:55
-msgid "Generate output linear to time (default is linear to number of function calls)"
-msgstr "Uitvoer lineair in de tijd genereren (standaard is lineair in het aantal functie-aanroepen)"
+#: nscd/nscd.c:101
+msgid "Shut the server down"
+msgstr "de server afsluiten"
 
-#: malloc/memusagestat.c:57
-msgid "Also draw graph for total memory consumption"
-msgstr "Ook een grafiek tekenen voor totaal geheugengebruik"
+#: nscd/nscd.c:102
+msgid "Print current configuration statistic"
+msgstr "huidige configuratiestatistieken weergeven"
 
-#: malloc/memusagestat.c:58
-msgid "make output graphic VALUE pixel wide"
-msgstr "uitvoergrafiek WAARDE beeldpunten breed maken"
+#: nscd/nscd.c:103
+msgid "TABLE"
+msgstr "TABEL"
 
-#: malloc/memusagestat.c:59
-msgid "make output graphic VALUE pixel high"
-msgstr "uitvoergrafiek WAARDE beeldpunten hoog maken"
+#: nscd/nscd.c:104
+msgid "Invalidate the specified cache"
+msgstr "genoemde cache ongeldig maken"
 
-#: malloc/memusagestat.c:64
-msgid "Generate graphic from memory profiling data"
-msgstr "Grafiek genereren van geheugenprofileringsgegevens"
+#: nscd/nscd.c:105
+msgid "TABLE,yes"
+msgstr "TABEL,ja"
 
-#: malloc/memusagestat.c:67
-msgid "DATAFILE [OUTFILE]"
-msgstr "GEGEVENSBESTAND [UITVOERBESTAND]"
+#: nscd/nscd.c:106
+msgid "Use separate cache for each user"
+msgstr "aparte cache gebruiken voor elke gebruiker"
 
-#: string/strerror.c:43 posix/../sysdeps/posix/gai_strerror.c:57
-msgid "Unknown error"
-msgstr "Onbekende fout"
+#: nscd/nscd.c:111
+msgid "Name Service Cache Daemon."
+msgstr "Daemon voor namen-cache."
 
-#: string/strsignal.c:69
+#: nscd/nscd.c:143 nss/getent.c:858 nss/makedb.c:123
 #, c-format
-msgid "Real-time signal %d"
-msgstr "Real-time signaal %d"
+msgid "wrong number of arguments"
+msgstr "Verkeerd aantal argumenten"
 
-#: string/strsignal.c:73
+#: nscd/nscd.c:153
 #, c-format
-msgid "Unknown signal %d"
-msgstr "Onbekend signaal %d"
+msgid "failure while reading configuration file; this is fatal"
+msgstr "kan configuratiebestand niet lezen -- server wordt niet gestart"
 
-#: timezone/zdump.c:176
+#: nscd/nscd.c:162
 #, c-format
-msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
-msgstr "%s: gebruik is %s [ --version ] [ -v ] [ -c afkapwaarde ] zonenaam ...\n"
+msgid "already running"
+msgstr "wordt al uitgevoerd"
 
-#: timezone/zdump.c:269
-msgid "Error writing to standard output"
-msgstr "Fout bij schrijven naar standaard uitvoer"
+#: nscd/nscd.c:177 nscd/nscd.c:232
+#, c-format
+msgid "cannot fork"
+msgstr "kan geen nieuw proces starten"
 
-#: timezone/zic.c:361
+#: nscd/nscd.c:240
 #, c-format
-msgid "%s: Memory exhausted: %s\n"
-msgstr "%s: Geheugen uitgeput: %s\n"
+msgid "cannot change current working directory to \"/\""
+msgstr "kan huidige werkmap niet overschakelen naar '/'"
 
-#: timezone/zic.c:386 misc/error.c:129 misc/error.c:157
-msgid "Unknown system error"
-msgstr "Onbekende systeemfout"
+#: nscd/nscd.c:248
+msgid "Could not create log file"
+msgstr "Kan geen logbestand aanmaken"
 
-#: timezone/zic.c:420
+#: nscd/nscd.c:301 nscd/nscd.c:326 nscd/nscd_stat.c:172
 #, c-format
-msgid "\"%s\", line %d: %s"
-msgstr "\"%s\", regel %d: %s"
+msgid "Only root is allowed to use this option!"
+msgstr "Alleen root mag deze optie gebruiken!"
 
-#: timezone/zic.c:423
+#: nscd/nscd.c:359 nscd/nscd_stat.c:191
 #, c-format
-msgid " (rule from \"%s\", line %d)"
-msgstr " (regel van \"%s\", regel %d)"
-
-#: timezone/zic.c:435
-msgid "warning: "
-msgstr "waarschuwing: "
+msgid "write incomplete"
+msgstr "ongeldigmakingsopdracht is onvolledig geschreven"
 
-#: timezone/zic.c:445
+#: nscd/nscd.c:370
 #, c-format
-msgid ""
-"%s: usage is %s [ --version ] [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
-"\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
-msgstr ""
-"%s: gebruik is %s [ --version ] [ -s ] [ -v ] [ -l lokale-tijd ] [ -p posix-regels ] \\\n"
-"\t[ -d map ] [ -L schrikkelseconden ] [ -y jaar-is-soort ] [ bestandsnaam ... ]\n"
+msgid "cannot read invalidate ACK"
+msgstr "geen ongeldigheidsbevestiging ontvangen"
 
-#: timezone/zic.c:492
+#: nscd/nscd.c:376
 #, c-format
-msgid "%s: More than one -d option specified\n"
-msgstr "%s: Meerdere -d opties opgegeven\n"
+msgid "invalidation failed"
+msgstr "het ongeldigmaken is mislukt"
 
-#: timezone/zic.c:502
+#: nscd/nscd.c:386
 #, c-format
-msgid "%s: More than one -l option specified\n"
-msgstr "%s: Meerdere -l opties opgegeven\n"
+msgid "secure services not implemented anymore"
+msgstr "beveiligde services worden niet langer ondersteund"
 
-#: timezone/zic.c:512
+#: nscd/nscd_conf.c:55
 #, c-format
-msgid "%s: More than one -p option specified\n"
-msgstr "%s: Meerdere -p opties opgegeven\n"
+msgid "database %s is not supported\n"
+msgstr "gegevensbank '%s' wordt niet ondersteund\n"
 
-#: timezone/zic.c:522
+#: nscd/nscd_conf.c:106
 #, c-format
-msgid "%s: More than one -y option specified\n"
-msgstr "%s: Meerdere -y opties opgegeven\n"
+msgid "Parse error: %s"
+msgstr "Ontledingsfout: %s"
 
-#: timezone/zic.c:532
+#: nscd/nscd_conf.c:191
 #, c-format
-msgid "%s: More than one -L option specified\n"
-msgstr "%s: Meerdere -L opties opgegeven\n"
+msgid "Must specify user name for server-user option"
+msgstr "De optie 'server-user' vereist een gebruikersnaam als argument"
 
-#: timezone/zic.c:639
+#: nscd/nscd_conf.c:198
 #, c-format
-msgid "%s: Can't unlink  %s: %s\n"
-msgstr "%s: Kan %s niet ontkoppelen: %s\n"
-
-#: timezone/zic.c:646
-msgid "hard link failed, symbolic link used"
-msgstr "harde koppeling mislukt, symbolische wordt gebruikt"
+msgid "Must specify user name for stat-user option"
+msgstr "De optie 'stat-user' vereist een gebruikersnaam als argument"
 
-#: timezone/zic.c:654
+#: nscd/nscd_conf.c:242
 #, c-format
-msgid "%s: Can't link from %s to %s: %s\n"
-msgstr "%s: Kan niet koppelen van %s naar %s: %s\n"
+msgid "invalid value for 'reload-count': %u"
+msgstr "Ongeldige waarde voor 'reload-count': %u"
 
-#: timezone/zic.c:752 timezone/zic.c:754
-msgid "same rule name in multiple files"
-msgstr "dezelfde regelnaam in meerdere bestanden"
+#: nscd/nscd_conf.c:257
+#, c-format
+msgid "Must specify value for restart-interval option"
+msgstr "De optie 'restart-interval' vereist een waarde als argument"
 
-#: timezone/zic.c:795
-msgid "unruly zone"
-msgstr "onhandelbare zone"
+#: nscd/nscd_conf.c:271
+#, c-format
+msgid "Unknown option: %s %s %s"
+msgstr "Onbekende optie: %s %s %s"
 
-#: timezone/zic.c:802
+#: nscd/nscd_conf.c:284
 #, c-format
-msgid "%s in ruleless zone"
-msgstr "%s in regelloze zone"
+msgid "cannot get current working directory: %s; disabling paranoia mode"
+msgstr "Kan huidige werkmap niet bepalen: %s -- paranoia-modus is uitgeschakeld"
 
-#: timezone/zic.c:823
-msgid "standard input"
-msgstr "standaard invoer"
+#: nscd/nscd_conf.c:304
+#, c-format
+msgid "maximum file size for %s database too small"
+msgstr "Maximum bestandsgrootte voor %s-gegevensbank is te klein"
 
-#: timezone/zic.c:828
+#: nscd/nscd_stat.c:141
 #, c-format
-msgid "%s: Can't open %s: %s\n"
-msgstr "%s: Kan %s niet openen: %s\n"
+msgid "cannot write statistics: %s"
+msgstr "Kan statistieken niet schrijven: %s"
 
-#: timezone/zic.c:839
-msgid "line too long"
-msgstr "regel te lang"
+#: nscd/nscd_stat.c:156
+msgid "yes"
+msgstr "ja"
 
-#: timezone/zic.c:859
-msgid "input line of unknown type"
-msgstr "invoerregel van onbekende soort"
+#: nscd/nscd_stat.c:157
+msgid "no"
+msgstr "nee"
 
-#: timezone/zic.c:875
+#: nscd/nscd_stat.c:168
 #, c-format
-msgid "%s: Leap line in non leap seconds file %s\n"
-msgstr "%s: Schrikkelregel in niet-schrikkelseconden bestand %s\n"
+msgid "Only root or %s is allowed to use this option!"
+msgstr "Alleen root of %s mag deze optie gebruiken!"
 
-#: timezone/zic.c:882 timezone/zic.c:1297 timezone/zic.c:1322
+#: nscd/nscd_stat.c:179
 #, c-format
-msgid "%s: panic: Invalid l_value %d\n"
-msgstr "%s: paniek: Ongeldige l_value %d\n"
+msgid "nscd not running!\n"
+msgstr "Er is geen nscd-proces actief!\n"
 
-#: timezone/zic.c:890
+#: nscd/nscd_stat.c:203
 #, c-format
-msgid "%s: Error reading %s\n"
-msgstr "%s: Fout bij lezen %s\n"
+msgid "cannot read statistics data"
+msgstr "Kan statistieken niet lezen"
 
-#: timezone/zic.c:897
+#: nscd/nscd_stat.c:206
 #, c-format
-msgid "%s: Error closing %s: %s\n"
-msgstr "%s: Fout bij sluiten %s: %s\n"
-
-#: timezone/zic.c:902
-msgid "expected continuation line not found"
-msgstr "verwachte continuering regel niet gevonden"
-
-#: timezone/zic.c:958
-msgid "wrong number of fields on Rule line"
-msgstr "verkeerd aantal velden op Rule (regel) regel"
-
-#: timezone/zic.c:962
-msgid "nameless rule"
-msgstr "naamloze regel"
-
-#: timezone/zic.c:967
-msgid "invalid saved time"
-msgstr "ongeldige opgeslagen tijd"
-
-#: timezone/zic.c:986
-msgid "wrong number of fields on Zone line"
-msgstr "verkeerd aantal velden in Zone regel"
+msgid ""
+"nscd configuration:\n"
+"\n"
+"%15d  server debug level\n"
+msgstr ""
+"Configuratie van nscd:\n"
+"\n"
+"%15d  debugniveau van server\n"
 
-#: timezone/zic.c:992
+#: nscd/nscd_stat.c:230
 #, c-format
-msgid "\"Zone %s\" line and -l option are mutually exclusive"
-msgstr "\"Zone %s\" regel en -l optie sluiten elkaar uit"
+msgid "%3ud %2uh %2um %2lus  server runtime\n"
+msgstr "%3ud %2uh %2um %2lus  looptijd van server\n"
 
-#: timezone/zic.c:1000
+#: nscd/nscd_stat.c:233
 #, c-format
-msgid "\"Zone %s\" line and -p option are mutually exclusive"
-msgstr "\"Zone %s\" regel en -p optie sluiten elkaar uit"
+msgid "    %2uh %2um %2lus  server runtime\n"
+msgstr "    %2uh %2um %2lus  looptijd van server\n"
 
-#: timezone/zic.c:1012
+#: nscd/nscd_stat.c:235
 #, c-format
-msgid "duplicate zone name %s (file \"%s\", line %d)"
-msgstr "dubbele zonenaam %s (bestand \"%s\", regel %d)"
-
-#: timezone/zic.c:1028
-msgid "wrong number of fields on Zone continuation line"
-msgstr "verkeerd aantal velden in Zone continueringsregel"
-
-#: timezone/zic.c:1068
-msgid "invalid UTC offset"
-msgstr "ongeldige positie ten opzichte van UTC"
-
-#: timezone/zic.c:1071
-msgid "invalid abbreviation format"
-msgstr "ongeldig afgekort formaat"
-
-#: timezone/zic.c:1097
-msgid "Zone continuation line end time is not after end time of previous line"
-msgstr "Einde tijd bij zone continueringsregel is niet na einde tijd van vorige regel"
-
-#: timezone/zic.c:1124
-msgid "wrong number of fields on Leap line"
-msgstr "verkeerd aantal velden op Leap (schrikkel) regel"
-
-#: timezone/zic.c:1133
-msgid "invalid leaping year"
-msgstr "ongeldig schrikkeljaar"
-
-#: timezone/zic.c:1148 timezone/zic.c:1252
-msgid "invalid month name"
-msgstr "ongeldige naam maand"
-
-#: timezone/zic.c:1161 timezone/zic.c:1374 timezone/zic.c:1388
-msgid "invalid day of month"
-msgstr "ongeldig dag van maand"
-
-#: timezone/zic.c:1166
-msgid "time before zero"
-msgstr "tijd voor nul"
-
-#: timezone/zic.c:1170
-msgid "time too small"
-msgstr "tijd te klein"
-
-#: timezone/zic.c:1174
-msgid "time too large"
-msgstr "tijd te groot"
+msgid "        %2um %2lus  server runtime\n"
+msgstr "        %2um %2lus  looptijd van server\n"
 
-#: timezone/zic.c:1178 timezone/zic.c:1281
-msgid "invalid time of day"
-msgstr "ongeldig tijd van dag"
+#: nscd/nscd_stat.c:237
+#, c-format
+msgid "            %2lus  server runtime\n"
+msgstr "            %2lus  looptijd van server\n"
 
-#: timezone/zic.c:1197
-msgid "illegal CORRECTION field on Leap line"
-msgstr "ongeldig CORRECTION (correctie) veld op Leap (schrikkel) regel"
+#: nscd/nscd_stat.c:239
+#, c-format
+msgid ""
+"%15d  current number of threads\n"
+"%15d  maximum number of threads\n"
+"%15lu  number of times clients had to wait\n"
+"%15s  paranoia mode enabled\n"
+"%15lu  restart internal\n"
+msgstr ""
+"%15d  huidig aantal threads\n"
+"%15d  maximum aantal threads\n"
+"%15lu  aantal keren dat aanroepers moesten wachten\n"
+"%15s  paranoia-modus ingeschakeld\n"
+"%15lu  interne herstarts\n"
 
-#: timezone/zic.c:1201
-msgid "illegal Rolling/Stationary field on Leap line"
-msgstr "ongeldig Rolling/Stationary (Rollend/Stationair) veld op Leap (schrikkel) regel"
+#: nscd/nscd_stat.c:273
+#, c-format
+msgid ""
+"\n"
+"%s cache:\n"
+"\n"
+"%15s  cache is enabled\n"
+"%15s  cache is persistent\n"
+"%15s  cache is shared\n"
+"%15zu  suggested size\n"
+"%15zu  total data pool size\n"
+"%15zu  used data pool size\n"
+"%15lu  seconds time to live for positive entries\n"
+"%15lu  seconds time to live for negative entries\n"
+"%15<PRIuMAX>  cache hits on positive entries\n"
+"%15<PRIuMAX>  cache hits on negative entries\n"
+"%15<PRIuMAX>  cache misses on positive entries\n"
+"%15<PRIuMAX>  cache misses on negative entries\n"
+"%15lu%% cache hit rate\n"
+"%15zu  current number of cached values\n"
+"%15zu  maximum number of cached values\n"
+"%15zu  maximum chain length searched\n"
+"%15<PRIuMAX>  number of delays on rdlock\n"
+"%15<PRIuMAX>  number of delays on wrlock\n"
+"%15<PRIuMAX>  memory allocations failed\n"
+"%15s  check /etc/%s for changes\n"
+msgstr ""
+"\n"
+"%s-cache:\n"
+"\n"
+"%15s  cache is ingeschakeld\n"
+"%15s  cache is persistent\n"
+"%15s  cache wordt gedeeld\n"
+"%15zu  voorgestelde grootte\n"
+"%15zu  totale beschikbare ruimte\n"
+"%15zu  gebruikte ruimte\n"
+"%15lu  seconden levensduur voor positieve items\n"
+"%15lu  seconden levensduur voor negatieve items\n"
+"%15<PRIuMAX>  cachetreffers op positieve items\n"
+"%15<PRIuMAX>  cachetreffers op negatieve items\n"
+"%15<PRIuMAX>  cachemissers op positieve items\n"
+"%15<PRIuMAX>  cachemissers op negatieve items\n"
+"%15lu%% treffers\n"
+"%15zu  huidig aantal waarden in cache\n"
+"%15zu  maximum aantal waarden in cache\n"
+"%15zu  maximale doorzochte kettinglengte\n"
+"%15<PRIuMAX>  aantal vertragingen op leesblokkering\n"
+"%15<PRIuMAX>  aantal vertragingen op schrijfblokkering\n"
+"%15<PRIuMAX>  aantal mislukte geheugenreserveringen\n"
+"%15s  /etc/%s controleren op wijzigingen\n"
+
+#: nscd/pwdcache.c:438
+#, c-format
+msgid "Haven't found \"%s\" in password cache!"
+msgstr "Item \"%s\" niet gevonden in wachtwoorden-cache!"
 
-#: timezone/zic.c:1216
-msgid "wrong number of fields on Link line"
-msgstr "verkeerd aantal velden op Link regel"
+#: nscd/pwdcache.c:440
+#, c-format
+msgid "Reloading \"%s\" in password cache!"
+msgstr "Herladen van \"%s\" in wachtwoorden-cache!"
 
-#: timezone/zic.c:1220
-msgid "blank FROM field on Link line"
-msgstr "leeg FROM-veld op Link-regel"
+#: nscd/pwdcache.c:532
+#, c-format
+msgid "Invalid numeric uid \"%s\"!"
+msgstr "Ongeldig numeriek UID '%s'!"
 
-#: timezone/zic.c:1224
-msgid "blank TO field on Link line"
-msgstr "leeg TO-veld op Link-regel"
+#: nscd/selinux.c:151
+#, c-format
+msgid "Failed opening connection to the audit subsystem: %m"
+msgstr "Kan geen verbinding maken met audit-subsysteem: %m"
 
-#: timezone/zic.c:1301
-msgid "invalid starting year"
-msgstr "ongeldig beginjaar"
+#: nscd/selinux.c:172
+msgid "Failed to set keep-capabilities"
+msgstr "Kan 'keep-capabilities' (privilegesbehoud) niet inschakelen"
 
-#: timezone/zic.c:1305
-msgid "starting year too low to be represented"
-msgstr "beginjaar te laag om te representeren"
+#: nscd/selinux.c:173 nscd/selinux.c:232
+#, c-format
+msgid "prctl(KEEPCAPS) failed"
+msgstr "prctl(KEEPCAPS) is mislukt"
 
-#: timezone/zic.c:1307
-msgid "starting year too high to be represented"
-msgstr "beginjaar te hoog om te representeren"
+#: nscd/selinux.c:187
+msgid "Failed to initialize drop of capabilities"
+msgstr "Privilegesvermindering werkt niet"
 
-#: timezone/zic.c:1326
-msgid "invalid ending year"
-msgstr "ongeldig afsluitend jaar"
+#: nscd/selinux.c:188
+#, c-format
+msgid "cap_init failed"
+msgstr "cap_init() is mislukt"
 
-#: timezone/zic.c:1330
-msgid "ending year too low to be represented"
-msgstr "eindjaar te laag om te representeren"
+#: nscd/selinux.c:205
+msgid "Failed to drop capabilities\n"
+msgstr "Verminderen van privileges is mislukt\n"
 
-#: timezone/zic.c:1332
-msgid "ending year too high to be represented"
-msgstr "eindjaar te hoog om te representeren"
+#: nscd/selinux.c:206 nscd/selinux.c:223
+#, c-format
+msgid "cap_set_proc failed"
+msgstr "cap_set_proc() is mislukt"
 
-#: timezone/zic.c:1335
-msgid "starting year greater than ending year"
-msgstr "beginjaar groter dan afsluitend jaar"
+#: nscd/selinux.c:222
+msgid "Failed to drop capabilities"
+msgstr "Verminderen van privileges is mislukt"
 
-#: timezone/zic.c:1342
-msgid "typed single year"
-msgstr ""
+#: nscd/selinux.c:231
+msgid "Failed to unset keep-capabilities"
+msgstr "Kan 'keep-capabilities' (privilegesbehoud) niet uitschakelen"
 
-#: timezone/zic.c:1379
-msgid "invalid weekday name"
-msgstr "ongeldige naam weekdag"
+#: nscd/selinux.c:247
+msgid "Failed to determine if kernel supports SELinux"
+msgstr "Kan niet bepalen of de kernel SELinux ondersteunt"
 
-#: timezone/zic.c:1494
+#: nscd/selinux.c:262
 #, c-format
-msgid "%s: Can't remove %s: %s\n"
-msgstr "%s: Kan %s niet verwijderen: %s\n"
+msgid "Failed to start AVC thread"
+msgstr "Kan geen AVC-thread starten"
 
-#: timezone/zic.c:1504
+#: nscd/selinux.c:284
 #, c-format
-msgid "%s: Can't create %s: %s\n"
-msgstr "%s: Kan %s niet aanmaken: %s\n"
+msgid "Failed to create AVC lock"
+msgstr "Kan geen AVC-grendel aanmaken"
 
-#: timezone/zic.c:1570
+#: nscd/selinux.c:324
 #, c-format
-msgid "%s: Error writing %s\n"
-msgstr "%s: Fout bij schrijven %s\n"
+msgid "Failed to start AVC"
+msgstr "Kan AVC niet starten"
 
-#: timezone/zic.c:1760
-msgid "can't determine time zone abbreviation to use just after until time"
-msgstr "kan tijdzone afkorting niet bepalen voor gebruik net na tot-tijd"
+#: nscd/selinux.c:326
+msgid "Access Vector Cache (AVC) started"
+msgstr "AVC (Access Vector Cache) is gestart"
 
-#: timezone/zic.c:1803
-msgid "too many transitions?!"
-msgstr "teveel overgangen?!"
+#: nscd/selinux.c:347
+msgid "Error getting context of socket peer"
+msgstr "Kan geen context voor partnersocket verkrijgen"
 
-#: timezone/zic.c:1822
-msgid "internal error - addtype called with bad isdst"
-msgstr "interne fout - addtype aangeroepen met slechte isdst"
+#: nscd/selinux.c:352
+msgid "Error getting context of nscd"
+msgstr "Kan geen context voor nscd verkrijgen"
 
-#: timezone/zic.c:1826
-msgid "internal error - addtype called with bad ttisstd"
-msgstr "interne fout - addtype aangeroepen met slechte ttisstd"
-
-#: timezone/zic.c:1830
-msgid "internal error - addtype called with bad ttisgmt"
-msgstr "interne fout - addtype aangeroepen met slechte ttisgmt"
-
-#: timezone/zic.c:1849
-msgid "too many local time types"
-msgstr "teveel soorten lokale tijd"
-
-#: timezone/zic.c:1877
-msgid "too many leap seconds"
-msgstr "teveel schrikkelseconden"
-
-#: timezone/zic.c:1883
-msgid "repeated leap second moment"
-msgstr "herhaald schrikkelseconde ogenblik"
+#: nscd/selinux.c:358
+msgid "Error getting sid from context"
+msgstr "Kan uit de context geen SID verkrijgen"
 
-#: timezone/zic.c:1935
-msgid "Wild result from command execution"
-msgstr "Wild resultaat van uitvoeren opdracht"
-
-#: timezone/zic.c:1936
+#: nscd/selinux.c:390
 #, c-format
-msgid "%s: command was '%s', result was %d\n"
-msgstr "%s: opdracht was '%s', resultaat was %d\n"
-
-#: timezone/zic.c:2031
-msgid "Odd number of quotation marks"
-msgstr "Oneven aantal aanhalingstekens"
-
-#: timezone/zic.c:2051 timezone/zic.c:2070
-msgid "time overflow"
-msgstr "tijdoverloop"
-
-#: timezone/zic.c:2117
-msgid "use of 2/29 in non leap-year"
-msgstr "gebruik van 2/29 in een niet-schrikkeljaar"
+msgid ""
+"\n"
+"SELinux AVC Statistics:\n"
+"\n"
+"%15u  entry lookups\n"
+"%15u  entry hits\n"
+"%15u  entry misses\n"
+"%15u  entry discards\n"
+"%15u  CAV lookups\n"
+"%15u  CAV hits\n"
+"%15u  CAV probes\n"
+"%15u  CAV misses\n"
+msgstr ""
+"\n"
+"SELinux AVC-statistieken:\n"
+"\n"
+"%15u  items opgezocht\n"
+"%15u  item-treffers\n"
+"%15u  item-missers\n"
+"%15u  items verworpen\n"
+"%15u  CAV-opzoekingen\n"
+"%15u  CAV-treffers\n"
+"%15u  CAV-peilingen\n"
+"%15u  CAV-missers\n"
+
+#: nss/getent.c:52
+msgid "database [key ...]"
+msgstr "gegevensbank [sleutel...]"
 
-#: timezone/zic.c:2151
-msgid "no day in month matches rule"
-msgstr "geen dag in de maand komt overeen met de regel"
+#: nss/getent.c:57
+msgid "Service configuration to be used"
+msgstr "te gebruiken configuratie"
 
-#: timezone/zic.c:2175
-msgid "too many, or too long, time zone abbreviations"
-msgstr "teveel of te lange tijdzone afkortingen"
+#: nss/getent.c:62
+msgid ""
+"Get entries from administrative database.For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+"Items uit een gegevensbank weergeven.Voor het rapporteren van fouten, zie:\n"
+"  <http://www.gnu.org/software/libc/bugs.html>.\n"
 
-#: timezone/zic.c:2216
+#: nss/getent.c:145 nss/getent.c:394
 #, c-format
-msgid "%s: Can't create directory %s: %s\n"
-msgstr "%s: Kan map %s niet aanmaken: %s\n"
+msgid "Enumeration not supported on %s\n"
+msgstr "Opsomming wordt niet ondersteund op %s\n"
 
-#: timezone/zic.c:2238
+#: nss/getent.c:782
 #, c-format
-msgid "%s: %d did not sign extend correctly\n"
-msgstr "%s: %d (min/plus)teken-uitbreiding niet juist gedaan\n"
+msgid "Unknown database name"
+msgstr "Onbekende gegevensbanknaam"
 
-#: posix/../sysdeps/generic/wordexp.c:1797
-msgid "parameter null or not set"
-msgstr "parameter null of niet ingesteld"
+#: nss/getent.c:808
+msgid "Supported databases:\n"
+msgstr "Ondersteunde gegevensbanken:\n"
 
-#: posix/../sysdeps/posix/gai_strerror.c:31
-msgid "Address family for hostname not supported"
-msgstr "Adresfamilie voor hostnaam niet ondersteund"
-
-#: posix/../sysdeps/posix/gai_strerror.c:32
-msgid "Temporary failure in name resolution"
-msgstr "Tijdelijke mislukking bij naamoplossing"
-
-#: posix/../sysdeps/posix/gai_strerror.c:33
-msgid "Bad value for ai_flags"
-msgstr "Slechte waarde voor ai_flags"
-
-#: posix/../sysdeps/posix/gai_strerror.c:34
-msgid "Non-recoverable failure in name resolution"
-msgstr "Niet-herstelbare mislukking in naamoplossing"
+#: nss/getent.c:868
+#, c-format
+msgid "Unknown database: %s\n"
+msgstr "Onbekende gegevensbank: %s\n"
 
-#: posix/../sysdeps/posix/gai_strerror.c:35
-msgid "ai_family not supported"
-msgstr "ai_family niet ondersteund"
+#: nss/makedb.c:60
+msgid "Convert key to lower case"
+msgstr "sleutel converteren naar kleine letters"
 
-#: posix/../sysdeps/posix/gai_strerror.c:36
-msgid "Memory allocation failure"
-msgstr "Geheugentoewijzingsfout"
+#: nss/makedb.c:63
+msgid "Do not print messages while building database"
+msgstr "geen meldingen doen tijdens opbouwen van gegevensbanken"
 
-#: posix/../sysdeps/posix/gai_strerror.c:37
-msgid "No address associated with hostname"
-msgstr "Geen adres geassocieerd met hostnaam"
+#: nss/makedb.c:65
+msgid "Print content of database file, one entry a line"
+msgstr "inhoud van gegevensbank weergeven, één item per regel"
 
-#: posix/../sysdeps/posix/gai_strerror.c:38
-msgid "Name or service not known"
-msgstr "Naam of dienst niet bekend"
+#: nss/makedb.c:70
+msgid "Create simple DB database from textual input."
+msgstr "Uit tekstinvoer een eenvoudige DB-gegevensbank genereren."
 
-#: posix/../sysdeps/posix/gai_strerror.c:39
-msgid "Servname not supported for ai_socktype"
-msgstr "Servnaam niet ondersteund voor ai_socktype"
+#: nss/makedb.c:73
+msgid ""
+"INPUT-FILE OUTPUT-FILE\n"
+"-o OUTPUT-FILE INPUT-FILE\n"
+"-u INPUT-FILE"
+msgstr ""
+"INVOERBESTAND UITVOERBESTAND\n"
+"-o UITVOERBESTAND INVOERBESTAND\n"
+"-u INVOERBESTAND"
 
-#: posix/../sysdeps/posix/gai_strerror.c:40
-msgid "ai_socktype not supported"
-msgstr "ai_socktype niet ondersteund"
+#: nss/makedb.c:142
+#, c-format
+msgid "No usable database library found."
+msgstr "Geen bruikbare gegevensbankbibliotheek gevonden"
 
-#: posix/../sysdeps/posix/gai_strerror.c:41
-msgid "System error"
-msgstr "Systeemfout"
+#: nss/makedb.c:149
+#, c-format
+msgid "cannot open database file `%s': %s"
+msgstr "kan gegevensbestand '%s' niet openen: %s"
 
-#: posix/../sysdeps/posix/gai_strerror.c:42
-msgid "Processing request in progress"
-msgstr "Bezig met verwerken verzoek"
+#: nss/makedb.c:151
+msgid "incorrectly formatted file"
+msgstr "onjuist ingedeeld bestand"
 
-#: posix/../sysdeps/posix/gai_strerror.c:43
-msgid "Request canceled"
-msgstr "Verzoek geannuleerd"
+#: nss/makedb.c:331
+msgid "duplicate key"
+msgstr "dubbele sleutel"
 
-#: posix/../sysdeps/posix/gai_strerror.c:44
-msgid "Request not canceled"
-msgstr "Verzoek niet geannuleerd"
+#: nss/makedb.c:337
+#, c-format
+msgid "while writing database file"
+msgstr "tijdens schrijven van gegevensbestand"
 
-#: posix/../sysdeps/posix/gai_strerror.c:45
-msgid "All requests done"
-msgstr "Alle verzoeken gedaan"
+#: nss/makedb.c:348
+#, c-format
+msgid "problems while reading `%s'"
+msgstr "problemen tijdens lezen van '%s'"
 
-#: posix/../sysdeps/posix/gai_strerror.c:46
-msgid "Interrupted by a signal"
-msgstr "Onderbroken door een signaal"
+#: nss/makedb.c:368 nss/makedb.c:385
+#, c-format
+msgid "while reading database"
+msgstr "tijdens lezen van gegevensbestand"
 
-#: posix/getconf.c:892
+#: posix/getconf.c:940
 #, c-format
 msgid "Usage: %s [-v specification] variable_name [pathname]\n"
-msgstr "Gebruik: %s [-v specificatie] variabele_naam [padnaam]\n"
+msgstr "Gebruik:  %s [-v specificatie] naam_van_variabele [padnaam]\n"
 
-#: posix/getconf.c:950
+#: posix/getconf.c:943
+#, c-format
+msgid "       %s -a [pathname]\n"
+msgstr "          %s -a [padnaam]\n"
+
+#: posix/getconf.c:1062
 #, c-format
 msgid "unknown specification \"%s\""
-msgstr "onbekende specificatie \"%s\""
+msgstr "onbekende specificatie '%s'"
+
+#: posix/getconf.c:1090
+#, c-format
+msgid "Couldn't execute %s"
+msgstr "Kan %s niet uitvoeren"
 
-#: posix/getconf.c:979 posix/getconf.c:995
+#: posix/getconf.c:1130 posix/getconf.c:1146
 msgid "undefined"
 msgstr "ongedefinieerd"
 
-#: posix/getconf.c:1017
+#: posix/getconf.c:1168
 #, c-format
 msgid "Unrecognized variable `%s'"
-msgstr "Variabele `%s' niet herkend"
+msgstr "Onbekende variabele '%s'"
 
-#: posix/getopt.c:692 posix/getopt.c:711
+#: posix/getopt.c:571 posix/getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: optie `%s' is dubbelzinnig\n"
+msgstr "%s: optie '%s' is niet eenduidig\n"
 
-#: posix/getopt.c:744 posix/getopt.c:748
+#: posix/getopt.c:620 posix/getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: optie `--%s' staat geen argument toe\n"
+msgstr "%s: optie '--%s' staat geen argument toe\n"
 
-#: posix/getopt.c:757 posix/getopt.c:762
+#: posix/getopt.c:633 posix/getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: optie `%c%s' staat geen argument toe\n"
+msgstr "%s: optie '%c%s' staat geen argument toe\n"
 
-#: posix/getopt.c:807 posix/getopt.c:829 posix/getopt.c:1159
-#: posix/getopt.c:1181
+#: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016
+#: posix/getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: optie `%s' vereist een argument\n"
+msgstr "%s: optie '%s' vereist een argument\n"
 
-#: posix/getopt.c:867 posix/getopt.c:870
+#: posix/getopt.c:738 posix/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: optie niet herkend `--%s'\n"
+msgstr "%s: onbekende optie '--%s'\n"
 
-#: posix/getopt.c:878 posix/getopt.c:881
+#: posix/getopt.c:749 posix/getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: optie `%c%s' niet herkend\n"
+msgstr "%s: onbekende optie '%c%s'\n"
 
-#: posix/getopt.c:936 posix/getopt.c:939
+#: posix/getopt.c:804 posix/getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
-#: posix/getopt.c:945 posix/getopt.c:948
+#: posix/getopt.c:813 posix/getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
-#: posix/getopt.c:1003 posix/getopt.c:1022 posix/getopt.c:1234
-#: posix/getopt.c:1255
+#: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088
+#: posix/getopt.c:1106
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: optie vereist een argument -- %c\n"
 
-#: posix/getopt.c:1074 posix/getopt.c:1093
+#: posix/getopt.c:937 posix/getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: optie`-W %s' is dubbelzinnig\n"
+msgstr "%s: optie '-W %s' is niet eenduidig\n"
 
-#: posix/getopt.c:1117 posix/getopt.c:1138
+#: posix/getopt.c:977 posix/getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: optie`-W %s' staat geen argument toe\n"
+msgstr "%s: optie '-W %s' staat geen argument toe\n"
 
-#: posix/regcomp.c:150
+#: posix/regcomp.c:135
 msgid "No match"
-msgstr "Geen overeenkomst"
+msgstr "Geen overeenkomsten"
 
-#: posix/regcomp.c:153
+#: posix/regcomp.c:138
 msgid "Invalid regular expression"
-msgstr "Ongeldige reguliere uitdrukking"
+msgstr "Ongeldige reguliere expressie"
 
-#: posix/regcomp.c:156
+#: posix/regcomp.c:141
 msgid "Invalid collation character"
-msgstr "Ongeldig sorteerteken"
+msgstr "Ongeldig samengesteld teken"
 
-#: posix/regcomp.c:159
+#: posix/regcomp.c:144
 msgid "Invalid character class name"
-msgstr "Ongeldige tekenklasse naam"
+msgstr "Ongeldige tekenklassenaam"
 
-#: posix/regcomp.c:162
+#: posix/regcomp.c:147
 msgid "Trailing backslash"
 msgstr "Backslash aan einde"
 
-#: posix/regcomp.c:165
+#: posix/regcomp.c:150
 msgid "Invalid back reference"
-msgstr "Ongeldig terugverwijzing"
+msgstr "Ongeldige terugverwijzing"
 
-#: posix/regcomp.c:168
+#: posix/regcomp.c:153
 msgid "Unmatched [ or [^"
-msgstr "Niet overeenkomende [ of [^"
+msgstr "Ongepaarde [ of [^"
 
-#: posix/regcomp.c:171
+#: posix/regcomp.c:156
 msgid "Unmatched ( or \\("
-msgstr "Niet overeenkomende ( of \\("
+msgstr "Ongepaarde ( of \\("
 
-#: posix/regcomp.c:174
+#: posix/regcomp.c:159
 msgid "Unmatched \\{"
-msgstr "Niet overeenkomende \\{"
+msgstr "Ongepaarde \\{"
 
-#: posix/regcomp.c:177
+#: posix/regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Ongeldige inhoud van \\{\\}"
 
-#: posix/regcomp.c:180
+#: posix/regcomp.c:165
 msgid "Invalid range end"
 msgstr "Ongeldig bereikeinde"
 
-#: posix/regcomp.c:183
+#: posix/regcomp.c:168
 msgid "Memory exhausted"
-msgstr "Geheugen uitgeput"
+msgstr "Onvoldoende geheugen"
 
-#: posix/regcomp.c:186
+#: posix/regcomp.c:171
 msgid "Invalid preceding regular expression"
-msgstr "Ongeldige voorafgaande reguliere uitdrukking"
+msgstr "Ongeldige voorafgaande reguliere expressie"
 
-#: posix/regcomp.c:189
+#: posix/regcomp.c:174
 msgid "Premature end of regular expression"
-msgstr "Vroegtijdig einde van reguliere uitdrukking"
+msgstr "Voortijdig einde van reguliere expressie"
 
-#: posix/regcomp.c:192
+#: posix/regcomp.c:177
 msgid "Regular expression too big"
-msgstr "Reguliere uitdrukking te groot"
+msgstr "Reguliere expressie is te groot"
 
-#: posix/regcomp.c:195
+#: posix/regcomp.c:180
 msgid "Unmatched ) or \\)"
-msgstr "Niet overeenkomende ) of \\)"
+msgstr "Ongepaarde ) of \\)"
 
-#: posix/regcomp.c:661
+#: posix/regcomp.c:660
 msgid "No previous regular expression"
-msgstr "Geen eerdere reguliere uitdrukking"
-
-#: argp/argp-help.c:224
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr "%.*s: ARGP_HELP_FMT parameter vereist een waarde"
-
-#: argp/argp-help.c:233
-#, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr "%.*s: Onbekende ARGP_HELP_FMT parameter"
-
-#: argp/argp-help.c:245
-#, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr "Troep in ARGP_HELP_FMT: %s"
-
-#: argp/argp-help.c:1205
-msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
-msgstr "Verplichte of optionele argumenten voor lange opties zijn ook verplicht of optioneel voor overeenkomende korte opties."
-
-#: argp/argp-help.c:1592
-msgid "Usage:"
-msgstr "Gebruik:"
-
-#: argp/argp-help.c:1596
-msgid "  or: "
-msgstr "  of: "
-
-#: argp/argp-help.c:1608
-msgid " [OPTION...]"
-msgstr " [OPTIE...]"
-
-#: argp/argp-help.c:1635
-#, c-format
-msgid "Try `%s --help' or `%s --usage' for more information.\n"
-msgstr "Probeer `%s --help' of `%s --usage' voor meer informatie.\n"
-
-#: argp/argp-help.c:1663
-#, c-format
-msgid "Report bugs to %s.\n"
-msgstr ""
-"Rapporteer fouten in het programma aan %s,\n"
-"en in de vertaling aan vertaling@nl.linux.org.\n"
+msgstr "Geen eerdere reguliere expressie"
 
-#: argp/argp-parse.c:115
-msgid "Give this help list"
-msgstr "Deze hulplijst geven"
-
-#: argp/argp-parse.c:116
-msgid "Give a short usage message"
-msgstr "Een kort gebruiksbericht geven"
-
-#: argp/argp-parse.c:117
-msgid "Set the program name"
-msgstr "De programmanaam instellen"
-
-#: argp/argp-parse.c:119
-msgid "Hang for SECS seconds (default 3600)"
-msgstr "SECS seconden hangen (standaard 3600)"
-
-#: argp/argp-parse.c:180
-msgid "Print program version"
-msgstr "Programmaversie weergeven"
-
-#: argp/argp-parse.c:196
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr "(PROGRAMMAFOUT) Geen versie bekend!?"
-
-#: argp/argp-parse.c:672
-#, c-format
-msgid "%s: Too many arguments\n"
-msgstr "%s: Teveel argumenten\n"
-
-#: argp/argp-parse.c:813
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr "(PROGRAMMAFOUT) Optie had herkend moeten worden!?"
+#: posix/wordexp.c:1798
+msgid "parameter null or not set"
+msgstr "parameter is null of niet ingesteld"
 
 #: resolv/herror.c:68
 msgid "Resolver Error 0 (no error)"
-msgstr "Oplosfout 0 (geen fout)"
+msgstr "Geen fout -- (herleidingsfoutnummer 0)"
 
 #: resolv/herror.c:69
 msgid "Unknown host"
@@ -3727,7 +4480,7 @@ msgstr "Onbekende host"
 
 #: resolv/herror.c:70
 msgid "Host name lookup failure"
-msgstr "Opzoeken hostnaam mislukt"
+msgstr "Opzoeken van hostnaam is mislukt"
 
 #: resolv/herror.c:71
 msgid "Unknown server error"
@@ -3737,201 +4490,73 @@ msgstr "Onbekende serverfout"
 msgid "No address associated with name"
 msgstr "Geen adres geassocieerd met naam"
 
-#: resolv/herror.c:108
+#: resolv/herror.c:107
 msgid "Resolver internal error"
-msgstr "Interne fout oplosser"
+msgstr "**Interne fout** in naamsherleider"
 
-#: resolv/herror.c:111
+#: resolv/herror.c:110
 msgid "Unknown resolver error"
-msgstr "Onbekende fout oplosser"
+msgstr "Onbekende fout in naamsherleider"
 
-#: resolv/res_hconf.c:147
+#: resolv/res_hconf.c:124
 #, c-format
-msgid "%s: line %d: expected service, found `%s'\n"
-msgstr "%s: regel %d: dienst verwacht, `%s' gevonden\n"
-
-#: resolv/res_hconf.c:165
-#, c-format
-msgid "%s: line %d: cannot specify more than %d services"
-msgstr "%s: regel %d: kan niet meer dan %d diensten opgeven"
-
-#: resolv/res_hconf.c:191
-#, c-format
-msgid "%s: line %d: list delimiter not followed by keyword"
-msgstr "%s: regel %d: lijstscheidingsteken niet gevolgd door sleutelwoord"
-
-#: resolv/res_hconf.c:231
-#, fuzzy, c-format
 msgid "%s: line %d: cannot specify more than %d trim domains"
-msgstr "%s: regel %d: kan niet meer dan %d trim domeinen opgeven"
+msgstr "%s: regel %d: meer dan %d trimdomeinen zijn niet mogelijk"
 
-#: resolv/res_hconf.c:256
+#: resolv/res_hconf.c:145
 #, c-format
 msgid "%s: line %d: list delimiter not followed by domain"
-msgstr "%s: regel %d: lijstscheidingsteken niet gevolgd door domein"
+msgstr "%s: regel %d: lijstscheidingsteken wordt niet gevolgd door domeinnaam"
 
-#: resolv/res_hconf.c:319
+#: resolv/res_hconf.c:204
 #, c-format
 msgid "%s: line %d: expected `on' or `off', found `%s'\n"
-msgstr "%s: regel %d: verwacht `on' of `off' (aan of uit), gevonden `%s'\n"
+msgstr "%s: regel %d: 'on' (aan) of 'off' (uit) verwacht, '%s' gevonden\n"
 
-#: resolv/res_hconf.c:366
+#: resolv/res_hconf.c:247
 #, c-format
 msgid "%s: line %d: bad command `%s'\n"
-msgstr "%s: regel %d: slechte opdracht `%s'\n"
+msgstr "%s: regel %d: ongeldige opdracht '%s'\n"
 
-#: resolv/res_hconf.c:395
+#: resolv/res_hconf.c:282
 #, c-format
 msgid "%s: line %d: ignoring trailing garbage `%s'\n"
-msgstr "%s: regel %d: troep aan einde genegeerd `%s'\n"
-
-#: nss/getent.c:51
-msgid "database [key ...]"
-msgstr "gegevensbank [sleutel ...]"
-
-#: nss/getent.c:56
-msgid "Service configuration to be used"
-msgstr "Dienstconfiguratie om te gebruiken"
-
-#: nss/getent.c:136 nss/getent.c:375
-#, c-format
-msgid "Enumeration not supported on %s\n"
-msgstr "Opsomming niet ondersteund op %s\n"
-
-#: nss/getent.c:800
-msgid "getent - get entries from administrative database."
-msgstr "getent - ingangen uit administratieve gegevensbank opvragen."
-
-#: nss/getent.c:801
-msgid "Supported databases:"
-msgstr "Ondersteunde gegevensbanken:"
-
-#: nss/getent.c:858 nscd/nscd.c:131 nscd/nscd_nischeck.c:64
-msgid "wrong number of arguments"
-msgstr "verkeerd aantal argumenten"
+msgstr "%s: regel %d: rommel '%s' aan einde wordt genegeerd\n"
 
-#: nss/getent.c:868
+#: stdio-common/psignal.c:51
 #, c-format
-msgid "Unknown database: %s\n"
-msgstr "Onbekende gegevensbank: %s\n"
-
-#: debug/pcprofiledump.c:52
-msgid "Don't buffer output"
-msgstr "Uitvoer niet bufferen"
-
-#: debug/pcprofiledump.c:57
-msgid "Dump information generated by PC profiling."
-msgstr "Door PC-profilering gegenereerde informatie weergeven."
-
-#: debug/pcprofiledump.c:60
-msgid "[FILE]"
-msgstr "[BESTAND]"
-
-#: debug/pcprofiledump.c:100
-msgid "cannot open input file"
-msgstr "kan invoerbestand niet openen"
-
-#: debug/pcprofiledump.c:106
-msgid "cannot read header"
-msgstr "kan kop niet lezen"
-
-#: debug/pcprofiledump.c:170
-msgid "invalid pointer size"
-msgstr "ongeldige pointergrootte"
-
-#: inet/rcmd.c:163 inet/rcmd.c:166
-msgid "rcmd: Cannot allocate memory\n"
-msgstr "rcmd: Kan geheugen niet toewijzen\n"
-
-#: inet/rcmd.c:185 inet/rcmd.c:188
-msgid "rcmd: socket: All ports in use\n"
-msgstr "rcmd: socket: Alle poorten in gebruik\n"
-
-#: inet/rcmd.c:222
-#, c-format
-msgid "connect to address %s: "
-msgstr "verbinden met adres %s:"
-
-#: inet/rcmd.c:240
-#, c-format
-msgid "Trying %s...\n"
-msgstr "Bezig met proberen %s...\n"
-
-#: inet/rcmd.c:289
-#, c-format
-msgid "rcmd: write (setting up stderr): %m\n"
-msgstr "rcmd: schrijven (bezig met opzetten stderr): %m\n"
+msgid "%s%sUnknown signal %d\n"
+msgstr "%s%sOnbekend signaal %d\n"
 
-#: inet/rcmd.c:310
-#, c-format
-msgid "rcmd: poll (setting up stderr): %m\n"
-msgstr "rcmd: polsen (bezig met opzetten stderr): %m\n"
+#: stdio-common/psignal.c:52
+msgid "Unknown signal"
+msgstr "Onbekend signaal"
 
-#: inet/rcmd.c:313
-msgid "poll: protocol failure in circuit setup\n"
-msgstr "polsen: protocolmislukking bij opzetten schakeling\n"
+#: string/_strerror.c:45 sysdeps/mach/_strerror.c:87
+msgid "Unknown error "
+msgstr "Onbekende fout "
 
-#: inet/rcmd.c:358
-msgid "socket: protocol failure in circuit setup\n"
-msgstr "socket: protocolmislukking bij opzetten schakeling\n"
+#: string/strerror.c:43
+msgid "Unknown error"
+msgstr "Onbekende fout"
 
-#: inet/rcmd.c:387
+#: string/strsignal.c:65
 #, c-format
-msgid "rcmd: %s: short read"
-msgstr "rcmd: %s: te weinig gelezen"
-
-#: inet/rcmd.c:549
-msgid "lstat failed"
-msgstr "lstat mislukt"
-
-#: inet/rcmd.c:551
-msgid "not regular file"
-msgstr "niet een normaal bestand"
-
-#: inet/rcmd.c:556
-msgid "cannot open"
-msgstr "kan niet openen"
-
-#: inet/rcmd.c:558
-msgid "fstat failed"
-msgstr "fstat mislukt"
-
-#: inet/rcmd.c:560
-msgid "bad owner"
-msgstr "slechte eigenaar"
-
-#: inet/rcmd.c:562
-msgid "writeable by other than owner"
-msgstr "schrijfbaar door anderen dan eigenaar"
-
-#: inet/rcmd.c:564
-msgid "hard linked somewhere"
-msgstr "ergens hard gekoppeld"
-
-#: inet/ruserpass.c:170 inet/ruserpass.c:193
-msgid "out of memory"
-msgstr "geheugen uitgeput"
-
-#: inet/ruserpass.c:184
-msgid "Error: .netrc file is readable by others."
-msgstr "Fout: .netrc-bestand is leesbaar voor anderen."
-
-#: inet/ruserpass.c:185
-msgid "Remove password or make file unreadable by others."
-msgstr "Verwijder het wachtwoord of maak het bestand onleesbaar voor anderen."
+msgid "Real-time signal %d"
+msgstr "Realtime-signaal %d"
 
-#: inet/ruserpass.c:277
+#: string/strsignal.c:69
 #, c-format
-msgid "Unknown .netrc keyword %s"
-msgstr "Onbekend .netrc-sleutelwoord %s"
+msgid "Unknown signal %d"
+msgstr "Onbekend signaal %d"
 
-#: sunrpc/auth_unix.c:115 sunrpc/auth_unix.c:118
+#: sunrpc/auth_unix.c:114
 msgid "authunix_create: out of memory\n"
-msgstr "authunix_create: geheugentekort\n"
+msgstr "authunix_create(): onvoldoende geheugen\n"
 
-#: sunrpc/auth_unix.c:318
+#: sunrpc/auth_unix.c:350
 msgid "auth_none.c - Fatal marshalling problem"
-msgstr ""
+msgstr "Fataal marshallingprobleem (in auth_unix.c)"
 
 #: sunrpc/clnt_perr.c:118 sunrpc/clnt_perr.c:139
 #, c-format
@@ -3940,313 +4565,301 @@ msgstr "; lage versie = %lu, hoge versie = %lu"
 
 #: sunrpc/clnt_perr.c:125
 msgid "; why = "
-msgstr "; waarom = "
+msgstr "; reden = "
 
 #: sunrpc/clnt_perr.c:132
 #, c-format
 msgid "(unknown authentication error - %d)"
-msgstr "(onbekende authentificatiefout - %d)"
+msgstr "(onbekende authentificatiefout -- %d)"
 
-#: sunrpc/clnt_perr.c:177
+#: sunrpc/clnt_perr.c:172
 msgid "RPC: Success"
-msgstr "RPC: Succes"
+msgstr "RPC: Gelukt"
 
-#: sunrpc/clnt_perr.c:180
+#: sunrpc/clnt_perr.c:175
 msgid "RPC: Can't encode arguments"
 msgstr "RPC: Kan argumenten niet coderen"
 
-#: sunrpc/clnt_perr.c:184
+#: sunrpc/clnt_perr.c:179
 msgid "RPC: Can't decode result"
 msgstr "RPC: Kan resultaat niet decoderen"
 
-#: sunrpc/clnt_perr.c:188
+#: sunrpc/clnt_perr.c:183
 msgid "RPC: Unable to send"
 msgstr "RPC: Kan niet verzenden"
 
-#: sunrpc/clnt_perr.c:192
+#: sunrpc/clnt_perr.c:187
 msgid "RPC: Unable to receive"
 msgstr "RPC: Kan niet ontvangen"
 
-#: sunrpc/clnt_perr.c:196
+#: sunrpc/clnt_perr.c:191
 msgid "RPC: Timed out"
-msgstr "RPC: Time-out"
+msgstr "RPC: Duurde te lang"
 
-#: sunrpc/clnt_perr.c:200
+#: sunrpc/clnt_perr.c:195
 msgid "RPC: Incompatible versions of RPC"
 msgstr "RPC: Incompatibele versies van RPC"
 
-#: sunrpc/clnt_perr.c:204
+#: sunrpc/clnt_perr.c:199
 msgid "RPC: Authentication error"
 msgstr "RPC: Authentificatiefout"
 
-#: sunrpc/clnt_perr.c:208
+#: sunrpc/clnt_perr.c:203
 msgid "RPC: Program unavailable"
-msgstr "RPC: Programma onbeschikbaar"
+msgstr "RPC: Programma is onbeschikbaar"
 
-#: sunrpc/clnt_perr.c:212
+#: sunrpc/clnt_perr.c:207
 msgid "RPC: Program/version mismatch"
-msgstr "RPC: Programma/versie komt niet overeen"
+msgstr "RPC: Programma's of versies passen niet bij elkaar"
 
-#: sunrpc/clnt_perr.c:216
+#: sunrpc/clnt_perr.c:211
 msgid "RPC: Procedure unavailable"
-msgstr "RPC: Procedure onbeschikbaar"
+msgstr "RPC: Procedure is onbeschikbaar"
 
-#: sunrpc/clnt_perr.c:220
+#: sunrpc/clnt_perr.c:215
 msgid "RPC: Server can't decode arguments"
 msgstr "RPC: Server kan argumenten niet decoderen"
 
-#: sunrpc/clnt_perr.c:224
+#: sunrpc/clnt_perr.c:219
 msgid "RPC: Remote system error"
-msgstr "RPC: Systeemfout op afstand"
+msgstr "RPC: Fout in ginds systeem"
 
-#: sunrpc/clnt_perr.c:228
+#: sunrpc/clnt_perr.c:223
 msgid "RPC: Unknown host"
 msgstr "RPC: Onbekende host"
 
-#: sunrpc/clnt_perr.c:232
+#: sunrpc/clnt_perr.c:227
 msgid "RPC: Unknown protocol"
 msgstr "RPC: Onbekend protocol"
 
-#: sunrpc/clnt_perr.c:236
+#: sunrpc/clnt_perr.c:231
 msgid "RPC: Port mapper failure"
-msgstr "RPC: Portvertaler (portmapper) mislukking"
+msgstr "RPC: Mislukking in poortvertaler"
 
-#: sunrpc/clnt_perr.c:240
+#: sunrpc/clnt_perr.c:235
 msgid "RPC: Program not registered"
-msgstr "RPC: Programma niet geregistreerd"
+msgstr "RPC: Programma is niet geregistreerd"
 
-#: sunrpc/clnt_perr.c:244
+#: sunrpc/clnt_perr.c:239
 msgid "RPC: Failed (unspecified error)"
-msgstr "RPC: Mislukt (fout niet aangegeven)"
+msgstr "RPC: Mislukt (ongespecificeerde fout)"
 
-#: sunrpc/clnt_perr.c:285
+#: sunrpc/clnt_perr.c:280
 msgid "RPC: (unknown error code)"
 msgstr "RPC: (onbekende foutcode)"
 
-#: sunrpc/clnt_perr.c:357
+#: sunrpc/clnt_perr.c:342
 msgid "Authentication OK"
-msgstr "Authentificatie gelukt"
+msgstr "Authentificatie is gelukt"
 
-#: sunrpc/clnt_perr.c:360
+#: sunrpc/clnt_perr.c:345
 msgid "Invalid client credential"
 msgstr "Ongeldige client-identificatiegegevens"
 
-#: sunrpc/clnt_perr.c:364
+#: sunrpc/clnt_perr.c:349
 msgid "Server rejected credential"
 msgstr "Server verwierp identificatiegegevens"
 
-#: sunrpc/clnt_perr.c:368
+#: sunrpc/clnt_perr.c:353
 msgid "Invalid client verifier"
-msgstr "Ongeldige client-verifieerder"
+msgstr "Ongeldige client-verificatie"
 
-#: sunrpc/clnt_perr.c:372
+#: sunrpc/clnt_perr.c:357
 msgid "Server rejected verifier"
-msgstr "Server verwierp verifieerder"
+msgstr "Server verwierp verificatie"
 
-#: sunrpc/clnt_perr.c:376
+#: sunrpc/clnt_perr.c:361
 msgid "Client credential too weak"
-msgstr "Client-identificatiegegevens te zwak"
+msgstr "Client-identificatiegegevens zijn te zwak"
 
-#: sunrpc/clnt_perr.c:380
+#: sunrpc/clnt_perr.c:365
 msgid "Invalid server verifier"
-msgstr "Ongeldige server-verifieerder"
+msgstr "Ongeldige server-verificatie"
 
-#: sunrpc/clnt_perr.c:384
+#: sunrpc/clnt_perr.c:369
 msgid "Failed (unspecified error)"
-msgstr "Mislukt (fout niet aangegeven)"
+msgstr "Mislukt (ongespecificeerde fout)"
 
 #: sunrpc/clnt_raw.c:117
 msgid "clnt_raw.c - Fatal header serialization error."
-msgstr "clnt_raw.c - Fatale kopserialisatiefout."
+msgstr "clnt_raw.c: fatale serialisatiefout van de kop"
 
-#: sunrpc/clnt_tcp.c:134 sunrpc/clnt_tcp.c:137
+#: sunrpc/clnt_tcp.c:131
 msgid "clnttcp_create: out of memory\n"
-msgstr "clnttcp_create: geheugentekort\n"
+msgstr "clnttcp_create(): onvoldoende geheugen\n"
 
-#: sunrpc/clnt_udp.c:141 sunrpc/clnt_udp.c:144
+#: sunrpc/clnt_udp.c:139
 msgid "clntudp_create: out of memory\n"
-msgstr "clntudp_create: geheugentekort\n"
+msgstr "clntudp_create(): onvoldoende geheugen\n"
 
-#: sunrpc/clnt_unix.c:131 sunrpc/clnt_unix.c:134
+#: sunrpc/clnt_unix.c:128
 msgid "clntunix_create: out of memory\n"
-msgstr "clntunix_create: geheugentekort\n"
-
-#: sunrpc/get_myaddr.c:78
-msgid "get_myaddress: ioctl (get interface configuration)"
-msgstr "get_myaddress: ioctl (interface-configuratie opvragen)"
+msgstr "clntunix_create(): onvoldoende geheugen\n"
 
-#: sunrpc/pm_getmaps.c:74
+#: sunrpc/pm_getmaps.c:83
 msgid "pmap_getmaps rpc problem"
-msgstr "pmap_getmaps rpc probleem"
+msgstr "pmap_getmaps.c: RPC-probleem"
 
-#: sunrpc/pmap_clnt.c:72
-msgid "__get_myaddress: ioctl (get interface configuration)"
-msgstr "__get_myaddress: ioctl (interface-configuratie opvragen)"
-
-#: sunrpc/pmap_clnt.c:137
+#: sunrpc/pmap_clnt.c:129
 msgid "Cannot register service"
 msgstr "Kan dienst niet registreren"
 
-#: sunrpc/pmap_rmt.c:190
-msgid "broadcast: ioctl (get interface configuration)"
-msgstr "broadcast: ioctl (interface-configuratie opvragen)"
-
-#: sunrpc/pmap_rmt.c:199
-msgid "broadcast: ioctl (get interface flags)"
-msgstr "broadcast: ioctl (interface opties opvragen)"
-
-#: sunrpc/pmap_rmt.c:269
+#: sunrpc/pmap_rmt.c:248
 msgid "Cannot create socket for broadcast rpc"
-msgstr "Kan socket voor uitzend-rpc niet aanmaken"
+msgstr "Kan socket voor broadcast-RPC niet aanmaken"
 
-#: sunrpc/pmap_rmt.c:276
+#: sunrpc/pmap_rmt.c:255
 msgid "Cannot set socket option SO_BROADCAST"
-msgstr "Kan socket-optie SO_BROADCAST niet instellen"
+msgstr "Kan socket-optie 'SO_BROADCAST' niet instellen"
 
-#: sunrpc/pmap_rmt.c:328
+#: sunrpc/pmap_rmt.c:307
 msgid "Cannot send broadcast packet"
-msgstr "Kan broadcasting pakket niet verzenden"
+msgstr "Kan broadcast-pakket niet verzenden"
 
-#: sunrpc/pmap_rmt.c:353
+#: sunrpc/pmap_rmt.c:332
 msgid "Broadcast poll problem"
-msgstr "Uitzend-polsen probleem"
+msgstr "Probleem bij polsen na broadcast"
 
-#: sunrpc/pmap_rmt.c:366
+#: sunrpc/pmap_rmt.c:345
 msgid "Cannot receive reply to broadcast"
-msgstr "Kan antwoord op broadcast niet ontvangen"
+msgstr "Kan geen antwoord op broadcast ontvangen"
 
-#: sunrpc/rpc_main.c:288
+#: sunrpc/rpc_main.c:286
 #, c-format
 msgid "%s: output would overwrite %s\n"
 msgstr "%s: uitvoer zou %s overschrijven\n"
 
-#: sunrpc/rpc_main.c:295
+#: sunrpc/rpc_main.c:293
 #, c-format
 msgid "%s: unable to open %s: %m\n"
 msgstr "%s: kan %s niet openen: %m\n"
 
-#: sunrpc/rpc_main.c:307
+#: sunrpc/rpc_main.c:305
 #, c-format
 msgid "%s: while writing output %s: %m"
-msgstr "%s: tijdens schrijven uitvoer naar %s: %m"
+msgstr "%s: tijdens schrijven van uitvoer naar %s: %m"
 
-#: sunrpc/rpc_main.c:342
+#: sunrpc/rpc_main.c:340
 #, c-format
 msgid "cannot find C preprocessor: %s \n"
 msgstr "kan C-voorverwerker niet vinden: %s \n"
 
-#: sunrpc/rpc_main.c:350
+#: sunrpc/rpc_main.c:348
 msgid "cannot find any C preprocessor (cpp)\n"
-msgstr "kan geen enkele C-voorverwerker (cpp) vinden\n"
+msgstr "kan geen enkele C-voorverwerker (CPP) vinden\n"
 
-#: sunrpc/rpc_main.c:419
+#: sunrpc/rpc_main.c:417
 #, c-format
 msgid "%s: C preprocessor failed with signal %d\n"
-msgstr "%s: C-voorverwerker mislukt met signaal %d\n"
+msgstr "%s: C-voorverwerking is mislukt met signaal %d\n"
 
-#: sunrpc/rpc_main.c:422
+#: sunrpc/rpc_main.c:420
 #, c-format
 msgid "%s: C preprocessor failed with exit code %d\n"
-msgstr "%s: C-voorverwerker mislukt met afsluitcode %d\n"
+msgstr "%s: C-voorverwerking is mislukt met afsluitwaarde %d\n"
 
-#: sunrpc/rpc_main.c:462
+#: sunrpc/rpc_main.c:460
 #, c-format
 msgid "illegal nettype :`%s'\n"
-msgstr "ongeldige netsoort :`%s'\n"
+msgstr "ongeldige netsoort: '%s'\n"
 
-#: sunrpc/rpc_main.c:1104
+#: sunrpc/rpc_main.c:1122
 #, c-format
 msgid "rpcgen: too many defines\n"
-msgstr "rpcgen: teveel definities\n"
+msgstr "rpcgen: te veel definities\n"
 
-#: sunrpc/rpc_main.c:1116
+#: sunrpc/rpc_main.c:1134
 #, c-format
 msgid "rpcgen: arglist coding error\n"
-msgstr "rpcgen: fout codering argumentenlijst\n"
+msgstr "rpcgen: fout in codering van argumentenlijst\n"
 
 #. TRANS: the file will not be removed; this is an
 #. TRANS: informative message.
-#: sunrpc/rpc_main.c:1149
+#: sunrpc/rpc_main.c:1167
 #, c-format
 msgid "file `%s' already exists and may be overwritten\n"
-msgstr "bestand `%s' bestaat al en wordt mogelijk overschreven\n"
+msgstr "Bestand '%s' bestaat al en wordt mogelijk overschreven.\n"
 
-#: sunrpc/rpc_main.c:1194
+#: sunrpc/rpc_main.c:1212
 #, c-format
 msgid "Cannot specify more than one input file!\n"
-msgstr "Kan niet meer dan één invoerbestand opgeven!\n"
+msgstr "Meer dan één invoerbestand is niet mogelijk\n"
 
-#: sunrpc/rpc_main.c:1364
+#: sunrpc/rpc_main.c:1382
 msgid "This implementation doesn't support newstyle or MT-safe code!\n"
-msgstr "Deze implementatie ondersteund geen newstyle of MT veilige code!\n"
+msgstr "Deze implementatie ondersteunt geen 'newstyle'- of 'MT-safe'-code\n"
 
-#: sunrpc/rpc_main.c:1373
+#: sunrpc/rpc_main.c:1391
 #, c-format
 msgid "Cannot use netid flag with inetd flag!\n"
-msgstr "Kan netid optie niet met inetd optie gebruiken!\n"
+msgstr "Optie 'netid' gaat niet samen met standaardoptie 'inetd'\n"
 
-#: sunrpc/rpc_main.c:1385
+#: sunrpc/rpc_main.c:1403
 msgid "Cannot use netid flag without TIRPC!\n"
-msgstr "Kan netid optie niet zonder TIRPC gebruiken!\n"
+msgstr "Optie 'netid' is niet mogelijk zonder TIRPC\n"
 
-#: sunrpc/rpc_main.c:1392
+#: sunrpc/rpc_main.c:1410
 msgid "Cannot use table flags with newstyle!\n"
-msgstr "Kan tabelopties niet gebruiken met newstyle!\n"
+msgstr "Tabelopties gaan niet samen met 'newstyle'\n"
 
-#: sunrpc/rpc_main.c:1411
+#: sunrpc/rpc_main.c:1429
 #, c-format
 msgid "\"infile\" is required for template generation flags.\n"
-msgstr "\"invoerbestand\" is vereist voor sjabloonaanmaakopties.\n"
+msgstr "Bij sjabloonaanmaakopties is een invoerbestand vereist\n"
 
-#: sunrpc/rpc_main.c:1416
+#: sunrpc/rpc_main.c:1434
 #, c-format
 msgid "Cannot have more than one file generation flag!\n"
-msgstr "Kan niet meer dan één bestandsgenereeroptie hebben!\n"
+msgstr "Meer dan één bestandsaanmaakoptie is niet mogelijk\n"
 
-#: sunrpc/rpc_main.c:1425
+#: sunrpc/rpc_main.c:1443
 #, c-format
 msgid "usage: %s infile\n"
-msgstr "gebruik: %s invoerbestand\n"
+msgstr "Gebruik:  %s invoerbestand\n"
 
-#: sunrpc/rpc_main.c:1426
+#: sunrpc/rpc_main.c:1444
 #, c-format
 msgid "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] infile\n"
-msgstr "\t%s [-abkCLNTM][-Dnaam[=waarde]] [-i grootte] [-I [-K seconden]] [-Y pad] invoerbestand\n"
+msgstr ""
+"          %s [-abkCLNTM] [-Dnaam[=waarde]] [-i grootte]\n"
+"              [-I [-K seconden]] [-Y pad] invoerbestand\n"
 
-#: sunrpc/rpc_main.c:1428
+#: sunrpc/rpc_main.c:1446
 #, c-format
 msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
-msgstr "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o uitvoerbestand] [invoerbestand]\n"
+msgstr ""
+"          %s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm]\n"
+"              [-o uitvoerbestand] [invoerbestand]\n"
 
-#: sunrpc/rpc_main.c:1430
+#: sunrpc/rpc_main.c:1448
 #, c-format
 msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
-msgstr "\t%s [-s netsoort]* [-o uitvoerbestand] [invoerbestand]\n"
+msgstr "          %s [-s netsoort]* [-o uitvoerbestand] [invoerbestand]\n"
 
-#: sunrpc/rpc_main.c:1431
+#: sunrpc/rpc_main.c:1449
 #, c-format
 msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
-msgstr "\t%s [-n netid]* [-o uitvoerbestand] [invoerbestand]\n"
+msgstr "          %s [-n netid]* [-o uitvoerbestand] [invoerbestand]\n"
 
-#: sunrpc/rpc_scan.c:116
+#: sunrpc/rpc_scan.c:114
 msgid "constant or identifier expected"
-msgstr "constante of identificeerder verwacht"
+msgstr "een constante of een naam werd verwacht"
 
-#: sunrpc/rpc_scan.c:312
+#: sunrpc/rpc_scan.c:310
 msgid "illegal character in file: "
 msgstr "ongeldig teken in bestand: "
 
-#: sunrpc/rpc_scan.c:351 sunrpc/rpc_scan.c:377
+#: sunrpc/rpc_scan.c:349 sunrpc/rpc_scan.c:375
 msgid "unterminated string constant"
-msgstr "onbepaalde tekenreeksconstante"
+msgstr "onafgesloten tekenreeksconstante"
 
-#: sunrpc/rpc_scan.c:383
+#: sunrpc/rpc_scan.c:381
 msgid "empty char string"
 msgstr "lege tekenreeks"
 
-#: sunrpc/rpc_scan.c:525 sunrpc/rpc_scan.c:535
+#: sunrpc/rpc_scan.c:523 sunrpc/rpc_scan.c:533
 msgid "preprocessor error"
-msgstr "voorverwerker fout"
+msgstr "voorverwerkingsfout"
 
 #: sunrpc/rpcinfo.c:237 sunrpc/rpcinfo.c:383
 #, c-format
@@ -4267,15 +4880,15 @@ msgstr "programma %lu versie %lu is gereed en wacht\n"
 
 #: sunrpc/rpcinfo.c:556 sunrpc/rpcinfo.c:563
 msgid "rpcinfo: can't contact portmapper"
-msgstr "rpcinfo: kan geen contact maken met poortvertaler (portmapper)"
+msgstr "rpcinfo: kan geen contact maken met poortvertaler"
 
 #: sunrpc/rpcinfo.c:570
 msgid "No remote programs registered.\n"
-msgstr "Geen programma's-op-afstand geregistreerd.\n"
+msgstr "Er zijn geen programma's van elders geregistreerd.\n"
 
 #: sunrpc/rpcinfo.c:574
 msgid "   program vers proto   port\n"
-msgstr "   programma versie protocol poort\n"
+msgstr "   program.vers.protocl.poort\n"
 
 #: sunrpc/rpcinfo.c:613
 msgid "(unknown)"
@@ -4284,1720 +4897,1646 @@ msgstr "(onbekend)"
 #: sunrpc/rpcinfo.c:637
 #, c-format
 msgid "rpcinfo: broadcast failed: %s\n"
-msgstr "rpcinfo: uitzenden mislukt: %s\n"
+msgstr "rpcinfo: broadcast is mislukt: %s\n"
 
 #: sunrpc/rpcinfo.c:658
 msgid "Sorry. You are not root\n"
-msgstr "Sorry, u bent niet root\n"
+msgstr "Sorry, u bent niet root.\n"
 
 #: sunrpc/rpcinfo.c:665
 #, c-format
 msgid "rpcinfo: Could not delete registration for prog %s version %s\n"
-msgstr "rpcinfo: Kon registratie voor programma %s versie %s niet verwijderen\n"
+msgstr "rpcinfo: Kan registratie voor programma %s versie %s niet verwijderen\n"
 
 #: sunrpc/rpcinfo.c:674
 msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
-msgstr "Gebruik: rpcinfo [ -n poortnummer ] -u host programmanummer [ versienummer ]\n"
+msgstr "Gebruik:  rpcinfo [-n poortnummer] -u host programmanummer [versienummer]\n"
 
 #: sunrpc/rpcinfo.c:676
 msgid "       rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n"
-msgstr "       rpcinfo [ -n poortnummer ] -t host programmanummer [ versienummer ]\n"
+msgstr "          rpcinfo [-n poortnummer] -t host programmanummer [versienummer]\n"
 
 #: sunrpc/rpcinfo.c:678
 msgid "       rpcinfo -p [ host ]\n"
-msgstr "       rpcinfo -p [ host ]\n"
+msgstr "          rpcinfo -p [ host ]\n"
 
 #: sunrpc/rpcinfo.c:679
 msgid "       rpcinfo -b prognum versnum\n"
-msgstr "       rpcinfo -b programmanummer versienummer\n"
+msgstr "          rpcinfo -b programmanummer versienummer\n"
 
 #: sunrpc/rpcinfo.c:680
 msgid "       rpcinfo -d prognum versnum\n"
-msgstr "       rpcinfo -d programmanummer versienummer\n"
+msgstr "          rpcinfo -d programmanummer versienummer\n"
 
 #: sunrpc/rpcinfo.c:695
 #, c-format
 msgid "rpcinfo: %s is unknown service\n"
-msgstr "rpcinfo: %s is onbekende dienst\n"
+msgstr "rpcinfo: %s is een onbekende dienst\n"
 
 #: sunrpc/rpcinfo.c:732
 #, c-format
 msgid "rpcinfo: %s is unknown host\n"
-msgstr "rpcinfo: %s is onbekende host\n"
+msgstr "rpcinfo: %s is een onbekende host\n"
 
 #: sunrpc/svc_run.c:76
 msgid "svc_run: - poll failed"
-msgstr "svc_run: - polsen mislukt"
+msgstr "svc_run.c: polsen is mislukt"
 
 #: sunrpc/svc_simple.c:87
 #, c-format
 msgid "can't reassign procedure number %ld\n"
 msgstr "kan procedurenummer %ld niet opnieuw toewijzen\n"
 
-#: sunrpc/svc_simple.c:96
+#: sunrpc/svc_simple.c:97
 msgid "couldn't create an rpc server\n"
-msgstr "kon geen rpc-server aanmaken\n"
+msgstr "kan geen RPC-server aanmaken\n"
 
-#: sunrpc/svc_simple.c:104
+#: sunrpc/svc_simple.c:105
 #, c-format
 msgid "couldn't register prog %ld vers %ld\n"
-msgstr "kon programma %ld versie %ld niet registreren\n"
+msgstr "kan programma %ld (versie %ld) niet registreren\n"
 
-#: sunrpc/svc_simple.c:111
+#: sunrpc/svc_simple.c:113
 msgid "registerrpc: out of memory\n"
-msgstr "registerrpc: geheugentekort\n"
+msgstr "registerrpc(): onvoldoende geheugen\n"
 
-#: sunrpc/svc_simple.c:175
+#: sunrpc/svc_simple.c:173
 #, c-format
 msgid "trouble replying to prog %d\n"
 msgstr "problemen bij antwoorden aan programma %d\n"
 
-#: sunrpc/svc_simple.c:183
+#: sunrpc/svc_simple.c:182
 #, c-format
 msgid "never registered prog %d\n"
-msgstr "programma %d nooit geregistreerd\n"
+msgstr "programma %d is nooit geregistreerd\n"
 
 #: sunrpc/svc_tcp.c:155
 msgid "svc_tcp.c - tcp socket creation problem"
-msgstr "svc_tcp.c - probleem bij aanmaken TCP socket"
+msgstr "svc_tcp.c: probleem bij aanmaken van TCP-socket"
 
 #: sunrpc/svc_tcp.c:170
 msgid "svc_tcp.c - cannot getsockname or listen"
-msgstr "svc_tcp.c - kan niet getsockname() of listen()"
+msgstr "svc_tcp.c: getsockname() en listen() zijn mislukt"
 
-#: sunrpc/svc_tcp.c:181 sunrpc/svc_tcp.c:184
+#: sunrpc/svc_tcp.c:179
 msgid "svctcp_create: out of memory\n"
-msgstr "svctcp_create: geheugentekort\n"
+msgstr "svctcp_create(): onvoldoende geheugen\n"
 
-#: sunrpc/svc_tcp.c:225 sunrpc/svc_tcp.c:228
+#: sunrpc/svc_tcp.c:218
 msgid "svc_tcp: makefd_xprt: out of memory\n"
-msgstr "svc_tcp: makefd_xprt: geheugentekort\n"
+msgstr "svc_tcp.c: makefd_xprt(): onvoldoende geheugen\n"
 
 #: sunrpc/svc_udp.c:128
 msgid "svcudp_create: socket creation problem"
-msgstr "svcudp_create: probleem bij aanmaken socket"
+msgstr "svcudp_create(): probleem bij aanmaken van socket"
 
 #: sunrpc/svc_udp.c:142
 msgid "svcudp_create - cannot getsockname"
-msgstr "svcudp_create - getsockname aanroep mislukt"
+msgstr "svcudp_create(): getsockname() is mislukt"
 
-#: sunrpc/svc_udp.c:154 sunrpc/svc_udp.c:157
+#: sunrpc/svc_udp.c:152
 msgid "svcudp_create: out of memory\n"
-msgstr "svcudp_create: geheugentekort\n"
+msgstr "svcudp_create(): onvoldoende geheugen\n"
 
-#: sunrpc/svc_udp.c:182 sunrpc/svc_udp.c:185
+#: sunrpc/svc_udp.c:174
 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
-msgstr "svcudp_create: xp_pad is te klein voor IP_PKTINFO\n"
+msgstr "svcudp_create(): 'xp_pad' is te klein voor 'IP_PKTINFO'\n"
 
-#: sunrpc/svc_udp.c:493
+#: sunrpc/svc_udp.c:474
 msgid "enablecache: cache already enabled"
-msgstr "enablecache: buffering staat al aan"
+msgstr "enablecache(): buffering staat al aan"
 
-#: sunrpc/svc_udp.c:499
+#: sunrpc/svc_udp.c:480
 msgid "enablecache: could not allocate cache"
-msgstr "enablecache: kon buffer niet toewijzen"
+msgstr "enablecache(): kan geen geheugen voor cache reserveren"
 
-#: sunrpc/svc_udp.c:507
+#: sunrpc/svc_udp.c:489
 msgid "enablecache: could not allocate cache data"
-msgstr "enablecache: kon buffergegevens niet toewijzen"
+msgstr "enablecache(): kan geen geheugen voor cachegegevens reserveren"
 
-#: sunrpc/svc_udp.c:514
+#: sunrpc/svc_udp.c:497
 msgid "enablecache: could not allocate cache fifo"
-msgstr "enablecache: kon buffer fifo niet toewijzen"
+msgstr "enablecache(): kan geen geheugen voor cache-fifo reserveren"
 
-#: sunrpc/svc_udp.c:550
+#: sunrpc/svc_udp.c:532
 msgid "cache_set: victim not found"
-msgstr "cache_set: slachtoffer niet gevonden"
+msgstr "cache_set(): kan het herbruikbare item niet vinden"
 
-#: sunrpc/svc_udp.c:561
+#: sunrpc/svc_udp.c:543
 msgid "cache_set: victim alloc failed"
-msgstr "cache_set: toewijzen slachtoffer mislukt"
+msgstr "cache_set(): kan geen geheugen reserveren voor nieuw item"
 
-#: sunrpc/svc_udp.c:567
+#: sunrpc/svc_udp.c:550
 msgid "cache_set: could not allocate new rpc_buffer"
-msgstr "cache_set: kon nieuwe rpc_buffer niet toewijzen"
+msgstr "cache_set(): kan geen geheugen reserveren voor nieuw RPC-buffer"
 
 #: sunrpc/svc_unix.c:150
 msgid "svc_unix.c - AF_UNIX socket creation problem"
-msgstr "svc_unix.c - probleem bij aanmaken AF_UNIX socket"
+msgstr "svc_unix.c: probleem bij aanmaken van AF_UNIX-socket"
 
 #: sunrpc/svc_unix.c:166
 msgid "svc_unix.c - cannot getsockname or listen"
-msgstr "svc_unix.c - kan niet getsockname() of listen()"
+msgstr "svc_unix.c: getsockname() en listen() zijn mislukt"
 
-#: sunrpc/svc_unix.c:178 sunrpc/svc_unix.c:181
+#: sunrpc/svc_unix.c:176
 msgid "svcunix_create: out of memory\n"
-msgstr "svcunix_create: geheugentekort\n"
+msgstr "svcunix_create(): onvoldoende geheugen\n"
 
-#: sunrpc/svc_unix.c:222 sunrpc/svc_unix.c:225
+#: sunrpc/svc_unix.c:215
 msgid "svc_unix: makefd_xprt: out of memory\n"
-msgstr "svc_unix: makefd_xprt: geheugentekort\n"
+msgstr "svc_unix.c: makefd_xprt(): onvoldoende geheugen\n"
 
-#: sunrpc/xdr.c:570 sunrpc/xdr.c:573
+#: sunrpc/xdr.c:566
 msgid "xdr_bytes: out of memory\n"
-msgstr "xdr_bytes: geheugentekort\n"
+msgstr "xdr_bytes(): onvoldoende geheugen\n"
 
-#: sunrpc/xdr.c:728 sunrpc/xdr.c:731
+#: sunrpc/xdr.c:718
 msgid "xdr_string: out of memory\n"
-msgstr "xdr_string: geheugentekort\n"
+msgstr "xdr_string(): onvoldoende geheugen\n"
 
-#: sunrpc/xdr_array.c:111 sunrpc/xdr_array.c:114
+#: sunrpc/xdr_array.c:106
 msgid "xdr_array: out of memory\n"
-msgstr "xdr_array: geheugentekort\n"
+msgstr "xdr_array(): onvoldoende geheugen\n"
 
-#: sunrpc/xdr_rec.c:158 sunrpc/xdr_rec.c:161
+#: sunrpc/xdr_rec.c:156
 msgid "xdrrec_create: out of memory\n"
-msgstr "xdrrec_create: geheugentekort\n"
+msgstr "xdrrec_create(): onvoldoende geheugen\n"
 
-#: sunrpc/xdr_ref.c:88 sunrpc/xdr_ref.c:91
+#: sunrpc/xdr_ref.c:86
 msgid "xdr_reference: out of memory\n"
-msgstr "xdr_reference: geheugentekort\n"
+msgstr "xdr_reference(): onvoldoende geheugen\n"
 
-#: nis/nis_callback.c:189
-msgid "unable to free arguments"
-msgstr "kan argumenten niet vrijgeven"
+#: sysdeps/generic/siglist.h:29 sysdeps/unix/siglist.c:27
+msgid "Hangup"
+msgstr "Ophangen"
 
-#: nis/nis_error.c:30
-msgid "Probable success"
-msgstr "Waarschijnlijk succes"
+#: sysdeps/generic/siglist.h:30 sysdeps/unix/siglist.c:28
+msgid "Interrupt"
+msgstr "Onderbreken"
 
-#: nis/nis_error.c:31
-msgid "Not found"
-msgstr "Niet gevonden"
+#: sysdeps/generic/siglist.h:31 sysdeps/unix/siglist.c:29
+msgid "Quit"
+msgstr "Afsluiten"
 
-#: nis/nis_error.c:32
-msgid "Probably not found"
-msgstr "Waarschijnlijk niet gevonden"
+#: sysdeps/generic/siglist.h:32 sysdeps/unix/siglist.c:30
+msgid "Illegal instruction"
+msgstr "Ongeldige instructie"
 
-#: nis/nis_error.c:33
-msgid "Cache expired"
-msgstr "Buffer verlopen"
+#: sysdeps/generic/siglist.h:33 sysdeps/unix/siglist.c:31
+msgid "Trace/breakpoint trap"
+msgstr "Traceer/breekpunt-instructie"
 
-#: nis/nis_error.c:34
-msgid "NIS+ servers unreachable"
-msgstr "NIS+ servers onbereikbaar"
+#: sysdeps/generic/siglist.h:34
+msgid "Aborted"
+msgstr "Afgebroken"
 
-#: nis/nis_error.c:35
-msgid "Unknown object"
-msgstr "Onbekend objekt"
+#: sysdeps/generic/siglist.h:35 sysdeps/unix/siglist.c:34
+msgid "Floating point exception"
+msgstr "Drijvende-komma-berekeningsfout"
 
-#: nis/nis_error.c:36
-msgid "Server busy, try again"
-msgstr "Server bezig, probeer nogmaals"
+#: sysdeps/generic/siglist.h:36 sysdeps/unix/siglist.c:35
+msgid "Killed"
+msgstr "Geëlimineerd"
 
-#: nis/nis_error.c:37
-msgid "Generic system error"
-msgstr "Algemene systeemfout"
+#: sysdeps/generic/siglist.h:37 sysdeps/unix/siglist.c:36
+msgid "Bus error"
+msgstr "Busfout"
 
-#: nis/nis_error.c:38
-msgid "First/next chain broken"
-msgstr "Eerst/volgende ketting gebroken"
+#: sysdeps/generic/siglist.h:38 sysdeps/unix/siglist.c:37
+msgid "Segmentation fault"
+msgstr "Segmentatiefout"
 
-#: nis/nis_error.c:41
-msgid "Name not served by this server"
-msgstr "Naam wordt door deze server niet aangeboden"
+#. TRANS Broken pipe; there is no process reading from the other end of a pipe.
+#. TRANS Every library function that returns this error code also generates a
+#. TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
+#. TRANS or blocked.  Thus, your program will never actually see @code{EPIPE}
+#. TRANS unless it has handled or blocked @code{SIGPIPE}.
+#: sysdeps/generic/siglist.h:39 sysdeps/gnu/errlist.c:359
+#: sysdeps/unix/siglist.c:39
+msgid "Broken pipe"
+msgstr "Gebroken pijp"
 
-#: nis/nis_error.c:42
-msgid "Server out of memory"
-msgstr "Server heeft geheugentekort"
+#: sysdeps/generic/siglist.h:40 sysdeps/unix/siglist.c:40
+msgid "Alarm clock"
+msgstr "Alarmklok"
 
-#: nis/nis_error.c:43
-msgid "Object with same name exists"
-msgstr "Objekt met dezelfde naam bestaat"
+#: sysdeps/generic/siglist.h:41 sysdeps/unix/siglist.c:41
+msgid "Terminated"
+msgstr "Afgesloten"
 
-#: nis/nis_error.c:44
-msgid "Not master server for this domain"
-msgstr "Niet hoofdserver voor dit domein"
+#: sysdeps/generic/siglist.h:42 sysdeps/unix/siglist.c:42
+msgid "Urgent I/O condition"
+msgstr "Spoedeisende I/O-toestand"
 
-#: nis/nis_error.c:45
-msgid "Invalid object for operation"
-msgstr "Ongeldig objekt voor bewerking"
+#: sysdeps/generic/siglist.h:43 sysdeps/unix/siglist.c:43
+msgid "Stopped (signal)"
+msgstr "Gestopt (signaal)"
 
-#: nis/nis_error.c:46
-msgid "Malformed name, or illegal name"
-msgstr "Misvormde of ongeldige naam"
+#: sysdeps/generic/siglist.h:44 sysdeps/unix/siglist.c:44
+msgid "Stopped"
+msgstr "Gestopt"
 
-#: nis/nis_error.c:47
-msgid "Unable to create callback"
-msgstr "Kan geen terugaanroep aanmaken"
+#: sysdeps/generic/siglist.h:45 sysdeps/unix/siglist.c:45
+msgid "Continued"
+msgstr "Doorgegaan"
 
-#: nis/nis_error.c:48
-msgid "Results sent to callback proc"
-msgstr "Resultaten verzonden aan terugaanroep proces"
+#: sysdeps/generic/siglist.h:46 sysdeps/unix/siglist.c:46
+msgid "Child exited"
+msgstr "Kind is afgesloten"
 
-#: nis/nis_error.c:49
-msgid "Not found, no such name"
-msgstr "Niet gevonden, onbekende naam"
+#: sysdeps/generic/siglist.h:47 sysdeps/unix/siglist.c:47
+msgid "Stopped (tty input)"
+msgstr "Gestopt (tty-invoer)"
 
-#: nis/nis_error.c:50
-msgid "Name/entry isn't unique"
-msgstr "Naam/ingang is niet uniek"
+#: sysdeps/generic/siglist.h:48 sysdeps/unix/siglist.c:48
+msgid "Stopped (tty output)"
+msgstr "Gestopt (tty-uitvoer)"
 
-#: nis/nis_error.c:51
-msgid "Modification failed"
-msgstr "Wijziging mislukt"
+#: sysdeps/generic/siglist.h:49 sysdeps/unix/siglist.c:49
+msgid "I/O possible"
+msgstr "I/O is mogelijk"
 
-#: nis/nis_error.c:52
-msgid "Database for table does not exist"
-msgstr "Gegevensbank voor tabel bestaat niet"
+#: sysdeps/generic/siglist.h:50 sysdeps/unix/siglist.c:50
+msgid "CPU time limit exceeded"
+msgstr "Limiet op processortijd is overschreden"
 
-#: nis/nis_error.c:53
-msgid "Entry/table type mismatch"
-msgstr "Ingang/tabelsoort komt niet overeen"
+#: sysdeps/generic/siglist.h:51 sysdeps/unix/siglist.c:51
+msgid "File size limit exceeded"
+msgstr "Limiet op bestandsgrootte is overschreden"
 
-#: nis/nis_error.c:54
-msgid "Link points to illegal name"
-msgstr "Koppeling wijst naar ongeldige naam"
+#: sysdeps/generic/siglist.h:52 sysdeps/unix/siglist.c:52
+msgid "Virtual timer expired"
+msgstr "Virtuele tijdopnemer is verlopen"
 
-#: nis/nis_error.c:55
-msgid "Partial success"
-msgstr "Gedeeltelijk succes"
+#: sysdeps/generic/siglist.h:53 sysdeps/unix/siglist.c:53
+msgid "Profiling timer expired"
+msgstr "Tijdopnemer voor analyse is verlopen"
 
-#: nis/nis_error.c:56
-msgid "Too many attributes"
-msgstr "Teveel kenmerken"
+#: sysdeps/generic/siglist.h:54 sysdeps/unix/siglist.c:54
+msgid "Window changed"
+msgstr "Venster is veranderd"
 
-#: nis/nis_error.c:57
-msgid "Error in RPC subsystem"
-msgstr "Fout in RPC-deelsysteem"
+#: sysdeps/generic/siglist.h:55 sysdeps/unix/siglist.c:56
+msgid "User defined signal 1"
+msgstr "Eerste door gebruiker gedefinieerd signaal"
 
-#: nis/nis_error.c:58
-msgid "Missing or malformed attribute"
-msgstr "Ontbrekend of misvormd kenmerk"
+#: sysdeps/generic/siglist.h:56 sysdeps/unix/siglist.c:57
+msgid "User defined signal 2"
+msgstr "Tweede door gebruiker gedefinieerd signaal"
 
-#: nis/nis_error.c:59
-msgid "Named object is not searchable"
-msgstr "Genaamd objekt is niet doorzoekbaar"
+#: sysdeps/generic/siglist.h:60 sysdeps/unix/siglist.c:33
+msgid "EMT trap"
+msgstr "EMT-instructie"
 
-#: nis/nis_error.c:60
-msgid "Error while talking to callback proc"
-msgstr "Fout bij praten met terugaanroep proces"
+#: sysdeps/generic/siglist.h:63 sysdeps/unix/siglist.c:38
+msgid "Bad system call"
+msgstr "Ongeldige systeemaanroep"
 
-#: nis/nis_error.c:61
-msgid "Non NIS+ namespace encountered"
-msgstr "Niet-NIS+ naamruimte tegengekomen"
+#: sysdeps/generic/siglist.h:66
+msgid "Stack fault"
+msgstr "Stackfout"
 
-#: nis/nis_error.c:62
-msgid "Illegal object type for operation"
-msgstr "Ongeldige objektsoort voor bewerking"
+#: sysdeps/generic/siglist.h:69
+msgid "Information request"
+msgstr "Verzoek om informatie"
 
-#: nis/nis_error.c:63
-msgid "Passed object is not the same object on server"
-msgstr "Meegegeven objekt is niet hetzelfde objekt op de server"
+#: sysdeps/generic/siglist.h:71
+msgid "Power failure"
+msgstr "Stroomstoring"
 
-#: nis/nis_error.c:64
-msgid "Modify operation failed"
-msgstr "Wijzigingsbewerking mislukt"
+#: sysdeps/generic/siglist.h:74 sysdeps/unix/siglist.c:55
+msgid "Resource lost"
+msgstr "Hulpbron verloren"
 
-#: nis/nis_error.c:65
-msgid "Query illegal for named table"
-msgstr "Zoekopdracht ongeldig voor genoemde tabel"
+#. TRANS Operation not permitted; only the owner of the file (or other resource)
+#. TRANS or processes with special privileges can perform the operation.
+#: sysdeps/gnu/errlist.c:25
+msgid "Operation not permitted"
+msgstr "Bewerking niet toegestaan"
 
-#: nis/nis_error.c:66
-msgid "Attempt to remove a non-empty table"
-msgstr "Poging een niet-lege tabel te verwijderen"
+#. TRANS No process matches the specified process ID.
+#: sysdeps/gnu/errlist.c:45
+msgid "No such process"
+msgstr "Proces bestaat niet"
 
-#: nis/nis_error.c:67
-msgid "Error in accessing NIS+ cold start file.  Is NIS+ installed?"
-msgstr "Fout bij toegang tot NIS+ koude-start bestand.  Is NIS+ wel geïnstalleerd?"
+#. TRANS Interrupted function call; an asynchronous signal occurred and prevented
+#. TRANS completion of the call.  When this happens, you should try the call
+#. TRANS again.
+#. TRANS
+#. TRANS You can choose to have functions resume after a signal that is handled,
+#. TRANS rather than failing with @code{EINTR}; see @ref{Interrupted
+#. TRANS Primitives}.
+#: sysdeps/gnu/errlist.c:60
+msgid "Interrupted system call"
+msgstr "Onderbroken systeemaanroep"
 
-#: nis/nis_error.c:68
-msgid "Full resync required for directory"
-msgstr "Volledige hersynchronisatie vereist voor map"
+#. TRANS Input/output error; usually used for physical read or write errors.
+#: sysdeps/gnu/errlist.c:69
+msgid "Input/output error"
+msgstr "Invoer-/uitvoerfout"
 
-#: nis/nis_error.c:69
-msgid "NIS+ operation failed"
-msgstr "NIS+ bewerking mislukt"
+#. TRANS No such device or address.  The system tried to use the device
+#. TRANS represented by a file you specified, and it couldn't find the device.
+#. TRANS This can mean that the device file was installed incorrectly, or that
+#. TRANS the physical device is missing or not correctly attached to the
+#. TRANS computer.
+#: sysdeps/gnu/errlist.c:82
+msgid "No such device or address"
+msgstr "Apparaat of adres bestaat niet"
 
-#: nis/nis_error.c:70
-msgid "NIS+ service is unavailable or not installed"
-msgstr "NIS+ dienst is onbeschikbaar of niet geïnstalleerd"
+#. TRANS Argument list too long; used when the arguments passed to a new program
+#. TRANS being executed with one of the @code{exec} functions (@pxref{Executing a
+#. TRANS File}) occupy too much memory space.  This condition never arises in the
+#. TRANS GNU system.
+#: sysdeps/gnu/errlist.c:94
+msgid "Argument list too long"
+msgstr "Argumentenlijst is te lang"
 
-#: nis/nis_error.c:71
-msgid "Yes, 42 is the meaning of life"
-msgstr "Dat is zeker waar, 42 is de betekenis van het leven"
+#. TRANS Invalid executable file format.  This condition is detected by the
+#. TRANS @code{exec} functions; see @ref{Executing a File}.
+#: sysdeps/gnu/errlist.c:104
+msgid "Exec format error"
+msgstr "Verkeerd uitvoerbaar bestand"
 
-#: nis/nis_error.c:72
-msgid "Unable to authenticate NIS+ server"
-msgstr "Kan niet authentificeren met NIS+-server"
+#. TRANS Bad file descriptor; for example, I/O on a descriptor that has been
+#. TRANS closed or reading from a descriptor open only for writing (or vice
+#. TRANS versa).
+#: sysdeps/gnu/errlist.c:115
+msgid "Bad file descriptor"
+msgstr "Ongeldige bestandsdescriptor"
 
-#: nis/nis_error.c:73
-msgid "Unable to authenticate NIS+ client"
-msgstr "Kan niet authentificeren met NIS+-client"
+#. TRANS There are no child processes.  This error happens on operations that are
+#. TRANS supposed to manipulate child processes, when there aren't any processes
+#. TRANS to manipulate.
+#: sysdeps/gnu/errlist.c:126
+msgid "No child processes"
+msgstr "Geen kindprocessen"
 
-#: nis/nis_error.c:74
-msgid "No file space on server"
-msgstr "Geen schijfruimte op server"
+#. TRANS Deadlock avoided; allocating a system resource would have resulted in a
+#. TRANS deadlock situation.  The system does not guarantee that it will notice
+#. TRANS all such situations.  This error means you got lucky and the system
+#. TRANS noticed; it might just hang.  @xref{File Locks}, for an example.
+#: sysdeps/gnu/errlist.c:138
+msgid "Resource deadlock avoided"
+msgstr "Volledige blokkering van hulpbron is omzeild"
 
-#: nis/nis_error.c:75
-msgid "Unable to create process on server"
-msgstr "Kan niet proces aanmaken op server"
+#. TRANS No memory available.  The system cannot allocate more virtual memory
+#. TRANS because its capacity is full.
+#: sysdeps/gnu/errlist.c:148
+msgid "Cannot allocate memory"
+msgstr "Kan geen geheugen meer reserveren"
 
-#: nis/nis_error.c:76
-msgid "Master server busy, full dump rescheduled."
-msgstr "Hoofdserver bezig, volledig ophalen uitgesteld."
+#. TRANS Bad address; an invalid pointer was detected.
+#. TRANS In the GNU system, this error never happens; you get a signal instead.
+#: sysdeps/gnu/errlist.c:167
+msgid "Bad address"
+msgstr "Ongeldig adres"
 
-#: nis/nis_local_names.c:126
-#, c-format
-msgid "LOCAL entry for UID %d in directory %s not unique\n"
-msgstr "LOCAL-ingang voor UID %d in map %s is niet uniek\n"
+#. TRANS A file that isn't a block special file was given in a situation that
+#. TRANS requires one.  For example, trying to mount an ordinary file as a file
+#. TRANS system in Unix gives this error.
+#: sysdeps/gnu/errlist.c:178
+msgid "Block device required"
+msgstr "Blokapparaat vereist"
 
-#: nis/nis_print.c:51
-msgid "UNKNOWN"
-msgstr "ONBEKEND"
+#. TRANS Resource busy; a system resource that can't be shared is already in use.
+#. TRANS For example, if you try to delete a file that is the root of a currently
+#. TRANS mounted filesystem, you get this error.
+#: sysdeps/gnu/errlist.c:189
+msgid "Device or resource busy"
+msgstr "Apparaat of hulpbron is bezig"
 
-#: nis/nis_print.c:109
-msgid "BOGUS OBJECT\n"
-msgstr "SLECHT OBJEKT\n"
+#. TRANS File exists; an existing file was specified in a context where it only
+#. TRANS makes sense to specify a new file.
+#: sysdeps/gnu/errlist.c:199
+msgid "File exists"
+msgstr "Bestand bestaat al"
 
-#: nis/nis_print.c:112
-msgid "NO OBJECT\n"
-msgstr "GEEN OBJEKT\n"
+#. TRANS An attempt to make an improper link across file systems was detected.
+#. TRANS This happens not only when you use @code{link} (@pxref{Hard Links}) but
+#. TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}).
+#: sysdeps/gnu/errlist.c:210
+msgid "Invalid cross-device link"
+msgstr "Ongeldige koppeling tussen apparaten"
 
-#: nis/nis_print.c:115
-msgid "DIRECTORY\n"
-msgstr "MAP\n"
+#. TRANS The wrong type of device was given to a function that expects a
+#. TRANS particular sort of device.
+#: sysdeps/gnu/errlist.c:220
+msgid "No such device"
+msgstr "Onjuist apparaat"
 
-#: nis/nis_print.c:118
-msgid "GROUP\n"
-msgstr "GROEP\n"
+#. TRANS A file that isn't a directory was specified when a directory is required.
+#: sysdeps/gnu/errlist.c:229
+msgid "Not a directory"
+msgstr "Niet een map"
 
-#: nis/nis_print.c:121
-msgid "TABLE\n"
-msgstr "TABEL\n"
+#. TRANS File is a directory; you cannot open a directory for writing,
+#. TRANS or create or remove hard links to it.
+#: sysdeps/gnu/errlist.c:239
+msgid "Is a directory"
+msgstr "Is een map"
 
-#: nis/nis_print.c:124
-msgid "ENTRY\n"
-msgstr "INGANG\n"
+#. TRANS Invalid argument.  This is used to indicate various kinds of problems
+#. TRANS with passing the wrong argument to a library function.
+#: sysdeps/gnu/errlist.c:249
+msgid "Invalid argument"
+msgstr "Ongeldig argument"
 
-#: nis/nis_print.c:127
-msgid "LINK\n"
-msgstr "KOPPELING\n"
+#. TRANS The current process has too many files open and can't open any more.
+#. TRANS Duplicate descriptors do count toward this limit.
+#. TRANS
+#. TRANS In BSD and GNU, the number of open files is controlled by a resource
+#. TRANS limit that can usually be increased.  If you get this error, you might
+#. TRANS want to increase the @code{RLIMIT_NOFILE} limit or make it unlimited;
+#. TRANS @pxref{Limits on Resources}.
+#: sysdeps/gnu/errlist.c:264
+msgid "Too many open files"
+msgstr "Te veel open bestanden"
 
-#: nis/nis_print.c:130
-msgid "PRIVATE\n"
-msgstr "PRIVÉ\n"
+#. TRANS There are too many distinct file openings in the entire system.  Note
+#. TRANS that any number of linked channels count as just one file opening; see
+#. TRANS @ref{Linked Channels}.  This error never occurs in the GNU system.
+#: sysdeps/gnu/errlist.c:275
+msgid "Too many open files in system"
+msgstr "Te veel open bestanden in systeem"
 
-#: nis/nis_print.c:133
-msgid "(Unknown object)\n"
-msgstr "(Onbekend objekt)\n"
+#. TRANS Inappropriate I/O control operation, such as trying to set terminal
+#. TRANS modes on an ordinary file.
+#: sysdeps/gnu/errlist.c:285
+msgid "Inappropriate ioctl for device"
+msgstr "Ongepaste ioctl() voor apparaat"
 
-#: nis/nis_print.c:166
-#, c-format
-msgid "Name : `%s'\n"
-msgstr "Naam : `%s'\n"
+#. TRANS An attempt to execute a file that is currently open for writing, or
+#. TRANS write to a file that is currently being executed.  Often using a
+#. TRANS debugger to run a program is considered having it open for writing and
+#. TRANS will cause this error.  (The name stands for ``text file busy''.)  This
+#. TRANS is not an error in the GNU system; the text is copied as necessary.
+#: sysdeps/gnu/errlist.c:298
+msgid "Text file busy"
+msgstr "Tekstbestand is bezig"
 
-#: nis/nis_print.c:167
-#, c-format
-msgid "Type : %s\n"
-msgstr "Soort : %s\n"
+#. TRANS File too big; the size of a file would be larger than allowed by the system.
+#: sysdeps/gnu/errlist.c:307
+msgid "File too large"
+msgstr "Bestand is te groot"
 
-#: nis/nis_print.c:172
-msgid "Master Server :\n"
-msgstr "Hoofdserver :\n"
+#. TRANS No space left on device; write operation on a file failed because the
+#. TRANS disk is full.
+#: sysdeps/gnu/errlist.c:317
+msgid "No space left on device"
+msgstr "Geen ruimte meer over op apparaat"
 
-#: nis/nis_print.c:174
-msgid "Replicate :\n"
-msgstr ""
+#. TRANS Invalid seek operation (such as on a pipe).
+#: sysdeps/gnu/errlist.c:326
+msgid "Illegal seek"
+msgstr "Ongeldige 'seek'-opdracht"
 
-#: nis/nis_print.c:175
-#, c-format
-msgid "\tName       : %s\n"
-msgstr "\tNaam       : %s\n"
+#. TRANS An attempt was made to modify something on a read-only file system.
+#: sysdeps/gnu/errlist.c:335
+msgid "Read-only file system"
+msgstr "Bestandssysteem is alleen-lezen"
 
-#: nis/nis_print.c:176
-msgid "\tPublic Key : "
-msgstr "\tOpenbare sleutel : "
+#. TRANS Too many links; the link count of a single file would become too large.
+#. TRANS @code{rename} can cause this error if the file being renamed already has
+#. TRANS as many links as it can take (@pxref{Renaming Files}).
+#: sysdeps/gnu/errlist.c:346
+msgid "Too many links"
+msgstr "Te veel koppelingen"
 
-#: nis/nis_print.c:180
-msgid "None.\n"
-msgstr "Geen.\n"
+#. TRANS Domain error; used by mathematical functions when an argument value does
+#. TRANS not fall into the domain over which the function is defined.
+#: sysdeps/gnu/errlist.c:369
+msgid "Numerical argument out of domain"
+msgstr "Numeriek argument valt buiten domein"
 
-#: nis/nis_print.c:183
-#, c-format
-msgid "Diffie-Hellmann (%d bits)\n"
-msgstr "Diffie-Hellmann (%d bits)\n"
+#. TRANS Range error; used by mathematical functions when the result value is
+#. TRANS not representable because of overflow or underflow.
+#: sysdeps/gnu/errlist.c:379
+msgid "Numerical result out of range"
+msgstr "Numeriek resultaat valt buiten bereik"
 
-#: nis/nis_print.c:188
-#, c-format
-msgid "RSA (%d bits)\n"
-msgstr "RSA (%d bits)\n"
+#. TRANS Resource temporarily unavailable; the call might work if you try again
+#. TRANS later.  The macro @code{EWOULDBLOCK} is another name for @code{EAGAIN};
+#. TRANS they are always the same in the GNU C library.
+#. TRANS
+#. TRANS This error can happen in a few different situations:
+#. TRANS
+#. TRANS @itemize @bullet
+#. TRANS @item
+#. TRANS An operation that would block was attempted on an object that has
+#. TRANS non-blocking mode selected.  Trying the same operation again will block
+#. TRANS until some external condition makes it possible to read, write, or
+#. TRANS connect (whatever the operation).  You can use @code{select} to find out
+#. TRANS when the operation will be possible; @pxref{Waiting for I/O}.
+#. TRANS
+#. TRANS @strong{Portability Note:} In many older Unix systems, this condition
+#. TRANS was indicated by @code{EWOULDBLOCK}, which was a distinct error code
+#. TRANS different from @code{EAGAIN}.  To make your program portable, you should
+#. TRANS check for both codes and treat them the same.
+#. TRANS
+#. TRANS @item
+#. TRANS A temporary resource shortage made an operation impossible.  @code{fork}
+#. TRANS can return this error.  It indicates that the shortage is expected to
+#. TRANS pass, so your program can try the call again later and it may succeed.
+#. TRANS It is probably a good idea to delay for a few seconds before trying it
+#. TRANS again, to allow time for other processes to release scarce resources.
+#. TRANS Such shortages are usually fairly serious and affect the whole system,
+#. TRANS so usually an interactive program should report the error to the user
+#. TRANS and return to its command loop.
+#. TRANS @end itemize
+#: sysdeps/gnu/errlist.c:416
+msgid "Resource temporarily unavailable"
+msgstr "Hulpbron is tijdelijk onbeschikbaar"
 
-#: nis/nis_print.c:191
-msgid "Kerberos.\n"
-msgstr "Kerberos.\n"
+#. TRANS In the GNU C library, this is another name for @code{EAGAIN} (above).
+#. TRANS The values are always the same, on every operating system.
+#. TRANS
+#. TRANS C libraries in many older Unix systems have @code{EWOULDBLOCK} as a
+#. TRANS separate error code.
+#: sysdeps/gnu/errlist.c:429
+msgid "Operation would block"
+msgstr "Bewerking zou blokkeren"
 
-#: nis/nis_print.c:194
-#, c-format
-msgid "Unknown (type = %d, bits = %d)\n"
-msgstr "Onbekend (soort = %d, bits = %d)\n"
+#. TRANS An operation that cannot complete immediately was initiated on an object
+#. TRANS that has non-blocking mode selected.  Some functions that must always
+#. TRANS block (such as @code{connect}; @pxref{Connecting}) never return
+#. TRANS @code{EAGAIN}.  Instead, they return @code{EINPROGRESS} to indicate that
+#. TRANS the operation has begun and will take some time.  Attempts to manipulate
+#. TRANS the object before the call completes return @code{EALREADY}.  You can
+#. TRANS use the @code{select} function to find out when the pending operation
+#. TRANS has completed; @pxref{Waiting for I/O}.
+#: sysdeps/gnu/errlist.c:445
+msgid "Operation now in progress"
+msgstr "Bewerking is nu bezig"
 
-#: nis/nis_print.c:205
-#, c-format
-msgid "\tUniversal addresses (%u)\n"
-msgstr "\tUniversele adressen (%u)\n"
+#. TRANS An operation is already in progress on an object that has non-blocking
+#. TRANS mode selected.
+#: sysdeps/gnu/errlist.c:455
+msgid "Operation already in progress"
+msgstr "Bewerking is al bezig"
 
-#: nis/nis_print.c:227
-msgid "Time to live : "
-msgstr "Levenstijd : "
+#. TRANS A file that isn't a socket was specified when a socket is required.
+#: sysdeps/gnu/errlist.c:464
+msgid "Socket operation on non-socket"
+msgstr "Socketbewerking op een niet-socket"
 
-#: nis/nis_print.c:229
-msgid "Default Access rights :\n"
-msgstr "Standaard toegangsrechten :\n"
+#. TRANS The size of a message sent on a socket was larger than the supported
+#. TRANS maximum size.
+#: sysdeps/gnu/errlist.c:474
+msgid "Message too long"
+msgstr "Bericht is te lang"
 
-#: nis/nis_print.c:238
-#, c-format
-msgid "\tType         : %s\n"
-msgstr "\tSoort        : %s\n"
+#. TRANS The socket type does not support the requested communications protocol.
+#: sysdeps/gnu/errlist.c:483
+msgid "Protocol wrong type for socket"
+msgstr "Protocol van verkeerde soort voor socket"
 
-#: nis/nis_print.c:239
-msgid "\tAccess rights: "
-msgstr "\tToegangsrechten: "
+#. TRANS You specified a socket option that doesn't make sense for the
+#. TRANS particular protocol being used by the socket.  @xref{Socket Options}.
+#: sysdeps/gnu/errlist.c:493
+msgid "Protocol not available"
+msgstr "Protocol is niet beschikbaar"
 
-#: nis/nis_print.c:252
-msgid "Group Flags :"
-msgstr "Groepaanduidingen :"
+#. TRANS The socket domain does not support the requested communications protocol
+#. TRANS (perhaps because the requested protocol is completely invalid).
+#. TRANS @xref{Creating a Socket}.
+#: sysdeps/gnu/errlist.c:504
+msgid "Protocol not supported"
+msgstr "Protocol wordt niet ondersteund"
 
-#: nis/nis_print.c:255
-msgid ""
-"\n"
-"Group Members :\n"
-msgstr ""
-"\n"
-"Groepsleden :\n"
+#. TRANS The socket type is not supported.
+#: sysdeps/gnu/errlist.c:513
+msgid "Socket type not supported"
+msgstr "Socketsoort wordt niet ondersteund"
 
-#: nis/nis_print.c:266
-#, c-format
-msgid "Table Type          : %s\n"
-msgstr "Tabelsoort          : %s\n"
+#. TRANS The operation you requested is not supported.  Some socket functions
+#. TRANS don't make sense for all types of sockets, and others may not be
+#. TRANS implemented for all communications protocols.  In the GNU system, this
+#. TRANS error can happen for many calls when the object does not support the
+#. TRANS particular operation; it is a generic indication that the server knows
+#. TRANS nothing to do for that call.
+#: sysdeps/gnu/errlist.c:527
+msgid "Operation not supported"
+msgstr "Bewerking wordt niet ondersteund"
 
-#: nis/nis_print.c:267
-#, c-format
-msgid "Number of Columns   : %d\n"
-msgstr "Aantal kolommen     : %d\n"
+#. TRANS The socket communications protocol family you requested is not supported.
+#: sysdeps/gnu/errlist.c:536
+msgid "Protocol family not supported"
+msgstr "Protocolfamilie wordt niet ondersteund"
 
-#: nis/nis_print.c:268
-#, c-format
-msgid "Character Separator : %c\n"
-msgstr "Teken-scheidingsteken : %c\n"
+#. TRANS The address family specified for a socket is not supported; it is
+#. TRANS inconsistent with the protocol being used on the socket.  @xref{Sockets}.
+#: sysdeps/gnu/errlist.c:546
+msgid "Address family not supported by protocol"
+msgstr "Adresfamilie wordt niet ondersteund door protocol"
 
-#: nis/nis_print.c:269
-#, c-format
-msgid "Search Path         : %s\n"
-msgstr "Zoek pad            : %s\n"
+#. TRANS The requested socket address is already in use.  @xref{Socket Addresses}.
+#: sysdeps/gnu/errlist.c:555
+msgid "Address already in use"
+msgstr "Adres is al in gebruik"
 
-#: nis/nis_print.c:270
-msgid "Columns             :\n"
-msgstr "Kolommen            :\n"
+#. TRANS The requested socket address is not available; for example, you tried
+#. TRANS to give a socket a name that doesn't match the local host name.
+#. TRANS @xref{Socket Addresses}.
+#: sysdeps/gnu/errlist.c:566
+msgid "Cannot assign requested address"
+msgstr "Kan verzochte adres niet toewijzen"
 
-#: nis/nis_print.c:273
-#, c-format
-msgid "\t[%d]\tName          : %s\n"
-msgstr "\t[%d]\tNaam          : %s\n"
+#. TRANS A socket operation failed because the network was down.
+#: sysdeps/gnu/errlist.c:575
+msgid "Network is down"
+msgstr "Netwerk ligt plat"
 
-#: nis/nis_print.c:275
-msgid "\t\tAttributes    : "
-msgstr "\t\tKenmerken     : "
+#. TRANS A socket operation failed because the subnet containing the remote host
+#. TRANS was unreachable.
+#: sysdeps/gnu/errlist.c:585
+msgid "Network is unreachable"
+msgstr "Netwerk is onbereikbaar"
 
-#: nis/nis_print.c:277
-msgid "\t\tAccess Rights : "
-msgstr "\t\tToegangsrechten : "
+#. TRANS A network connection was reset because the remote host crashed.
+#: sysdeps/gnu/errlist.c:594
+msgid "Network dropped connection on reset"
+msgstr "Verbinding is verbroken door KILL-opdracht"
 
-#: nis/nis_print.c:286
-msgid "Linked Object Type : "
-msgstr "Soort gekoppeld objekt:"
+#. TRANS A network connection was aborted locally.
+#: sysdeps/gnu/errlist.c:603
+msgid "Software caused connection abort"
+msgstr "Verbinding is verbroken door lokaal probleem"
 
-#: nis/nis_print.c:288
-#, c-format
-msgid "Linked to : %s\n"
-msgstr "Gekoppeld aan : %s\n"
+#. TRANS A network connection was closed for reasons outside the control of the
+#. TRANS local host, such as by the remote machine rebooting or an unrecoverable
+#. TRANS protocol violation.
+#: sysdeps/gnu/errlist.c:614
+msgid "Connection reset by peer"
+msgstr "Verbinding is weggevallen"
 
-#: nis/nis_print.c:297
-#, c-format
-msgid "\tEntry data of type %s\n"
-msgstr "\tIngangsgegevens van soort %s\n"
+#. TRANS The kernel's buffers for I/O operations are all in use.  In GNU, this
+#. TRANS error is always synonymous with @code{ENOMEM}; you may get one or the
+#. TRANS other from network operations.
+#: sysdeps/gnu/errlist.c:625
+msgid "No buffer space available"
+msgstr "Geen bufferruimte meer beschikbaar"
 
-#: nis/nis_print.c:300
-#, c-format
-msgid "\t[%u] - [%u bytes] "
-msgstr "\t[%u] - [%u bytes] "
+#. TRANS You tried to connect a socket that is already connected.
+#. TRANS @xref{Connecting}.
+#: sysdeps/gnu/errlist.c:635
+msgid "Transport endpoint is already connected"
+msgstr "Overdrachtseindpunt is al verbonden"
 
-#: nis/nis_print.c:303
-msgid "Encrypted data\n"
-msgstr "Gecodeerde gegevens\n"
+#. TRANS The socket is not connected to anything.  You get this error when you
+#. TRANS try to transmit data over a socket, without first specifying a
+#. TRANS destination for the data.  For a connectionless socket (for datagram
+#. TRANS protocols, such as UDP), you get @code{EDESTADDRREQ} instead.
+#: sysdeps/gnu/errlist.c:647
+msgid "Transport endpoint is not connected"
+msgstr "Overdrachtseindpunt is niet verbonden"
 
-#: nis/nis_print.c:305
-msgid "Binary data\n"
-msgstr "Binaire gegevens\n"
+#. TRANS No default destination address was set for the socket.  You get this
+#. TRANS error when you try to transmit data over a connectionless socket,
+#. TRANS without first specifying a destination for the data with @code{connect}.
+#: sysdeps/gnu/errlist.c:658
+msgid "Destination address required"
+msgstr "Doeladres vereist"
 
-#: nis/nis_print.c:320
-#, c-format
-msgid "Object Name   : %s\n"
-msgstr "Objektnaam     : %s\n"
+#. TRANS The socket has already been shut down.
+#: sysdeps/gnu/errlist.c:667
+msgid "Cannot send after transport endpoint shutdown"
+msgstr "Kan niets meer verzenden na sluiten van overdrachtseindpunt"
 
-#: nis/nis_print.c:321
-#, c-format
-msgid "Directory     : %s\n"
-msgstr "Map           : %s\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:676
+msgid "Too many references: cannot splice"
+msgstr "Te veel verwijzingen: kan niet splitsen"
 
-#: nis/nis_print.c:322
-#, c-format
-msgid "Owner         : %s\n"
-msgstr "Eigenaar      : %s\n"
+#. TRANS A socket operation with a specified timeout received no response during
+#. TRANS the timeout period.
+#: sysdeps/gnu/errlist.c:686
+msgid "Connection timed out"
+msgstr "Verbinding is verlopen"
 
-#: nis/nis_print.c:323
-#, c-format
-msgid "Group         : %s\n"
-msgstr "Groep         : %s\n"
+#. TRANS A remote host refused to allow the network connection (typically because
+#. TRANS it is not running the requested service).
+#: sysdeps/gnu/errlist.c:696
+msgid "Connection refused"
+msgstr "Verbinding is geweigerd"
 
-#: nis/nis_print.c:324
-msgid "Access Rights : "
-msgstr "Toegangsrechten : "
+#. TRANS Too many levels of symbolic links were encountered in looking up a file name.
+#. TRANS This often indicates a cycle of symbolic links.
+#: sysdeps/gnu/errlist.c:706
+msgid "Too many levels of symbolic links"
+msgstr "Te veel niveaus van symbolische koppelingen -- vermoedelijk een lus"
 
-#: nis/nis_print.c:326
-#, c-format
-msgid ""
-"\n"
-"Time to Live  : "
-msgstr ""
-"\n"
-"Tijd te leven  : "
+#. TRANS Filename too long (longer than @code{PATH_MAX}; @pxref{Limits for
+#. TRANS Files}) or host name too long (in @code{gethostname} or
+#. TRANS @code{sethostname}; @pxref{Host Identification}).
+#: sysdeps/gnu/errlist.c:717
+msgid "File name too long"
+msgstr "Bestandsnaam is te lang"
 
-#: nis/nis_print.c:329
-#, c-format
-msgid "Creation Time : %s"
-msgstr "Aanmaaktijd : %s"
+#. TRANS The remote host for a requested network connection is down.
+#: sysdeps/gnu/errlist.c:726
+msgid "Host is down"
+msgstr "Host is inactief"
 
-#: nis/nis_print.c:331
-#, c-format
-msgid "Mod. Time     : %s"
-msgstr "Wijzigingstijd : %s"
+#. TRANS The remote host for a requested network connection is not reachable.
+#: sysdeps/gnu/errlist.c:735
+msgid "No route to host"
+msgstr "Geen route naar host"
 
-#: nis/nis_print.c:332
-msgid "Object Type   : "
-msgstr "Objektsoort   : "
+#. TRANS Directory not empty, where an empty directory was expected.  Typically,
+#. TRANS this error occurs when you are trying to delete a directory.
+#: sysdeps/gnu/errlist.c:745
+msgid "Directory not empty"
+msgstr "Map is niet leeg"
 
-#: nis/nis_print.c:352
-#, c-format
-msgid "    Data Length = %u\n"
-msgstr " Gegevenslengte = %u\n"
+#. TRANS This means that the per-user limit on new process would be exceeded by
+#. TRANS an attempted @code{fork}.  @xref{Limits on Resources}, for details on
+#. TRANS the @code{RLIMIT_NPROC} limit.
+#: sysdeps/gnu/errlist.c:756
+msgid "Too many processes"
+msgstr "Te veel processen"
 
-#: nis/nis_print.c:365
-#, c-format
-msgid "Status            : %s\n"
-msgstr "Status            : %s\n"
+#. TRANS The file quota system is confused because there are too many users.
+#. TRANS @c This can probably happen in a GNU system when using NFS.
+#: sysdeps/gnu/errlist.c:766
+msgid "Too many users"
+msgstr "Te veel gebruikers"
 
-#: nis/nis_print.c:366
-#, c-format
-msgid "Number of objects : %u\n"
-msgstr "Aantal objekten : %u\n"
+#. TRANS The user's disk quota was exceeded.
+#: sysdeps/gnu/errlist.c:775
+msgid "Disk quota exceeded"
+msgstr "Schijfquotum is overschreden"
 
-#: nis/nis_print.c:370
-#, c-format
-msgid "Object #%d:\n"
-msgstr "Objekt #%d:\n"
+#. TRANS Stale NFS file handle.  This indicates an internal confusion in the NFS
+#. TRANS system which is due to file system rearrangements on the server host.
+#. TRANS Repairing this condition usually requires unmounting and remounting
+#. TRANS the NFS file system on the local host.
+#: sysdeps/gnu/errlist.c:787
+msgid "Stale NFS file handle"
+msgstr "Achterhaald NFS-bestandshandvat"
 
-#: nis/nis_print_group_entry.c:115
-#, c-format
-msgid "Group entry for \"%s.%s\" group:\n"
-msgstr "Groepingang voor \"%s.%s\" groep:\n"
+#. TRANS An attempt was made to NFS-mount a remote file system with a file name that
+#. TRANS already specifies an NFS-mounted file.
+#. TRANS (This is an error on some operating systems, but we expect it to work
+#. TRANS properly on the GNU system, making this error code impossible.)
+#: sysdeps/gnu/errlist.c:799
+msgid "Object is remote"
+msgstr "Object is al elders"
 
-#: nis/nis_print_group_entry.c:123
-msgid "    Explicit members:\n"
-msgstr "    Expliciete leden:\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:808
+msgid "RPC struct is bad"
+msgstr "RPC-struct is ongeldig"
 
-#: nis/nis_print_group_entry.c:128
-msgid "    No explicit members\n"
-msgstr "    Niet-expliciete leden\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:817
+msgid "RPC version wrong"
+msgstr "RPC-versie is verkeerd"
 
-#: nis/nis_print_group_entry.c:131
-msgid "    Implicit members:\n"
-msgstr "    Impliciete leden:\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:826
+msgid "RPC program not available"
+msgstr "RPC-programma is niet beschikbaar"
 
-#: nis/nis_print_group_entry.c:136
-msgid "    No implicit members\n"
-msgstr "    Niet-impliciete leden\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:835
+msgid "RPC program version wrong"
+msgstr "RPC-programmaversie is verkeerd"
 
-#: nis/nis_print_group_entry.c:139
-msgid "    Recursive members:\n"
-msgstr "    Recursieve leden:\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:844
+msgid "RPC bad procedure for program"
+msgstr "Verkeerde RPC-procedure voor programma"
 
-#: nis/nis_print_group_entry.c:144
-msgid "    No recursive members\n"
-msgstr "    Niet-recursieve leden\n"
+#. TRANS No locks available.  This is used by the file locking facilities; see
+#. TRANS @ref{File Locks}.  This error is never generated by the GNU system, but
+#. TRANS it can result from an operation to an NFS server running another
+#. TRANS operating system.
+#: sysdeps/gnu/errlist.c:856
+msgid "No locks available"
+msgstr "Geen vergrendelingen meer beschikbaar"
 
-#: nis/nis_print_group_entry.c:147 nis/nis_print_group_entry.c:163
-msgid "    Explicit nonmembers:\n"
-msgstr "    Expliciete niet-leden:\n"
+#. TRANS Inappropriate file type or format.  The file was the wrong type for the
+#. TRANS operation, or a data file had the wrong format.
+#. TRANS
+#. TRANS On some systems @code{chmod} returns this error if you try to set the
+#. TRANS sticky bit on a non-directory file; @pxref{Setting Permissions}.
+#: sysdeps/gnu/errlist.c:869
+msgid "Inappropriate file type or format"
+msgstr "Ongepast bestandstype"
 
-#: nis/nis_print_group_entry.c:152
-msgid "    No explicit nonmembers\n"
-msgstr "    Niet-expliciete niet-leden\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:878
+msgid "Authentication error"
+msgstr "Authentificatiefout"
 
-#: nis/nis_print_group_entry.c:155
-msgid "    Implicit nonmembers:\n"
-msgstr "    Impliciete niet-leden:\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:887
+msgid "Need authenticator"
+msgstr "Authentificator vereist"
 
-#: nis/nis_print_group_entry.c:160
-msgid "    No implicit nonmembers\n"
-msgstr "    Niet-impliciete niet-leden\n"
+#. TRANS Function not implemented.  This indicates that the function called is
+#. TRANS not implemented at all, either in the C library itself or in the
+#. TRANS operating system.  When you get this error, you can be sure that this
+#. TRANS particular function will always fail with @code{ENOSYS} unless you
+#. TRANS install a new version of the C library or the operating system.
+#: sysdeps/gnu/errlist.c:900
+msgid "Function not implemented"
+msgstr "Functie is niet aanwezig"
 
-#: nis/nis_print_group_entry.c:168
-msgid "    No recursive nonmembers\n"
-msgstr "    Niet-recursieve niet-leden\n"
+#. TRANS Not supported.  A function returns this error when certain parameter
+#. TRANS values are valid, but the functionality they request is not available.
+#. TRANS This can mean that the function does not implement a particular command
+#. TRANS or option value or flag bit at all.  For functions that operate on some
+#. TRANS object given in a parameter, such as a file descriptor or a port, it
+#. TRANS might instead mean that only @emph{that specific object} (file
+#. TRANS descriptor, port, etc.) is unable to support the other parameters given;
+#. TRANS different file descriptors might support different ranges of parameter
+#. TRANS values.
+#. TRANS
+#. TRANS If the entire function is not available at all in the implementation,
+#. TRANS it returns @code{ENOSYS} instead.
+#: sysdeps/gnu/errlist.c:920
+msgid "Not supported"
+msgstr "Niet ondersteund"
 
-#: nis/nss_nisplus/nisplus-publickey.c:101
-#: nis/nss_nisplus/nisplus-publickey.c:182
-#, c-format
-msgid "DES entry for netname %s not unique\n"
-msgstr "DES-ingang voor netnaam %s is niet uniek\n"
+#. TRANS While decoding a multibyte character the function came along an invalid
+#. TRANS or an incomplete sequence of bytes or the given wide character is invalid.
+#: sysdeps/gnu/errlist.c:930
+msgid "Invalid or incomplete multibyte or wide character"
+msgstr "Ongeldig of onvolledig multibyte-teken"
 
-#: nis/nss_nisplus/nisplus-publickey.c:218
-#, c-format
-msgid "netname2user: missing group id list in `%s'."
-msgstr "netname2user: ontbrekende groep-ID-lijst in `%s'."
+#. TRANS In the GNU system, servers supporting the @code{term} protocol return
+#. TRANS this error for certain operations when the caller is not in the
+#. TRANS foreground process group of the terminal.  Users do not usually see this
+#. TRANS error because functions such as @code{read} and @code{write} translate
+#. TRANS it into a @code{SIGTTIN} or @code{SIGTTOU} signal.  @xref{Job Control},
+#. TRANS for information on process groups and these signals.
+#: sysdeps/gnu/errlist.c:944
+msgid "Inappropriate operation for background process"
+msgstr "Ongepaste bewerking voor achtergrondproces"
 
-#: nis/nss_nisplus/nisplus-publickey.c:300
-#: nis/nss_nisplus/nisplus-publickey.c:306
-#: nis/nss_nisplus/nisplus-publickey.c:370
-#: nis/nss_nisplus/nisplus-publickey.c:379
-#, c-format
-msgid "netname2user: (nis+ lookup): %s\n"
-msgstr "netname2user: (nis+ opzoeken): %s\n"
+#. TRANS In the GNU system, opening a file returns this error when the file is
+#. TRANS translated by a program and the translator program dies while starting
+#. TRANS up, before it has connected to the file.
+#: sysdeps/gnu/errlist.c:955
+msgid "Translator died"
+msgstr "Vertaler bestaat niet meer"
 
-#: nis/nss_nisplus/nisplus-publickey.c:319
-#, c-format
-msgid "netname2user: DES entry for %s in directory %s not unique"
-msgstr "netname2user: DES-ingang voor %s in map %s is niet uniek"
+#. TRANS The experienced user will know what is wrong.
+#. TRANS @c This error code is a joke.  Its perror text is part of the joke.
+#. TRANS @c Don't change it.
+#: sysdeps/gnu/errlist.c:966
+msgid "?"
+msgstr "?"
 
-#: nis/nss_nisplus/nisplus-publickey.c:337
-#, c-format
-msgid "netname2user: principal name `%s' too long"
-msgstr "netname2user: hoofdnaam `%s' is te lang"
+#. TRANS You did @strong{what}?
+#: sysdeps/gnu/errlist.c:975
+msgid "You really blew it this time"
+msgstr "Deze keer hebt u het echt verknald"
 
-#: nis/nss_nisplus/nisplus-publickey.c:392
-#, c-format
-msgid "netname2user: LOCAL entry for %s in directory %s not unique"
-msgstr "netname2user: LOCAL-ingang voor %s in map %s is niet uniek"
+#. TRANS Go home and have a glass of warm, dairy-fresh milk.
+#: sysdeps/gnu/errlist.c:984
+msgid "Computer bought the farm"
+msgstr "Ga er even rustig bij zitten"
 
-#: nis/nss_nisplus/nisplus-publickey.c:399
-msgid "netname2user: should not have uid 0"
-msgstr "netname2user: mag niet UID 0 hebben"
+#. TRANS This error code has no purpose.
+#: sysdeps/gnu/errlist.c:993
+msgid "Gratuitous error"
+msgstr "Zinloze fout"
 
-#: nis/ypclnt.c:171
-#, c-format
-msgid "YPBINDPROC_DOMAIN: %s\n"
-msgstr "YPBINDPROC_DOMAIN: %s\n"
+#: sysdeps/gnu/errlist.c:1001
+msgid "Bad message"
+msgstr "Ongeldig bericht"
 
-#: nis/ypclnt.c:780
-msgid "Request arguments bad"
-msgstr "Verzoekargumenten slecht"
+#: sysdeps/gnu/errlist.c:1009
+msgid "Identifier removed"
+msgstr "Naam is verwijderd"
 
-#: nis/ypclnt.c:782
-msgid "RPC failure on NIS operation"
-msgstr "RPC-mislukking bij NIS-bewerking"
+#: sysdeps/gnu/errlist.c:1017
+msgid "Multihop attempted"
+msgstr "Multihop geprobeerd"
 
-#: nis/ypclnt.c:784
-msgid "Can't bind to server which serves this domain"
-msgstr "Kan niet binden aan de server die dit domein aanbiedt"
+#: sysdeps/gnu/errlist.c:1025
+msgid "No data available"
+msgstr "Geen gegevens beschikbaar"
 
-#: nis/ypclnt.c:786
-msgid "No such map in server's domain"
-msgstr "Geen dergelijke afbeelding in domein van server"
+#: sysdeps/gnu/errlist.c:1033
+msgid "Link has been severed"
+msgstr "Koppeling is verbroken"
 
-#: nis/ypclnt.c:788
-msgid "No such key in map"
-msgstr "Geen dergelijke sleutel in afbeelding"
+#: sysdeps/gnu/errlist.c:1041
+msgid "No message of desired type"
+msgstr "Geen bericht van de gewenste soort"
 
-#: nis/ypclnt.c:790
-msgid "Internal NIS error"
-msgstr "Interne NIS-fout"
+#: sysdeps/gnu/errlist.c:1049
+msgid "Out of streams resources"
+msgstr "Geen hulpbronnen voor stromen meer beschikbaar"
 
-#: nis/ypclnt.c:792
-msgid "Local resource allocation failure"
-msgstr "Toewijzingsfout lokale bron"
+#: sysdeps/gnu/errlist.c:1057
+msgid "Device not a stream"
+msgstr "Apparaat is geen stroom"
 
-#: nis/ypclnt.c:794
-msgid "No more records in map database"
-msgstr "Niet meer records in afbeeldingengegevensbank"
+#: sysdeps/gnu/errlist.c:1065
+msgid "Value too large for defined data type"
+msgstr "Waarde is te groot voor gedefinieerde gegevenssoort"
 
-#: nis/ypclnt.c:796
-msgid "Can't communicate with portmapper"
-msgstr "Kan niet communiceren met poortvertaler"
+#: sysdeps/gnu/errlist.c:1073
+msgid "Protocol error"
+msgstr "Protocolfout"
 
-#: nis/ypclnt.c:798
-msgid "Can't communicate with ypbind"
-msgstr "Kan niet communiceren met ypbind"
+#: sysdeps/gnu/errlist.c:1081
+msgid "Timer expired"
+msgstr "Tijdopnemer is verlopen"
 
-#: nis/ypclnt.c:800
-msgid "Can't communicate with ypserv"
-msgstr "Kan niet communiceren met ypserv"
+#. TRANS Operation canceled; an asynchronous operation was canceled before it
+#. TRANS completed.  @xref{Asynchronous I/O}.  When you call @code{aio_cancel},
+#. TRANS the normal result is for the operations affected to complete with this
+#. TRANS error; @pxref{Cancel AIO Operations}.
+#: sysdeps/gnu/errlist.c:1093
+msgid "Operation canceled"
+msgstr "Bewerking is geannuleerd"
 
-#: nis/ypclnt.c:802
-msgid "Local domain name not set"
-msgstr "Lokaal domein niet ingesteld"
+#: sysdeps/gnu/errlist.c:1101
+msgid "Interrupted system call should be restarted"
+msgstr "Onderbroken systeemaanroep moet worden herstart"
 
-#: nis/ypclnt.c:804
-msgid "NIS map database is bad"
-msgstr "NIS-afbeeldingengegevensbank is slecht"
+#: sysdeps/gnu/errlist.c:1109
+msgid "Channel number out of range"
+msgstr "Kanaalnummer valt buiten bereik"
 
-#: nis/ypclnt.c:806
-msgid "NIS client/server version mismatch - can't supply service"
-msgstr "NIS client/server versie komt niet overeen - kan dienst niet aanbieden"
+#: sysdeps/gnu/errlist.c:1117
+msgid "Level 2 not synchronized"
+msgstr "Niveau 2 is niet gesynchroniseerd"
 
-#: nis/ypclnt.c:810
-msgid "Database is busy"
-msgstr "Gegevensbank is bezig"
+#: sysdeps/gnu/errlist.c:1125
+msgid "Level 3 halted"
+msgstr "Niveau 3 staat stil"
 
-#: nis/ypclnt.c:812
-msgid "Unknown NIS error code"
-msgstr "Onbekende NIS-foutcode"
+#: sysdeps/gnu/errlist.c:1133
+msgid "Level 3 reset"
+msgstr "Niveau 3 reset"
 
-#: nis/ypclnt.c:854
-msgid "Internal ypbind error"
-msgstr "Interne ypbind-fout"
+#: sysdeps/gnu/errlist.c:1141
+msgid "Link number out of range"
+msgstr "Koppelingsnummer valt buiten bereik"
 
-#: nis/ypclnt.c:856
-msgid "Domain not bound"
-msgstr "Domein niet gebonden"
+#: sysdeps/gnu/errlist.c:1149
+msgid "Protocol driver not attached"
+msgstr "Protocolstuurprogramma is niet aangehecht"
 
-#: nis/ypclnt.c:858
-msgid "System resource allocation failure"
-msgstr "Toewijzingsfout systeembron"
+#: sysdeps/gnu/errlist.c:1157
+msgid "No CSI structure available"
+msgstr "Geen CSI-structuur beschikbaar"
 
-#: nis/ypclnt.c:860
-msgid "Unknown ypbind error"
-msgstr "Onbekende ypbind-fout"
+#: sysdeps/gnu/errlist.c:1165
+msgid "Level 2 halted"
+msgstr "Niveau 2 staat stil"
 
-#: nis/ypclnt.c:899
-msgid "yp_update: cannot convert host to netname\n"
-msgstr "yp_update: kan host niet converteren naar netnaam\n"
+#: sysdeps/gnu/errlist.c:1173
+msgid "Invalid exchange"
+msgstr "Ongeldige uitwisseling"
 
-#: nis/ypclnt.c:911
-msgid "yp_update: cannot get server address\n"
-msgstr "yp_update: kan server-adres niet opvragen\n"
+#: sysdeps/gnu/errlist.c:1181
+msgid "Invalid request descriptor"
+msgstr "Ongeldige verzoeksdescriptor"
 
-#: nscd/cache.c:94
-msgid "while allocating hash table entry"
-msgstr "bij het toewijzen van een hash-tabel ingang"
+#: sysdeps/gnu/errlist.c:1189
+msgid "Exchange full"
+msgstr "Uitwisseling is vol"
 
-#: nscd/cache.c:162 nscd/connections.c:184
-#, c-format
-msgid "cannot stat() file `%s': %s"
-msgstr "kan bestand `%s' niet vinden: %s"
+#: sysdeps/gnu/errlist.c:1197
+msgid "No anode"
+msgstr "Geen anode"
 
-#: nscd/connections.c:150
-msgid "Cannot run nscd in secure mode as unprivileged user"
-msgstr "Kan nscd niet uitvoeren in veilige modus als gebruiker zonder privileges"
+#: sysdeps/gnu/errlist.c:1205
+msgid "Invalid request code"
+msgstr "Ongeldige verzoekscode"
 
-#: nscd/connections.c:172
-#, c-format
-msgid "while allocating cache: %s"
-msgstr "bij toewijzen buffer: %s"
+#: sysdeps/gnu/errlist.c:1213
+msgid "Invalid slot"
+msgstr "Ongeldige sleuf"
 
-#: nscd/connections.c:197
-#, c-format
-msgid "cannot open socket: %s"
-msgstr "kan socket niet openen: %s"
+#: sysdeps/gnu/errlist.c:1221
+msgid "File locking deadlock error"
+msgstr "Bestandsvergrendelingsfout; totale blokkering"
 
-#: nscd/connections.c:215
-#, c-format
-msgid "cannot enable socket to accept connections: %s"
-msgstr "kan socket niet verbindingen laten accepteren: %s"
+#: sysdeps/gnu/errlist.c:1229
+msgid "Bad font file format"
+msgstr "Ongeldige bestandsindeling voor lettertype"
 
-#: nscd/connections.c:260
-#, c-format
-msgid "cannot handle old request version %d; current version is %d"
-msgstr "kan oude verzoekversie %d niet behandelen; huidige versie is %d"
+#: sysdeps/gnu/errlist.c:1237
+msgid "Machine is not on the network"
+msgstr "Machine is niet op netwerk aangesloten"
 
-#: nscd/connections.c:298 nscd/connections.c:324
-#, c-format
-msgid "cannot write result: %s"
-msgstr "kan resultaat niet schrijven: %s"
+#: sysdeps/gnu/errlist.c:1245
+msgid "Package not installed"
+msgstr "Pakket is niet geïnstalleerd"
 
-#: nscd/connections.c:392 nscd/connections.c:514
-#, c-format
-msgid "error getting caller's id: %s"
-msgstr "fout bij opvragen ID van aanroeper: %s"
+#: sysdeps/gnu/errlist.c:1253
+msgid "Advertise error"
+msgstr "Adverteerfout"
 
-#: nscd/connections.c:485
-#, c-format
-msgid "while accepting connection: %s"
-msgstr "bij accepteren verbinding: %s"
+#: sysdeps/gnu/errlist.c:1261
+msgid "Srmount error"
+msgstr "Srmount-fout"
 
-#: nscd/connections.c:498
-#, c-format
-msgid "short read while reading request: %s"
-msgstr "te weinig gelezen bij lezen van verzoek: %s"
+#: sysdeps/gnu/errlist.c:1269
+msgid "Communication error on send"
+msgstr "Communicatiefout bij verzenden"
 
-#: nscd/connections.c:542
-#, c-format
-msgid "key length in request too long: %d"
-msgstr "sleutellengte in verzoek te lang: %d"
+#: sysdeps/gnu/errlist.c:1277
+msgid "RFS specific error"
+msgstr "RFS-specifieke fout"
 
-#: nscd/connections.c:556
-#, c-format
-msgid "short read while reading request key: %s"
-msgstr "te weinig gelezen bij lezen van verzoeksleutel: %s"
+#: sysdeps/gnu/errlist.c:1285
+msgid "Name not unique on network"
+msgstr "Naam is niet uniek op het netwerk"
 
-#: nscd/connections.c:566
-#, c-format
-msgid "handle_request: request received (Version = %d) from PID %ld"
-msgstr "handle_request: verzoek ontvangen (Versie = %d) van PID %ld"
+#: sysdeps/gnu/errlist.c:1293
+msgid "File descriptor in bad state"
+msgstr "Bestandsdescriptor is in ongeldige toestand"
 
-#: nscd/connections.c:571
-#, c-format
-msgid "handle_request: request received (Version = %d)"
-msgstr "handle_request: verzoek ontvangen (versie = %d)"
+#: sysdeps/gnu/errlist.c:1301
+msgid "Remote address changed"
+msgstr "Ginds adres is veranderd"
 
-#: nscd/connections.c:635 nscd/connections.c:636 nscd/connections.c:655
-#: nscd/connections.c:668 nscd/connections.c:674 nscd/connections.c:681
-#, c-format
-msgid "Failed to run nscd as user '%s'"
-msgstr "Uitvoeren van nscd als gebruiker '%s' mislukt"
+#: sysdeps/gnu/errlist.c:1309
+msgid "Can not access a needed shared library"
+msgstr "Kan geen toegang krijgen tot benodigde gedeelde bibliotheek"
 
-#: nscd/connections.c:656
-msgid "getgrouplist failed"
-msgstr "getgrouplist mislukt"
+#: sysdeps/gnu/errlist.c:1317
+msgid "Accessing a corrupted shared library"
+msgstr "Er wordt toegang gezocht tot een beschadigde gedeelde bibliotheek"
 
-#: nscd/connections.c:669
-msgid "setgroups failed"
-msgstr "setgroups mislukt"
+#: sysdeps/gnu/errlist.c:1325
+msgid ".lib section in a.out corrupted"
+msgstr ".lib-sectie in a.out is beschadigd"
 
-#: nscd/grpcache.c:103 nscd/hstcache.c:111 nscd/pwdcache.c:109
-msgid "while allocating key copy"
-msgstr "bij toewijzen sleutelkopie"
+#: sysdeps/gnu/errlist.c:1333
+msgid "Attempting to link in too many shared libraries"
+msgstr "Er wordt geprobeerd te veel gedeelde bibliotheken te linken"
 
-#: nscd/grpcache.c:153 nscd/hstcache.c:168 nscd/pwdcache.c:146
-msgid "while allocating cache entry"
-msgstr "bij toewijzen bufferingang"
+#: sysdeps/gnu/errlist.c:1341
+msgid "Cannot exec a shared library directly"
+msgstr "Kan een gedeelde bibliotheek niet direct uitvoeren"
 
-#: nscd/grpcache.c:197 nscd/hstcache.c:283 nscd/pwdcache.c:193
-#, c-format
-msgid "short write in %s: %s"
-msgstr "te weinig geschreven in %s: %s"
+#: sysdeps/gnu/errlist.c:1349
+msgid "Streams pipe error"
+msgstr "Pijpfout bij stromen"
 
-#: nscd/grpcache.c:219
-#, c-format
-msgid "Haven't found \"%s\" in group cache!"
-msgstr "Kon \"%s\" niet vinden in groepbuffer!"
+#: sysdeps/gnu/errlist.c:1357
+msgid "Structure needs cleaning"
+msgstr "Structure moet worden opgeschoond"
 
-#: nscd/grpcache.c:285
-#, c-format
-msgid "Invalid numeric gid \"%s\"!"
-msgstr "Ongeldige numerieke GID \"%s\"!"
+#: sysdeps/gnu/errlist.c:1365
+msgid "Not a XENIX named type file"
+msgstr "Niet een XENIX-bestand met naam"
 
-#: nscd/grpcache.c:292
-#, c-format
-msgid "Haven't found \"%d\" in group cache!"
-msgstr "Kon \"%d\" niet vinden in groepbuffer!"
+#: sysdeps/gnu/errlist.c:1373
+msgid "No XENIX semaphores available"
+msgstr "Geen XENIX-semaforen beschikbaar"
 
-#: nscd/hstcache.c:305 nscd/hstcache.c:371 nscd/hstcache.c:436
-#: nscd/hstcache.c:501
-#, c-format
-msgid "Haven't found \"%s\" in hosts cache!"
-msgstr "Kon \"%s\" niet vinden in hostsbuffer!"
+#: sysdeps/gnu/errlist.c:1381
+msgid "Is a named type file"
+msgstr "Is een bestand met naam"
 
-#: nscd/nscd.c:89
-msgid "Read configuration data from NAME"
-msgstr "Configuratiegegevens lezen uit NAAM"
+#: sysdeps/gnu/errlist.c:1389
+msgid "Remote I/O error"
+msgstr "Gindse invoer-/uitvoerfout"
 
-#: nscd/nscd.c:91
-msgid "Do not fork and display messages on the current tty"
-msgstr "Niet vertakken en berichten op de huidige TTY weergeven"
+#: sysdeps/gnu/errlist.c:1397
+msgid "No medium found"
+msgstr "Geen medium gevonden"
 
-#: nscd/nscd.c:92
-msgid "NUMBER"
-msgstr "GETAL"
+#: sysdeps/gnu/errlist.c:1405
+msgid "Wrong medium type"
+msgstr "Verkeerde mediumsoort"
 
-#: nscd/nscd.c:92
-msgid "Start NUMBER threads"
-msgstr "GETAL threads starten"
+#: sysdeps/gnu/errlist.c:1413
+msgid "Required key not available"
+msgstr "Vereiste sleutel is niet beschikbaar"
 
-#: nscd/nscd.c:93
-msgid "Shut the server down"
-msgstr "De server afsluiten"
+#: sysdeps/gnu/errlist.c:1421
+msgid "Key has expired"
+msgstr "Sleutel is verlopen"
 
-#: nscd/nscd.c:94
-msgid "Print current configuration statistic"
-msgstr "Huidige configuratiestatistiek weergeven"
+#: sysdeps/gnu/errlist.c:1429
+msgid "Key has been revoked"
+msgstr "Sleutel is herroepen"
 
-#: nscd/nscd.c:95
-msgid "TABLE"
-msgstr "TABEL"
+#: sysdeps/gnu/errlist.c:1437
+msgid "Key was rejected by service"
+msgstr "Sleutel werd geweigerd door service"
 
-#: nscd/nscd.c:96
-msgid "Invalidate the specified cache"
-msgstr "De opgegeven buffer ongeldig maken"
+#: sysdeps/gnu/errlist.c:1445
+msgid "Owner died"
+msgstr "Eigenaar bestaat niet meer"
 
-#: nscd/nscd.c:97
-msgid "TABLE,yes"
-msgstr "TABEL,ja"
+#: sysdeps/gnu/errlist.c:1453
+msgid "State not recoverable"
+msgstr "Toestand is onherstelbaar"
 
-#: nscd/nscd.c:97
-msgid "Use separate cache for each user"
-msgstr "Gescheiden buffer gebruiken voor elke gebruiker"
+#: sysdeps/mach/_strerror.c:57
+msgid "Error in unknown error system: "
+msgstr "Fout in systeem voor onbekende fouten: "
 
-#: nscd/nscd.c:102
-msgid "Name Service Cache Daemon."
-msgstr "Naamdienst Bufferdaemon."
+#: sysdeps/posix/gai_strerror-strs.h:1
+msgid "Address family for hostname not supported"
+msgstr "Adresfamilie voor hostnaam wordt niet ondersteund"
 
-#: nscd/nscd.c:141
-msgid "cannot read configuration file; this is fatal"
-msgstr "kan configuratiebestand niet lezen; dit is fataal"
+#: sysdeps/posix/gai_strerror-strs.h:2
+msgid "Temporary failure in name resolution"
+msgstr "Tijdelijke storing in naamsherleiding"
 
-#: nscd/nscd.c:152
-msgid "already running"
-msgstr "word al uitgevoerd"
+#: sysdeps/posix/gai_strerror-strs.h:3
+msgid "Bad value for ai_flags"
+msgstr "Ongeldige waarde voor 'ai_flags'"
 
-#: nscd/nscd.c:270 nscd/nscd.c:294 nscd/nscd_stat.c:132
-msgid "Only root is allowed to use this option!"
-msgstr "Alleen root mag deze optie gebruiken!"
+#: sysdeps/posix/gai_strerror-strs.h:4
+msgid "Non-recoverable failure in name resolution"
+msgstr "Niet-herstelbare mislukking in naamsherleiding"
 
-#: nscd/nscd_conf.c:88
-#, c-format
-msgid "Parse error: %s"
-msgstr "Verwerkfout: %s"
+#: sysdeps/posix/gai_strerror-strs.h:5
+msgid "ai_family not supported"
+msgstr "'ai_family' wordt niet ondersteund"
 
-#: nscd/nscd_conf.c:171
-#, c-format
-msgid "Could not create log file \"%s\""
-msgstr "Kon logbestand \"%s\" niet aanmaken"
+#: sysdeps/posix/gai_strerror-strs.h:6
+msgid "Memory allocation failure"
+msgstr "Onvoldoende geheugen"
 
-#: nscd/nscd_conf.c:187
-msgid "Must specify user name for server-user option"
-msgstr "Het is nodig een gebruikersnaam op te geven bij de server-user optie"
+#: sysdeps/posix/gai_strerror-strs.h:7
+msgid "No address associated with hostname"
+msgstr "Geen adres geassocieerd met hostnaam"
 
-#: nscd/nscd_conf.c:194
-msgid "Must specify user name for stat-user option"
-msgstr "Het is nodig een gebruikersnaam op te geven bij de stat-user optie"
+#: sysdeps/posix/gai_strerror-strs.h:8
+msgid "Name or service not known"
+msgstr "Naam of dienst is niet bekend"
 
-#: nscd/nscd_conf.c:205
-#, c-format
-msgid "Unknown option: %s %s %s"
-msgstr "Onbekende optie: %s %s %s"
+#: sysdeps/posix/gai_strerror-strs.h:9
+msgid "Servname not supported for ai_socktype"
+msgstr "Servicenaam wordt niet ondersteund voor 'ai_socktype'"
 
-#: nscd/nscd_stat.c:103
-#, c-format
-msgid "cannot write statistics: %s"
-msgstr "kan statistieken niet schrijven: %s"
+#: sysdeps/posix/gai_strerror-strs.h:10
+msgid "ai_socktype not supported"
+msgstr "'ai_socktype' wordt niet ondersteund"
 
-#: nscd/nscd_stat.c:128
-#, c-format
-msgid "Only root or %s is allowed to use this option!"
-msgstr "Alleen root of %s mag deze optie gebruiken!"
+#: sysdeps/posix/gai_strerror-strs.h:11
+msgid "System error"
+msgstr "Systeemfout"
 
-#: nscd/nscd_stat.c:139
-msgid "nscd not running!\n"
-msgstr "nscd wordt niet uitgevoerd!\n"
+#: sysdeps/posix/gai_strerror-strs.h:12
+msgid "Processing request in progress"
+msgstr "Bezig met verwerken van verzoek"
 
-#: nscd/nscd_stat.c:150
-msgid "write incomplete"
-msgstr "schrijven onvolledig"
+#: sysdeps/posix/gai_strerror-strs.h:13
+msgid "Request canceled"
+msgstr "Verzoek is geannuleerd"
 
-#: nscd/nscd_stat.c:162
-msgid "cannot read statistics data"
-msgstr "kan statistische gegevens niet lezen"
+#: sysdeps/posix/gai_strerror-strs.h:14
+msgid "Request not canceled"
+msgstr "Verzoek is niet geannuleerd"
 
-#: nscd/nscd_stat.c:165
-#, c-format
-msgid ""
-"nscd configuration:\n"
-"\n"
-"%15d  server debug level\n"
-msgstr ""
-"nscd configuratie:\n"
-"\n"
-"%15d  server debugniveau\n"
+#: sysdeps/posix/gai_strerror-strs.h:15
+msgid "All requests done"
+msgstr "Alle verzoeken zijn gedaan"
 
-#: nscd/nscd_stat.c:189
-#, c-format
-msgid "%3ud %2uh %2um %2lus  server runtime\n"
-msgstr "%3ud %2uh %2um %2lus  server looptijd\n"
+#: sysdeps/posix/gai_strerror-strs.h:16
+msgid "Interrupted by a signal"
+msgstr "Onderbroken door een signaal"
 
-#: nscd/nscd_stat.c:192
-#, c-format
-msgid "    %2uh %2um %2lus  server runtime\n"
-msgstr "    %2uh %2um %2lus  server looptijd\n"
+#: sysdeps/posix/gai_strerror-strs.h:17
+msgid "Parameter string not correctly encoded"
+msgstr "Parameter-tekenreeks is niet juist gecodeerd"
 
-#: nscd/nscd_stat.c:194
-#, c-format
-msgid "        %2um %2lus  server runtime\n"
-msgstr "        %2um %2lus  server looptijd\n"
+#: sysdeps/unix/siglist.c:26
+msgid "Signal 0"
+msgstr "Signaal 0"
 
-#: nscd/nscd_stat.c:196
-#, c-format
-msgid "            %2lus  server runtime\n"
-msgstr "            %2lus  server looptijd\n"
+#: sysdeps/unix/siglist.c:32
+msgid "IOT trap"
+msgstr "IOT-instructie"
 
-#: nscd/nscd_stat.c:198
+#: sysdeps/unix/sysv/linux/i386/readelflib.c:49
 #, c-format
-msgid "%15lu  number of times clients had to wait\n"
-msgstr "%15lu  aantal keren dat de client moest wachten\n"
-
-#: nscd/nscd_stat.c:213 nscd/nscd_stat.c:215
-msgid "      no"
-msgstr "      nee"
-
-#: nscd/nscd_stat.c:213 nscd/nscd_stat.c:215
-msgid "     yes"
-msgstr "     ja"
+msgid "%s is for unknown machine %d.\n"
+msgstr "%s is voor onbekende machine %d.\n"
 
-#: nscd/nscd_stat.c:221
+#: sysdeps/unix/sysv/linux/ia64/makecontext.c:63
 #, c-format
-msgid ""
-"\n"
-"%s cache:\n"
-"\n"
-"%15s  cache is enabled\n"
-"%15Zu  suggested size\n"
-"%15lu  seconds time to live for positive entries\n"
-"%15lu  seconds time to live for negative entries\n"
-"%15lu  cache hits on positive entries\n"
-"%15lu  cache hits on negative entries\n"
-"%15lu  cache misses on positive entries\n"
-"%15lu  cache misses on negative entries\n"
-"%15lu%% cache hit rate\n"
-"%15lu  current number of cached values\n"
-"%15lu  maximum number of cached values\n"
-"%15lu  maximum chain length searched\n"
-"%15lu  number of delays on rdlock\n"
-"%15lu  number of delays on wrlock\n"
-"%15s  check /etc/%s for changes\n"
-msgstr ""
-"\n"
-"%s buffer:\n"
-"\n"
-"%15s  buffer staat aan\n"
-"%15Zu  voorgestelde grootte\n"
-"%15lu  seconden levenstijd voor positieve ingangen\n"
-"%15lu  seconden levenstijd voor negatieve ingangen\n"
-"%15lu  buffertreffers op positieve ingangen\n"
-"%15lu  buffertreffers op negatieve ingangen\n"
-"%15lu  buffermissers op positieve ingangen\n"
-"%15lu  buffermissers op negatieve ingangen\n"
-"%15lu%% aantal buffertreffers\n"
-"%15lu  huidige aantal gebufferde waarden\n"
-"%15lu  maximaal aantal gebufferde waarden\n"
-"%15lu  maximale kettingslengte om te doorzoeken\n"
-"%15lu  aantal vertragingen op·leesblokkering\n"
-"%15lu  aantal vertragingen op schrijfblokkering\n"
-"%15s  controleer /etc/%s voor wijzigingen\n"
-
-#: nscd/pwdcache.c:215
-#, c-format
-msgid "Haven't found \"%s\" in password cache!"
-msgstr "Kon \"%s\" niet vinden in wachtwoordenbuffer!"
+msgid "makecontext: does not know how to handle more than 8 arguments\n"
+msgstr "makecontext(): kan niet meer dan 8 argumenten aan\n"
 
-#: nscd/pwdcache.c:281
+#: sysdeps/unix/sysv/linux/lddlibc4.c:64
 #, c-format
-msgid "Invalid numeric uid \"%s\"!"
-msgstr "Ongeldige numerieke UID \"%s\"!"
+msgid "cannot open `%s'"
+msgstr "kan '%s' niet openen"
 
-#: nscd/pwdcache.c:288
+#: sysdeps/unix/sysv/linux/lddlibc4.c:68
 #, c-format
-msgid "Haven't found \"%d\" in password cache!"
-msgstr "Kon \"%d\" niet vinden in wachtwoordenbuffer!"
+msgid "cannot read header from `%s'"
+msgstr "kan kop van '%s' niet lezen"
 
-#: elf/../sysdeps/generic/dl-sysdep.c:422
-msgid "cannot create capability list"
-msgstr "kan mogelijkhedenlijst niet aanmaken"
+#: timezone/zdump.c:215
+msgid "lacks alphabetic at start"
+msgstr "begint niet met een letter"
 
-#: elf/../sysdeps/generic/readelflib.c:35
-#, c-format
-msgid "file %s is truncated\n"
-msgstr "bestand %s is afgekapt\n"
+#: timezone/zdump.c:217
+msgid "has fewer than 3 alphabetics"
+msgstr "heeft minder dan drie letters"
 
-#: elf/../sysdeps/generic/readelflib.c:67
-#, c-format
-msgid "%s is a 32 bit ELF file.\n"
-msgstr "%s is een 32-bits ELF-bestand.\n"
+#: timezone/zdump.c:219
+msgid "has more than 6 alphabetics"
+msgstr "heeft meer dan zes letters"
 
-#: elf/../sysdeps/generic/readelflib.c:69
-#, c-format
-msgid "%s is a 64 bit ELF file.\n"
-msgstr "%s is een 64-bits ELF-bestand.\n"
+#: timezone/zdump.c:227
+msgid "differs from POSIX standard"
+msgstr "verschilt van de POSIX-standaard"
 
-#: elf/../sysdeps/generic/readelflib.c:71
+#: timezone/zdump.c:233
 #, c-format
-msgid "Unknown ELFCLASS in file %s.\n"
-msgstr "Onbekende ELFCLASS in bestand %s.\n"
+msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"
+msgstr "%s: Waarschuwing: zone \"%s\", afkorting \"%s\" %s\n"
 
-#: elf/../sysdeps/generic/readelflib.c:78
+#: timezone/zdump.c:284
 #, c-format
-msgid "%s is not a shared object file (Type: %d).\n"
-msgstr "%s is niet een gedeeld objektbestand (Soort: %d).\n"
-
-#: elf/../sysdeps/generic/readelflib.c:109
-msgid "more than one dynamic segment\n"
-msgstr "meerdere dynamische segmenten\n"
+msgid "%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"
+msgstr ""
+"Gebruik:  %s [-v] [-c [ondergrens,]bovengrens] zonenaam...\n"
+"          %s --version\n"
 
-#: elf/../sysdeps/unix/sysv/linux/i386/readelflib.c:49
+#: timezone/zdump.c:301
 #, c-format
-msgid "%s is for unknown machine %d.\n"
-msgstr "%s is voor onbekende machine %d.\n"
+msgid "%s: wild -c argument %s\n"
+msgstr "%s: extra argument %s bij optie -c\n"
 
-#: elf/cache.c:70
-msgid "unknown"
-msgstr "onbekend"
+#: timezone/zdump.c:392
+msgid "Error writing to standard output"
+msgstr "Fout tijdens schrijven naar standaarduitvoer"
 
-#: elf/cache.c:111
-msgid "Unknown OS"
-msgstr "Onbekend besturingssysteem"
+#: timezone/zdump.c:415
+#, c-format
+msgid "%s: use of -v on system with floating time_t other than float or double\n"
+msgstr "%s: Optie -v is gebruikt op een systeem zonder een adequaat drijvende-kommatype voor 'time_t'\n"
 
-#: elf/cache.c:116
+#: timezone/zic.c:371
 #, c-format
-msgid ", OS ABI: %s %d.%d.%d"
-msgstr ", Besturingssysteem ABI: %s %d.%d.%d"
+msgid "%s: Memory exhausted: %s\n"
+msgstr "%s: Onvoldoende geheugen: %s\n"
 
-#: elf/cache.c:142 elf/ldconfig.c:1078
+#: timezone/zic.c:430
 #, c-format
-msgid "Can't open cache file %s\n"
-msgstr "Kan bufferbestand %s niet openen\n"
+msgid "\"%s\", line %d: %s"
+msgstr "\"%s\", regel %d: %s"
 
-#: elf/cache.c:154
-msgid "mmap of cache file failed.\n"
-msgstr "mmap van bufferbestand mislukt.\n"
+#: timezone/zic.c:433
+#, c-format
+msgid " (rule from \"%s\", line %d)"
+msgstr " (voorschrift uit \"%s\", regel %d)"
 
-#: elf/cache.c:158 elf/cache.c:168
-msgid "File is not a cache file.\n"
-msgstr "Bestand is niet een bufferbestand.\n"
+#: timezone/zic.c:445
+msgid "warning: "
+msgstr "waarschuwing: "
 
-#: elf/cache.c:201 elf/cache.c:211
+#: timezone/zic.c:455
 #, c-format
-msgid "%d libs found in cache `%s'\n"
-msgstr "%d bibliotheken gevonden in buffer `%s'\n"
+msgid ""
+"%s: usage is %s [ --version ] [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+"\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+msgstr ""
+"Gebruik:  %s [-s] [-v] [-l lokale_tijd] [-p posixvoorschriften] [-d map] \\\n"
+"              [-L schrikkelseconden] [-y jaar_is_soort] [bestandsnaam...]\n"
+"          %s --version\n"
 
-#: elf/cache.c:410
+#: timezone/zic.c:503
 #, c-format
-msgid "Can't remove old temporary cache file %s"
-msgstr "Kan oud tijdelijk bufferbestand %s niet verwijderen"
+msgid "%s: More than one -d option specified\n"
+msgstr "%s: Optie -d is meermaals gegeven\n"
 
-#: elf/cache.c:417
+#: timezone/zic.c:513
 #, c-format
-msgid "Can't create temporary cache file %s"
-msgstr "Kan tijdelijk bufferbestand %s niet aanmaken"
-
-#: elf/cache.c:425 elf/cache.c:434 elf/cache.c:438
-msgid "Writing of cache data failed"
-msgstr "Schrijven van buffergegevens mislukt"
-
-#: elf/cache.c:442
-msgid "Writing of cache data failed."
-msgstr "Schrijven van buffergegevens mislukt."
+msgid "%s: More than one -l option specified\n"
+msgstr "%s: Optie -l is meermaals gegeven\n"
 
-#: elf/cache.c:449
+#: timezone/zic.c:523
 #, c-format
-msgid "Changing access rights of %s to %#o failed"
-msgstr "Wijzigen toegangsrechten van %s naar %#o mislukt"
+msgid "%s: More than one -p option specified\n"
+msgstr "%s: Optie -p is meermaals gegeven\n"
 
-#: elf/cache.c:454
+#: timezone/zic.c:533
 #, c-format
-msgid "Renaming of %s to %s failed"
-msgstr "Naam wijzigen van %s naar %s mislukt"
-
-#: elf/dl-close.c:128
-msgid "shared object not open"
-msgstr "gedeeld objekt niet open"
-
-#: elf/dl-close.c:531 elf/dl-open.c:454
-msgid "TLS generation counter wrapped!  Please send report with the 'glibcbug' script."
-msgstr "De teller bij het TLS genereren is weer opnieuw begonnen!  Rapporteer deze softwarefout alstublieft met het 'glibcbug' script."
-
-#: elf/dl-deps.c:111 elf/dl-open.c:183
-msgid "DST not allowed in SUID/SGID programs"
-msgstr "DST niet toegestaan in SUID/SGID-programma's"
-
-#: elf/dl-deps.c:124
-msgid "empty dynamics string token substitution"
-msgstr "lege dynamische vervanging van tekenreeks-token"
+msgid "%s: More than one -y option specified\n"
+msgstr "%s: Optie -y is meermaals gegeven\n"
 
-#: elf/dl-deps.c:130
+#: timezone/zic.c:543
 #, c-format
-msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
-msgstr "kan helper `%s' niet laden vanwege lege dynamische vervanging van tekenreeks-token\n"
-
-#: elf/dl-deps.c:461
-msgid "cannot allocate dependency list"
-msgstr "kan afhankelijkhedenlijst niet toewijzen"
-
-#: elf/dl-deps.c:494 elf/dl-deps.c:549
-msgid "cannot allocate symbol search list"
-msgstr "kan symboolzoeklijst niet toewijzen"
-
-#: elf/dl-deps.c:534
-msgid "Filters not supported with LD_TRACE_PRELINKING"
-msgstr "Filters niet ondersteund met LD_TRACE_PRELINKING"
-
-#: elf/dl-error.c:75
-msgid "DYNAMIC LINKER BUG!!!"
-msgstr "FOUT IN DYNAMISCHE KOPPELAAR!!!"
-
-#: elf/dl-error.c:108
-msgid "error while loading shared libraries"
-msgstr "fout bij laden gedeelde bibliotheken"
-
-#: elf/dl-load.c:347
-msgid "cannot allocate name record"
-msgstr "kan naamrecord niet toewijzen"
-
-#: elf/dl-load.c:449 elf/dl-load.c:528 elf/dl-load.c:648 elf/dl-load.c:743
-msgid "cannot create cache for search path"
-msgstr "kan buffer voor zoekpad niet aanmaken"
-
-#: elf/dl-load.c:551
-msgid "cannot create RUNPATH/RPATH copy"
-msgstr "kan geen kopie maken van RUNPATH/RPATH"
-
-#: elf/dl-load.c:634
-msgid "cannot create search path array"
-msgstr "kan zoekpad array niet aanmaken"
-
-#: elf/dl-load.c:830
-msgid "cannot stat shared object"
-msgstr "kan gedeeld objekt niet vinden"
-
-#: elf/dl-load.c:874
-msgid "cannot open zero fill device"
-msgstr "kan nul-opvul apparaat niet openen"
-
-#: elf/dl-load.c:883 elf/dl-load.c:1929
-msgid "cannot create shared object descriptor"
-msgstr "kan gedeeld objekt beschrijver niet aanmaken"
-
-#: elf/dl-load.c:902 elf/dl-load.c:1470 elf/dl-load.c:1553
-msgid "cannot read file data"
-msgstr "kan bestandsgegevens niet lezen"
-
-#: elf/dl-load.c:946
-msgid "ELF load command alignment not page-aligned"
-msgstr "uitlijning van ELF-laadopdracht niet pagina-uitgelijnd"
-
-#: elf/dl-load.c:953
-msgid "ELF load command address/offset not properly aligned"
-msgstr "ELF-laadopdracht adres/positie niet juist uitgelijnd"
-
-#: elf/dl-load.c:1037
-msgid "cannot allocate TLS data structures for initial thread"
-msgstr "kan TLS-gegevensstructuren niet toewijzen voor initiële thread"
-
-#: elf/dl-load.c:1061
-msgid "cannot handle TLS data"
-msgstr "kan TLS-gegevens niet verwerken"
-
-#: elf/dl-load.c:1075
-msgid "object file has no loadable segments"
-msgstr "objektbestand heeft geen te laden segmenten"
-
-#: elf/dl-load.c:1110
-msgid "failed to map segment from shared object"
-msgstr "afbeelden van segment van gedeeld objekt mislukt"
-
-#: elf/dl-load.c:1135
-msgid "cannot dynamically load executable"
-msgstr "kan uitvoerbaar bestand niet dynamisch laden"
-
-#: elf/dl-load.c:1191
-msgid "cannot change memory protections"
-msgstr "kan geheugenbeschermingen niet veranderen"
-
-#: elf/dl-load.c:1210
-msgid "cannot map zero-fill pages"
-msgstr "kan nul-gevulde pagina's niet afbeelden"
-
-#: elf/dl-load.c:1228
-msgid "cannot allocate memory for program header"
-msgstr "kan geen geheugen toewijzen voor programmakop"
-
-#: elf/dl-load.c:1259
-msgid "object file has no dynamic section"
-msgstr "objektbestand heeft geen dynamische sectie"
-
-#: elf/dl-load.c:1299
-msgid "shared object cannot be dlopen()ed"
-msgstr "gedeeld objekt kan niet ge-dlopen()d worden"
-
-#: elf/dl-load.c:1322
-msgid "cannot create searchlist"
-msgstr "kan zoeklijst niet aanmaken"
-
-#: elf/dl-load.c:1352
-msgid "cannot enable executable stack as shared object requires"
-msgstr "kan uitvoerbare stack niet aanzetten zoals gedeeld objekt vereist"
+msgid "%s: More than one -L option specified\n"
+msgstr "%s: Optie -L is meermaals gegeven\n"
 
-#: elf/dl-load.c:1470
-msgid "file too short"
-msgstr "bestand te kort"
+#: timezone/zic.c:592
+msgid "link to link"
+msgstr "koppeling naar een andere koppeling"
 
-#: elf/dl-load.c:1493
-msgid "invalid ELF header"
-msgstr "ongeldige ELF-header"
+#: timezone/zic.c:657
+msgid "hard link failed, symbolic link used"
+msgstr "harde koppeling is mislukt; symbolische wordt gebruikt"
 
-#: elf/dl-load.c:1502
-msgid "ELF file data encoding not big-endian"
-msgstr "ELF-bestand gegevenscodering niet big-endian"
+#: timezone/zic.c:665
+#, c-format
+msgid "%s: Can't link from %s to %s: %s\n"
+msgstr "%s: Kan geen koppeling maken van %s naar %s: %s\n"
 
-#: elf/dl-load.c:1504
-msgid "ELF file data encoding not little-endian"
-msgstr "ELF-bestand gegevenscodering niet little-endian"
+#: timezone/zic.c:774 timezone/zic.c:776
+msgid "same rule name in multiple files"
+msgstr "dezelfde voorschriftnaam in meerdere bestanden"
 
-#: elf/dl-load.c:1508
-msgid "ELF file version ident does not match current one"
-msgstr "ELF-bestandsversie identificatie komt niet overeen met huidige"
+#: timezone/zic.c:817
+msgid "unruly zone"
+msgstr "onhandelbare zone"
 
-#: elf/dl-load.c:1512
-msgid "ELF file OS ABI invalid"
-msgstr "ELF-bestand OS ABI onjuist"
+#: timezone/zic.c:824
+#, c-format
+msgid "%s in ruleless zone"
+msgstr "%s in voorschriftloze zone"
 
-#: elf/dl-load.c:1514
-msgid "ELF file ABI version invalid"
-msgstr "ELF-bestand ABI-versie ongeldig"
+#: timezone/zic.c:845
+msgid "standard input"
+msgstr "standaardinvoer"
 
-#: elf/dl-load.c:1517
-msgid "internal error"
-msgstr "interne fout"
+#: timezone/zic.c:850
+#, c-format
+msgid "%s: Can't open %s: %s\n"
+msgstr "%s: Kan %s niet openen: %s\n"
 
-#: elf/dl-load.c:1524
-msgid "ELF file version does not match current one"
-msgstr "ELF-bestand versie komt niet overeen met huidige"
+#: timezone/zic.c:861
+msgid "line too long"
+msgstr "regel is te lang"
 
-#: elf/dl-load.c:1532
-msgid "ELF file's phentsize not the expected size"
-msgstr "phentsize van ELF-bestand niet de verwachte grootte"
+#: timezone/zic.c:881
+msgid "input line of unknown type"
+msgstr "invoerregel is van onbekende soort"
 
-#: elf/dl-load.c:1538
-msgid "only ET_DYN and ET_EXEC can be loaded"
-msgstr "slechts ET_DYN en ET_EXEC kunnen worden geladen"
+#: timezone/zic.c:897
+#, c-format
+msgid "%s: Leap line in non leap seconds file %s\n"
+msgstr "%s: Schrikkelregel in niet-schrikkelbestand %s\n"
 
-#: elf/dl-load.c:1944
-msgid "cannot open shared object file"
-msgstr "kan gedeeld objektbestand niet openen"
+#: timezone/zic.c:904 timezone/zic.c:1325 timezone/zic.c:1350
+#, c-format
+msgid "%s: panic: Invalid l_value %d\n"
+msgstr "%s: **interne fout** -- ongeldige regelcode %d\n"
 
-#: elf/dl-lookup.c:265 elf/dl-lookup.c:443
-msgid "relocation error"
-msgstr "verhuisfout"
+#: timezone/zic.c:912
+#, c-format
+msgid "%s: Error reading %s\n"
+msgstr "%s: Fout bij lezen van %s\n"
 
-#: elf/dl-open.c:111
-msgid "cannot extend global scope"
-msgstr "kan globaal bereik niet uitbreiden"
+#: timezone/zic.c:919
+#, c-format
+msgid "%s: Error closing %s: %s\n"
+msgstr "%s: Fout bij sluiten van %s: %s\n"
 
-#: elf/dl-open.c:214
-msgid "empty dynamic string token substitution"
-msgstr "lege dynamische vervanging van tekenreeks-token"
+#: timezone/zic.c:924
+msgid "expected continuation line not found"
+msgstr "verwachte regelcontinuering is niet gevonden"
 
-#: elf/dl-open.c:361 elf/dl-open.c:372
-msgid "cannot create scope list"
-msgstr "kan bereiklijst niet aanmaken"
+#: timezone/zic.c:968
+msgid "24:00 not handled by pre-1998 versions of zic"
+msgstr "versies van 'zic' van voor 1998 kunnen '24:00' niet aan"
 
-#: elf/dl-open.c:434
-msgid "cannot create TLS data structures"
-msgstr "kan TLS-gegevensstructuren niet aanmaken"
+#: timezone/zic.c:982
+msgid "wrong number of fields on Rule line"
+msgstr "verkeerd aantal velden op 'Rule'-regel"
 
-#: elf/dl-open.c:496
-msgid "invalid mode for dlopen()"
-msgstr "ongeldige modus voor dlopen()"
+#: timezone/zic.c:986
+msgid "nameless rule"
+msgstr "naamloos voorschrift"
 
-#: elf/dl-reloc.c:57
-msgid "cannot allocate memory in static TLS block"
-msgstr "kan geen geheugen toewijzen in statisch TLS-blok"
+#: timezone/zic.c:991
+msgid "invalid saved time"
+msgstr "ongeldige opgeslagen tijd"
 
-#: elf/dl-reloc.c:176
-msgid "cannot make segment writable for relocation"
-msgstr "kan segment niet schrijfbaar maken voor verhuizing"
+#: timezone/zic.c:1010
+msgid "wrong number of fields on Zone line"
+msgstr "verkeerd aantal velden op 'Zone'-regel"
 
-#: elf/dl-reloc.c:277
+#: timezone/zic.c:1016
 #, c-format
-msgid "%s: profiler found no PLTREL in object %s\n"
-msgstr "%s: profileerder heeft geen PLTREL in objekt gevonden %s\n"
+msgid "\"Zone %s\" line and -l option are mutually exclusive"
+msgstr "De regel \"Zone %s\" en optie -l sluiten elkaar uit"
 
-#: elf/dl-reloc.c:289
+#: timezone/zic.c:1024
 #, c-format
-msgid "%s: profiler out of memory shadowing PLTREL of %s\n"
-msgstr "%s: profileerder heeft geheugentekort bij schaduwen van PLTREL van %s\n"
-
-#: elf/dl-reloc.c:304
-msgid "cannot restore segment prot after reloc"
-msgstr "kan segmentbescherming niet herstellen na verhuizing"
-
-#: elf/dl-sym.c:74 elf/dl-sym.c:145
-msgid "RTLD_NEXT used in code not dynamically loaded"
-msgstr "RTLD_NEXT gebruikt in code niet dynamisch geladen"
-
-#: elf/dl-version.c:303
-msgid "cannot allocate version reference table"
-msgstr "kan versieverwijzingstabel niet toewijzen"
+msgid "\"Zone %s\" line and -p option are mutually exclusive"
+msgstr "De regel \"Zone %s\" en optie -p sluiten elkaar uit"
 
-#: elf/ldconfig.c:122
-msgid "Print cache"
-msgstr "Buffer weergeven"
+#: timezone/zic.c:1036
+#, c-format
+msgid "duplicate zone name %s (file \"%s\", line %d)"
+msgstr "dubbele zonenaam '%s' (in bestand %s, regel %d)"
 
-#: elf/ldconfig.c:123
-msgid "Generate verbose messages"
-msgstr "Breedsprakige berichten genereren"
+#: timezone/zic.c:1052
+msgid "wrong number of fields on Zone continuation line"
+msgstr "verkeerd aantal velden op 'Zone'-continueringsregel"
 
-#: elf/ldconfig.c:124
-msgid "Don't build cache"
-msgstr "Geen buffer bouwen"
+#: timezone/zic.c:1092
+msgid "invalid UTC offset"
+msgstr "ongeldige positie ten opzichte van UTC"
 
-#: elf/ldconfig.c:125
-msgid "Don't generate links"
-msgstr "Geen koppelingen genereren"
+#: timezone/zic.c:1095
+msgid "invalid abbreviation format"
+msgstr "ongeldige opmaak voor afkorting"
 
-#: elf/ldconfig.c:126
-msgid "Change to and use ROOT as root directory"
-msgstr "Gaan naar en ROOT gebruiken als root-map"
+#: timezone/zic.c:1122
+msgid "Zone continuation line end time is not after end time of previous line"
+msgstr "'Zone'-continueringsregel: eindtijd ligt niet na eindtijd van vorige regel"
 
-#: elf/ldconfig.c:127
-msgid "Use CACHE as cache file"
-msgstr "BUFFER als bufferbestand gebruiken"
+#: timezone/zic.c:1150
+msgid "wrong number of fields on Leap line"
+msgstr "verkeerd aantal velden op 'Leap'-regel"
 
-#: elf/ldconfig.c:128
-msgid "Use CONF as configuration file"
-msgstr "CONF als configuratiebestand gebruiken"
+#: timezone/zic.c:1159
+msgid "invalid leaping year"
+msgstr "ongeldig schrikkeljaar"
 
-#: elf/ldconfig.c:129
-msgid "Only process directories specified on the command line.  Don't build cache."
-msgstr "Alleen mappen opgegeven op opdrachtregel verwerken.  Geen buffer opbouwen."
+#: timezone/zic.c:1174 timezone/zic.c:1280
+msgid "invalid month name"
+msgstr "ongeldige maandnaam"
 
-#: elf/ldconfig.c:130
-msgid "Manually link individual libraries."
-msgstr "Handmatig losse bibliotheken koppelen."
+#: timezone/zic.c:1187 timezone/zic.c:1402 timezone/zic.c:1416
+msgid "invalid day of month"
+msgstr "ongeldige dag van maand"
 
-#: elf/ldconfig.c:131
-msgid "Format to use: new, old or compat (default)"
-msgstr "Formaat om te gebruiken: nieuw, oud of compatibiliteit (standaard)"
+#: timezone/zic.c:1192
+msgid "time before zero"
+msgstr "tijdswaarde is kleiner dan nul"
 
-#: elf/ldconfig.c:139
-msgid "Configure Dynamic Linker Run Time Bindings."
-msgstr "Dynamische koppelaar uitvoer-tijd bindingen configureren."
+#: timezone/zic.c:1196
+msgid "time too small"
+msgstr "tijdswaarde is te klein"
 
-#: elf/ldconfig.c:297
-#, c-format
-msgid "Path `%s' given more than once"
-msgstr "Pad `%s' meerdere malen opgegeven"
+#: timezone/zic.c:1200
+msgid "time too large"
+msgstr "tijdswaarde is te groot"
 
-#: elf/ldconfig.c:341
-#, c-format
-msgid "%s is not a known library type"
-msgstr "%s is geen bekende bibliotheeksoort"
+#: timezone/zic.c:1204 timezone/zic.c:1309
+msgid "invalid time of day"
+msgstr "ongeldige tijd van de dag"
 
-#: elf/ldconfig.c:361
-#, c-format
-msgid "Can't stat %s"
-msgstr "Kan %s niet vinden"
+#: timezone/zic.c:1223
+msgid "illegal CORRECTION field on Leap line"
+msgstr "ongeldig CORRECTION-veld op 'Leap'-regel"
 
-#: elf/ldconfig.c:431
-#, c-format
-msgid "Can't stat %s\n"
-msgstr "Kan %s niet vinden\n"
+#: timezone/zic.c:1228
+msgid "illegal Rolling/Stationary field on Leap line"
+msgstr "ongeldig 'Rolling'/'Stationary'-veld op 'Leap'-regel"
 
-#: elf/ldconfig.c:441
-#, c-format
-msgid "%s is not a symbolic link\n"
-msgstr "%s is geen symbolische koppeling\n"
+#: timezone/zic.c:1244
+msgid "wrong number of fields on Link line"
+msgstr "verkeerd aantal velden op 'Link'-regel"
 
-#: elf/ldconfig.c:460
-#, c-format
-msgid "Can't unlink %s"
-msgstr "Kan %s niet ontkoppelen"
+#: timezone/zic.c:1248
+msgid "blank FROM field on Link line"
+msgstr "leeg FROM-veld op 'Link'-regel"
 
-#: elf/ldconfig.c:466
-#, c-format
-msgid "Can't link %s to %s"
-msgstr "Kan %s niet met %s koppelen"
+#: timezone/zic.c:1252
+msgid "blank TO field on Link line"
+msgstr "leeg TO-veld op 'Link'-regel"
 
-#: elf/ldconfig.c:472
-msgid " (changed)\n"
-msgstr " (gewijzigd)\n"
+#: timezone/zic.c:1329
+msgid "invalid starting year"
+msgstr "ongeldig beginjaar"
 
-#: elf/ldconfig.c:474
-msgid " (SKIPPED)\n"
-msgstr " (OVERGESLAGEN)\n"
+#: timezone/zic.c:1333
+msgid "starting year too low to be represented"
+msgstr "beginjaar is te vroeg om te kunnen representeren"
 
-#: elf/ldconfig.c:529
-#, c-format
-msgid "Can't find %s"
-msgstr "Kan %s niet vinden"
+#: timezone/zic.c:1335
+msgid "starting year too high to be represented"
+msgstr "beginjaar is te laat om te kunnen representeren"
 
-#: elf/ldconfig.c:545
-#, c-format
-msgid "Can't lstat %s"
-msgstr "Kan %s niet vinden (met lstat)"
+#: timezone/zic.c:1354
+msgid "invalid ending year"
+msgstr "ongeldig eindjaar"
 
-#: elf/ldconfig.c:552
-#, c-format
-msgid "Ignored file %s since it is not a regular file."
-msgstr "Bestand %s genegeerd omdat het geen gewoon bestand is."
+#: timezone/zic.c:1358
+msgid "ending year too low to be represented"
+msgstr "eindjaar is te vroeg om te kunnen representeren"
 
-#: elf/ldconfig.c:560
-#, c-format
-msgid "No link created since soname could not be found for %s"
-msgstr "Geen koppeling aangemaakt omdat soname (gedeeld-objekt naam) niet kon worden gevonden voor %s"
+#: timezone/zic.c:1360
+msgid "ending year too high to be represented"
+msgstr "eindjaar is te laat om te kunnen representeren"
 
-#: elf/ldconfig.c:651
-#, c-format
-msgid "Can't open directory %s"
-msgstr "Kan map %s niet openen"
+#: timezone/zic.c:1363
+msgid "starting year greater than ending year"
+msgstr "beginjaar is groter dan eindjaar"
 
-#: elf/ldconfig.c:706 elf/ldconfig.c:753
-#, c-format
-msgid "Cannot lstat %s"
-msgstr "Kan %s niet vinden (met lstat)"
+#: timezone/zic.c:1370
+msgid "typed single year"
+msgstr "beginjaar en eindjaar zijn gelijk"
 
-#: elf/ldconfig.c:718
-#, c-format
-msgid "Cannot stat %s"
-msgstr "Kan %s niet vinden"
+#: timezone/zic.c:1407
+msgid "invalid weekday name"
+msgstr "ongeldige naam voor weekdag"
 
-#: elf/ldconfig.c:775 elf/readlib.c:92
+#: timezone/zic.c:1521
 #, c-format
-msgid "Input file %s not found.\n"
-msgstr "Invoerbestand %s niet gevonden.\n"
+msgid "%s: Can't remove %s: %s\n"
+msgstr "%s: Kan %s niet verwijderen: %s\n"
 
-#: elf/ldconfig.c:826
+#: timezone/zic.c:1531
 #, c-format
-msgid "libc5 library %s in wrong directory"
-msgstr "libc5-bibliotheek %s in verkeerde map"
+msgid "%s: Can't create %s: %s\n"
+msgstr "%s: Kan %s niet aanmaken: %s\n"
 
-#: elf/ldconfig.c:829
+#: timezone/zic.c:1598
 #, c-format
-msgid "libc6 library %s in wrong directory"
-msgstr "libc6-bibliotheek %s in verkeerde map"
+msgid "%s: Error writing %s\n"
+msgstr "%s: Fout bij schrijven van %s\n"
 
-#: elf/ldconfig.c:832
-#, c-format
-msgid "libc4 library %s in wrong directory"
-msgstr "libc4-bibliotheek %s in verkeerde map"
+#: timezone/zic.c:1789
+msgid "can't determine time zone abbreviation to use just after until time"
+msgstr "kan tijdzone-afkorting voor gebruik na een tot-tijd niet bepalen"
 
-#: elf/ldconfig.c:859
-#, c-format
-msgid "libraries %s and %s in directory %s have same soname but different type."
-msgstr "bibliotheken %s en %s in map %s hebben dezelfde soname (gedeeld-objekt naam) maar een verschillende soort."
+#: timezone/zic.c:1832
+msgid "too many transitions?!"
+msgstr "te veel overgangen!?"
 
-#: elf/ldconfig.c:962
-#, c-format
-msgid "Can't open configuration file %s"
-msgstr "Kan configuratiebestand %s niet openen"
+#: timezone/zic.c:1851
+msgid "internal error - addtype called with bad isdst"
+msgstr "**interne fout** -- addtype() aangeroepen met onjuiste 'isdst'"
 
-#: elf/ldconfig.c:1033
-#, c-format
-msgid "relative path `%s' used to build cache"
-msgstr "relatief pad `%s' gebruikt om buffer te bouwen"
+#: timezone/zic.c:1855
+msgid "internal error - addtype called with bad ttisstd"
+msgstr "**interne fout** -- addtype() aangeroepen met onjuiste 'ttisstd'"
 
-#: elf/ldconfig.c:1057
-msgid "Can't chdir to /"
-msgstr "Kan niet verplaatsen naar map /"
+#: timezone/zic.c:1859
+msgid "internal error - addtype called with bad ttisgmt"
+msgstr "**interne fout** -- addtype() aangeroepen met onjuiste 'ttisgmt'"
 
-#: elf/ldconfig.c:1099
-#, c-format
-msgid "Can't open cache file directory %s\n"
-msgstr "Kan bufferbestandmap %s niet openen\n"
+#: timezone/zic.c:1878
+msgid "too many local time types"
+msgstr "te veel soorten lokale tijd"
 
-#: elf/readlib.c:98
-#, c-format
-msgid "Cannot fstat file %s.\n"
-msgstr "Kan bestand %s niet vinden (met fstat).\n"
+#: timezone/zic.c:1906
+msgid "too many leap seconds"
+msgstr "te veel schrikkelseconden"
 
-#: elf/readlib.c:108
-#, c-format
-msgid "File %s is too small, not checked."
-msgstr "Bestand %s is te klein, niet gecontroleerd."
+#: timezone/zic.c:1912
+msgid "repeated leap second moment"
+msgstr "herhaald schrikkelseconde-moment"
 
-#: elf/readlib.c:117
-#, c-format
-msgid "Cannot mmap file %s.\n"
-msgstr "In geheugen afbeelden van %s mislukt.\n"
+#: timezone/zic.c:1964
+msgid "Wild result from command execution"
+msgstr "Vreemd resultaat van uitgevoerde opdracht"
 
-#: elf/readlib.c:155
+#: timezone/zic.c:1965
 #, c-format
-msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
-msgstr "%s is geen ELF-bestand - het heeft de verkeerde magische bytes aan het begin.\n"
-
-#: elf/sprof.c:72
-msgid "Output selection:"
-msgstr "Uitvoerselectie:"
-
-#: elf/sprof.c:74
-msgid "print list of count paths and their number of use"
-msgstr "lijst weergeven met telpaden en hoe vaak ze worden gebruikt"
-
-#: elf/sprof.c:76
-msgid "generate flat profile with counts and ticks"
-msgstr "vlak profiel met aantallen en tikken genereren"
-
-#: elf/sprof.c:77
-msgid "generate call graph"
-msgstr "aanroepengrafiek genereren"
-
-#: elf/sprof.c:84
-msgid "Read and display shared object profiling data"
-msgstr "Profileergegevens van gedeeld objekt lezen en weergeven"
-
-#: elf/sprof.c:87
-msgid "SHOBJ [PROFDATA]"
-msgstr "GEDEELD_OBJEKT [PROFILEERGEGEVENS]"
+msgid "%s: command was '%s', result was %d\n"
+msgstr "%s: opdracht was '%s', resultaat was %d\n"
 
-#: elf/sprof.c:398
-#, c-format
-msgid "failed to load shared object `%s'"
-msgstr "laden gedeeld objekt `%s' mislukt"
+#: timezone/zic.c:2062
+msgid "Odd number of quotation marks"
+msgstr "Oneven aantal aanhalingstekens"
 
-#: elf/sprof.c:407
-msgid "cannot create internal descriptors"
-msgstr "kan interne beschrijvers niet aanmaken"
+#: timezone/zic.c:2083 timezone/zic.c:2102
+msgid "time overflow"
+msgstr "tijdsoverloop"
 
-#: elf/sprof.c:526
-#, c-format
-msgid "Reopening shared object `%s' failed"
-msgstr "Opnieuw openen van gedeelde objekt `%s' mislukt"
+#: timezone/zic.c:2149
+msgid "use of 2/29 in non leap-year"
+msgstr "'29-2' gebruikt in een niet-schrikkeljaar"
 
-#: elf/sprof.c:534
-msgid "mapping of section headers failed"
-msgstr "afbeelden van sectiekoppen mislukt"
+#: timezone/zic.c:2184
+msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic"
+msgstr "voorschrift gaat voorbij begin of einde van maand -- dit werkt niet met versies van 'zic' van voor 2004"
 
-#: elf/sprof.c:544
-msgid "mapping of section header string table failed"
-msgstr "afbeelden van sectiekoppen tekenreekstabel mislukt"
+#: timezone/zic.c:2218
+msgid "time zone abbreviation lacks alphabetic at start"
+msgstr "tijdzone-afkorting begint niet met een letter"
 
-#: elf/sprof.c:564
-#, c-format
-msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
-msgstr "*** Het bestand `%s' is gestript: geen gedetailleerde analyse mogelijk\n"
+#: timezone/zic.c:2220
+msgid "time zone abbreviation has more than 3 alphabetics"
+msgstr "tijdzone-afkorting heeft meer dan drie letters"
 
-#: elf/sprof.c:594
-msgid "failed to load symbol data"
-msgstr "laden symboolgegevens mislukt"
+#: timezone/zic.c:2222
+msgid "time zone abbreviation has too many alphabetics"
+msgstr "tijdzone-afkorting heeft te veel letters"
 
-#: elf/sprof.c:664
-msgid "cannot load profiling data"
-msgstr "kan profileergegevens niet laden"
+#: timezone/zic.c:2232
+msgid "time zone abbreviation differs from POSIX standard"
+msgstr "tijdzone-afkorting verschilt van de POSIX-standaard"
 
-#: elf/sprof.c:673
-msgid "while stat'ing profiling data file"
-msgstr "bij vinden profileergegevensbestand"
+#: timezone/zic.c:2244
+msgid "too many, or too long, time zone abbreviations"
+msgstr "te veel of te lange tijdzone-afkortingen"
 
-#: elf/sprof.c:681
+#: timezone/zic.c:2285
 #, c-format
-msgid "profiling data file `%s' does not match shared object `%s'"
-msgstr "profileergegevens bestand `%s' komt niet overeen met gedeeld objekt `%s'"
-
-#: elf/sprof.c:692
-msgid "failed to mmap the profiling data file"
-msgstr "afbeelden in geheugen van profileergegevensbestand mislukt"
-
-#: elf/sprof.c:700
-msgid "error while closing the profiling data file"
-msgstr "fout bij sluiten profileergegevens bestand"
-
-#: elf/sprof.c:709 elf/sprof.c:779
-msgid "cannot create internal descriptor"
-msgstr "kan interne beschrijver niet aanmaken"
+msgid "%s: Can't create directory %s: %s\n"
+msgstr "%s: Kan map %s niet aanmaken: %s\n"
 
-#: elf/sprof.c:755
+#: timezone/zic.c:2307
 #, c-format
-msgid "`%s' is no correct profile data file for `%s'"
-msgstr "`%s' is geen juist bestand met profileergegevens voor `%s'"
-
-#: elf/sprof.c:936 elf/sprof.c:988
-msgid "cannot allocate symbol data"
-msgstr "kan symboolgegevens niet toewijzen"
+msgid "%s: %d did not sign extend correctly\n"
+msgstr "%s: %d is niet correct omgezet naar een grotere precisie\n"
diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c
index 1740e58cdc..3eaf0a25ab 100644
--- a/sunrpc/auth_unix.c
+++ b/sunrpc/auth_unix.c
@@ -347,7 +347,7 @@ marshal_new_auth (AUTH *auth)
   INTUSE(xdrmem_create) (xdrs, au->au_marshed, MAX_AUTH_BYTES, XDR_ENCODE);
   if ((!INTUSE(xdr_opaque_auth) (xdrs, &(auth->ah_cred))) ||
       (!INTUSE(xdr_opaque_auth) (xdrs, &(auth->ah_verf))))
-    perror (_("auth_none.c - Fatal marshalling problem"));
+    perror (_("auth_unix.c: Fatal marshalling problem"));
   else
     au->au_mpos = XDR_GETPOS (xdrs);
 
diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
index 954657a7e4..bda432d3cd 100644
--- a/sunrpc/rpc_main.c
+++ b/sunrpc/rpc_main.c
@@ -457,7 +457,7 @@ check_nettype (const char *name, const char *list_to_check[])
 	  return 1;
 	}
     }
-  fprintf (stderr, _ ("illegal nettype :`%s'\n"), name);
+  fprintf (stderr, _ ("illegal nettype: `%s'\n"), name);
   return 0;
 }
 
diff --git a/sysdeps/x86_64/fpu/s_copysign.S b/sysdeps/x86_64/fpu/s_copysign.S
index f1ebcf8bf1..f3d9b0cbb4 100644
--- a/sysdeps/x86_64/fpu/s_copysign.S
+++ b/sysdeps/x86_64/fpu/s_copysign.S
@@ -1,5 +1,5 @@
 /* copy sign, double version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 2002.
 
@@ -31,6 +31,8 @@
 signmask:
 	.byte 0, 0, 0, 0, 0, 0, 0, 0x80
 	.byte 0, 0, 0, 0, 0, 0, 0, 0
+	ASM_SIZE_DIRECTIVE(signmask)
+	ASM_TYPE_DIRECTIVE(othermask,@object)
 othermask:
 	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
 	.byte 0, 0, 0, 0, 0, 0, 0, 0
@@ -42,6 +44,7 @@ othermask:
 #define MO(op) op
 #endif
 
+	.text
 ENTRY(__copysign)
 	andpd MO(othermask),%xmm0
 	andpd MO(signmask),%xmm1
diff --git a/sysdeps/x86_64/fpu/s_copysignf.S b/sysdeps/x86_64/fpu/s_copysignf.S
index f5dc5f78ad..0fbe1d4c96 100644
--- a/sysdeps/x86_64/fpu/s_copysignf.S
+++ b/sysdeps/x86_64/fpu/s_copysignf.S
@@ -1,5 +1,5 @@
 /* copy sign, double version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 2002.
 
@@ -38,6 +38,7 @@ mask:
 #define MO(op) op
 #endif
 
+	.text
 ENTRY(__copysignf)
 	movss	MO(mask),%xmm3
 	andps	%xmm3,%xmm0
diff --git a/time/tzfile.c b/time/tzfile.c
index e95fd55f36..ea2d7cae4c 100644
--- a/time/tzfile.c
+++ b/time/tzfile.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991-1993,1995-2001,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993,1995-2001,2003,2004,2006
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -71,24 +72,34 @@ static inline int
 __attribute ((always_inline))
 decode (const void *ptr)
 {
-  if ((BYTE_ORDER == BIG_ENDIAN) && sizeof (int) == 4)
+  if (BYTE_ORDER == BIG_ENDIAN && sizeof (int) == 4)
     return *(const int *) ptr;
-  else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4)
+  if (sizeof (int) == 4)
     return bswap_32 (*(const int *) ptr);
-  else
-    {
-      const unsigned char *p = ptr;
-      int result = *p & (1 << (CHAR_BIT - 1)) ? ~0 : 0;
 
-      result = (result << 8) | *p++;
-      result = (result << 8) | *p++;
-      result = (result << 8) | *p++;
-      result = (result << 8) | *p++;
+  const unsigned char *p = ptr;
+  int result = *p & (1 << (CHAR_BIT - 1)) ? ~0 : 0;
 
-      return result;
-    }
+  result = (result << 8) | *p++;
+  result = (result << 8) | *p++;
+  result = (result << 8) | *p++;
+  result = (result << 8) | *p++;
+
+  return result;
 }
 
+
+static inline int64_t
+__attribute ((always_inline))
+decode64 (const void *ptr)
+{
+  if ((BYTE_ORDER == BIG_ENDIAN))
+    return *(const int64_t *) ptr;
+
+  return bswap_64 (*(const int64_t *) ptr);
+}
+
+
 void
 __tzfile_read (const char *file, size_t extra, char **extrap)
 {
@@ -102,6 +113,10 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
   size_t types_idx;
   size_t leaps_idx;
   int was_using_tzfile = __use_tzfile;
+  int trans_width = 4;
+
+  if (sizeof (time_t) != 4 && sizeof (time_t) != 8)
+    abort ();
 
   __use_tzfile = 0;
 
@@ -185,8 +200,10 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
   /* No threads reading this stream.  */
   __fsetlocking (f, FSETLOCKING_BYCALLER);
 
+ read_again:
   if (__builtin_expect (fread_unlocked ((void *) &tzhead, sizeof (tzhead),
-					1, f) != 1, 0))
+					1, f) != 1, 0)
+      || memcmp (tzhead.tzh_magic, TZ_MAGIC, sizeof (tzhead.tzh_magic)) != 0)
     goto lose;
 
   num_transitions = (size_t) decode (tzhead.tzh_timecnt);
@@ -196,6 +213,26 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
   num_isstd = (size_t) decode (tzhead.tzh_ttisstdcnt);
   num_isgmt = (size_t) decode (tzhead.tzh_ttisgmtcnt);
 
+  /* For platforms with 64-bit time_t we use the new format if available.  */
+  if (sizeof (time_t) == 8 && trans_width == 4
+      && tzhead.tzh_version[0] != '\0')
+    {
+      /* We use the 8-byte format.  */
+      trans_width = 8;
+
+      /* Position the stream before the second header.  */
+      size_t to_skip = (num_transitions * (4 + 1)
+			+ num_types * 6
+			+ chars
+			+ num_leaps * 8
+			+ num_isstd
+			+ num_isgmt);
+      if (fseek (f, to_skip, SEEK_CUR) != 0)
+	goto lose;
+
+      goto read_again;
+    }
+
   total_size = num_transitions * (sizeof (time_t) + 1);
   total_size = ((total_size + __alignof__ (struct ttinfo) - 1)
 		& ~(__alignof__ (struct ttinfo) - 1));
@@ -205,10 +242,10 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
 		& ~(__alignof__ (struct leap) - 1));
   leaps_idx = total_size;
   total_size += num_leaps * sizeof (struct leap);
-  /* This is for the extra memory required by the caller.  */
-  total_size += extra;
 
-  transitions = (time_t *) malloc (total_size);
+  /* Allocate enough memory including the extra block requested by the
+     caller.  */
+  transitions = (time_t *) malloc (total_size + extra);
   if (transitions == NULL)
     goto lose;
 
@@ -220,14 +257,11 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
   if (extra > 0)
     *extrap = (char *) &leaps[num_leaps];
 
-  if (sizeof (time_t) < 4)
-    abort ();
-
-  if (sizeof (time_t) == 4)
+  if (sizeof (time_t) == 4 || trans_width == 8)
     {
-      if (__builtin_expect (fread_unlocked (transitions, 1,
-					    (4 + 1) * num_transitions, f)
-			    != (4 + 1) * num_transitions, 0))
+      if (__builtin_expect (fread_unlocked (transitions, trans_width + 1,
+					    num_transitions, f)
+			    != num_transitions, 0))
 	goto lose;
     }
   else
@@ -245,7 +279,9 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
     if (__builtin_expect (type_idxs[i] >= num_types, 0))
       goto lose;
 
-  if (BYTE_ORDER != BIG_ENDIAN || sizeof (time_t) != 4)
+  if ((BYTE_ORDER != BIG_ENDIAN && (sizeof (time_t) == 4 || trans_width == 4))
+      || (BYTE_ORDER == BIG_ENDIAN && sizeof (time_t) == 8
+	  && trans_width == 4))
     {
       /* Decode the transition times, stored as 4-byte integers in
 	 network (big-endian) byte order.  We work from the end of
@@ -255,6 +291,13 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
       while (i-- > 0)
 	transitions[i] = decode ((char *) transitions + i * 4);
     }
+  else if (BYTE_ORDER != BIG_ENDIAN && sizeof (time_t) == 8)
+    {
+      /* Decode the transition times, stored as 8-byte integers in
+	 network (big-endian) byte order.  */
+      for (i = 0; i < num_transitions; ++i)
+	transitions[i] = decode64 ((char *) transitions + i * 8);
+    }
 
   for (i = 0; i < num_types; ++i)
     {
@@ -280,13 +323,16 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
 
   for (i = 0; i < num_leaps; ++i)
     {
-      unsigned char x[4];
-      if (__builtin_expect (fread_unlocked (x, 1, sizeof (x), f) != sizeof (x),
-			    0))
+      unsigned char x[8];
+      if (__builtin_expect (fread_unlocked (x, 1, trans_width, f)
+			    != trans_width, 0))
 	goto lose;
-      leaps[i].transition = (time_t) decode (x);
-      if (__builtin_expect (fread_unlocked (x, 1, sizeof (x), f) != sizeof (x),
-			    0))
+      if (sizeof (time_t) == 4 || trans_width == 4)
+	leaps[i].transition = (time_t) decode (x);
+      else
+	leaps[i].transition = (time_t) decode64 (x);
+
+      if (__builtin_expect (fread_unlocked (x, 1, 4, f) != 4, 0))
 	goto lose;
       leaps[i].change = (long int) decode (x);
     }
@@ -311,6 +357,12 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
   while (i < num_types)
     types[i++].isgmt = 0;
 
+  /* XXX When a version 2 file is available it can contain a POSIX TZ-style
+     formatted string which specifies how times past the last one specified
+     are supposed to be handled.  We might want to handle this at some
+     point.  But it might be overhead since most/all? files have an
+     open-ended last entry.  */
+
   fclose (f);
 
   /* First "register" all timezone names.  */
diff --git a/timezone/africa b/timezone/africa
index 29625df934..d73d340751 100644
--- a/timezone/africa
+++ b/timezone/africa
@@ -1,15 +1,15 @@
-# @(#)africa	8.1
+# @(#)africa	8.5
 # <pre>
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
 # tz@elsie.nci.nih.gov for general use in the future).
 
-# From Paul Eggert (1999-03-22):
+# From Paul Eggert (2006-03-22):
 #
 # A good source for time zone historical data outside the U.S. is
-# Thomas G. Shanks, The International Atlas (5th edition),
-# San Diego: ACS Publications, Inc. (1999).
+# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+# San Diego: ACS Publications, Inc. (2003).
 #
 # Gwillim Law writes that a good source
 # for recent time zone data is the International Air Transport
@@ -17,8 +17,8 @@
 # published semiannually.  Law sent in several helpful summaries
 # of the IATA's data after 1990.
 #
-# Except where otherwise noted, Shanks is the source for entries through 1990,
-# and IATA SSIM is the source for entries after 1990.
+# Except where otherwise noted, Shanks & Pottenger is the source for
+# entries through 1990, and IATA SSIM is the source for entries afterwards.
 #
 # Another source occasionally used is Edward W. Whitman, World Time Differences,
 # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
@@ -65,7 +65,7 @@
 # Algeria
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Algeria	1916	only	-	Jun	14	23:00s	1:00	S
-Rule	Algeria	1916	1919	-	Oct	Sun<=7	23:00s	0	-
+Rule	Algeria	1916	1919	-	Oct	Sun>=1	23:00s	0	-
 Rule	Algeria	1917	only	-	Mar	24	23:00s	1:00	S
 Rule	Algeria	1918	only	-	Mar	 9	23:00s	1:00	S
 Rule	Algeria	1919	only	-	Mar	 1	23:00s	1:00	S
@@ -75,7 +75,7 @@ Rule	Algeria	1921	only	-	Mar	14	23:00s	1:00	S
 Rule	Algeria	1921	only	-	Jun	21	23:00s	0	-
 Rule	Algeria	1939	only	-	Sep	11	23:00s	1:00	S
 Rule	Algeria	1939	only	-	Nov	19	 1:00	0	-
-Rule	Algeria	1944	1945	-	Apr	Mon<=7	 2:00	1:00	S
+Rule	Algeria	1944	1945	-	Apr	Mon>=1	 2:00	1:00	S
 Rule	Algeria	1944	only	-	Oct	 8	 2:00	0	-
 Rule	Algeria	1945	only	-	Sep	16	 1:00	0	-
 Rule	Algeria	1971	only	-	Apr	25	23:00s	1:00	S
@@ -86,7 +86,8 @@ Rule	Algeria	1978	only	-	Mar	24	 1:00	1:00	S
 Rule	Algeria	1978	only	-	Sep	22	 3:00	0	-
 Rule	Algeria	1980	only	-	Apr	25	 0:00	1:00	S
 Rule	Algeria	1980	only	-	Oct	31	 2:00	0	-
-# Shanks gives 0:09 for Paris Mean Time; go with Howse's more precise 0:09:21.
+# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
+# more precise 0:09:21.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15 0:01
 			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
@@ -106,7 +107,8 @@ Zone	Africa/Luanda	0:52:56	-	LMT	1892
 			1:00	-	WAT
 
 # Benin
-# Whitman says they switched to 1:00 in 1946, not 1934; go with Shanks.
+# Whitman says they switched to 1:00 in 1946, not 1934;
+# go with Shanks & Pottenger.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Porto-Novo	0:10:28	-	LMT	1912
 			0:00	-	GMT	1934 Feb 26
@@ -130,7 +132,7 @@ Zone Africa/Bujumbura	1:57:28	-	LMT	1890
 			2:00	-	CAT
 
 # Cameroon
-# Whitman says they switched to 1:00 in 1920; go with Shanks.
+# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Douala	0:38:48	-	LMT	1912
 			1:00	-	WAT
@@ -209,7 +211,14 @@ Rule	Egypt	1990	1994	-	May	 1	1:00	1:00	S
 # IATA (after 1990) says transitions are at 0:00.
 # Go with IATA starting in 1995, except correct 1995 entry from 09-30 to 09-29.
 Rule	Egypt	1995	max	-	Apr	lastFri	 0:00s	1:00	S
-Rule	Egypt	1995	max	-	Sep	lastThu	23:00s	0	-
+Rule	Egypt	1995	2005	-	Sep	lastThu	23:00s	0	-
+# From Steffen Thorsen (2006-09-19):
+# The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
+# Egypt will turn back clocks by one hour at the midnight of Thursday
+# after observing the daylight saving time since May.
+# http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
+Rule	Egypt	2006	only	-	Sep	21	23:00s	0	-
+Rule	Egypt	2007	max	-	Sep	lastThu	23:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct
@@ -229,9 +238,9 @@ Zone	Africa/Asmera	2:35:32 -	LMT	1870
 			3:00	-	EAT
 
 # Ethiopia
-# From Paul Eggert (1997-10-05):
-# Shanks writes that Ethiopia had six narrowly-spaced time zones between
-# 1870 and 1890, and that they merged to 38E50 (2:35:20) in 1890.
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time zones
+# between 1870 and 1890, and that they merged to 38E50 (2:35:20) in 1890.
 # We'll guess that 38E50 is for Adis Dera.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
@@ -252,7 +261,8 @@ Zone	Africa/Banjul	-1:06:36 -	LMT	1912
 
 # Ghana
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman says DST was observed from 1931 to ``the present''; go with Shanks.
+# Whitman says DST was observed from 1931 to ``the present'';
+# go with Shanks & Pottenger.
 Rule	Ghana	1936	1942	-	Sep	 1	0:00	0:20	GHST
 Rule	Ghana	1936	1942	-	Dec	31	0:00	0	GMT
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -288,13 +298,14 @@ Zone	Africa/Maseru	1:50:00 -	LMT	1903 Mar
 			2:00	-	SAST
 
 # Liberia
-# From Paul Eggert (2001-07-17):
+# From Paul Eggert (2006-03-22):
 # In 1972 Liberia was the last country to switch
 # from a UTC offset that was not a multiple of 15 or 20 minutes.
 # Howse reports that it was in honor of their president's birthday.
-# Shanks reports the date as May 1, whereas Howse reports Jan; go with Shanks.
-# For Liberia before 1972, Shanks reports -0:44, whereas Howse and Whitman
-# each report -0:44:30; go with the more precise figure.
+# Shank & Pottenger report the date as May 1, whereas Howse reports Jan;
+# go with Shanks & Pottenger.
+# For Liberia before 1972, Shanks & Pottenger report -0:44, whereas Howse and
+# Whitman each report -0:44:30; go with the more precise figure.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Monrovia	-0:43:08 -	LMT	1882
 			-0:43:08 -	MMT	1919 Mar # Monrovia Mean Time
@@ -324,7 +335,7 @@ Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 			1:00	Libya	CE%sT	1959
 			2:00	-	EET	1982
 			1:00	Libya	CE%sT	1990 May  4
-# The following entries are all from Shanks;
+# The following entries are from Shanks & Pottenger;
 # the IATA SSIM data contain some obvious errors.
 			2:00	-	EET	1996 Sep 30
 			1:00	-	CET	1997 Apr  4
@@ -403,8 +414,8 @@ Zone	Africa/Maputo	2:10:20 -	LMT	1903 Mar
 			2:00	-	CAT
 
 # Namibia
-# The 1994-04-03 transition is from Shanks.
-# Shanks reports no DST after 1998-04; go with IATA.
+# The 1994-04-03 transition is from Shanks & Pottenger.
+# Shanks & Pottenger report no DST after 1998-04; go with IATA.
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Namibia	1994	max	-	Sep	Sun>=1	2:00	1:00	S
 Rule	Namibia	1995	max	-	Apr	Sun>=1	2:00	0	-
@@ -488,7 +499,7 @@ Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun	# Victoria
 
 # Sierra Leone
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman gives Mar 31 - Aug 31 for 1931 on; go with Shanks.
+# Whitman gives Mar 31 - Aug 31 for 1931 on; go with Shanks & Pottenger.
 Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
 Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
 Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
@@ -557,7 +568,6 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Tunisia
 
 # From Gwillim Law (2005-04-30):
-#
 # My correspondent, Risto Nykanen, has alerted me to another adoption of DST,
 # this time in Tunisia.  According to Yahoo France News
 # <http://fr.news.yahoo.com/050426/5/4dumk.html>, in a story attributed to AP
@@ -571,6 +581,12 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # <http://www.lapresse.tn/archives/archives280405/actualites/lheure.html>
 # ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
 # 1h standard time.
+#
+# From Atef Loukil (2006-03-28):
+# The daylight saving time will be the same each year:
+# Beginning      : the last Sunday of March at 02:00
+# Ending         : the last Sunday of October at 03:00 ...
+# http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=1188&Itemid=50
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Tunisia	1939	only	-	Apr	15	23:00s	1:00	S
@@ -596,8 +612,11 @@ Rule	Tunisia	1989	only	-	Mar	26	 0:00s	1:00	S
 Rule	Tunisia	1990	only	-	May	 1	 0:00s	1:00	S
 Rule	Tunisia	2005	only	-	May	 1	 0:00s	1:00	S
 Rule	Tunisia	2005	only	-	Sep	30	 1:00s	0	-
-# Shanks gives 0:09 for Paris Mean Time; go with Howse's more precise 0:09:21.
-# Shanks says the 1911 switch occurred on Mar 9; go with Howse's Mar 11.
+Rule	Tunisia	2006	max	-	Mar	lastSun	 2:00s	1:00	S
+Rule	Tunisia	2006	max	-	Oct	lastSun	 2:00s	0	-
+# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
+# more precise 0:09:21.
+# Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Tunis	0:40:44 -	LMT	1881 May 12
 			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
diff --git a/timezone/antarctica b/timezone/antarctica
index 8a9ea939c9..2584ae4f1d 100644
--- a/timezone/antarctica
+++ b/timezone/antarctica
@@ -1,4 +1,4 @@
-# @(#)antarctica	8.1
+# @(#)antarctica	8.3
 # <pre>
 
 # From Paul Eggert (1999-11-15):
@@ -33,19 +33,27 @@ Rule	RussAQ	1996	max	-	Oct	lastSun	 2:00s	0	-
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	ArgAQ	1964	1966	-	Mar	 1	0:00	0	-
 Rule	ArgAQ	1964	1966	-	Oct	15	0:00	1:00	S
-Rule	ArgAQ	1967	only	-	Apr	 1	0:00	0	-
-Rule	ArgAQ	1967	1968	-	Oct	Sun<=7	0:00	1:00	S
-Rule	ArgAQ	1968	1969	-	Apr	Sun<=7	0:00	0	-
+Rule	ArgAQ	1967	only	-	Apr	 2	0:00	0	-
+Rule	ArgAQ	1967	1968	-	Oct	Sun>=1	0:00	1:00	S
+Rule	ArgAQ	1968	1969	-	Apr	Sun>=1	0:00	0	-
 Rule	ArgAQ	1974	only	-	Jan	23	0:00	1:00	S
 Rule	ArgAQ	1974	only	-	May	 1	0:00	0	-
-Rule	ArgAQ	1974	1976	-	Oct	Sun<=7	0:00	1:00	S
-Rule	ArgAQ	1975	1977	-	Apr	Sun<=7	0:00	0	-
-Rule	ChileAQ	1966	1997	-	Oct	Sun>=9	0:00	1:00	S
-Rule	ChileAQ	1967	1998	-	Mar	Sun>=9	0:00	0	-
-Rule	ChileAQ	1998	only	-	Sep	27	0:00	1:00	S
-Rule	ChileAQ	1999	only	-	Apr	 4	0:00	0	-
-Rule	ChileAQ	1999	max	-	Oct	Sun>=9	0:00	1:00	S
-Rule	ChileAQ	2000	max	-	Mar	Sun>=9	0:00	0	-
+Rule	ChileAQ	1972	1986	-	Mar	Sun>=9	3:00u	0	-
+Rule	ChileAQ	1974	1987	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	ChileAQ	1987	only	-	Apr	12	3:00u	0	-
+Rule	ChileAQ	1988	1989	-	Mar	Sun>=9	3:00u	0	-
+Rule	ChileAQ	1988	only	-	Oct	Sun>=1	4:00u	1:00	S
+Rule	ChileAQ	1989	only	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	ChileAQ	1990	only	-	Mar	18	3:00u	0	-
+Rule	ChileAQ	1990	only	-	Sep	16	4:00u	1:00	S
+Rule	ChileAQ	1991	1996	-	Mar	Sun>=9	3:00u	0	-
+Rule	ChileAQ	1991	1997	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	ChileAQ	1997	only	-	Mar	30	3:00u	0	-
+Rule	ChileAQ	1998	only	-	Mar	Sun>=9	3:00u	0	-
+Rule	ChileAQ	1998	only	-	Sep	27	4:00u	1:00	S
+Rule	ChileAQ	1999	only	-	Apr	 4	3:00u	0	-
+Rule	ChileAQ	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	ChileAQ	2000	max	-	Mar	Sun>=9	3:00u	0	-
 
 
 # Argentina - year-round bases
diff --git a/timezone/asia b/timezone/asia
index 446cc16e6f..04ddc863e7 100644
--- a/timezone/asia
+++ b/timezone/asia
@@ -1,15 +1,15 @@
-# @(#)asia	8.1
+# @(#)asia	8.8
 # <pre>
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
 # tz@elsie.nci.nih.gov for general use in the future).
 
-# From Paul Eggert (1999-03-22):
+# From Paul Eggert (2006-03-22):
 #
 # A good source for time zone historical data outside the U.S. is
-# Thomas G. Shanks, The International Atlas (5th edition),
-# San Diego: ACS Publications, Inc. (1999).
+# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+# San Diego: ACS Publications, Inc. (2003).
 #
 # Gwillim Law writes that a good source
 # for recent time zone data is the International Air Transport
@@ -17,8 +17,8 @@
 # published semiannually.  Law sent in several helpful summaries
 # of the IATA's data after 1990.
 #
-# Except where otherwise noted, Shanks is the source for entries through 1990,
-# and IATA SSIM is the source for entries after 1990.
+# Except where otherwise noted, Shanks & Pottenger is the source for
+# entries through 1990, and IATA SSIM is the source for entries afterwards.
 #
 # Another source occasionally used is Edward W. Whitman, World Time Differences,
 # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
@@ -61,6 +61,7 @@
 # These rules are stolen from the `europe' file.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	EUAsia	1981	max	-	Mar	lastSun	 1:00u	1:00	S
+Rule	EUAsia	1979	1995	-	Sep	lastSun	 1:00u	0	-
 Rule	EUAsia	1996	max	-	Oct	lastSun	 1:00u	0	-
 Rule E-EurAsia	1981	max	-	Mar	lastSun	 0:00	1:00	S
 Rule E-EurAsia	1979	1995	-	Sep	lastSun	 0:00	0	-
@@ -82,10 +83,11 @@ Zone	Asia/Kabul	4:36:48 -	LMT	1890
 			4:30	-	AFT
 
 # Armenia
-# From Paul Eggert (1999-10-29):
-# Shanks has Yerevan switching to 3:00 (with Russian DST) in spring 1991,
-# then to 4:00 with no DST in fall 1995, then readopting Russian DST in 1997.
-# Go with Shanks, even when he disagrees with others.  Edgar Der-Danieliantz
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger have Yerevan switching to 3:00 (with Russian DST)
+# in spring 1991, then to 4:00 with no DST in fall 1995, then
+# readopting Russian DST in 1997.  Go with Shanks & Pottenger, even
+# when they disagree with others.  Edgar Der-Danieliantz
 # reported (1996-05-04) that Yerevan probably wouldn't use DST
 # in 1996, though it did use DST in 1995.  IATA SSIM (1991/1998) reports that
 # Armenia switched from 3:00 to 4:00 in 1998 and observed DST after 1991,
@@ -194,13 +196,15 @@ Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jun  9
 # CHINA               8 H  AHEAD OF UTC  ALL OF CHINA, INCL TAIWAN
 # CHINA               9 H  AHEAD OF UTC  APR 17 - SEP 10
 
-# From Paul Eggert (1995-12-19):
-# Shanks writes that China has had a single time zone since 1980 May 1,
-# observing summer DST from 1986 through 1991; this contradicts Devine's
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger write that China (except for Hong Kong and Macau)
+# has had a single time zone since 1980 May 1, observing summer DST
+# from 1986 through 1991; this contradicts Devine's
 # note about Time magazine, though apparently _something_ happened in 1986.
-# Go with Shanks for now.  I made up names for the other pre-1980 time zones.
+# Go with Shanks & Pottenger for now.  I made up names for the other
+# pre-1980 time zones.
 
-# From Shanks:
+# From Shanks & Pottenger:
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Shang	1940	only	-	Jun	 3	0:00	1:00	D
 Rule	Shang	1940	1941	-	Oct	 1	0:00	0	S
@@ -208,14 +212,27 @@ Rule	Shang	1941	only	-	Mar	16	0:00	1:00	D
 Rule	PRC	1986	only	-	May	 4	0:00	1:00	D
 Rule	PRC	1986	1991	-	Sep	Sun>=11	0:00	0	S
 Rule	PRC	1987	1991	-	Apr	Sun>=10	0:00	1:00	D
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-#
+
 # From Anthony Fok (2001-12-20):
 # BTW, I did some research on-line and found some info regarding these five
 # historic timezones from some Taiwan websites.  And yes, there are official
-# Chinese names for these locales (before 1949):
+# Chinese names for these locales (before 1949).
+# 
+# From Jesper Norgaard Welen (2006-07-14):
+# I have investigated the timezones around 1970 on the
+# http://www.astro.com/atlas site [with provinces and county
+# boundaries summarized below]....  A few other exceptions were two
+# counties on the Sichuan side of the Xizang-Sichuan border,
+# counties Dege and Baiyu which lies on the Sichuan side and are
+# therefore supposed to be GMT+7, Xizang region being GMT+6, but Dege
+# county is GMT+8 according to astro.com while Baiyu county is GMT+6
+# (could be true), for the moment I am assuming that those two
+# counties are mistakes in the astro.com data.
+
+
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Changbai Time ("Long-white Time", Long-white = Heilongjiang area)
+# Heilongjiang (except Mohe county), Jilin
 Zone	Asia/Harbin	8:26:44	-	LMT	1928 # or Haerbin
 			8:30	-	CHAT	1932 Mar # Changbai Time
 			8:00	-	CST	1940
@@ -223,18 +240,35 @@ Zone	Asia/Harbin	8:26:44	-	LMT	1928 # or Haerbin
 			8:30	-	CHAT	1980 May
 			8:00	PRC	C%sT
 # Zhongyuan Time ("Central plain Time")
+# most of China
 Zone	Asia/Shanghai	8:05:52	-	LMT	1928
 			8:00	Shang	C%sT	1949
 			8:00	PRC	C%sT
 # Long-shu Time (probably due to Long and Shu being two names of that area)
+# Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
+# most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong
+# counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
+# Yangchun, Yangjiang, Yu'nan, and Yunfu.
 Zone	Asia/Chongqing	7:06:20	-	LMT	1928 # or Chungking
 			7:00	-	LONT	1980 May # Long-shu Time
 			8:00	PRC	C%sT
 # Xin-zang Time ("Xinjiang-Tibet Time")
+# The Gansu counties Aksay, Anxi, Dunhuang, Subei; west Qinghai;
+# the Guangdong counties  Xuwen, Haikang, Suixi, Lianjiang,
+# Zhanjiang, Wuchuan, Huazhou, Gaozhou, Maoming, Dianbai, and Xinyi;
+# east Tibet, including Lhasa, Chamdo, Shigaise, Jimsar, Shawan and Hutubi;
+# east Xinjiang, including Urumqi, Turpan, Karamay, Korla, Minfeng, Jinghe,
+# Wusu, Qiemo, Xinyan, Wulanwusu, Jinghe, Yumin, Tacheng, Tuoli, Emin,
+# Shihezi, Changji, Yanqi, Heshuo, Tuokexun, Tulufan, Shanshan, Hami,
+# Fukang, Kuitun, Kumukuli, Miquan, Qitai, and Turfan.
 Zone	Asia/Urumqi	5:50:20	-	LMT	1928 # or Urumchi
 			6:00	-	URUT	1980 May # Urumqi Time
 			8:00	PRC	C%sT
 # Kunlun Time
+# West Tibet, including Pulan, Aheqi, Shufu, Shule;
+# West Xinjiang, including Aksu, Atushi, Yining, Hetian, Cele, Luopu, Nileke,
+# Zhaosu, Tekesi, Gongliu, Chabuchaer, Huocheng, Bole, Pishan, Suiding,
+# and Yarkand.
 Zone	Asia/Kashgar	5:03:56	-	LMT	1928 # or Kashi or Kaxgar
 			5:30	-	KAST	1940	 # Kashgar Time
 			5:00	-	KAST	1980 May
@@ -266,7 +300,7 @@ Zone	Asia/Hong_Kong	7:36:36 -	LMT	1904 Oct 30
 
 # Taiwan
 
-# Shanks writes that Taiwan observed DST during 1945, when it
+# Shanks & Pottenger write that Taiwan observed DST during 1945, when it
 # was still controlled by Japan.  This is hard to believe, but we don't
 # have any other information.
 
@@ -423,7 +457,7 @@ Zone	Asia/Calcutta	5:53:28 -	LMT	1880	# Kolkata
 
 # Indonesia
 #
-# From Gwillim Law (2001-05-28), overriding Shanks:
+# From Gwillim Law (2001-05-28), overriding Shanks & Pottenger:
 # <http://www.sumatera-inc.com/go_to_invest/about_indonesia.asp#standtime>
 # says that Indonesia's time zones changed on 1988-01-01.  Looking at some
 # time zone maps, I think that must refer to Western Borneo (Kalimantan Barat
@@ -431,7 +465,7 @@ Zone	Asia/Calcutta	5:53:28 -	LMT	1880	# Kolkata
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Asia/Jakarta	7:07:12 -	LMT	1867 Aug 10
-# Shanks says the next transition was at 1924 Jan 1 0:13,
+# Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
 # but this must be a typo.
 			7:07:12	-	JMT	1923 Dec 31 23:47:12 # Jakarta
 			7:20	-	JAVT	1932 Nov	 # Java Time
@@ -498,8 +532,8 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
 # leap year calculation involved.  There has never been any serious
 # plan to change that law....
 #
-# From Paul Eggert (2005-04-05):
-# Go with Shanks before September 1991, and with Pournader thereafter.
+# From Paul Eggert (2006-03-22):
+# Go with Shanks & Pottenger before Sept. 1991, and with Pournader thereafter.
 # I used Ed Reingold's cal-persia in GNU Emacs 21.2 to check Persian dates,
 # stopping after 2037 when 32-bit time_t's overflow.
 # That cal-persia used Birashk's approximation, which disagrees with the solar
@@ -519,6 +553,14 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
 # Reingold's/Dershowitz' calculator gives correctly the Gregorian date
 # 2058-03-21 for 1 Farvardin 1437 (astronomical).
 #
+# From Paul Eggert (2006-03-22):
+# The above comments about post-2006 transitions may become relevant again,
+# if Iran ever resuscitates DST, so we'll leave the comments in.
+#
+# From Steffen Thorsen (2006-03-22):
+# Several of my users have reported that Iran will not observe DST anymore:
+# http://www.irna.ir/en/news/view/line-17/0603193812164948.htm
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Iran	1978	1980	-	Mar	21	0:00	1:00	D
 Rule	Iran	1978	only	-	Oct	21	0:00	0	S
@@ -537,38 +579,8 @@ Rule	Iran	2001	2003	-	Mar	22	0:00	1:00	D
 Rule	Iran	2001	2003	-	Sep	22	0:00	0	S
 Rule	Iran	2004	only	-	Mar	21	0:00	1:00	D
 Rule	Iran	2004	only	-	Sep	21	0:00	0	S
-Rule	Iran	2005	2007	-	Mar	22	0:00	1:00	D
-Rule	Iran	2005	2007	-	Sep	22	0:00	0	S
-Rule	Iran	2008	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2008	only	-	Sep	21	0:00	0	S
-Rule	Iran	2009	2011	-	Mar	22	0:00	1:00	D
-Rule	Iran	2009	2011	-	Sep	22	0:00	0	S
-Rule	Iran	2012	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2012	only	-	Sep	21	0:00	0	S
-Rule	Iran	2013	2015	-	Mar	22	0:00	1:00	D
-Rule	Iran	2013	2015	-	Sep	22	0:00	0	S
-Rule	Iran	2016	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2016	only	-	Sep	21	0:00	0	S
-Rule	Iran	2017	2019	-	Mar	22	0:00	1:00	D
-Rule	Iran	2017	2019	-	Sep	22	0:00	0	S
-Rule	Iran	2020	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2020	only	-	Sep	21	0:00	0	S
-Rule	Iran	2021	2023	-	Mar	22	0:00	1:00	D
-Rule	Iran	2021	2023	-	Sep	22	0:00	0	S
-Rule	Iran	2024	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2024	only	-	Sep	21	0:00	0	S
-Rule	Iran	2025	2027	-	Mar	22	0:00	1:00	D
-Rule	Iran	2025	2027	-	Sep	22	0:00	0	S
-Rule	Iran	2028	2029	-	Mar	21	0:00	1:00	D
-Rule	Iran	2028	2029	-	Sep	21	0:00	0	S
-Rule	Iran	2030	2031	-	Mar	22	0:00	1:00	D
-Rule	Iran	2030	2031	-	Sep	22	0:00	0	S
-Rule	Iran	2032	2033	-	Mar	21	0:00	1:00	D
-Rule	Iran	2032	2033	-	Sep	21	0:00	0	S
-Rule	Iran	2034	2035	-	Mar	22	0:00	1:00	D
-Rule	Iran	2034	2035	-	Sep	22	0:00	0	S
-Rule	Iran	2036	2037	-	Mar	21	0:00	1:00	D
-Rule	Iran	2036	2037	-	Sep	21	0:00	0	S
+Rule	Iran	2005	only	-	Mar	22	0:00	1:00	D
+Rule	Iran	2005	only	-	Sep	22	0:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tehran	3:25:44	-	LMT	1916
 			3:25:44	-	TMT	1946	# Tehran Mean Time
@@ -601,7 +613,8 @@ Rule	Iraq	1984	1985	-	Apr	1	0:00	1:00	D
 Rule	Iraq	1985	1990	-	Sep	lastSun	1:00s	0	S
 Rule	Iraq	1986	1990	-	Mar	lastSun	1:00s	1:00	D
 # IATA SSIM (1991/1996) says Apr 1 12:01am UTC; guess the `:01' is a typo.
-# Shanks says Iraq did not observe DST 1992/1997 or 1999 on; ignore this.
+# Shanks & Pottenger say Iraq did not observe DST 1992/1997; ignore this.
+# 
 Rule	Iraq	1991	max	-	Apr	 1	3:00s	1:00	D
 Rule	Iraq	1991	max	-	Oct	 1	3:00s	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -635,7 +648,7 @@ Zone	Asia/Baghdad	2:57:40	-	LMT	1890
 # high on my favorite-country list (and not only because my wife's
 # family is from India).
 
-# From Shanks:
+# From Shanks & Pottenger:
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Zion	1940	only	-	Jun	 1	0:00	1:00	D
 Rule	Zion	1942	1944	-	Nov	 1	0:00	0	S
@@ -874,14 +887,15 @@ Zone	Asia/Jerusalem	2:20:56 -	LMT	1880
 # of the Japanese wanted to scrap daylight-saving time, as opposed to 30% who
 # wanted to keep it.)
 
-# Shanks writes that daylight saving in Japan during those years was as follows:
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger write that DST in Japan during those years was as follows:
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Japan	1948	only	-	May	Sun>=1	2:00	1:00	D
 Rule	Japan	1948	1951	-	Sep	Sat>=8	2:00	0	S
 Rule	Japan	1949	only	-	Apr	Sun>=1	2:00	1:00	D
 Rule	Japan	1950	1951	-	May	Sun>=1	2:00	1:00	D
 # but the only locations using it (for birth certificates, presumably, since
-# Shanks's audience is astrologers) were US military bases.  For now, assume
+# their audience is astrologers) were US military bases.  For now, assume
 # that for most purposes daylight-saving time was observed; otherwise, what
 # would have been the point of the 1951 poll?
 
@@ -906,8 +920,9 @@ Rule	Japan	1950	1951	-	May	Sun>=1	2:00	1:00	D
 # I wrote "ordinance" above, but I don't know how to translate.
 # In Japanese it's "chokurei", which means ordinance from emperor.
 
-# Shanks claims JST in use since 1896, and that a few places (e.g. Ishigaki)
-# use +0800; go with Suzuki.  Guess that all ordinances took effect on Jan 1.
+# Shanks & Pottenger claim JST in use since 1896, and that a few
+# places (e.g. Ishigaki) use +0800; go with Suzuki.  Guess that all
+# ordinances took effect on Jan 1.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 31 15:00u
@@ -938,6 +953,10 @@ Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 31 15:00u
 # For Jordan I have received multiple independent user reports every year
 # about DST end dates, as the end-rule is different every year.
 #
+# From Steffen Thorsen (2006-10-01), after a heads-up from Hilal Malawi:
+# http://www.petranews.gov.jo/nepras/2006/Sep/05/4000.htm
+# "Jordan will switch to winter time on Friday, October 27".
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Jordan	1973	only	-	Jun	6	0:00	1:00	S
 Rule	Jordan	1973	1975	-	Oct	1	0:00	0	-
@@ -964,7 +983,8 @@ Rule	Jordan	1999	2002	-	Sep	lastThu	0:00s	0	-
 Rule	Jordan	2000	max	-	Mar	lastThu	0:00s	1:00	S
 Rule	Jordan	2003	only	-	Oct	24	0:00s	0	-
 Rule	Jordan	2004	only	-	Oct	15	0:00s	0	-
-Rule	Jordan	2005	max	-	Sep	lastFri	0:00s	0	-
+Rule	Jordan	2005	only	-	Sep	lastFri	0:00s	0	-
+Rule	Jordan	2006	max	-	Oct	lastFri	0:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Amman	2:23:44 -	LMT	1931
 			2:00	Jordan	EE%sT
@@ -979,11 +999,11 @@ Zone	Asia/Amman	2:23:44 -	LMT	1931
 # Guess that Aqtau and Aqtobe diverged in 1995, since that's the first time
 # IATA SSIM mentions a third time zone in Kazakhstan.
 
-# From Paul Eggert (2001-10-18):
+# From Paul Eggert (2006-03-22):
 # German Iofis, ELSI, Almaty (2001-10-09) reports that Kazakhstan uses
 # RussiaAsia rules, instead of switching at 00:00 as the IATA has it.
-# Go with Shanks, who has them always using RussiaAsia rules.
-# Also go with the following claims of Shanks:
+# Go with Shanks & Pottenger, who have them always using RussiaAsia rules.
+# Also go with the following claims of Shanks & Pottenger:
 #
 # - Kazakhstan did not observe DST in 1991.
 # - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00.
@@ -1063,7 +1083,7 @@ Zone	Asia/Oral	3:25:24	-	LMT	1924 May  2 # or Ural'sk
 			5:00	-	ORAT
 
 # Kyrgyzstan (Kirgizstan)
-# Transitions through 1991 are from Shanks.
+# Transitions through 1991 are from Shanks & Pottenger.
 
 # From Paul Eggert (2005-08-15):
 # According to an article dated today in the Kyrgyzstan Development Gateway
@@ -1091,17 +1111,19 @@ Zone	Asia/Bishkek	4:58:24 -	LMT	1924 May  2
 
 # Korea (North and South)
 
-# From Guy Harris:
-# According to someone at the Korean Times in San Francisco,
-# Daylight Savings Time was not observed until 1987.  He did not know
-# at what time of day DST starts or ends.
+# From Annie I. Bang (2006-07-10) in
+# <http://www.koreaherald.co.kr/SITE/data/html_dir/2006/07/10/200607100012.asp>:
+# The Ministry of Commerce, Industry and Energy has already
+# commissioned a research project [to reintroduce DST] and has said
+# the system may begin as early as 2008....  Korea ran a daylight
+# saving program from 1949-61 but stopped it during the 1950-53 Korean War.
 
-# From Shanks:
+# From Shanks & Pottenger:
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	ROK	1960	only	-	May	15	0:00	1:00	D
 Rule	ROK	1960	only	-	Sep	13	0:00	0	S
-Rule	ROK	1987	1988	-	May	Sun<=14	0:00	1:00	D
-Rule	ROK	1987	1988	-	Oct	Sun<=14	0:00	0	S
+Rule	ROK	1987	1988	-	May	Sun>=8	0:00	1:00	D
+Rule	ROK	1987	1988	-	Oct	Sun>=8	0:00	0	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Seoul	8:27:52	-	LMT	1890
@@ -1184,8 +1206,8 @@ Zone Asia/Kuala_Lumpur	6:46:46 -	LMT	1901 Jan  1
 			7:30	-	MALT	1982 Jan  1
 			8:00	-	MYT	# Malaysia Time
 # Sabah & Sarawak
-# From Paul Eggert (2003-11-01):
-# The data here are mostly from Shanks, but the 1942, 1945 and 1982
+# From Paul Eggert (2006-03-22):
+# The data here are mostly from Shanks & Pottenger, but the 1942, 1945 and 1982
 # transition dates are from Mok Ly Yng.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Asia/Kuching	7:21:20	-	LMT	1926 Mar
@@ -1203,8 +1225,8 @@ Zone	Indian/Maldives	4:54:00 -	LMT	1880	# Male
 
 # Mongolia
 
-# Shanks says that Mongolia has three time zones, but usno1995 and the CIA map
-# Standard Time Zones of the World (1997-01)
+# Shanks & Pottenger say that Mongolia has three time zones, but
+# usno1995 and the CIA map Standard Time Zones of the World (2005-03)
 # both say that it has just one.
 
 # From Oscar van Vlijmen (1999-12-11):
@@ -1274,11 +1296,19 @@ Zone	Indian/Maldives	4:54:00 -	LMT	1880	# Male
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Mongol	1983	1984	-	Apr	1	0:00	1:00	S
 Rule	Mongol	1983	only	-	Oct	1	0:00	0	-
-# IATA SSIM says 1990s switches occurred at 00:00, but Shanks (1995) lists
-# them at 02:00s, and McDow says the 2001 switches also occurred at 02:00.
-# Also, IATA SSIM (1996-09) says 1996-10-25.  Go with Shanks through 1998.
-Rule	Mongol	1985	1998	-	Mar	lastSun	2:00s	1:00	S
-Rule	Mongol	1984	1998	-	Sep	lastSun	2:00s	0	-
+# Shanks & Pottenger and IATA SSIM say 1990s switches occurred at 00:00,
+# but McDow says the 2001 switches occurred at 02:00.  Also, IATA SSIM
+# (1996-09) says 1996-10-25.  Go with Shanks & Pottenger through 1998.
+#
+# Shanks & Pottenger say that the Sept. 1984 through Sept. 1990 switches
+# in Choibalsan (more precisely, in Dornod and Sukhbaatar) took place
+# at 02:00 standard time, not at 00:00 local time as in the rest of
+# the country.  That would be odd, and possibly is a result of their
+# correction of 02:00 (in the previous edition) not being done correctly
+# in the latest edition; so ignore it for now.
+
+Rule	Mongol	1985	1998	-	Mar	lastSun	0:00	1:00	S
+Rule	Mongol	1984	1998	-	Sep	lastSun	0:00	0	-
 # IATA SSIM (1999-09) says Mongolia no longer observes DST.
 Rule	Mongol	2001	only	-	Apr	lastSat	2:00	1:00	S
 Rule	Mongol	2001	max	-	Sep	lastSat	2:00	0	-
@@ -1404,8 +1434,8 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # I guess more info may be available from the PA's web page (if/when they
 # have one).
 
-# From Paul Eggert (1998-02-25):
-# Shanks writes that Gaza did not observe DST until 1957, but we'll go
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger write that Gaza did not observe DST until 1957, but go
 # with Shapir and assume that it observed DST from 1940 through 1947,
 # and that it used Jordanian rules starting in 1996.
 # We don't yet need a separate entry for the West Bank, since
@@ -1443,6 +1473,23 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # there is a good chance next year's end date will be around two weeks
 # earlier--the same goes for Jordan.
 
+# From Steffen Thorsen (2006-08-17):
+# I was informed by a user in Bethlehem that in Bethlehem it started the
+# same day as Israel, and after checking with other users in the area, I
+# was informed that they started DST one day after Israel.  I was not
+# able to find any authoritative sources at the time, nor details if
+# Gaza changed as well, but presumed Gaza to follow the same rules as
+# the West Bank.
+
+# From Steffen Thorsen (2006-09-26):
+# according to the Palestine News Network (2006-09-19):
+# http://english.pnn.ps/index.php?option=com_content&task=view&id=596&Itemid=5
+# > The Council of Ministers announced that this year its winter schedule
+# > will begin early, as of midnight Thursday.  It is also time to turn
+# > back the clocks for winter.  Friday will begin an hour late this week.
+# I guess it is likely that next year's date will be moved as well,
+# because of the Ramadan.
+
 # The rules for Egypt are stolen from the `africa' file.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
@@ -1452,10 +1499,13 @@ Rule EgyptAsia	1959	1967	-	May	 1	1:00	1:00	S
 Rule EgyptAsia	1959	1965	-	Sep	30	3:00	0	-
 Rule EgyptAsia	1966	only	-	Oct	 1	3:00	0	-
 
-Rule Palestine	1999	max	-	Apr	Fri>=15	0:00	1:00	S
+Rule Palestine	1999	2005	-	Apr	Fri>=15	0:00	1:00	S
 Rule Palestine	1999	2003	-	Oct	Fri>=15	0:00	0	-
 Rule Palestine	2004	only	-	Oct	 1	1:00	0	-
-Rule Palestine	2005	max	-	Oct	 4	2:00	0	-
+Rule Palestine	2005	only	-	Oct	 4	2:00	0	-
+Rule Palestine	2006	max	-	Apr	 1	0:00	1:00	S
+Rule Palestine	2006	only	-	Sep	22	0:00	0	-
+Rule Palestine	2007	max	-	Oct	Fri>=15	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
@@ -1473,7 +1523,21 @@ Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
 # Philippines, issued a proclamation announcing that 1844-12-30 was to
 # be immediately followed by 1845-01-01.  Robert H. van Gent has a
 # transcript of the decree in <http://www.phys.uu.nl/~vgent/idl/idl.htm>.
-# The rest of this data is from Shanks.
+# The rest of the data are from Shanks & Pottenger.
+
+# From Paul Eggert (2006-04-25):
+# Tomorrow's Manila Standard reports that the Philippines Department of
+# Trade and Industry is considering adopting DST this June when the
+# rainy season begins.  See
+# <http://www.manilastandardtoday.com/?page=politics02_april26_2006>.
+# For now, we'll ignore this, since it's not definite and we lack details.
+#
+# From Jesper Norgaard Welen (2006-04-26):
+# ... claims that Philippines had DST last time in 1990:
+# http://story.philippinetimes.com/p.x/ct/9/id/145be20cc6b121c0/cid/3e5bbccc730d258c/
+# [a story dated 2006-04-25 by Cris Larano of Dow Jones Newswires,
+# but no details]
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Phil	1936	only	-	Nov	1	0:00	1:00	S
 Rule	Phil	1937	only	-	Feb	1	0:00	0	-
@@ -1533,6 +1597,49 @@ Zone	Asia/Singapore	6:55:25 -	LMT	1901 Jan  1
 # With effect from 12.30 a.m. on 26th October 1996
 # Sri Lanka will be six (06) hours ahead of GMT.
 
+# From Jesper Norgaard Welen (2006-04-14), quoting Sri Lanka News Online
+# <http://news.sinhalaya.com/wmview.php?ArtID=11002> (2006-04-13):
+# 0030 hrs on April 15, 2006 (midnight of April 14, 2006 +30 minutes)
+# at present, become 2400 hours of April 14, 2006 (midnight of April 14, 2006).
+
+# From Peter Apps and Ranga Sirila of Reuters (2006-04-12) in:
+# <http://today.reuters.co.uk/news/newsArticle.aspx?type=scienceNews&storyID=2006-04-12T172228Z_01_COL295762_RTRIDST_0_SCIENCE-SRILANKA-TIME-DC.XML>
+# [The Tamil Tigers] never accepted the original 1996 time change and simply
+# kept their clocks set five and a half hours ahead of Greenwich Mean
+# Time (GMT), in line with neighbor India.
+# From Paul Eggert (2006-04-18):
+# People who live in regions under Tamil control can use TZ='Asia/Calcutta',
+# as that zone has agreed with the Tamil areas since our cutoff date of 1970.
+
+# From K Sethu (2006-04-25):
+# I think the abbreviation LKT originated from the world of computers at
+# the time of or subsequent to the time zone changes by SL Government
+# twice in 1996 and probably SL Government or its standardization
+# agencies never declared an abbreviation as a national standard.
+#
+# I recollect before the recent change the government annoucemments
+# mentioning it as simply changing Sri Lanka Standard Time or Sri Lanka
+# Time and no mention was made about the abbreviation.
+#
+# If we look at Sri Lanka Department of Government's "Official News
+# Website of Sri Lanka" ... http://www.news.lk/ we can see that they
+# use SLT as abbreviation in time stamp at the beginning of each news
+# item....
+#
+# Within Sri Lanka I think LKT is well known among computer users and
+# adminsitrators.  In my opinion SLT may not be a good choice because the
+# nation's largest telcom / internet operator Sri Lanka Telcom is well
+# known by that abbreviation - simply as SLT (there IP domains are
+# slt.lk and sltnet.lk).
+#
+# But if indeed our government has adopted SLT as standard abbreviation
+# (that we have not known so far) then  it is better that it be used for
+# all computers.
+
+# From Paul Eggert (2006-04-25):
+# One possibility is that we wait for a bit for the dust to settle down
+# and then see what people actually say in practice.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Colombo	5:19:24 -	LMT	1880
 			5:19:32	-	MMT	1906	# Moratuwa Mean Time
@@ -1541,7 +1648,8 @@ Zone	Asia/Colombo	5:19:24 -	LMT	1880
 			5:30	1:00	IST	1945 Oct 16 2:00
 			5:30	-	IST	1996 May 25 0:00
 			6:30	-	LKT	1996 Oct 26 0:30
-			6:00	-	LKT
+			6:00	-	LKT	2006 Apr 15 0:30
+			5:30	-	IST
 
 # Syria
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -1576,17 +1684,24 @@ Rule	Syria	1993	only	-	Sep	25	0:00	0	-
 # IATA SSIM (1998-02) says 1998-04-02;
 # (1998-09) says 1999-03-29 and 1999-09-29; (1999-02) says 1999-04-02,
 # 2000-04-02, and 2001-04-02; (1999-09) says 2000-03-31 and 2001-03-31;
-# ignore all these claims and go with Shanks.
+# (2006) says 2006-03-31 and 2006-09-22;
+# for now ignore all these claims and go with Shanks & Pottenger,
+# except for the 2006-09-22 claim (which seems right for Ramadan).
 Rule	Syria	1994	1996	-	Apr	 1	0:00	1:00	S
-Rule	Syria	1994	max	-	Oct	 1	0:00	0	-
+Rule	Syria	1994	2005	-	Oct	 1	0:00	0	-
 Rule	Syria	1997	1998	-	Mar	lastMon	0:00	1:00	S
 Rule	Syria	1999	max	-	Apr	 1	0:00	1:00	S
+# From Stephen Colebourne (2006-09-18):
+# According to IATA data, Syria will change DST on 21st September [21:00 UTC]
+# this year [only]....  This is probably related to Ramadan, like Egypt.
+Rule	Syria	2006	only	-	Sep	22	0:00	0	-
+Rule	Syria	2007	max	-	Oct	 1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Damascus	2:25:12 -	LMT	1920	# Dimashq
 			2:00	Syria	EE%sT
 
 # Tajikistan
-# From Shanks.
+# From Shanks & Pottenger.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dushanbe	4:35:12 -	LMT	1924 May  2
 			5:00	-	DUST	1930 Jun 21 # Dushanbe Time
@@ -1601,13 +1716,13 @@ Zone	Asia/Bangkok	6:42:04	-	LMT	1880
 			7:00	-	ICT
 
 # Turkmenistan
-# From Shanks.
+# From Shanks & Pottenger.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Ashgabat	3:53:32 -	LMT	1924 May  2 # or Ashkhabad
 			4:00	-	ASHT	1930 Jun 21 # Ashkhabad Time
 			5:00 RussiaAsia	ASH%sT	1991 Mar 31 2:00
 			4:00 RussiaAsia	ASH%sT	1991 Oct 27 # independence
-			4:00 RussiaAsia TM%sT	1992 Jan 19 2:00
+			4:00 RussiaAsia	TM%sT	1992 Jan 19 2:00
 			5:00	-	TMT
 
 # United Arab Emirates
@@ -1621,24 +1736,24 @@ Zone	Asia/Samarkand	4:27:12 -	LMT	1924 May  2
 			4:00	-	SAMT	1930 Jun 21 # Samarkand Time
 			5:00	-	SAMT	1981 Apr  1
 			5:00	1:00	SAMST	1981 Oct  1
-			6:00 RussiaAsia TAS%sT	1991 Mar 31 2:00 # Tashkent Time
-			5:00 RussiaAsia	TAS%sT	1991 Sep  1 # independence
+			6:00	-	TAST	1982 Apr  1 # Tashkent Time
+			5:00 RussiaAsia	SAM%sT	1991 Sep  1 # independence
 			5:00 RussiaAsia	UZ%sT	1992
-			5:00 RussiaAsia	UZ%sT	1993
 			5:00	-	UZT
 Zone	Asia/Tashkent	4:37:12 -	LMT	1924 May  2
 			5:00	-	TAST	1930 Jun 21 # Tashkent Time
-			6:00 RussiaAsia TAS%sT	1991 Mar 31 2:00s
+			6:00 RussiaAsia	TAS%sT	1991 Mar 31 2:00
 			5:00 RussiaAsia	TAS%sT	1991 Sep  1 # independence
 			5:00 RussiaAsia	UZ%sT	1992
-			5:00 RussiaAsia	UZ%sT	1993
 			5:00	-	UZT
 
 # Vietnam
+
 # From Paul Eggert (1993-11-18):
 # Saigon's official name is Thanh-Pho Ho Chi Minh, but it's too long.
 # We'll stick with the traditional name for now.
-# From Shanks:
+
+# From Shanks & Pottenger:
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Saigon	7:06:40 -	LMT	1906 Jun  9
 			7:06:20	-	SMT	1911 Mar 11 0:01 # Saigon MT?
diff --git a/timezone/australasia b/timezone/australasia
index 70b845560e..2e17bcc0c3 100644
--- a/timezone/australasia
+++ b/timezone/australasia
@@ -1,4 +1,4 @@
-# @(#)australasia	8.1
+# @(#)australasia	8.3
 # <pre>
 
 # This file also includes Pacific islands.
@@ -210,7 +210,7 @@ Zone Indian/Christmas	7:02:52 -	LMT	1895 Feb
 			7:00	-	CXT	# Christmas Island Time
 
 # Cook Is
-# From Shanks:
+# From Shanks & Pottenger:
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Cook	1978	only	-	Nov	12	0:00	0:30	HS
 Rule	Cook	1979	1991	-	Mar	Sun>=1	0:00	0	-
@@ -308,7 +308,7 @@ Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15	# Uaobe
 Rule	NC	1977	1978	-	Dec	Sun>=1	0:00	1:00	S
 Rule	NC	1978	1979	-	Feb	27	0:00	0	-
 Rule	NC	1996	only	-	Dec	 1	2:00s	1:00	S
-# Shanks says the following was at 2:00; go with IATA.
+# Shanks & Pottenger say the following was at 2:00; go with IATA.
 Rule	NC	1997	only	-	Mar	 2	2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Noumea	11:05:48 -	LMT	1912 Jan 13
@@ -507,10 +507,10 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # go ahead and edit the file (and please send any changes to
 # tz@elsie.nci.nih.gov for general use in the future).
 
-# From Paul Eggert (1999-10-29):
+# From Paul Eggert (2006-03-22):
 # A good source for time zone historical data outside the U.S. is
-# Thomas G. Shanks, The International Atlas (5th edition),
-# San Diego: ACS Publications, Inc. (1999).
+# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+# San Diego: ACS Publications, Inc. (2003).
 #
 # Gwillim Law writes that a good source
 # for recent time zone data is the International Air Transport
@@ -518,8 +518,8 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # published semiannually.  Law sent in several helpful summaries
 # of the IATA's data after 1990.
 #
-# Except where otherwise noted, Shanks is the source for entries through 1990,
-# and IATA SSIM is the source for entries after 1990.
+# Except where otherwise noted, Shanks & Pottenger is the source for
+# entries through 1990, and IATA SSIM is the source for entries afterwards.
 #
 # Another source occasionally used is Edward W. Whitman, World Time Differences,
 # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
@@ -587,6 +587,12 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 #	WST	for any place operating at a GMTOFF of 8:00
 #	EST	for any place operating at a GMTOFF of 10:00
 
+# From Chuck Soper (2006-06-01):
+# I recently found this Australian government web page on time zones:
+# <http://www.australia.gov.au/about-australia-13time>
+# And this government web page lists time zone names and abbreviations:
+# <http://www.bom.gov.au/climate/averages/tables/daysavtm.shtml>
+
 # From Paul Eggert (2001-04-05), summarizing a long discussion about "EST"
 # versus "AEST" etc.:
 #
@@ -669,7 +675,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 #   understood in Australia.
 
 # From Paul Eggert (1995-12-19):
-# Shanks reports 2:00 for all autumn changes in Australia and New Zealand.
+# Shanks & Pottenger report 2:00 for all autumn changes in Australia and NZ.
 # Mark Prior writes that his newspaper
 # reports that NSW's fall 1995 change will occur at 2:00,
 # but Robert Elz says it's been 3:00 in Victoria since 1970
@@ -842,14 +848,14 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # current DST ending dates, no worries.
 #
 # Rule	Oz	1971	1985	-	Oct	lastSun	2:00	1:00	-
-# Rule	Oz	1986	max	-	Oct	Sun<=24	2:00	1:00	-
+# Rule	Oz	1986	max	-	Oct	Sun>=18	2:00	1:00	-
 # Rule	Oz	1972	only	-	Feb	27	3:00	0	-
 # Rule	Oz	1973	1986	-	Mar	Sun>=1	3:00	0	-
-# Rule	Oz	1987	max	-	Mar	Sun<=21	3:00	0	-
+# Rule	Oz	1987	max	-	Mar	Sun>=15	3:00	0	-
 # Zone	Australia/Tasmania	10:00	Oz	EST
 # Zone	Australia/South		9:30	Oz	CST
 # Zone	Australia/Victoria	10:00	Oz	EST	1985 Oct lastSun 2:00
-#				10:00	1:00	EST	1986 Mar Sun<=21 3:00
+#				10:00	1:00	EST	1986 Mar Sun>=15 3:00
 #				10:00	Oz	EST
 
 # From Robert Elz (1991-03-06):
@@ -875,7 +881,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # ...
 # Rule	 AS	1971	max	-	Oct	lastSun	2:00	1:00	D
 # Rule	 AS	1972	1985	-	Mar	Sun>=1	3:00	0	C
-# Rule	 AS	1986	1990	-	Mar	Sun<=21	3:00	0	C
+# Rule	 AS	1986	1990	-	Mar	Sun>=15	3:00	0	C
 # Rule	 AS	1991	max	-	Mar	Sun>=1	3:00	0	C
 
 # From Bradley White (1992-03-11):
@@ -1068,9 +1074,9 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # shown on clocks on LHI. I guess this means that for 30 minutes at the start
 # of DST, LHI is actually 1 hour ahead of the rest of NSW.
 
-# From Paul Eggert (2001-02-09):
-# For Lord Howe dates we use Shanks through 1989, and Lonergan thereafter.
-# For times we use Lonergan.
+# From Paul Eggert (2006-03-22):
+# For Lord Howe dates we use Shanks & Pottenger through 1989, and
+# Lonergan thereafter.  For times we use Lonergan.
 
 ###############################################################################
 
@@ -1101,16 +1107,16 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # rather than the October 1 value.
 
 # From Paul Eggert (1995-12-19);
-# Shanks reports 2:00 for all autumn changes in Australia and New Zealand.
+# Shank & Pottenger report 2:00 for all autumn changes in Australia and NZ.
 # Robert Uzgalis writes that the New Zealand Daylight
 # Savings Time Order in Council dated 1990-06-18 specifies 2:00 standard
 # time on both the first Sunday in October and the third Sunday in March.
 # As with Australia, we'll assume the tradition is 2:00s, not 2:00.
 #
-# From Paul Eggert (2003-05-26):
+# From Paul Eggert (2006-03-22):
 # The Department of Internal Affairs (DIA) maintains a brief history,
 # as does Carol Squires; see tz-link.htm for the full references.
-# Use these sources in preference to Shanks.
+# Use these sources in preference to Shanks & Pottenger.
 #
 # For Chatham, IATA SSIM (1991/1999) gives the NZ rules but with
 # transitions at 2:45 local standard time; this confirms that Chatham
@@ -1185,8 +1191,8 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # ``I am certain, having lived there for the past decade, that "Truk"
 # (now properly known as Chuuk) ... is in the time zone GMT+10.''
 #
-# Shanks writes that Truk switched from UTC+10 to UTC+11 on 1978-10-01;
-# ignore this for now.
+# Shanks & Pottenger write that Truk switched from UTC+10 to UTC+11
+# on 1978-10-01; ignore this for now.
 
 # From Paul Eggert (1999-10-29):
 # The Federated States of Micronesia Visitors Board writes in
@@ -1279,8 +1285,8 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # on the World Day of Prayer, you would be the first people on Earth
 # to say your prayers in the morning."
 
-# From Paul Eggert (1999-08-12):
-# Shanks says the transition was on 1968-10-01; go with Mundell.
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger say the transition was on 1968-10-01; go with Mundell.
 
 # From Eric Ulevik (1999-05-03):
 # Tonga's director of tourism, who is also secretary of the National Millenium
diff --git a/timezone/backward b/timezone/backward
index 66fbf30618..00824407fa 100644
--- a/timezone/backward
+++ b/timezone/backward
@@ -1,4 +1,4 @@
-# @(#)backward	8.1
+# @(#)backward	8.2
 
 # This file provides links between current names for time zones
 # and their old names.  Many names changed in late 1993.
@@ -8,6 +8,7 @@ Link	America/Argentina/Catamarca	America/Argentina/ComodRivadavia
 Link	America/Adak		America/Atka
 Link	America/Argentina/Buenos_Aires	America/Buenos_Aires
 Link	America/Argentina/Catamarca	America/Catamarca
+Link	America/Atikokan	America/Coral_Harbour
 Link	America/Argentina/Cordoba	America/Cordoba
 Link	America/Tijuana		America/Ensenada
 Link	America/Indiana/Indianapolis	America/Fort_Wayne
diff --git a/timezone/checktab.awk b/timezone/checktab.awk
index 6d532141e6..80ad7d5701 100644
--- a/timezone/checktab.awk
+++ b/timezone/checktab.awk
@@ -1,6 +1,6 @@
 # Check tz tables for consistency.
 
-# @(#)checktab.awk	1.7
+# @(#)checktab.awk	8.1
 
 # Contributed by Paul Eggert.
 
diff --git a/timezone/europe b/timezone/europe
index 54146d7400..b3a3b269d3 100644
--- a/timezone/europe
+++ b/timezone/europe
@@ -1,14 +1,14 @@
-# @(#)europe	8.1
+# @(#)europe	8.6
 # <pre>
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
 # tz@elsie.nci.nih.gov for general use in the future).
 
-# From Paul Eggert (1999-10-29):
+# From Paul Eggert (2006-03-22):
 # A good source for time zone historical data outside the U.S. is
-# Thomas G. Shanks, The International Atlas (5th edition),
-# San Diego: ACS Publications, Inc. (1999).
+# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+# San Diego: ACS Publications, Inc. (2003).
 #
 # Gwillim Law writes that a good source
 # for recent time zone data is the International Air Transport
@@ -16,8 +16,8 @@
 # published semiannually.  Law sent in several helpful summaries
 # of the IATA's data after 1990.
 #
-# Except where otherwise noted, Shanks is the source for entries through 1991,
-# and IATA SSIM is the source for entries afterwards.
+# Except where otherwise noted, Shanks & Pottenger is the source for
+# entries through 1991, and IATA SSIM is the source for entries afterwards.
 #
 # Other sources occasionally used include:
 #
@@ -221,11 +221,12 @@
 # (Lords Hansard 11 June 1997 columns 964 to 976)
 # </a>.
 
-# From Paul Eggert (2001-07-18):
+# From Paul Eggert (2006-03-22):
 #
-# For lack of other data, we'll follow Shanks for Eire in 1940-1948.
+# For lack of other data, follow Shanks & Pottenger for Eire in 1940-1948.
 #
-# Given Ilieve and Myers's data, the following claims by Shanks are incorrect:
+# Given Ilieve and Myers's data, the following claims by Shanks & Pottenger
+# are incorrect:
 #     * Wales did not switch from GMT to daylight saving time until
 #	1921 Apr 3, when they began to conform with the rest of Great Britain.
 # Actually, Wales was identical after 1880.
@@ -237,18 +238,19 @@
 # Actually, that date saw the usual switch to summer time.
 # Standard time was not changed until 1968-10-27 (the clocks didn't change).
 #
-# Here is another incorrect claim by Shanks:
+# Here is another incorrect claim by Shanks & Pottenger:
 #     * Jersey, Guernsey, and the Isle of Man did not switch from GMT
 #	to daylight saving time until 1921 Apr 3, when they began to
 #	conform with Great Britain.
 # S.R.&O. 1916, No. 382 and HO 45/10811/312364 (quoted above) say otherwise.
 #
-# The following claim by Shanks is possible though doubtful;
+# The following claim by Shanks & Pottenger is possible though doubtful;
 # we'll ignore it for now.
 #     * Dublin's 1971-10-31 switch was at 02:00, even though London's was 03:00.
 #
 #
-# Whitman says Dublin Mean Time was -0:25:21, which is more precise than Shanks.
+# Whitman says Dublin Mean Time was -0:25:21, which is more precise than
+# Shanks & Pottenger.
 # Perhaps this was Dunsink Observatory Time, as Dunsink Observatory
 # (8 km NW of Dublin's center) seemingly was to Dublin as Greenwich was
 # to London.  For example:
@@ -418,11 +420,14 @@ Rule	GB-Eire 1990	1995	-	Oct	Sun>=22	1:00u	0	GMT
 # See EU for rules starting in 1996.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/London	-0:01:15 -	LMT	1847 Dec  1
+Zone	Europe/London	-0:01:15 -	LMT	1847 Dec  1 0:00s
 			 0:00	GB-Eire	%s	1968 Oct 27
 			 1:00	-	BST	1971 Oct 31 2:00u
 			 0:00	GB-Eire	%s	1996
 			 0:00	EU	GMT/BST
+Link	Europe/London	Europe/Jersey
+Link	Europe/London	Europe/Guernsey
+Link	Europe/London	Europe/Isle_of_Man
 Zone	Europe/Dublin	-0:25:00 -	LMT	1880 Aug  2
 			-0:25:21 -	DMT	1916 May 21 2:00
 			-0:25:21 1:00	IST	1916 Oct  1 2:00s
@@ -476,7 +481,7 @@ Rule	C-Eur	1942	only	-	Nov	 2	 2:00s	0	-
 Rule	C-Eur	1943	only	-	Mar	29	 2:00s	1:00	S
 Rule	C-Eur	1943	only	-	Oct	 4	 2:00s	0	-
 Rule	C-Eur	1944	only	-	Apr	 3	 2:00s	1:00	S
-# Whitman gives 1944 Oct 7; go with Shanks.
+# Whitman gives 1944 Oct 7; go with Shanks & Pottenger.
 Rule	C-Eur	1944	only	-	Oct	 2	 2:00s	0	-
 Rule	C-Eur	1977	1980	-	Apr	Sun>=1	 2:00s	1:00	S
 Rule	C-Eur	1977	only	-	Sep	lastSun	 2:00s	0	-
@@ -596,12 +601,12 @@ Zone	Europe/Andorra	0:06:04 -	LMT	1901
 
 # Austria
 
-# From Paul Eggert (2003-02-28): Shanks gives 1918-06-16 and
+# From Paul Eggert (2006-03-22): Shanks & Pottenger give 1918-06-16 and
 # 1945-11-18, but the Austrian Federal Office of Metrology and
 # Surveying (BEV) gives 1918-09-16 and for Vienna gives the "alleged"
 # date of 1945-04-12 with no time.  For the 1980-04-06 transition
-# Shanks gives 02:00, the BEV 00:00.  Go with the BEV, and guess 02:00
-# for 1945-04-12.
+# Shanks & Pottenger give 02:00, the BEV 00:00.  Go with the BEV,
+# and guess 02:00 for 1945-04-12.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Austria	1920	only	-	Apr	 5	2:00s	1:00	S
@@ -701,7 +706,7 @@ Zone	Europe/Brussels	0:17:30 -	LMT	1880
 			1:00	EU	CE%sT
 
 # Bosnia and Herzegovina
-# see Serbia and Montenegro
+# see Serbia
 
 # Bulgaria
 #
@@ -713,7 +718,7 @@ Zone	Europe/Brussels	0:17:30 -	LMT	1880
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Bulg	1979	only	-	Mar	31	23:00	1:00	S
 Rule	Bulg	1979	only	-	Oct	 1	 1:00	0	-
-Rule	Bulg	1980	1982	-	Apr	Sat<=7	23:00	1:00	S
+Rule	Bulg	1980	1982	-	Apr	Sat>=1	23:00	1:00	S
 Rule	Bulg	1980	only	-	Sep	29	 1:00	0	-
 Rule	Bulg	1981	only	-	Sep	27	 2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -728,7 +733,7 @@ Zone	Europe/Sofia	1:33:16 -	LMT	1880
 			2:00	EU	EE%sT
 
 # Croatia
-# see Serbia and Montenegro
+# see Serbia
 
 # Cyprus
 # Please see the `asia' file for Asia/Nicosia.
@@ -813,10 +818,10 @@ Zone Atlantic/Faeroe	-0:27:04 -	LMT	1908 Jan 11	# Torshavn
 # East Greenland and Franz Josef Land, but we don't know their time zones.
 # My source for this is Wilhelm Dege's book mentioned under Svalbard.
 #
-# From Paul Eggert (1996-11-22):
+# From Paul Eggert (2006-03-22):
 # Greenland joined the EU as part of Denmark, obtained home rule on 1979-05-01,
 # and left the EU on 1985-02-01.  It therefore should have been using EU
-# rules at least through 1984.  Shanks says Scoresbysund and Godthab
+# rules at least through 1984.  Shanks & Pottenger say Scoresbysund and Godthab
 # used C-Eur rules after 1980, but IATA SSIM (1991/1996) says they use EU
 # rules since at least 1991.  Assume EU rules since 1980.
 
@@ -871,24 +876,28 @@ Zone Atlantic/Faeroe	-0:27:04 -	LMT	1908 Jan 11	# Torshavn
 # I heard back from someone stationed at Thule; the time change took place
 # there at 2:00 AM.
 
-# From Paul Eggert (2001-11-19):
-# The 1997 CIA map shows Danmarkshavn on GMT; the 1995 map as like Godthab.
+# From Paul Eggert (2006-03-22):
+# From 1997 on the CIA map shows Danmarkshavn on GMT;
+# the 1995 map as like Godthab.
 # For lack of better info, assume they were like Godthab before 1996.
 # startkart.no says Thule does not observe DST, but this is clearly an error,
-# so go with Shanks for all Thule transitions.
+# so go with Shanks & Pottenger for Thule transitions until this year.
+# For 2007 on assume Thule will stay in sync with US DST rules.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Thule	1991	1992	-	Mar	lastSun	2:00	1:00	D
 Rule	Thule	1991	1992	-	Sep	lastSun	2:00	0	S
-Rule	Thule	1993	max	-	Apr	Sun>=1	2:00	1:00	D
-Rule	Thule	1993	max	-	Oct	lastSun	2:00	0	S
+Rule	Thule	1993	2006	-	Apr	Sun>=1	2:00	1:00	D
+Rule	Thule	1993	2006	-	Oct	lastSun	2:00	0	S
+Rule	Thule	2007	max	-	Mar	Sun>=8	2:00	1:00	D
+Rule	Thule	2007	max	-	Nov	Sun>=1	2:00	0	S
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Danmarkshavn -1:14:40 -	LMT	1916 Jul 28
 			-3:00	-	WGT	1980 Apr  6 2:00
 			-3:00	EU	WG%sT	1996
 			0:00	-	GMT
-Zone America/Scoresbysund -1:29:00 -	LMT	1916 Jul 28 # Ittoqqortoormiit
+Zone America/Scoresbysund -1:27:52 -	LMT	1916 Jul 28 # Ittoqqortoormiit
 			-2:00	-	CGT	1980 Apr  6 2:00
 			-2:00	C-Eur	CG%sT	1981 Mar 29
 			-1:00	EU	EG%sT
@@ -963,13 +972,13 @@ Zone	Europe/Tallinn	1:39:00	-	LMT	1880
 
 # Finland
 #
-# From Hannu Strang (25 Sep 1994 06:03:37 UTC):
+# From Hannu Strang (1994-09-25 06:03:37 UTC):
 # Well, here in Helsinki we're just changing from summer time to regular one,
 # and it's supposed to change at 4am...
 #
-# From Paul Eggert (25 Sep 1994):
-# Shanks says Finland has switched at 02:00 standard time since 1981.
-# Go with Strang instead.
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger say Finland has switched at 02:00 standard time
+# since 1981.  Go with Strang instead.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Finland	1942	only	-	Apr	3	0:00	1:00	S
@@ -999,7 +1008,7 @@ Link	Europe/Helsinki	Europe/Mariehamn
 
 
 #
-# Shanks seems to use `24:00' ambiguously; we resolve it with Whitman.
+# Shank & Pottenger seem to use `24:00' ambiguously; resolve it with Whitman.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	France	1916	only	-	Jun	14	23:00s	1:00	S
 Rule	France	1916	1919	-	Oct	Sun>=1	23:00s	0	-
@@ -1013,7 +1022,7 @@ Rule	France	1921	only	-	Oct	25	23:00s	0	-
 Rule	France	1922	only	-	Mar	25	23:00s	1:00	S
 # DSH writes that a law of 1923-05-24 specified 3rd Sat in Apr at 23:00 to 1st
 # Sat in Oct at 24:00; and that in 1930, because of Easter, the transitions
-# were Apr 12 and Oct 5.  Go with Shanks.
+# were Apr 12 and Oct 5.  Go with Shanks & Pottenger.
 Rule	France	1922	1938	-	Oct	Sat>=1	23:00s	0	-
 Rule	France	1923	only	-	May	26	23:00s	1:00	S
 Rule	France	1924	only	-	Mar	29	23:00s	1:00	S
@@ -1034,8 +1043,8 @@ Rule	France	1938	only	-	Mar	26	23:00s	1:00	S
 Rule	France	1939	only	-	Apr	15	23:00s	1:00	S
 Rule	France	1939	only	-	Nov	18	23:00s	0	-
 Rule	France	1940	only	-	Feb	25	 2:00	1:00	S
-# The French rules for 1941-1944 were not used in Paris, but Shanks writes
-# that they were used in Monaco and in many French locations.
+# The French rules for 1941-1944 were not used in Paris, but Shanks & Pottenger
+# write that they were used in Monaco and in many French locations.
 # Le Corre writes that the upper limit of the free zone was Arneguy, Orthez,
 # Mont-de-Marsan, Bazas, Langon, Lamotte-Montravel, Marouil, La
 # Rochefoucault, Champagne-Mouton, La Roche-Posay, La Haye-Decartes,
@@ -1043,7 +1052,7 @@ Rule	France	1940	only	-	Feb	25	 2:00	1:00	S
 # Paray-le-Monial, Montceau-les-Mines, Chalons-sur-Saone, Arbois,
 # Dole, Morez, St-Claude, and Collognes (Haute-Savioe).
 Rule	France	1941	only	-	May	 5	 0:00	2:00	M # Midsummer
-# Shanks says this transition occurred at Oct 6 1:00,
+# Shanks & Pottenger say this transition occurred at Oct 6 1:00,
 # but go with Denis Excoffier (1997-12-12),
 # who quotes the Ephemerides Astronomiques for 1998 from Bureau des Longitudes
 # as saying 5/10/41 22hUT.
@@ -1056,21 +1065,21 @@ Rule	France	1944	only	-	Apr	 3	 2:00	2:00	M
 Rule	France	1944	only	-	Oct	 8	 1:00	1:00	S
 Rule	France	1945	only	-	Apr	 2	 2:00	2:00	M
 Rule	France	1945	only	-	Sep	16	 3:00	0	-
-# Shanks gives Mar 28 2:00 and Sep 26 3:00;
+# Shanks & Pottenger give Mar 28 2:00 and Sep 26 3:00;
 # go with Excoffier's 28/3/76 0hUT and 25/9/76 23hUT.
 Rule	France	1976	only	-	Mar	28	 1:00	1:00	S
 Rule	France	1976	only	-	Sep	26	 1:00	0	-
-# Shanks gives 0:09 for Paris Mean Time, and Whitman gives 0:09:05,
+# Shanks & Pottenger give 0:09:20 for Paris Mean Time, and Whitman 0:09:05,
 # but Howse quotes the actual French legislation as saying 0:09:21.
 # Go with Howse.  Howse writes that the time in France was officially based
 # on PMT-0:09:21 until 1978-08-09, when the time base finally switched to UTC.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Paris	0:09:21 -	LMT	1891 Mar 15  0:01
 			0:09:21	-	PMT	1911 Mar 11  0:01  # Paris MT
-# Shanks gives 1940 Jun 14 0:00; go with Excoffier and Le Corre.
+# Shanks & Pottenger give 1940 Jun 14 0:00; go with Excoffier and Le Corre.
 			0:00	France	WE%sT	1940 Jun 14 23:00
 # Le Corre says Paris stuck with occupied-France time after the liberation;
-# go with Shanks.
+# go with Shanks & Pottenger.
 			1:00	C-Eur	CE%sT	1944 Aug 25
 			0:00	France	WE%sT	1945 Sep 16  3:00
 			1:00	France	CE%sT	1977
@@ -1121,23 +1130,23 @@ Zone	Europe/Berlin	0:53:28 -	LMT	1893 Apr
 
 # Gibraltar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Europe/Gibraltar	-0:21:24 -	LMT	1880 Aug  2
+Zone Europe/Gibraltar	-0:21:24 -	LMT	1880 Aug  2 0:00s
 			0:00	GB-Eire	%s	1957 Apr 14 2:00
 			1:00	-	CET	1982
 			1:00	EU	CE%sT
 
 # Greece
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman gives 1932 Jul 5 - Nov 1; go with Shanks.
+# Whitman gives 1932 Jul 5 - Nov 1; go with Shanks & Pottenger.
 Rule	Greece	1932	only	-	Jul	 7	0:00	1:00	S
 Rule	Greece	1932	only	-	Sep	 1	0:00	0	-
-# Whitman gives 1941 Apr 25 - ?; go with Shanks.
+# Whitman gives 1941 Apr 25 - ?; go with Shanks & Pottenger.
 Rule	Greece	1941	only	-	Apr	 7	0:00	1:00	S
-# Whitman gives 1942 Feb 2 - ?; go with Shanks.
+# Whitman gives 1942 Feb 2 - ?; go with Shanks & Pottenger.
 Rule	Greece	1942	only	-	Nov	 2	3:00	0	-
 Rule	Greece	1943	only	-	Mar	30	0:00	1:00	S
 Rule	Greece	1943	only	-	Oct	 4	0:00	0	-
-# Whitman gives 1944 Oct 3 - Oct 31; go with Shanks.
+# Whitman gives 1944 Oct 3 - Oct 31; go with Shanks & Pottenger.
 Rule	Greece	1952	only	-	Jul	 1	0:00	1:00	S
 Rule	Greece	1952	only	-	Nov	 2	0:00	0	-
 Rule	Greece	1975	only	-	Apr	12	0:00s	1:00	S
@@ -1157,7 +1166,7 @@ Zone	Europe/Athens	1:34:52 -	LMT	1895 Sep 14
 			2:00	Greece	EE%sT	1941 Apr 30
 			1:00	Greece	CE%sT	1944 Apr  4
 			2:00	Greece	EE%sT	1981
-			# Shanks says they switched to C-Eur in 1981;
+			# Shanks & Pottenger say it switched to C-Eur in 1981;
 			# go with EU instead, since Greece joined it on Jan 1.
 			2:00	EU	EE%sT
 
@@ -1220,10 +1229,10 @@ Zone	Europe/Budapest	1:16:20 -	LMT	1890 Oct
 # might be a reference to the Julian calendar as opposed to Gregorian, or it
 # might mean something else (???).
 #
-# From Paul Eggert (1999-10-29):
-# The Iceland Almanak, Shanks and Whitman disagree on many points.
-# We go with the Almanak, except for one claim from Shanks, namely that
-# Reykavik was 21W57 from 1837 to 1908, local mean time before that.
+# From Paul Eggert (2006-03-22):
+# The Iceland Almanak, Shanks & Pottenger, and Whitman disagree on many points.
+# We go with the Almanak, except for one claim from Shanks & Pottenger, namely
+# that Reykavik was 21W57 from 1837 to 1908, local mean time before that.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Iceland	1917	1918	-	Feb	19	23:00	1:00	S
@@ -1261,15 +1270,16 @@ Zone Atlantic/Reykjavik	-1:27:24 -	LMT	1837
 # But these events all occurred before the 1970 cutoff,
 # so record only the time in Rome.
 #
-# From Paul Eggert (1996-05-06):
-# For Italian DST we have three sources: Shanks, Whitman, and F. Pollastri
+# From Paul Eggert (2006-03-22):
+# For Italian DST we have three sources: Shanks & Pottenger, Whitman, and
+# F. Pollastri
 # <a href="http://toi.iriti.cnr.it/uk/ienitlt.html">
-# Day-light Saving Time in Italy (1996-03-14)
+# Day-light Saving Time in Italy (2006-02-03)
 # </a>
 # (`FP' below), taken from an Italian National Electrotechnical Institute
 # publication. When the three sources disagree, guess who's right, as follows:
 #
-# year	FP	Shanks (S)	Whitman (W)	Go with:
+# year	FP	Shanks&P. (S)	Whitman (W)	Go with:
 # 1916	06-03	06-03 24:00	06-03 00:00	FP & W
 #	09-30	09-30 24:00	09-30 01:00	FP; guess 24:00s
 # 1917	04-01	03-31 24:00	03-31 00:00	FP & S
@@ -1325,7 +1335,7 @@ Rule	Italy	1978	only	-	Oct	 1	0:00s	0	-
 Rule	Italy	1979	only	-	Sep	30	0:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Rome	0:49:56 -	LMT	1866 Sep 22
-			0:49:56	-	RMT	1893 Nov	# Rome Mean Time
+			0:49:56	-	RMT	1893 Nov  1 0:00s # Rome Mean
 			1:00	Italy	CE%sT	1942 Nov  2 2:00s
 			1:00	C-Eur	CE%sT	1944 Jul
 			1:00	Italy	CE%sT	1980
@@ -1467,7 +1477,8 @@ Zone	Europe/Vilnius	1:41:16	-	LMT	1880
 			2:00	EU	EE%sT
 
 # Luxembourg
-# Whitman disagrees with most of these dates in minor ways; go with Shanks.
+# Whitman disagrees with most of these dates in minor ways;
+# go with Shanks & Pottenger.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Lux	1916	only	-	May	14	23:00	1:00	S
 Rule	Lux	1916	only	-	Oct	 1	 1:00	0	-
@@ -1502,7 +1513,7 @@ Zone Europe/Luxembourg	0:24:36 -	LMT	1904 Jun
 			1:00	EU	CE%sT
 
 # Macedonia
-# see Serbia and Montenegro
+# see Serbia
 
 # Malta
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -1514,7 +1525,7 @@ Rule	Malta	1975	1979	-	Apr	Sun>=15	2:00	1:00	S
 Rule	Malta	1975	1980	-	Sep	Sun>=15	2:00	0	-
 Rule	Malta	1980	only	-	Mar	31	2:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2	# Valletta
+Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2 0:00s # Valletta
 			1:00	Italy	CE%sT	1942 Nov  2 2:00s
 			1:00	C-Eur	CE%sT	1945 Apr  2 2:00s
 			1:00	Italy	CE%sT	1973 Mar 31
@@ -1523,9 +1534,9 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2	# Valletta
 
 # Moldova
 
-# From Paul Eggert (2001-02-11):
-# A previous version of this database followed Shanks, who writes that
-# Tiraspol switched to Moscow time on 1992-01-19 at 02:00.
+# From Paul Eggert (2006-03-22):
+# A previous version of this database followed Shanks & Pottenger, who write
+# that Tiraspol switched to Moscow time on 1992-01-19 at 02:00.
 # However, this is most likely an error, as Moldova declared independence
 # on 1991-08-27 (the 1992-01-19 date is that of a Russian decree).
 # In early 1992 there was large-scale interethnic violence in the area
@@ -1550,7 +1561,8 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
 			2:00	EU	EE%sT
 
 # Monaco
-# Shanks gives 0:09 for Paris Mean Time; go with Howse's more precise 0:09:21.
+# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
+# more precise 0:09:21.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Monaco	0:29:32 -	LMT	1891 Mar 15
 			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
@@ -1558,6 +1570,9 @@ Zone	Europe/Monaco	0:29:32 -	LMT	1891 Mar 15
 			1:00	France	CE%sT	1977
 			1:00	EU	CE%sT
 
+# Montenegro
+# see Serbia
+
 # Netherlands
 
 # Howse writes that the Netherlands' railways used GMT between 1892 and 1940,
@@ -1633,7 +1648,8 @@ Zone Europe/Amsterdam	0:19:32 -	LMT	1835
 			1:00	EU	CE%sT
 
 # Norway
-# http://met.no/met/met_lex/q_u/sommertid.html (2004-01) agrees with Shanks.
+# http://met.no/met/met_lex/q_u/sommertid.html (2004-01) agrees with Shanks &
+# Pottenger.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Norway	1916	only	-	May	22	1:00	1:00	S
 Rule	Norway	1916	only	-	Sep	30	0:00	0	-
@@ -1704,9 +1720,10 @@ Link	Europe/Oslo	Atlantic/Jan_Mayen
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Poland	1918	1919	-	Sep	16	2:00s	0	-
 Rule	Poland	1919	only	-	Apr	15	2:00s	1:00	S
-# Whitman gives 1944 Nov 30; go with Shanks.
+Rule	Poland	1944	only	-	Apr	 3	2:00s	1:00	S
+# Whitman gives 1944 Nov 30; go with Shanks & Pottenger.
 Rule	Poland	1944	only	-	Oct	 4	2:00	0	-
-# For 1944-1948 Whitman gives the previous day; go with Shanks.
+# For 1944-1948 Whitman gives the previous day; go with Shanks & Pottenger.
 Rule	Poland	1945	only	-	Apr	29	0:00	1:00	S
 Rule	Poland	1945	only	-	Nov	 1	0:00	0	-
 # For 1946 on the source is Kazimierz Borkowski,
@@ -1762,9 +1779,9 @@ Zone	Europe/Warsaw	1:24:00 -	LMT	1880
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 # DSH writes that despite Decree 1,469 (1915), the change to the clocks was not
 # done every year, depending on what Spain did, because of railroad schedules.
-# Go with Shanks.
+# Go with Shanks & Pottenger.
 Rule	Port	1916	only	-	Jun	17	23:00	1:00	S
-# Whitman gives 1916 Oct 31; go with Shanks.
+# Whitman gives 1916 Oct 31; go with Shanks & Pottenger.
 Rule	Port	1916	only	-	Nov	 1	 1:00	0	-
 Rule	Port	1917	only	-	Feb	28	23:00s	1:00	S
 Rule	Port	1917	1921	-	Oct	14	23:00s	0	-
@@ -1780,24 +1797,23 @@ Rule	Port	1927	only	-	Apr	 9	23:00s	1:00	S
 Rule	Port	1928	only	-	Apr	14	23:00s	1:00	S
 Rule	Port	1929	only	-	Apr	20	23:00s	1:00	S
 Rule	Port	1931	only	-	Apr	18	23:00s	1:00	S
-# Whitman gives 1931 Oct 8; go with Shanks.
+# Whitman gives 1931 Oct 8; go with Shanks & Pottenger.
 Rule	Port	1931	1932	-	Oct	Sat>=1	23:00s	0	-
 Rule	Port	1932	only	-	Apr	 2	23:00s	1:00	S
-# Shanks gives 1934 Apr 4; go with Whitman.
 Rule	Port	1934	only	-	Apr	 7	23:00s	1:00	S
-# Whitman gives 1934 Oct 5; go with Shanks.
+# Whitman gives 1934 Oct 5; go with Shanks & Pottenger.
 Rule	Port	1934	1938	-	Oct	Sat>=1	23:00s	0	-
-# Shanks gives 1935 Apr 30; go with Whitman.
+# Shanks & Pottenger give 1935 Apr 30; go with Whitman.
 Rule	Port	1935	only	-	Mar	30	23:00s	1:00	S
 Rule	Port	1936	only	-	Apr	18	23:00s	1:00	S
-# Whitman gives 1937 Apr 2; go with Shanks.
+# Whitman gives 1937 Apr 2; go with Shanks & Pottenger.
 Rule	Port	1937	only	-	Apr	 3	23:00s	1:00	S
 Rule	Port	1938	only	-	Mar	26	23:00s	1:00	S
 Rule	Port	1939	only	-	Apr	15	23:00s	1:00	S
-# Whitman gives 1939 Oct 7; go with Shanks.
+# Whitman gives 1939 Oct 7; go with Shanks & Pottenger.
 Rule	Port	1939	only	-	Nov	18	23:00s	0	-
 Rule	Port	1940	only	-	Feb	24	23:00s	1:00	S
-# Shanks gives 1940 Oct 7; go with Whitman.
+# Shanks & Pottenger give 1940 Oct 7; go with Whitman.
 Rule	Port	1940	1941	-	Oct	 5	23:00s	0	-
 Rule	Port	1941	only	-	Apr	 5	23:00s	1:00	S
 Rule	Port	1942	1945	-	Mar	Sat>=8	23:00s	1:00	S
@@ -1811,8 +1827,8 @@ Rule	Port	1946	only	-	Apr	Sat>=1	23:00s	1:00	S
 Rule	Port	1946	only	-	Oct	Sat>=1	23:00s	0	-
 Rule	Port	1947	1949	-	Apr	Sun>=1	 2:00s	1:00	S
 Rule	Port	1947	1949	-	Oct	Sun>=1	 2:00s	0	-
-# Shanks says DST was observed in 1950; go with Whitman.
-# Whitman gives Oct lastSun for 1952 on; go with Shanks.
+# Shanks & Pottenger say DST was observed in 1950; go with Whitman.
+# Whitman gives Oct lastSun for 1952 on; go with Shanks & Pottenger.
 Rule	Port	1951	1965	-	Apr	Sun>=1	 2:00s	1:00	S
 Rule	Port	1951	1965	-	Oct	Sun>=1	 2:00s	0	-
 Rule	Port	1977	only	-	Mar	27	 0:00s	1:00	S
@@ -1824,7 +1840,7 @@ Rule	Port	1980	only	-	Mar	lastSun	 0:00s	1:00	S
 Rule	Port	1981	1982	-	Mar	lastSun	 1:00s	1:00	S
 Rule	Port	1983	only	-	Mar	lastSun	 2:00s	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-# Shanks says that the transition from LMT to WET occurred 1911-05-24;
+# Shanks & Pottenger say the transition from LMT to WET occurred 1911-05-24;
 # Willett says 1912-01-01.  Go with Willett.
 Zone	Europe/Lisbon	-0:36:32 -	LMT	1884
 			-0:36:32 -	LMT	1912 Jan  1  # Lisbon Mean Time
@@ -1877,11 +1893,12 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 
 # Russia
 
-# From Paul Eggert (1999-11-12):
+# From Paul Eggert (2006-03-22):
 # Except for Moscow after 1919-07-01, I invented the time zone abbreviations.
 # Moscow time zone abbreviations after 1919-07-01, and Moscow rules after 1991,
-# are from Andrey A. Chernov.  The rest is from Shanks, except we follow
-# Chernov's report that 1992 DST transitions were Sat 23:00, not Sun 02:00s.
+# are from Andrey A. Chernov.  The rest is from Shanks & Pottenger,
+# except we follow Chernov's report that 1992 DST transitions were Sat
+# 23:00, not Sun 02:00s.
 #
 # From Stanislaw A. Kuzikowski (1994-06-29):
 # But now it is some months since Novosibirsk is 3 hours ahead of Moscow!
@@ -1926,20 +1943,20 @@ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
 			 2:00	Russia	EE%sT
 #
 # From Oscar van Vlijmen (2001-08-25): [This region consists of]
-# Respublika Adygeya, Arkhangel'skaya oblast', Astrakhanskaya oblast',
+# Respublika Adygeya, Arkhangel'skaya oblast',
 # Belgorodskaya oblast', Bryanskaya oblast', Vladimirskaya oblast',
-# Volgogradskaya oblast', Vologodskaya oblast', Voronezhskaya oblast',
+# Vologodskaya oblast', Voronezhskaya oblast',
 # Respublika Dagestan, Ivanovskaya oblast', Respublika Ingushetiya,
 # Kabarbino-Balkarskaya Respublika, Respublika Kalmykiya,
 # Kalyzhskaya oblast', Respublika Karachaevo-Cherkessiya,
-# Respublika Kareliya, Kirovskaya oblast', Respublika Komi,
+# Respublika Kareliya, Respublika Komi,
 # Kostromskaya oblast', Krasnodarskij kraj, Kurskaya oblast',
 # Leningradskaya oblast', Lipetskaya oblast', Respublika Marij El,
 # Respublika Mordoviya, Moskva, Moskovskaya oblast',
 # Murmanskaya oblast', Nenetskij avtonomnyj okrug,
 # Nizhegorodskaya oblast', Novgorodskaya oblast', Orlovskaya oblast',
 # Penzenskaya oblast', Pskovskaya oblast', Rostovskaya oblast',
-# Ryazanskaya oblast', Sankt-Peterburg, Saratovskaya oblast',
+# Ryazanskaya oblast', Sankt-Peterburg,
 # Respublika Severnaya Osetiya, Smolenskaya oblast',
 # Stavropol'skij kraj, Tambovskaya oblast', Respublika Tatarstan,
 # Tverskaya oblast', Tyl'skaya oblast', Ul'yanovskaya oblast',
@@ -1954,11 +1971,25 @@ Zone Europe/Moscow	 2:30:20 -	LMT	1880
 			 2:00	Russia	EE%sT	1992 Jan 19 2:00s
 			 3:00	Russia	MSK/MSD
 #
+# Astrakhanskaya oblast', Kirovskaya oblast', Saratovskaya oblast',
+# Volgogradskaya oblast'.  Shanks & Pottenger say Kirov is still at +0400
+# but Wikipedia (2006-05-09) says +0300.  Perhaps it switched after the
+# others?  But we have no data.
+Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
+			 3:00	-	TSAT	1925 Apr  6 # Tsaritsyn Time
+			 3:00	-	STAT	1930 Jun 21 # Stalingrad Time
+			 4:00	-	STAT	1961 Nov 11
+			 4:00	Russia	VOL%sT	1989 Mar 26 2:00s # Volgograd T
+			 3:00	Russia	VOL%sT	1991 Mar 31 2:00s
+			 4:00	-	VOLT	1992 Mar 29 2:00s
+			 3:00	Russia	VOL%sT
+#
 # From Oscar van Vlijmen (2001-08-25): [This region consists of]
 # Samarskaya oblast', Udmyrtskaya respublika
 Zone Europe/Samara	 3:20:36 -	LMT	1919 Jul  1 2:00
-			 3:00	-	KUYT	1930 Jun 21 # Kuybyshev
-			 4:00	Russia	KUY%sT	1989 Mar 26 2:00s
+			 3:00	-	SAMT	1930 Jun 21
+			 4:00	-	SAMT	1935 Jan 27
+			 4:00	Russia	KUY%sT	1989 Mar 26 2:00s # Kuybyshev
 			 3:00	Russia	KUY%sT	1991 Mar 31 2:00s
 			 2:00	Russia	KUY%sT	1991 Sep 29 2:00s
 			 3:00	-	KUYT	1991 Oct 20 3:00
@@ -1984,17 +2015,19 @@ Zone Asia/Omsk		 4:53:36 -	LMT	1919 Nov 14
 			 5:00	Russia	OMS%sT	1992 Jan 19 2:00s
 			 6:00	Russia	OMS%sT
 #
-# Novosibirskaya oblast'.
+# From Paul Eggert (2006-08-19): I'm guessing about Tomsk here; it's
+# not clear when it switched from +7 to +6.
+# Novosibirskaya oblast', Tomskaya oblast'.
 Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14 6:00
 			 6:00	-	NOVT	1930 Jun 21 # Novosibirsk Time
 			 7:00	Russia	NOV%sT	1991 Mar 31 2:00s
 			 6:00	Russia	NOV%sT	1992 Jan 19 2:00s
-			 7:00	Russia	NOV%sT	1993 May 23 # says Shanks
+			 7:00	Russia	NOV%sT	1993 May 23 # say Shanks & P.
 			 6:00	Russia	NOV%sT
 #
 # From Oscar van Vlijmen (2001-08-25): [This region consists of]
 # Kemerovskaya oblast', Krasnoyarskij kraj,
-# Tajmyrskij (Dolgano-Nenetskij) avtonomnyj okrug, Tomskaya oblast',
+# Tajmyrskij (Dolgano-Nenetskij) avtonomnyj okrug,
 # Respublika Tuva, Respublika Khakasiya, Evenkijskij avtonomnyj okrug.
 Zone Asia/Krasnoyarsk	 6:11:20 -	LMT	1920 Jan  6
 			 6:00	-	KRAT	1930 Jun 21 # Krasnoyarsk Time
@@ -2077,7 +2110,7 @@ Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
 			11:00	Russia	ANA%sT	1992 Jan 19 2:00s
 			12:00	Russia	ANA%sT
 
-# Serbia and Montenegro
+# Serbia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Belgrade	1:22:00	-	LMT	1884
 			1:00	-	CET	1941 Apr 18 23:00
@@ -2085,10 +2118,11 @@ Zone	Europe/Belgrade	1:22:00	-	LMT	1884
 			1:00	1:00	CEST	1945 Sep 16  2:00s
 # Metod Kozelj reports that the legal date of
 # transition to EU rules was 1982-11-27, for all of Yugoslavia at the time.
-# Shanks doesn't give as much detail, so go with Kozelj.
+# Shanks & Pottenger don't give as much detail, so go with Kozelj.
 			1:00	-	CET	1982 Nov 27
 			1:00	EU	CE%sT
 Link Europe/Belgrade Europe/Ljubljana	# Slovenia
+Link Europe/Belgrade Europe/Podgorica	# Montenegro
 Link Europe/Belgrade Europe/Sarajevo	# Bosnia and Herzegovina
 Link Europe/Belgrade Europe/Skopje	# Macedonia
 Link Europe/Belgrade Europe/Zagreb	# Croatia
@@ -2097,32 +2131,34 @@ Link Europe/Belgrade Europe/Zagreb	# Croatia
 Link Europe/Prague Europe/Bratislava
 
 # Slovenia
-# see Serbia and Montenegro
+# see Serbia
 
 # Spain
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# For 1917-1919 Whitman gives Apr Sat>=1 - Oct Sat>=1; go with Shanks.
+# For 1917-1919 Whitman gives Apr Sat>=1 - Oct Sat>=1;
+# go with Shanks & Pottenger.
 Rule	Spain	1917	only	-	May	 5	23:00s	1:00	S
 Rule	Spain	1917	1919	-	Oct	 6	23:00s	0	-
 Rule	Spain	1918	only	-	Apr	15	23:00s	1:00	S
 Rule	Spain	1919	only	-	Apr	 5	23:00s	1:00	S
-# Whitman gives 1921 Feb 28 - Oct 14; go with Shanks.
+# Whitman gives 1921 Feb 28 - Oct 14; go with Shanks & Pottenger.
 Rule	Spain	1924	only	-	Apr	16	23:00s	1:00	S
-# Whitman gives 1924 Oct 14; go with Shanks.
+# Whitman gives 1924 Oct 14; go with Shanks & Pottenger.
 Rule	Spain	1924	only	-	Oct	 4	23:00s	0	-
 Rule	Spain	1926	only	-	Apr	17	23:00s	1:00	S
-# Whitman says no DST in 1929; go with Shanks.
+# Whitman says no DST in 1929; go with Shanks & Pottenger.
 Rule	Spain	1926	1929	-	Oct	Sat>=1	23:00s	0	-
 Rule	Spain	1927	only	-	Apr	 9	23:00s	1:00	S
 Rule	Spain	1928	only	-	Apr	14	23:00s	1:00	S
 Rule	Spain	1929	only	-	Apr	20	23:00s	1:00	S
-# Whitman gives 1937 Jun 16, 1938 Apr 16, 1940 Apr 13; go with Shanks.
+# Whitman gives 1937 Jun 16, 1938 Apr 16, 1940 Apr 13;
+# go with Shanks & Pottenger.
 Rule	Spain	1937	only	-	May	22	23:00s	1:00	S
 Rule	Spain	1937	1939	-	Oct	Sat>=1	23:00s	0	-
 Rule	Spain	1938	only	-	Mar	22	23:00s	1:00	S
 Rule	Spain	1939	only	-	Apr	15	23:00s	1:00	S
 Rule	Spain	1940	only	-	Mar	16	23:00s	1:00	S
-# Whitman says no DST 1942-1945; go with Shanks.
+# Whitman says no DST 1942-1945; go with Shanks & Pottenger.
 Rule	Spain	1942	only	-	May	 2	22:00s	2:00	M # Midsummer
 Rule	Spain	1942	only	-	Sep	 1	22:00s	1:00	S
 Rule	Spain	1943	1946	-	Apr	Sat>=13	22:00s	2:00	M
@@ -2149,7 +2185,7 @@ Rule SpainAfrica 1977	only	-	Sep	28	 0:00	0	-
 Rule SpainAfrica 1978	only	-	Jun	 1	 0:00	1:00	S
 Rule SpainAfrica 1978	only	-	Aug	 4	 0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Madrid	-0:14:44 -	LMT	1901
+Zone	Europe/Madrid	-0:14:44 -	LMT	1901 Jan  1  0:00s
 			 0:00	Spain	WE%sT	1946 Sep 30
 			 1:00	Spain	CE%sT	1979
 			 1:00	EU	CE%sT
@@ -2171,7 +2207,7 @@ Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
 
 # Sweden
 
-# From Ivan Nilsson (2001-04-13), superseding Shanks:
+# From Ivan Nilsson (2001-04-13), superseding Shanks & Pottenger:
 #
 # The law "Svensk forfattningssamling 1878, no 14" about standard time in 1879:
 # From the beginning of 1879 (that is 01-01 00:00) the time for all
@@ -2232,7 +2268,7 @@ Zone Europe/Stockholm	1:12:12 -	LMT	1879 Jan  1
 # From Whitman (who writes ``Midnight?''):
 Rule	Swiss	1940	only	-	Nov	 2	0:00	1:00	S
 Rule	Swiss	1940	only	-	Dec	31	0:00	0	-
-# From Shanks:
+# From Shanks & Pottenger:
 Rule	Swiss	1941	1942	-	May	Sun>=1	2:00	1:00	S
 Rule	Swiss	1941	1942	-	Oct	Sun>=1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -2251,7 +2287,8 @@ Rule	Turkey	1921	only	-	Apr	 3	0:00	1:00	S
 Rule	Turkey	1921	only	-	Oct	 3	0:00	0	-
 Rule	Turkey	1922	only	-	Mar	26	0:00	1:00	S
 Rule	Turkey	1922	only	-	Oct	 8	0:00	0	-
-# Whitman gives 1923 Apr 28 - Sep 16 and no DST in 1924-1925; go with Shanks.
+# Whitman gives 1923 Apr 28 - Sep 16 and no DST in 1924-1925;
+# go with Shanks & Pottenger.
 Rule	Turkey	1924	only	-	May	13	0:00	1:00	S
 Rule	Turkey	1924	1925	-	Oct	 1	0:00	0	-
 Rule	Turkey	1925	only	-	May	 1	0:00	1:00	S
@@ -2260,7 +2297,8 @@ Rule	Turkey	1940	only	-	Oct	 5	0:00	0	-
 Rule	Turkey	1940	only	-	Dec	 1	0:00	1:00	S
 Rule	Turkey	1941	only	-	Sep	21	0:00	0	-
 Rule	Turkey	1942	only	-	Apr	 1	0:00	1:00	S
-# Whitman omits the next two transition and gives 1945 Oct 1; go with Shanks.
+# Whitman omits the next two transition and gives 1945 Oct 1;
+# go with Shanks & Pottenger.
 Rule	Turkey	1942	only	-	Nov	 1	0:00	0	-
 Rule	Turkey	1945	only	-	Apr	 2	0:00	1:00	S
 Rule	Turkey	1945	only	-	Oct	 8	0:00	0	-
@@ -2357,11 +2395,13 @@ Zone Europe/Simferopol	2:16:24 -	LMT	1880
 			3:00	Russia	MSK/MSD	1990
 			3:00	-	MSK	1990 Jul  1 2:00
 			2:00	-	EET	1992
-# From Paul Eggert (1999-11-12):
+# From Paul Eggert (2006-03-22):
 # The _Economist_ (1994-05-28, p 45) reports that central Crimea switched
 # from Kiev to Moscow time sometime after the January 1994 elections.
-# Shanks says ``date of change uncertain'', but implies that it happened
-# sometime between the 1994 DST switches.  For now, guess it changed in May.
+# Shanks (1999) says ``date of change uncertain'', but implies that it happened
+# sometime between the 1994 DST switches.  Shanks & Pottenger simply say
+# 1994-09-25 03:00, but that can't be right.  For now, guess it
+# changed in May.
 			2:00	E-Eur	EE%sT	1994 May
 # From IATA SSIM (1994/1997), which also says that Kerch is still like Kiev.
 			3:00	E-Eur	MSK/MSD	1996 Mar 31 3:00s
diff --git a/timezone/ialloc.c b/timezone/ialloc.c
index 8a0c701578..1fc2035f45 100644
--- a/timezone/ialloc.c
+++ b/timezone/ialloc.c
@@ -1,6 +1,11 @@
+/*
+** This file is in the public domain, so clarified as of
+** 2006-07-17 by Arthur David Olson.
+*/
+
 #ifndef lint
 #ifndef NOID
-static char	elsieid[] = "@(#)ialloc.c	8.29";
+static char	elsieid[] = "@(#)ialloc.c	8.30";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
diff --git a/timezone/iso3166.tab b/timezone/iso3166.tab
index 1cfaf265c2..8bb8231055 100644
--- a/timezone/iso3166.tab
+++ b/timezone/iso3166.tab
@@ -1,12 +1,12 @@
 # ISO 3166 alpha-2 country codes
 #
-# @(#)iso3166.tab	8.1
+# @(#)iso3166.tab	8.3
 #
-# From Paul Eggert (2004-06-14):
+# From Paul Eggert (2006-09-27):
 #
 # This file contains a table with the following columns:
 # 1.  ISO 3166-1 alpha-2 country code, current as of
-#     ISO 3166-1 Newsletter No. V-10 (2004-04-26).  See:
+#     ISO 3166-1 Newsletter No. V-12 (2006-09-26).  See:
 #     <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/index.html">
 #     ISO 3166 Maintenance agency (ISO 3166/MA)
 #     </a>.
@@ -70,7 +70,6 @@ CM	Cameroon
 CN	China
 CO	Colombia
 CR	Costa Rica
-CS	Serbia and Montenegro
 CU	Cuba
 CV	Cape Verde
 CX	Christmas Island
@@ -100,6 +99,7 @@ GB	Britain (UK)
 GD	Grenada
 GE	Georgia
 GF	French Guiana
+GG	Guernsey
 GH	Ghana
 GI	Gibraltar
 GL	Greenland
@@ -122,12 +122,14 @@ HU	Hungary
 ID	Indonesia
 IE	Ireland
 IL	Israel
+IM	Isle of Man
 IN	India
 IO	British Indian Ocean Territory
 IQ	Iraq
 IR	Iran
 IS	Iceland
 IT	Italy
+JE	Jersey
 JM	Jamaica
 JO	Jordan
 JP	Japan
@@ -156,6 +158,7 @@ LY	Libya
 MA	Morocco
 MC	Monaco
 MD	Moldova
+ME	Montenegro
 MG	Madagascar
 MH	Marshall Islands
 MK	Macedonia
@@ -204,6 +207,7 @@ PY	Paraguay
 QA	Qatar
 RE	Reunion
 RO	Romania
+RS	Serbia
 RU	Russia
 RW	Rwanda
 SA	Saudi Arabia
diff --git a/timezone/northamerica b/timezone/northamerica
index 73e2470e0b..3d80c5e3c2 100644
--- a/timezone/northamerica
+++ b/timezone/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica	8.1
+# @(#)northamerica	8.10
 # <pre>
 
 # also includes Central America and the Caribbean
@@ -30,12 +30,12 @@
 # That 1883 transition occurred at 12:00 new time, not at 12:00 old time.
 # See p 46 of David Prerau, Seize the daylight, Thunder's Mouth Press (2005).
 
-# From Paul Eggert (1995-12-19):
+# From Paul Eggert (2006-03-22):
 # A good source for time zone historical data in the US is
 # Thomas G. Shanks, The American Atlas (5th edition),
 # San Diego: ACS Publications, Inc. (1991).
 # Make sure you have the errata sheet; the book is somewhat useless without it.
-# It is the source for most of the pre-1991 US and Puerto Rico entries below.
+# It is the source for most of the pre-1991 US entries below.
 
 # From Paul Eggert (2001-03-06):
 # Daylight Saving Time was first suggested as a joke by Benjamin Franklin
@@ -229,7 +229,7 @@ Zone	PST8PDT		 -8:00	US	P%sT
 # Public law 106-564 (2000-12-23) introduced the abbreviation
 # "Chamorro Standard Time" for time in Guam and the Northern Marianas.
 # See the file "australasia".
- 
+
 # From Arthur David Olson, 2005-08-09
 # The following was signed into law on 2005-08-08.
 #
@@ -274,7 +274,7 @@ Zone	PST8PDT		 -8:00	US	P%sT
 # set their watches and clocks on Eastern time."  It quotes H.H. "Bubba"
 # Roberts, city administrator in Phenix City. as saying "We are in the Central
 # time zone, but we do go by the Eastern time zone because so many people work
-# in Columbus." 
+# in Columbus."
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
 Rule	NYC	1920	only	-	Mar	lastSun	2:00	1:00	D
@@ -301,6 +301,13 @@ Zone America/New_York	-4:56:02 -	LMT	1883 Nov 18 12:03:58
 # Nebraska, eastern North Dakota, Oklahoma, eastern South Dakota,
 # western Tennessee, most of Texas, Wisconsin
 
+# From Larry M. Smith (2006-04-26) re Wisconsin:
+# http://www.legis.state.wi.us/statutes/Stat0175.pdf ...
+# is currently enforced at the 01:00 time of change.  Because the local
+# "bar time" in the state corresponds to 02:00, a number of citations
+# are issued for the "sale of class 'B' alcohol after prohibited
+# hours" within the deviated hour of this change every year....
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
 Rule	Chicago	1920	only	-	Jun	13	2:00	1:00	D
 Rule	Chicago	1920	1921	-	Oct	lastSun	2:00	0	S
@@ -321,14 +328,16 @@ Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:09:24
 Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
 			-7:00	US	M%sT	1992 Oct 25 02:00
 			-6:00	US	C%sT
-# From Paul Eggert (2006-01-20):
-# The following is not implemented yet.
-# What is the most populous city in that area?
-# From http://www.statoids.com/tus.html (2006-01-20):
-# 2003-10-26 02:00: All of Morton County, ND, and the part of Sioux
-# County, ND east of ND route 31 moved from MT to CT.  (The area
-# around Fort Yates in Sioux County and the area around Mandan in
-# Morton County were already in CT.)
+# Morton County, ND, switched from mountain to central time on
+# 2003-10-26, except for the area around Mandan which was already central time.
+# See <http://dmses.dot.gov/docimages/p63/135818.pdf>.
+# Officially this switch also included part of Sioux County, and
+# Jones, Mellette, and Todd Counties in South Dakota;
+# but in practice these other counties were already observing central time.
+# See <http://www.epa.gov/fedrgstr/EPA-IMPACT/2003/October/Day-28/i27056.htm>.
+Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
+			-7:00	US	M%sT	2003 Oct 26 02:00
+			-6:00	US	C%sT
 
 # US mountain time, represented by Denver
 #
@@ -407,7 +416,8 @@ Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
 Zone America/Anchorage	 14:00:24 -	LMT	1867 Oct 18
 			 -9:59:36 -	LMT	1900 Aug 20 12:00
 			-10:00	-	CAT	1942
-			-10:00	US	CAT/CAWT 1946
+			-10:00	US	CAT/CAWT 1945 Aug 14 23:00u
+			-10:00	US	CAT/CAPT 1946 # Peace
 			-10:00	-	CAT	1967 Apr
 			-10:00	-	AHST	1969
 			-10:00	US	AH%sT	1983 Oct 30 2:00
@@ -527,9 +537,9 @@ Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 12:15:11
 # For a map of Indiana's time zone regions, see:
 # <a href="http://www.mccsc.edu/time.html">
 # What time is it in Indiana?
-# </a> (2005-10-30)
+# </a> (2006-03-01)
 #
-# From Paul Eggert (2006-01-20):
+# From Paul Eggert (2006-03-22):
 # Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
 # with the following exceptions:
 #
@@ -549,6 +559,7 @@ Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 12:15:11
 #
 # Shanks partitioned Indiana into 345 regions, each with its own time history,
 # and wrote ``Even newspaper reports present contradictory information.''
+# Those Hoosiers!  Such a flighty and changeable people!
 # Fortunately, most of the complexity occurred before our cutoff date of 1970.
 #
 # Other than Indianapolis, the Indiana place names are so nondescript
@@ -558,8 +569,10 @@ Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 12:15:11
 # From Paul Eggert (2005-08-16):
 # http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006.
 
+# From Nathan Stratton Treadway (2006-03-30):
+# http://www.dot.gov/affairs/dot0406.htm [3705 B]
 # From Deborah Goldsmith (2006-01-18):
-# http://dmses.dot.gov/docimages/pdf95/382329_web.pdf
+# http://dmses.dot.gov/docimages/pdf95/382329_web.pdf [2.9 MB]
 # From Paul Eggert (2006-01-20):
 # It says "DOT is relocating the time zone boundary in Indiana to move Starke,
 # Pulaski, Knox, Daviess, Martin, Pike, Dubois, and Perry Counties from the
@@ -625,7 +638,7 @@ Zone America/Indiana/Vincennes -5:50:07 - LMT	1883 Nov 18 12:09:53
 			-5:00	US	E%sT	1971
 			-5:00	-	EST	2006 Apr  2 2:00
 			-6:00	US	C%sT
-# 
+#
 # Pike County, Indiana moved from central to eastern time in 1977,
 # then switched back in 2006.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
@@ -818,10 +831,10 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 ################################################################################
 
 
-# From Paul Eggert (1999-10-29):
-# A good source for time zone historical data outside the US is
-# Thomas G. Shanks, The International Atlas (5th edition),
-# San Diego: ACS Publications, Inc. (1999).
+# From Paul Eggert (2006-03-22):
+# A good source for time zone historical data outside the U.S. is
+# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+# San Diego: ACS Publications, Inc. (2003).
 #
 # Gwillim Law writes that a good source
 # for recent time zone data is the International Air Transport
@@ -829,8 +842,8 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 # published semiannually.  Law sent in several helpful summaries
 # of the IATA's data after 1990.
 #
-# Except where otherwise noted, Shanks is the source for entries through 1990,
-# and IATA SSIM is the source for entries after 1990.
+# Except where otherwise noted, Shanks & Pottenger is the source for
+# entries through 1990, and IATA SSIM is the source for entries afterwards.
 #
 # Other sources occasionally used include:
 #
@@ -878,9 +891,51 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 # From Paul Eggert (1994-11-22):
 # Alas, this sort of thing must be handled by localization software.
 
-# Unless otherwise specified, the data for Canada are all from Shanks.
-
-# From Paul Eggert (2005-12-21):
+# Unless otherwise specified, the data for Canada are all from Shanks
+# & Pottenger.
+
+# From Chris Walton (2006-04-01):
+# The British Columbia government announced yesterday that it will
+# adjust daylight savings next year to align with changes in the
+# U.S. and the rest of Canada....
+# http://www2.news.gov.bc.ca/news_releases_2005-2009/2006AG0014-000330.htm
+
+# From Chris Walton (2006-04-25):
+# Daylight saving time will be extended by four weeks starting in 2007....
+# Here is a news release which was issued today by the Nova Scotia government:
+# http://www.gov.ns.ca/news/details.asp?id=20060425004
+
+# From Chris Walton (2006-06-26):
+# [For New Brunswick] the new legislation dictates that the time change is to
+# be done at 02:00 instead of 00:01.
+# http://www.gnb.ca/0062/acts/BBA-2006/Chap-19.pdf
+# ...
+# Manitoba has traditionally changed the clock every fall at 03:00.
+# As of 2006, the transition is to take place one hour earlier at 02:00.
+# http://web2.gov.mb.ca/laws/statutes/ccsm/o030e.php
+# ...
+# [Alberta, Ontario, Quebec] will follow US rules.
+# http://www.qp.gov.ab.ca/documents/Acts/2006CH03_UNPR.cfm?frm_isbn=0779744934
+# http://www.e-laws.gov.on.ca/DBLaws/Source/Regs/English/2006/R06111_e.htm
+# http://www.assnat.qc.ca/eng/37legislature2/Projets-loi/Publics/06-a002.htm
+# ...
+# P.E.I. will follow US rules.  The new legislation is not law yet.
+# It passed first reading on April 20....
+# http://www.assembly.pe.ca/bills/pdf_first/62/3/bill-101.pdf
+# ...
+# Province of Newfoundland and Labrador.... The change is being considered.
+# http://www.releases.gov.nl.ca/releases/2006/mpa/0331n01.htm
+# ...
+# N.W.T. will follow US rules.  Whoever maintains the government web site
+# does not seem to believe in bookmarks.  To see the news release, click the
+# following link and search for "Daylight Savings Time Change".  Press the
+# "Daylight Savings Time Change" link; it will fire off a popup using
+# JavaScript.
+# http://www.exec.gov.nt.ca/currentnews/currentPR.asp?mode=archive
+
+
+
+# From Paul Eggert (2006-04-25):
 # H. David Matthews and Mary Vincent's map
 # <a href="http://www.canadiangeographic.ca/Magazine/SO98/geomap.asp">
 # "It's about TIME", _Canadian Geographic_ (September-October 1998)
@@ -892,25 +947,10 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 # information about standard and daylight saving time zones in Canada.
 # </a> (updated periodically).
 # Its unofficial information is often taken from Matthews and Vincent.
-#
-# CBC News reported that Ontario and Manitoba have announced plans to
-# follow the US change, and that Nova Scotia is considering it; see
-# <http://www.cbc.ca/news/background/daylightsavingtime/> (2005-10-21).
-# CBC news also reported that Prince Edward Island is the first
-# province in Atlantic Canada to follow the US change, and that Quebec
-# had agreed; see <http://www.cbc.ca/pei/story/pe_daylight_20051207.html>
-# (2005-12-07).
-#
-# To reflect all this, the Canada and Winn rules have been adjusted to
-# agree with the 2007 US change.  This means we assume most of Canada
-# will fall into line.  However, Alberta, British Columbia,
-# Newfoundland, Northwest Territories, and Yukon already have separate
-# rules in our database, so for now we'll leave them alone, which
-# means that we currently assume these regions will not change their
-# rules and will disagree with the US starting in 2007.  This
-# assumption is probably incorrect, with the possible exception of
-# Newfoundland.  We plan to adjust the Edm, Vanc, StJohns, and NT_YK
-# rules as the corresponding provinces make their announcements.
+
+# From Paul Eggert (2006-06-27):
+# For now, assume all of DST-observing Canada will fall into line with the
+# new US DST rules,
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Canada	1918	only	-	Apr	14	2:00	1:00	D
@@ -925,7 +965,7 @@ Rule	Canada	2007	max	-	Mar	Sun>=8	2:00	1:00	D
 Rule	Canada	2007	max	-	Nov	Sun>=1	2:00	0	S
 
 
-# Newfoundland (and far southeast Labrador)
+# Newfoundland and Labrador
 
 # From Paul Eggert (2000-10-02):
 # Matthews and Vincent (1998) write that Labrador should use NST/NDT,
@@ -936,20 +976,21 @@ Rule	Canada	2007	max	-	Nov	Sun>=1	2:00	0	S
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	StJohns	1917	only	-	Apr	 8	2:00	1:00	D
 Rule	StJohns	1917	only	-	Sep	17	2:00	0	S
-# Whitman gives 1919 Apr 5 and 1920 Apr 5; go with Shanks.
+# Whitman gives 1919 Apr 5 and 1920 Apr 5; go with Shanks & Pottenger.
 Rule	StJohns	1919	only	-	May	 5	23:00	1:00	D
 Rule	StJohns	1919	only	-	Aug	12	23:00	0	S
-# For 1931-1935 Whitman gives Apr same date; go with Shanks.
+# For 1931-1935 Whitman gives Apr same date; go with Shanks & Pottenger.
 Rule	StJohns	1920	1935	-	May	Sun>=1	23:00	1:00	D
 Rule	StJohns	1920	1935	-	Oct	lastSun	23:00	0	S
-# For 1936-1941 Whitman gives May Sun>=8 and Oct Sun>=1; go with Shanks.
+# For 1936-1941 Whitman gives May Sun>=8 and Oct Sun>=1; go with Shanks &
+# Pottenger.
 Rule	StJohns	1936	1941	-	May	Mon>=9	0:00	1:00	D
 Rule	StJohns	1936	1941	-	Oct	Mon>=2	0:00	0	S
 # Whitman gives the following transitions:
 # 1942 03-01/12-31, 1943 05-30/09-05, 1944 07-10/09-02, 1945 01-01/10-07
-# but go with Shanks and assume they used Canadian rules.
+# but go with Shanks & Pottenger and assume they used Canadian rules.
 # For 1946-9 Whitman gives May 5,4,9,1 - Oct 1,5,3,2, and for 1950 he gives
-# Apr 30 - Sep 24; go with Shanks.
+# Apr 30 - Sep 24; go with Shanks & Pottenger.
 Rule	StJohns	1946	1950	-	May	Sun>=8	2:00	1:00	D
 Rule	StJohns	1946	1950	-	Oct	Sun>=2	2:00	0	S
 Rule	StJohns	1951	1986	-	Apr	lastSun	2:00	1:00	D
@@ -959,9 +1000,12 @@ Rule	StJohns	1960	1986	-	Oct	lastSun	2:00	0	S
 # INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
 # at 00:01 local time.  For now, assume it started in 1987.
 Rule	StJohns	1987	only	-	Apr	Sun>=1	0:01	1:00	D
-Rule	StJohns	1987	max	-	Oct	lastSun	0:01	0	S
+Rule	StJohns	1987	2006	-	Oct	lastSun	0:01	0	S
 Rule	StJohns	1988	only	-	Apr	Sun>=1	0:01	2:00	DD
-Rule	StJohns	1989	max	-	Apr	Sun>=1	0:01	1:00	D
+Rule	StJohns	1989	2006	-	Apr	Sun>=1	0:01	1:00	D
+Rule	StJohns	2007	max	-	Mar	Sun>=8	0:01	1:00	D
+Rule	StJohns	2007	max	-	Nov	Sun>=1	0:01	0	S
+#
 # St John's has an apostrophe, but Posix file names can't have apostrophes.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/St_Johns	-3:30:52 -	LMT	1884
@@ -989,12 +1033,13 @@ Zone America/Goose_Bay	-4:01:40 -	LMT	1884 # Happy Valley-Goose Bay
 
 # west Labrador, Nova Scotia, Prince Edward I
 
-# From Paul Eggert (1996-06-12):
-# Shanks writes that since 1970 most of this region has been like Halifax.
-# Many locales did not observe peacetime DST until 1972;
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger write that since 1970 most of this region has been like
+# Halifax.  Many locales did not observe peacetime DST until 1972;
 # Glace Bay, NS is the largest that we know of.
-# Shanks also writes that Liverpool, NS was the only town in Canada to observe
-# DST in 1971 but not 1970; for now we'll assume this is a typo.
+# Shanks & Pottenger also write that Liverpool, NS was the only town
+# in Canada to observe DST in 1971 but not 1970; for now we'll assume
+# this is a typo.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Halifax	1916	only	-	Apr	 1	0:00	1:00	D
@@ -1060,10 +1105,7 @@ Zone America/Glace_Bay	-3:59:48 -	LMT	1902 Jun 15
 # <http://www.gnb.ca/0062/PDF-acts/t-06.pdf> says they change at 00:01, and
 # <http://www.canlii.org/nb/laws/sta/t-6/20030127/whole.html> makes it
 # clear that this has been the case since at least 1993.
-# For now, assume it started in 1993.  The Office of the Premier announced
-# <http://www.gnb.ca/cnb/news/pre/2005e1737pr.htm> (2005-12-23)
-# that they will bring forward proposed amendments to harmonize with the US;
-# for now assume that this will happen, but they'll still switch at 00:01.
+# For now, assume it started in 1993.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Moncton	1933	1935	-	Jun	Sun>=8	1:00	1:00	D
@@ -1076,11 +1118,9 @@ Rule	Moncton	1940	only	-	May	19	1:00	1:00	D
 Rule	Moncton	1941	only	-	May	 4	1:00	1:00	D
 Rule	Moncton	1946	1972	-	Apr	lastSun	2:00	1:00	D
 Rule	Moncton	1946	1956	-	Sep	lastSun	2:00	0	S
-Rule	Moncton	1956	1972	-	Oct	lastSun	2:00	0	S
+Rule	Moncton	1957	1972	-	Oct	lastSun	2:00	0	S
 Rule	Moncton	1993	2006	-	Apr	Sun>=1	0:01	1:00	D
 Rule	Moncton	1993	2006	-	Oct	lastSun	0:01	0	S
-Rule	Moncton	2007	max	-	Mar	Sun>=8	0:01	1:00	D
-Rule	Moncton	2007	max	-	Nov	Sun>=1	0:01	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Moncton	-4:19:08 -	LMT	1883 Dec  9
 			-5:00	-	EST	1902 Jun 15
@@ -1089,13 +1129,79 @@ Zone America/Moncton	-4:19:08 -	LMT	1883 Dec  9
 			-4:00	Canada	A%sT	1946
 			-4:00	Moncton	A%sT	1973
 			-4:00	Canada	A%sT	1993
-			-4:00	Moncton	A%sT
+			-4:00	Moncton	A%sT	2007
+			-4:00	Canada	A%sT
 
-# Ontario, Quebec
+# Quebec
+
+# From Paul Eggert (2006-07-09):
+# Shanks & Pottenger write that since 1970 most of Quebec has been
+# like Montreal.
+
+# From Paul Eggert (2006-06-27):
+# Matthews and Vincent (1998) also write that Quebec east of the -63
+# meridian is supposed to observe AST, but residents as far east as
+# Natashquan use EST/EDT, and residents east of Natashquan use AST.
+# In "Official time in Quebec" the Quebec department of justice writes in
+# http://www.justice.gouv.qc.ca/english/publications/generale/temps-regl-1-a.htm
+# that "The residents of the Municipality of the
+# Cote-Nord-du-Golfe-Saint-Laurent and the municipalities of Saint-Augustin,
+# Bonne-Esperance and Blanc-Sablon apply the Official Time Act as it is
+# written and use Atlantic standard time all year round. The same applies to
+# the residents of the Native facilities along the lower North Shore."
+# <http://www.assnat.qc.ca/eng/37legislature2/Projets-loi/Publics/06-a002.htm>
+# says this common practice was codified into law as of 2007.
+# For lack of better info, guess this practice began around 1970, contra to
+# Shanks & Pottenger who have this region observing AST/ADT.
 
-# From Paul Eggert (1996-06-12):
-# Shanks writes that since 1970 most of Ontario has been like Toronto,
-# and most of Quebec has been like Montreal.
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
+Rule	Mont	1917	only	-	Apr	24	0:00	0	S
+Rule	Mont	1919	only	-	Mar	31	2:30	1:00	D
+Rule	Mont	1919	only	-	Oct	25	2:30	0	S
+Rule	Mont	1920	only	-	May	 2	2:30	1:00	D
+Rule	Mont	1920	1922	-	Oct	Sun>=1	2:30	0	S
+Rule	Mont	1921	only	-	May	 1	2:00	1:00	D
+Rule	Mont	1922	only	-	Apr	30	2:00	1:00	D
+Rule	Mont	1924	only	-	May	17	2:00	1:00	D
+Rule	Mont	1924	1926	-	Sep	lastSun	2:30	0	S
+Rule	Mont	1925	1926	-	May	Sun>=1	2:00	1:00	D
+# The 1927-to-1937 rules can be expressed more simply as
+# Rule	Mont	1927	1937	-	Apr	lastSat	24:00	1:00	D
+# Rule	Mont	1927	1937	-	Sep	lastSat	24:00	0	S
+# The rules below avoid use of 24:00
+# (which pre-1998 versions of zic cannot handle).
+Rule	Mont	1927	only	-	May	1	0:00	1:00	D
+Rule	Mont	1927	1932	-	Sep	lastSun	0:00	0	S
+Rule	Mont	1928	1931	-	Apr	lastSun	0:00	1:00	D
+Rule	Mont	1932	only	-	May	1	0:00	1:00	D
+Rule	Mont	1933	1940	-	Apr	lastSun	0:00	1:00	D
+Rule	Mont	1933	only	-	Oct	1	0:00	0	S
+Rule	Mont	1934	1939	-	Sep	lastSun	0:00	0	S
+Rule	Mont	1946	1973	-	Apr	lastSun	2:00	1:00	D
+Rule	Mont	1945	1948	-	Sep	lastSun	2:00	0	S
+Rule	Mont	1949	1950	-	Oct	lastSun	2:00	0	S
+Rule	Mont	1951	1956	-	Sep	lastSun	2:00	0	S
+Rule	Mont	1957	1973	-	Oct	lastSun	2:00	0	S
+
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/Blanc-Sablon -3:48:28 -	LMT	1884
+			-4:00	Canada	A%sT	1970
+			-4:00	-	AST
+Zone America/Montreal	-4:54:16 -	LMT	1884
+			-5:00	Mont	E%sT	1918
+			-5:00	Canada	E%sT	1919
+			-5:00	Mont	E%sT	1942 Feb  9 2:00s
+			-5:00	Canada	E%sT	1946
+			-5:00	Mont	E%sT	1974
+			-5:00	Canada	E%sT
+
+
+# Ontario
+
+# From Paul Eggert (2006-07-09):
+# Shanks & Pottenger write that since 1970 most of Ontario has been like
+# Toronto.
 # Thunder Bay skipped DST in 1973.
 # Many smaller locales did not observe peacetime DST until 1974;
 # Nipigon (EST) and Rainy River (CST) are the largest that we know of.
@@ -1125,50 +1231,46 @@ Zone America/Moncton	-4:19:08 -	LMT	1883 Dec  9
 # says that Ontario east of 90W uses EST/EDT, and west of 90W uses CST/CDT.
 # Officially Atikokan is therefore on CST/CDT, and most likely this report
 # concerns a non-official time observed as a matter of local practice.
-# For what it's worth, Shanks says that Atikokan has agreed with
-# Rainy River ever since standard time was introduced.
-
+#
 # From Paul Eggert (2000-10-02):
 # Matthews and Vincent (1998) write that Atikokan, Pickle Lake, and
 # New Osnaburgh observe CST all year, that Big Trout Lake observes
 # CST/CDT, and that Upsala and Shebandowan observe EST/EDT, all in
 # violation of the official Ontario rules.
-# They also write that Quebec east of the -63 meridian is supposed to
-# observe AST, but residents as far east as Natashquan use EST/EDT,
-# and residents east of Natashquan use AST.
-# We probably need Zones for far east Quebec and for Atikokan,
-# but we don't know when their practices started.
+#
+# From Paul Eggert (2006-07-09):
+# Chris Walton (2006-07-06) mentioned an article by Stephanie MacLellan in the
+# 2005-07-21 Chronicle-Journal, which said:
+#
+#	The clocks in Atikokan stay set on standard time year-round.
+#	This means they spend about half the time on central time and
+#	the other half on eastern time.
+#
+#	For the most part, the system works, Mayor Dennis Brown said.
+#
+#	"The majority of businesses in Atikokan deal more with Eastern
+#	Canada, but there are some that deal with Western Canada," he
+#	said.  "I don't see any changes happening here."
+#
+# Walton also writes "Supposedly Pickle Lake and Mishkeegogamang
+# [New Osnaburgh] follow the same practice."
 
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
-Rule	Mont	1917	only	-	Apr	24	0:00	0	S
-Rule	Mont	1919	only	-	Mar	31	2:30	1:00	D
-Rule	Mont	1919	only	-	Oct	25	2:30	0	S
-Rule	Mont	1920	only	-	May	 2	2:30	1:00	D
-Rule	Mont	1920	1922	-	Oct	Sun>=1	2:30	0	S
-Rule	Mont	1921	only	-	May	 1	2:00	1:00	D
-Rule	Mont	1922	only	-	Apr	30	2:00	1:00	D
-Rule	Mont	1924	only	-	May	17	2:00	1:00	D
-Rule	Mont	1924	1926	-	Sep	lastSun	2:30	0	S
-Rule	Mont	1925	1926	-	May	Sun>=1	2:00	1:00	D
-# The 1927-to-1937 rules can be expressed more simply as
-# Rule	Mont	1927	1937	-	Apr	lastSat	24:00	1:00	D
-# Rule	Mont	1927	1937	-	Sep	lastSat	24:00	0	S
-# The rules below avoid use of 24:00
-# (which pre-1998 versions of zic cannot handle).
-Rule	Mont	1927	only	-	May	1	0:00	1:00	D
-Rule	Mont	1927	1932	-	Sep	lastSun	0:00	0	S
-Rule	Mont	1928	1931	-	Apr	lastSun	0:00	1:00	D
-Rule	Mont	1932	only	-	May	1	0:00	1:00	D
-Rule	Mont	1933	1940	-	Apr	lastSun	0:00	1:00	D
-Rule	Mont	1933	only	-	Oct	1	0:00	0	S
-Rule	Mont	1934	1939	-	Sep	lastSun	0:00	0	S
-Rule	Mont	1946	1973	-	Apr	lastSun	2:00	1:00	D
-Rule	Mont	1945	1948	-	Sep	lastSun	2:00	0	S
-Rule	Mont	1949	1950	-	Oct	lastSun	2:00	0	S
-Rule	Mont	1951	1956	-	Sep	lastSun	2:00	0	S
-Rule	Mont	1957	1973	-	Oct	lastSun	2:00	0	S
+# From Garry McKinnon (2006-07-14) via Chris Walton:
+# I chatted with a member of my board who has an outstanding memory
+# and a long history in Atikokan (and in the telecom industry) and he
+# can say for certain that Atikokan has been practicing the current
+# time keeping since 1952, at least.
 
+# From Paul Eggert (2006-07-17):
+# Shanks & Pottenger say that Atikokan has agreed with Rainy River
+# ever since standard time was introduced, but the information from
+# McKinnon sounds more authoritative.  For now, assume that Atikokan
+# switched to EST immediately after WWII era daylight saving time
+# ended.  This matches the old (less-populous) America/Coral_Harbour
+# entry since our cutoff date of 1970, so we can move
+# America/Coral_Harbour to the 'backward' file.
+
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Toronto	1919	only	-	Mar	30	23:30	1:00	D
 Rule	Toronto	1919	only	-	Oct	26	0:00	0	S
 Rule	Toronto	1920	only	-	May	 2	2:00	1:00	D
@@ -1176,7 +1278,8 @@ Rule	Toronto	1920	only	-	Sep	26	0:00	0	S
 Rule	Toronto	1921	only	-	May	15	2:00	1:00	D
 Rule	Toronto	1921	only	-	Sep	15	2:00	0	S
 Rule	Toronto	1922	1923	-	May	Sun>=8	2:00	1:00	D
-# Shanks says 1923-09-19; assume it's a typo and that "-16" was meant.
+# Shanks & Pottenger say 1923-09-19; assume it's a typo and that "-16"
+# was meant.
 Rule	Toronto	1922	1926	-	Sep	Sun>=15	2:00	0	S
 Rule	Toronto	1924	1927	-	May	Sun>=1	2:00	1:00	D
 # The 1927-to-1939 rules can be expressed more simply as
@@ -1200,9 +1303,10 @@ Rule	Toronto	1949	only	-	Nov	lastSun	0:00	0	S
 Rule	Toronto	1950	1973	-	Apr	lastSun	2:00	1:00	D
 Rule	Toronto	1950	only	-	Nov	lastSun	2:00	0	S
 Rule	Toronto	1951	1956	-	Sep	lastSun	2:00	0	S
-# Shanks says Toronto ended DST a week early in 1971, namely on 1971-10-24,
-# but Mark Brader wrote (2003-05-31) that he checked the 1971-10-30 issue
-# of the Toronto Star, and it said that DST ended 1971-10-31 as usual.
+# Shanks & Pottenger say Toronto ended DST a week early in 1971,
+# namely on 1971-10-24, but Mark Brader wrote (2003-05-31) that this
+# is wrong, and that he had confirmed it by checking the 1971-10-30
+# Toronto Star, which said that DST was ending 1971-10-31 as usual.
 Rule	Toronto	1957	1973	-	Oct	lastSun	2:00	0	S
 
 # From Paul Eggert (2003-07-27):
@@ -1224,13 +1328,6 @@ Rule	Toronto	1957	1973	-	Oct	lastSun	2:00	0	S
 # months for the remainder of the war years.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Montreal	-4:54:16 -	LMT	1884
-			-5:00	Mont	E%sT	1918
-			-5:00	Canada	E%sT	1919
-			-5:00	Mont	E%sT	1942 Feb  9 2:00s
-			-5:00	Canada	E%sT	1946
-			-5:00	Mont	E%sT	1974
-			-5:00	Canada	E%sT
 Zone America/Toronto	-5:17:32 -	LMT	1895
 			-5:00	Canada	E%sT	1919
 			-5:00	Toronto	E%sT	1942 Feb  9 2:00s
@@ -1248,14 +1345,38 @@ Zone America/Nipigon	-5:53:04 -	LMT	1895
 			-5:00	Canada	E%sT	1940 Sep 29
 			-5:00	1:00	EDT	1942 Feb  9 2:00s
 			-5:00	Canada	E%sT
-Zone America/Rainy_River -6:17:56 -	LMT	1895
+Zone America/Rainy_River -6:18:16 -	LMT	1895
 			-6:00	Canada	C%sT	1940 Sep 29
 			-6:00	1:00	CDT	1942 Feb  9 2:00s
 			-6:00	Canada	C%sT
+Zone America/Atikokan	-6:06:28 -	LMT	1895
+			-6:00	Canada	C%sT	1940 Sep 29
+			-6:00	1:00	CDT	1942 Feb  9 2:00s
+			-6:00	Canada	C%sT	1945 Sep 30 2:00
+			-5:00	-	EST
 
 
 # Manitoba
 
+# From Rob Douglas (2006-04-06):
+# the old Manitoba Time Act - as amended by Bill 2, assented to
+# March 27, 1987 ... said ...
+# "between two o'clock Central Standard Time in the morning of
+# the first Sunday of April of each year and two o'clock Central
+# Standard Time in the morning of the last Sunday of October next
+# following, one hour in advance of Central Standard Time."...
+# I believe that the English legislation [of the old time act] had =
+# been assented to (March 22, 1967)....
+# Also, as far as I can tell, there was no order-in-council varying
+# the time of Daylight Saving Time for 2005 and so the provisions of
+# the 1987 version would apply - the changeover was at 2:00 Central
+# Standard Time (i.e. not until 3:00 Central Daylight Time).
+
+# From Paul Eggert (2006-04-10):
+# Shanks & Pottenger say Manitoba switched at 02:00 (not 02:00s)
+# starting 1966.  Since 02:00s is clearly correct for 1967 on, assume
+# it was also 02:00s in 1966.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Winn	1916	only	-	Apr	23	0:00	1:00	D
 Rule	Winn	1916	only	-	Sep	17	0:00	0	S
@@ -1278,18 +1399,13 @@ Rule	Winn	1959	only	-	Oct	lastSun	2:00	0	S
 Rule	Winn	1960	only	-	Sep	lastSun	2:00	0	S
 Rule	Winn	1963	only	-	Apr	lastSun	2:00	1:00	D
 Rule	Winn	1963	only	-	Sep	22	2:00	0	S
-Rule	Winn	1966	1986	-	Apr	lastSun	2:00	1:00	D
-Rule	Winn	1966	1986	-	Oct	lastSun	2:00	0	S
-Rule	Winn	1987	2006	-	Apr	Sun>=1	2:00s	1:00	D
-# From Paul Eggert (2000-10-02):
-# INMS (2000-09-12) says that, since 1988 at least, Manitoba switches from
-# DST at 03:00 local time.  For now, assume it started in 1987.
-Rule	Winn	1987	2006	-	Oct	lastSun	2:00s	0	S
-Rule	Winn	2007	max	-	Mar	Sun>=8	2:00s	1:00	D
-Rule	Winn	2007	max	-	Nov	Sun>=1	2:00s	0	S
+Rule	Winn	1966	1986	-	Apr	lastSun	2:00s	1:00	D
+Rule	Winn	1966	2005	-	Oct	lastSun	2:00s	0	S
+Rule	Winn	1987	2005	-	Apr	Sun>=1	2:00s	1:00	D
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16
-			-6:00	Winn	C%sT
+			-6:00	Winn	C%sT	2006
+			-6:00	Canada	C%sT
 
 
 # Saskatchewan
@@ -1308,8 +1424,8 @@ Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16
 # Willett (1914-03) notes that DST "has been in operation ... in the
 # City of Moose Jaw, Saskatchewan, for one year."
 
-# From Paul Eggert (2000-10-02):
-# Shanks writes that since 1970 most of this region has been like Regina.
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger say that since 1970 this region has mostly been as Regina.
 # Some western towns (e.g. Swift Current) switched from MST/MDT to CST in 1972.
 # Other western towns (e.g. Lloydminster) are like Edmonton.
 # Matthews and Vincent (1998) write that Denare Beach and Creighton
@@ -1341,6 +1457,11 @@ Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16
 # rules any more; all other districts appear to have used CST year round
 # since sometime in the 1960s.
 
+# From Chris Walton (2006-06-26):
+# The Saskatchewan time act which was last updated in 1996 is about 30 pages
+# long and rather painful to read.
+# http://www.qp.gov.sk.ca/documents/English/Statutes/Statutes/T14.pdf
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Regina	1918	only	-	Apr	14	2:00	1:00	D
 Rule	Regina	1918	only	-	Oct	31	2:00	0	S
@@ -1395,17 +1516,18 @@ Rule	Edm	1967	only	-	Oct	lastSun	2:00	0	S
 Rule	Edm	1969	only	-	Apr	lastSun	2:00	1:00	D
 Rule	Edm	1969	only	-	Oct	lastSun	2:00	0	S
 Rule	Edm	1972	1986	-	Apr	lastSun	2:00	1:00	D
-Rule	Edm	1972	max	-	Oct	lastSun	2:00	0	S
-Rule	Edm	1987	max	-	Apr	Sun>=1	2:00	1:00	D
+Rule	Edm	1972	2006	-	Oct	lastSun	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Edmonton	-7:33:52 -	LMT	1906 Sep
-			-7:00	Edm	M%sT
+			-7:00	Edm	M%sT	1987
+			-7:00	Canada	M%sT
 
 
 # British Columbia
 
-# From Paul Eggert (2000-10-02):
-# Shanks writes that since 1970 most of this region has been like Vancouver.
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger write that since 1970 most of this region has
+# been like Vancouver.
 # Dawson Creek uses MST.  Much of east BC is like Edmonton.
 # Matthews and Vincent (1998) write that Creston is like Dawson Creek.
 
@@ -1418,11 +1540,11 @@ Rule	Vanc	1945	only	-	Sep	30	2:00	0	S
 Rule	Vanc	1946	1986	-	Apr	lastSun	2:00	1:00	D
 Rule	Vanc	1946	only	-	Oct	13	2:00	0	S
 Rule	Vanc	1947	1961	-	Sep	lastSun	2:00	0	S
-Rule	Vanc	1962	max	-	Oct	lastSun	2:00	0	S
-Rule	Vanc	1987	max	-	Apr	Sun>=1	2:00	1:00	D
+Rule	Vanc	1962	2006	-	Oct	lastSun	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Vancouver	-8:12:28 -	LMT	1884
-			-8:00	Vanc	P%sT
+			-8:00	Vanc	P%sT	1987
+			-8:00	Canada	P%sT
 Zone America/Dawson_Creek -8:00:56 -	LMT	1884
 			-8:00	Canada	P%sT	1947
 			-8:00	Vanc	P%sT	1972 Aug 30 2:00
@@ -1431,7 +1553,7 @@ Zone America/Dawson_Creek -8:00:56 -	LMT	1884
 
 # Northwest Territories, Nunavut, Yukon
 
-# From Paul Eggert (1999-10-29):
+# From Paul Eggert (2006-03-22):
 # Dawson switched to PST in 1973.  Inuvik switched to MST in 1979.
 # Mathew Englander (1996-10-07) gives the following refs:
 #	* 1967. Paragraph 28(34)(g) of the Interpretation Act, S.C. 1967-68,
@@ -1440,7 +1562,12 @@ Zone America/Dawson_Creek -8:00:56 -	LMT	1884
 #	* C.O. 1973/214 switched Yukon to PST on 1973-10-28 00:00.
 #	* O.I.C. 1980/02 established DST.
 #	* O.I.C. 1987/056 changed DST to Apr firstSun 2:00 to Oct lastSun 2:00.
-# Shanks says Yukon's 1973-10-28 switch was at 2:00; go with Englander.
+# Shanks & Pottenger say Yukon's 1973-10-28 switch was at 2:00; go
+# with Englander.
+# From Chris Walton (2006-06-26):
+# Here is a link to the old daylight saving portion of the interpretation
+# act which was last updated in 1987:
+# http://www.gov.yk.ca/legislation/regs/oic1987_056.pdf
 
 # From Rives McDow (1999-09-04):
 # Nunavut ... moved ... to incorporate the whole territory into one time zone.
@@ -1549,6 +1676,10 @@ Zone America/Dawson_Creek -8:00:56 -	LMT	1884
 # For lack of better information, assume that Southampton Island observed
 # daylight saving only during wartime.
 
+# From Chris Walton (2006-07-19):
+# The government of Yukon Territory ... recently announced it will extend
+# daylight saving in 2007....  http://www.gov.yk.ca/news/2006/06-164.html
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	NT_YK	1918	only	-	Apr	14	2:00	1:00	D
 Rule	NT_YK	1918	only	-	Oct	27	2:00	0	S
@@ -1560,8 +1691,8 @@ Rule	NT_YK	1945	only	-	Sep	30	2:00	0	S
 Rule	NT_YK	1965	only	-	Apr	lastSun	0:00	2:00	DD
 Rule	NT_YK	1965	only	-	Oct	lastSun	2:00	0	S
 Rule	NT_YK	1980	1986	-	Apr	lastSun	2:00	1:00	D
-Rule	NT_YK	1980	max	-	Oct	lastSun	2:00	0	S
-Rule	NT_YK	1987	max	-	Apr	Sun>=1	2:00	1:00	D
+Rule	NT_YK	1980	2006	-	Oct	lastSun	2:00	0	S
+Rule	NT_YK	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Pangnirtung -4:22:56 -	LMT	1884
 			-4:00	NT_YK	A%sT	1995 Apr Sun>=1 2:00
@@ -1572,10 +1703,11 @@ Zone America/Iqaluit	-4:33:52 -	LMT	1884 # Frobisher Bay before 1987
 			-5:00	NT_YK	E%sT	1999 Oct 31 2:00
 			-6:00	Canada	C%sT	2000 Oct 29 2:00
 			-5:00	Canada	E%sT
-Zone America/Coral_Harbour -5:32:40 -	LMT	1884
-			-5:00	NT_YK	E%sT	1946
-			-5:00	-	EST
-Zone America/Rankin_Inlet -6:08:40 -	LMT	1884
+# Now subsumed by America/Atikokan.
+#Zone America/Coral_Harbour -5:32:40 -	LMT	1884
+#			-5:00	NT_YK	E%sT	1946
+#			-5:00	-	EST
+Zone America/Rankin_Inlet -6:08:20 -	LMT	1884
 			-6:00	NT_YK	C%sT	2000 Oct 29 2:00
 			-5:00	-	EST	2001 Apr  1 3:00
 			-6:00	Canada	C%sT
@@ -1586,16 +1718,20 @@ Zone America/Cambridge_Bay -7:00:20 -	LMT	1884
 			-6:00	-	CST	2001 Apr  1 3:00
 			-7:00	Canada	M%sT
 Zone America/Yellowknife -7:37:24 -	LMT	1884
-			-7:00	NT_YK	M%sT
-Zone America/Inuvik	-8:54:00 -	LMT	1884
+			-7:00	NT_YK	M%sT	1980
+			-7:00	Canada	M%sT
+Zone America/Inuvik	-8:54:52 -	LMT	1884
 			-8:00	NT_YK	P%sT	1979 Apr lastSun 2:00
-			-7:00	NT_YK	M%sT
+			-7:00	NT_YK	M%sT	1980
+			-7:00	Canada	M%sT
 Zone America/Whitehorse	-9:00:12 -	LMT	1900 Aug 20
 			-9:00	NT_YK	Y%sT	1966 Jul 1 2:00
-			-8:00	NT_YK	P%sT
+			-8:00	NT_YK	P%sT	1980
+			-8:00	Canada	P%sT
 Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 			-9:00	NT_YK	Y%sT	1973 Oct 28 0:00
-			-8:00	NT_YK	P%sT
+			-8:00	NT_YK	P%sT	1980
+			-8:00	Canada	P%sT
 
 
 ###############################################################################
@@ -1609,16 +1745,12 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 # history of Mexican local time (in Spanish)
 # </a>.
 #
-# Here are the discrepancies between Shanks and the MLoC.
+# Here are the discrepancies between Shanks & Pottenger (S&P) and the MLoC.
 # (In all cases we go with the MLoC.)
-# Shanks reports that Baja was at -8:00 in 1922/1923.
-# Shanks says the 1930 transition in Baja was 1930-11-16.
-# Shanks reports no DST during summer 1931.
-# Shanks reports a transition at 1932-03-30 23:00, not 1932-04-01.
-# Shanks does not report transitions for Baja in 1945 or 1948.
-# Shanks reports southern Mexico transitions on 1981-12-01, not 12-23.
-# Shanks says Quintana Roo switched to -6:00 on 1982-12-02, and to -5:00
-# on 1997-10-26 at 02:00.
+# S&P report that Baja was at -8:00 in 1922/1923.
+# S&P say the 1930 transition in Baja was 1930-11-16.
+# S&P report no DST during summer 1931.
+# S&P report a transition at 1932-03-30 23:00, not 1932-04-01.
 
 # From Gwillim Law (2001-02-20):
 # There are some other discrepancies between the Decrees page and the
@@ -1626,10 +1758,6 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 # the researchers who prepared the Decrees page failed to find some of
 # the relevant documents.
 
-# From Paul Eggert (2000-07-26):
-# Shanks gives 1942-04-01 instead of 1942-04-24, and omits the 1981
-# and 1988 DST experiments.  Go with spin.com.mx.
-
 # From Alan Perry (1996-02-15):
 # A guy from our Mexico subsidiary finally found the Presidential Decree
 # outlining the timezone changes in Mexico.
@@ -1829,7 +1957,8 @@ Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
 			-8:00	-	PST	1931 Apr  1
 			-8:00	1:00	PDT	1931 Sep 30
 			-8:00	-	PST	1942 Apr 24
-			-8:00	1:00	PWT	1945 Nov 12
+			-8:00	1:00	PWT	1945 Aug 14 23:00u
+			-8:00	1:00	PPT	1945 Nov 12 # Peace
 			-8:00	-	PST	1948 Apr  5
 			-8:00	1:00	PDT	1949 Jan 14
 			-8:00	-	PST	1954
@@ -1839,12 +1968,13 @@ Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
 			-8:00	Mexico	P%sT	2001
 			-8:00	US	P%sT	2002 Feb 20
 			-8:00	Mexico	P%sT
-# From Paul Eggert (2001-03-05):
+# From Paul Eggert (2006-03-22):
 # Formerly there was an America/Ensenada zone, which differed from
 # America/Tijuana only in that it did not observe DST from 1976
-# through 1995.  This was as per Shanks.  However, Guy Harris reports
+# through 1995.  This was as per Shanks (1999).  But Shanks & Pottenger say
+# Ensenada did not observe DST from 1948 through 1975.  Guy Harris reports
 # that the 1987 OAG says "Only Ensenada, Mexicale, San Felipe and
-# Tijuana observe DST," which contradicts Shanks but does imply that
+# Tijuana observe DST," which agrees with Shanks & Pottenger but implies that
 # DST-observance was a town-by-town matter back then.  This concerns
 # data after 1970 so most likely there should be at least one Zone
 # other than America/Tijuana for Baja, but it's not clear yet what its
@@ -1888,7 +2018,7 @@ Zone America/Barbados	-3:58:28 -	LMT	1924		# Bridgetown
 			-4:00	Barb	A%sT
 
 # Belize
-# Whitman entirely disagrees with Shanks; go with Shanks.
+# Whitman entirely disagrees with Shanks; go with Shanks & Pottenger.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Belize	1918	1942	-	Oct	Sun>=2	0:00	0:30	HD
 Rule	Belize	1919	1943	-	Feb	Sun>=9	0:00	0	S
@@ -1901,10 +2031,20 @@ Zone	America/Belize	-5:52:48 -	LMT	1912 Apr
 			-6:00	Belize	C%sT
 
 # Bermuda
+
+# From Dan Jones, reporting in The Royal Gazette (2006-06-26):
+
+# Next year, however, clocks in the US will go forward on the second Sunday
+# in March, until the first Sunday in November.  And, after the Time Zone
+# (Seasonal Variation) Bill 2006 was passed in the House of Assembly on
+# Friday, the same thing will happen in Bermuda.
+# http://www.theroyalgazette.com/apps/pbcs.dll/article?AID=/20060529/NEWS/105290135
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/Bermuda	-4:19:04 -	LMT	1930 Jan  1 2:00    # Hamilton
 			-4:00	-	AST	1974 Apr 28 2:00
-			-4:00	Bahamas	A%sT
+			-4:00	Bahamas	A%sT	1976
+			-4:00	US	A%sT
 
 # Cayman Is
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1917,7 +2057,8 @@ Zone	America/Cayman	-5:25:32 -	LMT	1890		# Georgetown
 Rule	CR	1979	1980	-	Feb	lastSun	0:00	1:00	D
 Rule	CR	1979	1980	-	Jun	Sun>=1	0:00	0	S
 Rule	CR	1991	1992	-	Jan	Sat>=15	0:00	1:00	D
-# IATA SSIM (1991-09) says the following was at 1:00; go with Shanks.
+# IATA SSIM (1991-09) says the following was at 1:00;
+# go with Shanks & Pottenger.
 Rule	CR	1991	only	-	Jul	 1	0:00	0	S
 Rule	CR	1992	only	-	Mar	15	0:00	0	S
 # There are too many San Joses elsewhere, so we'll use `Costa Rica'.
@@ -1943,18 +2084,26 @@ Zone America/Costa_Rica	-5:36:20 -	LMT	1890		# San Jose
 
 # From Evert van der Veer via Steffen Thorsen (2004-10-28):
 # Cuba is not going back to standard time this year.
-# From Paul Eggert (2004-10-28):
+# From Paul Eggert (2006-03-22):
 # http://www.granma.cu/ingles/2004/septiembre/juev30/41medid-i.html
 # says that it's due to a problem at the Antonio Guiteras
 # thermoelectric plant, and says "This October there will be no return
 # to normal hours (after daylight saving time)".
-# For now, let's assume that it's a one-year temporary measure.
+# For now, let's assume that it's a temporary measure.
 
 # From Carlos A. Carnero Delgado (2005-11-12):
 # This year (just like in 2004-2005) there's no change in time zone
 # adjustment in Cuba.  We will stay in daylight saving time:
 # http://www.granma.cu/espanol/2005/noviembre/mier9/horario.html
 
+# From Jesper Norgaard Welen (2006-10-21):
+# An article in GRANMA INTERNACIONAL claims that Cuba will end
+# the 3 years of permanent DST next weekend, see
+# http://www.granma.cu/ingles/2006/octubre/lun16/43horario.html
+# "On Saturday night, October 28 going into Sunday, October 29, at 01:00,
+# watches should be set back one hour -- going back to 00:00 hours -- returning
+# to the normal schedule....
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Cuba	1928	only	-	Jun	10	0:00	1:00	D
 Rule	Cuba	1928	only	-	Oct	10	0:00	0	S
@@ -2033,6 +2182,7 @@ Zone America/Santo_Domingo -4:39:36 -	LMT	1890
 			-4:00	-	AST
 
 # El Salvador
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Salv	1987	1988	-	May	Sun>=1	0:00	1:00	D
 Rule	Salv	1987	1988	-	Sep	lastSun	0:00	0	S
@@ -2053,6 +2203,19 @@ Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun 8	# Pointe a Pitre
 			-4:00	-	AST
 
 # Guatemala
+#
+# From Gwillim Law (2006-04-22), after a heads-up from Oscar van Vlijmen:
+# Diario Co Latino, at
+# http://www.diariocolatino.com/internacionales/detalles.asp?NewsID=8079,
+# says in an article dated 2006-04-19 that the Guatemalan government had
+# decided on that date to advance official time by 60 minutes, to lessen the
+# impact of the elevated cost of oil....  Daylight saving time will last from
+# 2006-04-29 24:00 (Guatemalan standard time) to 2006-09-30 (time unspecified).
+# From Paul Eggert (2006-06-22):
+# The Ministry of Energy and Mines, press release CP-15/2006
+# (2006-04-19), says DST ends at 24:00.  See
+# <http://www.sieca.org.gt/Sitio_publico/Energeticos/Doc/Medidas/Cambio_Horario_Nac_190406.pdf>.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Guat	1973	only	-	Nov	25	0:00	1:00	D
 Rule	Guat	1974	only	-	Feb	24	0:00	0	S
@@ -2060,6 +2223,8 @@ Rule	Guat	1983	only	-	May	21	0:00	1:00	D
 Rule	Guat	1983	only	-	Sep	22	0:00	0	S
 Rule	Guat	1991	only	-	Mar	23	0:00	1:00	D
 Rule	Guat	1991	only	-	Sep	 7	0:00	0	S
+Rule	Guat	2006	only	-	Apr	30	0:00	1:00	D
+Rule	Guat	2006	only	-	Oct	 1	0:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Guatemala	-6:02:04 -	LMT	1918 Oct 5
 			-6:00	Guat	C%sT
@@ -2084,26 +2249,67 @@ Zone America/Guatemala	-6:02:04 -	LMT	1918 Oct 5
 #   October 2005.
 #
 #  "Port-au-Prince, March 31, 2005"
+#
+# From Steffen Thorsen (2006-04-04):
+# I have been informed by users that Haiti observes DST this year like
+# last year, so the current "only" rule for 2005 might be changed to a
+# "max" rule or to last until 2006. (Who knows if they will observe DST
+# next year or if they will extend their DST like US/Canada next year).
+#
+# I have found this article about it (in French):
+# http://www.haitipressnetwork.com/news.cfm?articleID=7612
+#
+# The reason seems to be an energy crisis.
+
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
 Rule	Haiti	1984	1987	-	Apr	lastSun	0:00	1:00	D
 Rule	Haiti	1983	1987	-	Oct	lastSun	0:00	0	S
-# Shanks says AT is 2:00, but IATA SSIM (1991/1997) says 1:00s.  Go with IATA.
+# Shanks & Pottenger say AT is 2:00, but IATA SSIM (1991/1997) says 1:00s.
+# Go with IATA.
 Rule	Haiti	1988	1997	-	Apr	Sun>=1	1:00s	1:00	D
 Rule	Haiti	1988	1997	-	Oct	lastSun	1:00s	0	S
-Rule	Haiti	2005	only	-	Apr	Sun>=1	0:00	1:00	D
-Rule	Haiti	2005	only	-	Oct	lastSun	0:00	0	S
+Rule	Haiti	2005	max	-	Apr	Sun>=1	0:00	1:00	D
+Rule	Haiti	2005	max	-	Oct	lastSun	0:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Port-au-Prince -4:49:20 -	LMT	1890
 			-4:49	-	PPMT	1917 Jan 24 12:00 # P-a-P MT
 			-5:00	Haiti	E%sT
 
 # Honduras
-# Shanks says 1921 Jan 1; go with Whitman's more precise Apr 1.
+# Shanks & Pottenger say 1921 Jan 1; go with Whitman's more precise Apr 1.
+
+# From Paul Eggert (2006-05-05):
+# worldtimezone.com reports a 2006-05-02 Spanish-language AP article
+# saying Honduras will start using DST midnight Saturday, effective 4
+# months until September.  La Tribuna reported today
+# <http://www.latribuna.hn/99299.html> that Manuel Zelaya, the president
+# of Honduras, refused to back down on this.
+
+# From Jesper Norgaard Welen (2006-08-08):
+# It seems that Honduras has returned from DST to standard time this Monday at
+# 00:00 hours (prolonging Sunday to 25 hours duration).
+# http://www.worldtimezone.com/dst_news/dst_news_honduras04.html
+
+# From Paul Eggert (2006-08-08):
+# Also see Diario El Heraldo, The country returns to standard time (2006-08-08)
+# <http://www.elheraldo.hn/nota.php?nid=54941&sec=12>.
+# It mentions executive decree 18-2006.
+
+# From Steffen Thorsen (2006-08-17):
+# Honduras will observe DST from 2007 to 2009, exact dates are not
+# published, I have located this authoritative source:
+# http://www.presidencia.gob.hn/noticia.aspx?nId=47
+
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Hond	1987	1988	-	May	Sun>=1	0:00	1:00	D
+Rule	Hond	1987	1988	-	Sep	lastSun	0:00	0	S
+Rule	Hond	2006	2009	-	May	Sun>=1	0:00	1:00	D
+Rule	Hond	2006	2009	-	Aug	Mon>=1	0:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Tegucigalpa -5:48:52 -	LMT	1921 Apr
-			-6:00	Salv	C%sT
+			-6:00	Hond	C%sT
 #
 # Great Swan I ceded by US to Honduras in 1972
 
@@ -2115,7 +2321,7 @@ Zone America/Tegucigalpa -5:48:52 -	LMT	1921 Apr
 # From U. S. Naval Observatory (1989-01-19):
 # JAMAICA             5 H  BEHIND UTC
 
-# From Shanks:
+# From Shanks & Pottenger:
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Jamaica	-5:07:12 -	LMT	1890		# Kingston
 			-5:07:12 -	KMT	1912 Feb    # Kingston Mean Time
@@ -2132,18 +2338,16 @@ Zone America/Martinique	-4:04:20 -      LMT	1890		# Fort-de-France
 			-4:00	-	AST
 
 # Montserrat
-# From Paul Eggert (1997-08-31):
-# Recent volcanic eruptions have forced evacuation of Plymouth, the capital.
-# Luckily, Olveston, the current de facto capital, has the same longitude.
+# From Paul Eggert (2006-03-22):
+# In 1995 volcanic eruptions forced evacuation of Plymouth, the capital.
+# world.gazetteer.com says Cork Hill is the most populous location now.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul 1 0:01   # Olveston
+Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul 1 0:01   # Cork Hill
 			-4:00	-	AST
 
 # Nicaragua
 #
-# From Steffen Thorsen (1998-12-29):
-# Nicaragua seems to be back at -6:00 but I have not been able to find when
-# they changed from -5:00.
+# This uses Shanks & Pottenger for times before 2005.
 #
 # From Steffen Thorsen (2005-04-12):
 # I've got reports from 8 different people that Nicaragua just started
@@ -2157,8 +2361,7 @@ Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul 1 0:01   # Olveston
 #
 # From Paul Eggert (2005-05-01):
 # The decree doesn't say anything about daylight saving, but for now let's
-# assume that it is daylight saving and that they'll switch back on the
-# 3rd Sunday in September.
+# assume that it is daylight saving....
 #
 # From Gwillim Law (2005-04-21):
 # The Associated Press story on the time change, which can be found at
@@ -2176,20 +2379,35 @@ Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul 1 0:01   # Olveston
 # http://www.presidencia.gob.ni/presidencia/files_index/secretaria/comunicados/2005/septiembre/26septiembre-cambio-hora.htm
 # (2005-09-26)
 #
+# From Jesper Norgaard Welen (2006-05-05):
+# http://www.elnuevodiario.com.ni/2006/05/01/nacionales/18410
+# (my informal translation)
+# By order of the president of the republic, Enrique Bolanos, Nicaragua
+# advanced by sixty minutes their official time, yesterday at 2 in the
+# morning, and will stay that way until 30.th. of september.
+#
+# From Jesper Norgaard Welen (2006-09-30):
+# http://www.presidencia.gob.ni/buscador_gaceta/BD/DECRETOS/2006/D-063-2006P-PRN-Cambio-Hora.pdf
+# My informal translation runs:
+# The natural sun time is restored in all the national territory, in that the
+# time is returned one hour at 01:00 am of October 1 of 2006.
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Nic	1979	1980	-	Mar	Sun>=16	0:00	1:00	D
 Rule	Nic	1979	1980	-	Jun	Mon>=23	0:00	0	S
-Rule	Nic	1992	only	-	Jan	 1	4:00	1:00	D
-Rule	Nic	1992	only	-	Sep	24	0:00	0	S
 Rule	Nic	2005	only	-	Apr	10	0:00	1:00	D
-Rule	Nic	2005	only	-	Oct	 2	0:00	0	S
+Rule	Nic	2005	only	-	Oct	Sun>=1	0:00	0	S
+Rule	Nic	2006	only	-	Apr	30	2:00	1:00	D
+Rule	Nic	2006	only	-	Oct	Sun>=1	1:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Managua	-5:45:08 -	LMT	1890
 			-5:45:12 -	MMT	1934 Jun 23 # Managua Mean Time?
 			-6:00	-	CST	1973 May
 			-5:00	-	EST	1975 Feb 16
-			-6:00	Nic	C%sT	1993 Jan 1 4:00
-			-5:00	-	EST	1998 Dec
+			-6:00	Nic	C%sT	1992 Jan  1 4:00
+			-5:00	-	EST	1992 Sep 24
+			-6:00	-	CST	1993
+			-5:00	-	EST	1997
 			-6:00	Nic	C%sT
 
 # Panama
@@ -2203,7 +2421,7 @@ Zone	America/Panama	-5:18:08 -	LMT	1890
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Puerto_Rico -4:24:25 -	LMT	1899 Mar 28 12:00    # San Juan
 			-4:00	-	AST	1942 May  3
-			-4:00	1:00	AWT	1945 Sep 30  2:00
+			-4:00	US	A%sT	1946
 			-4:00	-	AST
 
 # St Kitts-Nevis
@@ -2232,8 +2450,8 @@ Zone America/St_Vincent	-4:04:56 -	LMT	1890		# Kingstown
 			-4:00	-	AST
 
 # Turks and Caicos
-# From Paul Eggert (1998-08-06):
-# Shanks says they use US DST rules, but IATA SSIM (1991/1998)
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger say they use US DST rules, but IATA SSIM (1991/1998)
 # says they switch at midnight.  Go with IATA SSIM.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	TC	1979	1986	-	Apr	lastSun	0:00	1:00	D
diff --git a/timezone/private.h b/timezone/private.h
index d9f232c8e3..2837b70c10 100644
--- a/timezone/private.h
+++ b/timezone/private.h
@@ -21,7 +21,7 @@
 
 #ifndef lint
 #ifndef NOID
-static char	privatehid[] = "@(#)private.h	7.55";
+static char	privatehid[] = "@(#)private.h	8.2";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -89,7 +89,7 @@ static char	privatehid[] = "@(#)private.h	7.55";
 #include "stdio.h"
 #include "errno.h"
 #include "string.h"
-#include "limits.h"	/* for CHAR_BIT */
+#include "limits.h"	/* for CHAR_BIT et al. */
 #include "time.h"
 #include "stdlib.h"
 
@@ -125,20 +125,51 @@ static char	privatehid[] = "@(#)private.h	7.55";
 #define is_digit(c) ((unsigned)(c) - '0' <= 9)
 
 /*
+** Define HAVE_STDINT_H's default value here, rather than at the
+** start, since __GLIBC__'s value depends on previously-included
+** files.
+** (glibc 2.1 and later have stdint.h, even with pre-C99 compilers.)
+*/
+#ifndef HAVE_STDINT_H
+#define HAVE_STDINT_H \
+	(199901 <= __STDC_VERSION__ || \
+	2 < (__GLIBC__ + (0 < __GLIBC_MINOR__)))
+#endif /* !defined HAVE_STDINT_H */
+
+#if HAVE_STDINT_H
+#include "stdint.h"
+#endif /* !HAVE_STDINT_H */
+
+#ifndef INT_FAST64_MAX
+/* Pre-C99 GCC compilers define __LONG_LONG_MAX__ instead of LLONG_MAX.  */
+#if defined LLONG_MAX || defined __LONG_LONG_MAX__
+typedef long long	int_fast64_t;
+#else /* ! (defined LLONG_MAX || defined __LONG_LONG_MAX__) */
+#if (LONG_MAX >> 31) < 0xffffffff
+Please use a compiler that supports a 64-bit integer type (or wider);
+you may need to compile with "-DHAVE_STDINT_H".
+#endif /* (LONG_MAX >> 31) < 0xffffffff */
+typedef long		int_fast64_t;
+#endif /* ! (defined LLONG_MAX || defined __LONG_LONG_MAX__) */
+#endif /* !defined INT_FAST64_MAX */
+
+#ifndef INT32_MAX
+#define INT32_MAX 0x7fffffff
+#endif /* !defined INT32_MAX */
+#ifndef INT32_MIN
+#define INT32_MIN (-1 - INT32_MAX)
+#endif /* !defined INT32_MIN */
+
+/*
 ** Workarounds for compilers/systems.
 */
 
 /*
-** SunOS 4.1.1 cc lacks prototypes.
+** If your compiler lacks prototypes, "#define P(x) ()".
 */
 
 #ifndef P
-#ifdef __STDC__
 #define P(x)	x
-#endif /* defined __STDC__ */
-#ifndef __STDC__
-#define P(x)	()
-#endif /* !defined __STDC__ */
 #endif /* !defined P */
 
 /*
@@ -211,14 +242,14 @@ extern char *	asctime_r();
 ** Private function declarations.
 */
 
-char *	icalloc P((int nelem, int elsize));
-char *	icatalloc P((char * old, const char * new));
-char *	icpyalloc P((const char * string));
-char *	imalloc P((int n));
-void *	irealloc P((void * pointer, int size));
-void	icfree P((char * pointer));
-void	ifree P((char * pointer));
-const char *scheck P((const char *string, const char *format));
+char *		icalloc P((int nelem, int elsize));
+char *		icatalloc P((char * old, const char * new));
+char *		icpyalloc P((const char * string));
+char *		imalloc P((int n));
+void *		irealloc P((void * pointer, int size));
+void		icfree P((char * pointer));
+void		ifree P((char * pointer));
+const char *	scheck P((const char * string, const char * format));
 
 /*
 ** Finally, some convenience items.
@@ -310,6 +341,26 @@ char *asctime_r P((struct tm const *, char *));
 char *ctime_r P((time_t const *, char *));
 #endif /* HAVE_INCOMPATIBLE_CTIME_R */
 
+#ifndef YEARSPERREPEAT
+#define YEARSPERREPEAT		400	/* years before a Gregorian repeat */
+#endif /* !defined YEARSPERREPEAT */
+
+/*
+** The Gregorian year averages 365.2425 days, which is 31556952 seconds.
+*/
+
+#ifndef AVGSECSPERYEAR
+#define AVGSECSPERYEAR		31556952L
+#endif /* !defined AVGSECSPERYEAR */
+
+#ifndef SECSPERREPEAT
+#define SECSPERREPEAT		((int_fast64_t) YEARSPERREPEAT * (int_fast64_t) AVGSECSPERYEAR)
+#endif /* !defined SECSPERREPEAT */
+ 
+#ifndef SECSPERREPEAT_BITS
+#define SECSPERREPEAT_BITS	34	/* ceil(log2(SECSPERREPEAT)) */
+#endif /* !defined SECSPERREPEAT_BITS */
+
 /*
 ** UNIX was a registered trademark of The Open Group in 2003.
 */
diff --git a/timezone/scheck.c b/timezone/scheck.c
index bc156379a0..74d9b07c14 100644
--- a/timezone/scheck.c
+++ b/timezone/scheck.c
@@ -1,6 +1,11 @@
+/*
+** This file is in the public domain, so clarified as of
+** 2006-07-17 by Arthur David Olson.
+*/
+
 #ifndef lint
 #ifndef NOID
-static char	elsieid[] = "@(#)scheck.c	8.17";
+static char	elsieid[] = "@(#)scheck.c	8.19";
 #endif /* !defined lint */
 #endif /* !defined NOID */
 
diff --git a/timezone/southamerica b/timezone/southamerica
index 3a61cd717a..ca6c492f3e 100644
--- a/timezone/southamerica
+++ b/timezone/southamerica
@@ -1,14 +1,14 @@
-# @(#)southamerica	8.1
+# @(#)southamerica	8.6
 # <pre>
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
 # tz@elsie.nci.nih.gov for general use in the future).
 
-# From Paul Eggert (1999-07-07):
+# From Paul Eggert (2006-03-22):
 # A good source for time zone historical data outside the U.S. is
-# Thomas G. Shanks, The International Atlas (5th edition),
-# San Diego: ACS Publications, Inc. (1999).
+# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+# San Diego: ACS Publications, Inc. (2003).
 #
 # Gwillim Law writes that a good source
 # for recent time zone data is the International Air Transport
@@ -16,8 +16,8 @@
 # published semiannually.  Law sent in several helpful summaries
 # of the IATA's data after 1990.
 #
-# Except where otherwise noted, Shanks is the source for entries through 1990,
-# and IATA SSIM is the source for entries after 1990.
+# Except where otherwise noted, Shanks & Pottenger is the source for
+# entries through 1990, and IATA SSIM is the source for entries afterwards.
 #
 # Earlier editions of these tables used the North American style (e.g. ARST and
 # ARDT for Argentine Standard and Daylight Time), but the following quote
@@ -92,8 +92,6 @@ Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	S
 # obtaining the data from the:
 # Talleres de Hidrografia Naval Argentina
 # (Argentine Naval Hydrography Institute)
-#
-# Shanks stops after 1992-03-01; go with Otero.
 Rule	Arg	1989	1993	-	Mar	Sun>=1	0:00	0	-
 Rule	Arg	1989	1992	-	Oct	Sun>=15	0:00	1:00	S
 #
@@ -150,12 +148,12 @@ Rule	Arg	2000	only	-	Mar	Sun>=1	0:00	0	-
 # It's Law No. 7,210.  This change is due to a public power emergency, so for
 # now we'll assume it's for this year only.
 #
-# From Paul Eggert (2002-01-22):
+# From Paul Eggert (2006-03-22):
 # <a href="http://www.spicasc.net/horvera.html">
-# Hora de verano para la Republica Argentina (2000-10-01)
+# Hora de verano para la Republica Argentina (2003-06-08)
 # </a> says that standard time in Argentina from 1894-10-31
 # to 1920-05-01 was -4:16:48.25.  Go with this more-precise value
-# over Shanks.
+# over Shanks & Pottenger.
 #
 # From Mariano Absatz (2004-06-05):
 # These media articles from a major newspaper mostly cover the current state:
@@ -202,8 +200,8 @@ Rule	Arg	2000	only	-	Mar	Sun>=1	0:00	0	-
 # http://www.sanjuan.gov.ar/prensa/archivo/000426.html
 # http://www.sanjuan.gov.ar/prensa/archivo/000441.html
 
-# Unless otherwise specified, data are from Shanks through 1992, from
-# the IATA otherwise.  As noted below, Shanks says that
+# Unless otherwise specified, data are from Shanks & Pottenger through 1992,
+# from the IATA otherwise.  As noted below, Shanks & Pottenger say that
 # America/Cordoba split into 6 subregions during 1991/1992, but we
 # haven't verified this yet so for now we'll keep it a single region.
 #
@@ -222,7 +220,7 @@ Zone America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 Oct 31
 # Formosa (FM), Salta (SA), Santiago del Estero (SE), Cordoba (CB),
 # San Luis (SL), La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
 #
-# Shanks also makes the following claims, which we haven't verified:
+# Shanks & Pottenger also make the following claims, which we haven't verified:
 # - Formosa switched to -3:00 on 1991-01-07.
 # - Misiones switched to -3:00 on 1990-12-29.
 # - Chaco switched to -3:00 on 1991-01-04.
@@ -430,11 +428,7 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # The official decrees referenced below are mostly taken from
 # <a href="http://pcdsh01.on.br/DecHV.html">
 # Decretos sobre o Horario de Verao no Brasil
-# </a> (2001-09-20, in Portuguese).
-# The official site for all decrees, including those not related to time, is
-# <a href="http://www.presidencia.gov.br/CCIVIL/decreto/principal_ano.htm">
-# Presidencia da Republica, Subchefia para Assuntos Juridicos, Decretos
-# </a> (in Portuguese).
+# </a>.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
@@ -550,7 +544,7 @@ Rule	Brazil	2000	only	-	Feb	27	 0:00	0	-
 # Decree <a href="http://pcdsh01.on.br/figuras/HV3916.gif">3,916</a>
 # (2001-09-13) reestablishes DST in AL, CE, MA, PB, PE, PI, RN, SE.
 Rule	Brazil	2000	2001	-	Oct	Sun>=8	 0:00	1:00	S
-Rule	Brazil	2001	max	-	Feb	Sun>=15	 0:00	0	-
+Rule	Brazil	2001	2006	-	Feb	Sun>=15	 0:00	0	-
 # Decree 4,399 (2002-10-01) repeals DST in AL, CE, MA, PB, PE, PI, RN, SE.
 # <a href="http://www.presidencia.gov.br/CCIVIL/decreto/2002/D4399.htm"></a>
 Rule	Brazil	2002	only	-	Nov	 3	 0:00	1:00	S
@@ -562,10 +556,14 @@ Rule	Brazil	2003	only	-	Oct	19	 0:00	1:00	S
 Rule	Brazil	2004	only	-	Nov	 2	 0:00	1:00	S
 # Decree <a href="http://pcdsh01.on.br/DecHV5539.gif">5,539</a> (2005-09-19),
 # adopted by the same states as before.
-Rule	Brazil	2005	max	-	Oct	Sun>=15	 0:00	1:00	S
+Rule	Brazil	2005	only	-	Oct	16	 0:00	1:00	S
+# Decree <a href="http://www.planalto.gov.br/ccivil_03/_Ato2004-2006/2006/Decreto/D5920.htm">5,920</a>
+# (2006-10-03), adopted by the same states as before.
+Rule	Brazil	2006	max	-	Nov	Sun>=1	 0:00	1:00	S
+Rule	Brazil	2007	max	-	Feb	lastSun	 0:00	0	-
 # The latest ruleset listed above says that the following states observe DST:
 # DF, ES, GO, MG, MS, MT, PR, RJ, RS, SC, SP.
-# For dates after mid-2006, the above rules with TO="max" are guesses
+# For dates after mid-2007, the above rules with TO="max" are guesses
 # and are quite possibly wrong, but are more likely than no DST at all.
 
 
@@ -706,53 +704,64 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # Because of the same drought, the government decided to end DST later,
 # on April 3, (one-time change).
 
-# From Gwillim Law (2001-05-04):
-# I came across another article in "La Tercera" about Chilean DST.
-# <http://www.tercera.cl/diario/2000/10/13/t-extras.html>
-# It clearly confirms my earlier suggestion, that DST begins at 22:00
-# on Easter Island....  But it also seems to be saying that the
-# observance of DST in Chile began in 1966, rather than 1969 as
-# ... [Shanks] has it....
-#
-# My translation:
-#
-# "The Chilean Army has announced that summer time will begin tomorrow,
-# Saturday, October 14 in continental Chile, insular Chile, and
-# Antarctica, as provided by Supreme Decree 25 of January 11, 1966.
-# By the preceding, official time in continental Chile and Chilean
-# Antarctic, and official time in Western Insular Chile, which applies
-# to Easter Island and Sala y Gomez Island, will be set forward at
-# midnight and at 22:00, respectively, by 20 minutes."
+# From Oscar van Vlijmen (2006-10-08):
+# http://www.horaoficial.cl/cambio.htm
 
-# From Paul Eggert (2001-05-04):
-# Go with this article in preference to Shanks's 1969 date for modern DST.
-# Assume this rule has been used since DST was introduced in the islands.
+# From Jesper Norgaard Welen (2006-10-08):
+# I think that there are some obvious mistakes in the suggested link
+# from Oscar van Vlijmen,... for instance entry 66 says that GMT-4
+# ended 1990-09-12 while entry 67 only begins GMT-3 at 1990-09-15
+# (they should have been 1990-09-15 and 1990-09-16 respectively), but
+# anyhow it clears up some doubts too.
 
-# From Paul Eggert (2002-10-24):
-# <http://www.shoa.cl/shoa/faqhoraoficial.htm> gives many details that
-# disagree with the following table, but we haven't had time to compare them.
+# The following data are from <http://www.horaoficial.cl/horaof.htm>
+# (2006-09-20), transcribed by Jesper Norgaard Welen.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Chile	1918	only	-	Sep	 1	0:00	1:00	S
-Rule	Chile	1919	only	-	Jul	 2	0:00	0	-
-Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	S
+Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
-Rule	Chile	1966	1997	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	Chile	1967	1998	-	Mar	Sun>=9	3:00u	0	-
+Rule	Chile	1942	only	-	Jun	 1	4:00u	0	-
+Rule	Chile	1942	only	-	Aug	 1	5:00u	1:00	S
+Rule	Chile	1946	only	-	Jul	15	4:00u	1:00	S
+Rule	Chile	1946	only	-	Sep	 1	3:00u	0:00	-
+Rule	Chile	1947	only	-	Apr	 1	4:00u	0	-
+Rule	Chile	1968	only	-	Nov	 3	4:00u	1:00	S
+Rule	Chile	1969	only	-	Mar	30	3:00u	0	-
+Rule	Chile	1969	only	-	Nov	23	4:00u	1:00	S
+Rule	Chile	1970	only	-	Mar	29	3:00u	0	-
+Rule	Chile	1971	only	-	Mar	14	3:00u	0	-
+Rule	Chile	1970	1972	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	1972	1986	-	Mar	Sun>=9	3:00u	0	-
+Rule	Chile	1973	only	-	Sep	30	4:00u	1:00	S
+Rule	Chile	1974	1987	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	1987	only	-	Apr	12	3:00u	0	-
+Rule	Chile	1988	1989	-	Mar	Sun>=9	3:00u	0	-
+Rule	Chile	1988	only	-	Oct	Sun>=1	4:00u	1:00	S
+Rule	Chile	1989	only	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	1990	only	-	Mar	18	3:00u	0	-
+Rule	Chile	1990	only	-	Sep	16	4:00u	1:00	S
+Rule	Chile	1991	1996	-	Mar	Sun>=9	3:00u	0	-
+Rule	Chile	1991	1997	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	1997	only	-	Mar	30	3:00u	0	-
+Rule	Chile	1998	only	-	Mar	Sun>=9	3:00u	0	-
 Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
 Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
 Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
 Rule	Chile	2000	max	-	Mar	Sun>=9	3:00u	0	-
-# IATA SSIM anomalies: (1990-09) says 1990-09-16; (1992-02) says 1992-03-14;
+# IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Santiago	-4:42:40 -	LMT	1890
-			-4:42:40 -	SMT	1910	    # Santiago Mean Time
-			-5:00	Chile	CL%sT	1932 Sep    # Chile Time
+Zone America/Santiago	-4:42:46 -	LMT	1890
+			-4:42:46 -	SMT	1910 	    # Santiago Mean Time
+			-5:00	-	CLT	1916 Jul  1 # Chile Time
+			-4:42:46 -	SMT	1918 Sep  1 # Santiago Mean Time
+			-4:00	-	CLT	1919 Jul  1 # Chile Time
+			-4:42:46 -	SMT	1927 Sep  1 # Santiago Mean Time
+			-5:00	Chile	CL%sT	1947 May 22 # Chile Time
 			-4:00	Chile	CL%sT
 Zone Pacific/Easter	-7:17:28 -	LMT	1890	    # Mataveri
 			-7:17:28 -	MMT	1932 Sep    # Mataveri Mean Time
-			-7:00	Chile	EAS%sT	1982 Mar 14 # Easter I Time
+			-7:00	Chile	EAS%sT	1982 Jan 18 21:00 # Easter I Time
 			-6:00	Chile	EAS%sT
 #
 # Sala y Gomez Island is like Pacific/Easter.
@@ -760,11 +769,9 @@ Zone Pacific/Easter	-7:17:28 -	LMT	1890	    # Mataveri
 # San Felix, and Antarctic bases, are like America/Santiago.
 
 # Colombia
-# Shanks specifies 24:00 for 1992 transition times; go with IATA,
-# as it seems implausible to change clocks at midnight New Year's Eve.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	CO	1992	only	-	May	 2	0:00	1:00	S
-Rule	CO	1992	only	-	Dec	31	0:00	0	-
+Rule	CO	1992	only	-	May	 3	0:00	1:00	S
+Rule	CO	1993	only	-	Apr	 4	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Bogota	-4:56:20 -	LMT	1884 Mar 13
 			-4:56:20 -	BMT	1914 Nov 23 # Bogota Mean Time
@@ -773,10 +780,21 @@ Zone	America/Bogota	-4:56:20 -	LMT	1884 Mar 13
 # no information; probably like America/Bogota
 
 # Curacao
-# Shanks says that Bottom and Oranjestad have been at -4:00 since
-# standard time was introduced on 1912-03-02; and that Kralendijk and Rincon
-# used Kralendijk Mean Time (-4:33:08) from 1912-02-02 to 1965-01-01.
-# This all predates our 1970 cutoff, though.
+#
+# From Paul Eggert (2006-03-22): 
+# Shanks & Pottenger say that The Bottom and Philipsburg have been at
+# -4:00 since standard time was introduced on 1912-03-02; and that
+# Kralendijk and Rincon used Kralendijk Mean Time (-4:33:08) from
+# 1912-02-02 to 1965-01-01.  The former is dubious, since S&P also say
+# Saba Island has been like Curacao.
+# This all predates our 1970 cutoff, though.  
+#
+# By July 2007 Curacao and St Maarten are planned to become
+# associated states within the Netherlands, much like Aruba;
+# Bonaire, Saba and St Eustatius would become directly part of the
+# Netherlands as Kingdom Islands.  This won't affect their time zones
+# though, as far as we know.
+# 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Curacao	-4:35:44 -	LMT	1912 Feb 12	# Willemstad
 			-4:30	-	ANT	1965 # Netherlands Antilles Time
@@ -793,9 +811,9 @@ Zone Pacific/Galapagos	-5:58:24 -	LMT	1931 # Puerto Baquerizo Moreno
 
 # Falklands
 
-# From Paul Eggert (2001-03-05):
-# Between 1990 and 2000 inclusive, Shanks and the IATA agree except
-# the IATA gives 1996-09-08.  Go with Shanks.
+# From Paul Eggert (2006-03-22):
+# Between 1990 and 2000 inclusive, Shanks & Pottenger and the IATA agree except
+# the IATA gives 1996-09-08.  Go with Shanks & Pottenger.
 
 # From Falkland Islands Government Office, London (2001-01-22)
 # via Jesper Norgaard:
@@ -878,9 +896,9 @@ Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar	# Georgetown
 			-4:00	-	GYT
 
 # Paraguay
-# From Paul Eggert (1999-10-29):
-# Shanks (1999) says that spring transitions are from 01:00 -> 02:00,
-# and autumn transitions are from 00:00 -> 23:00.  Go with earlier
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger say that spring transitions are from 01:00 -> 02:00,
+# and autumn transitions are from 00:00 -> 23:00.  Go with pre-1999
 # editions of Shanks, and with the IATA, who say transitions occur at 00:00.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Para	1975	1988	-	Oct	 1	0:00	1:00	S
@@ -911,13 +929,10 @@ Rule	Para	1996	only	-	Mar	 1	0:00	0	-
 # year, the time will change on the first Sunday of October; likewise, the
 # clock will be set back on the first Sunday of March.
 #
-# From Jesper Norgaard (2001-03-06) [an official URL saying similar things]:
-# http://gateway.abc.com.py:8000/pub/pag04.mbr/artic?FHA=2001-03-03-02.24.52.900592
-#
 Rule	Para	1996	2001	-	Oct	Sun>=1	0:00	1:00	S
-# IATA SSIM (1997-09) says Mar 1; go with Shanks.
+# IATA SSIM (1997-09) says Mar 1; go with Shanks & Pottenger.
 Rule	Para	1997	only	-	Feb	lastSun	0:00	0	-
-# Shanks says 1999-02-28; IATA SSIM (1999-02) says 1999-02-27, but
+# Shanks & Pottenger say 1999-02-28; IATA SSIM (1999-02) says 1999-02-27, but
 # (1999-09) reports no date; go with above sources and Gerd Knops (2001-02-27).
 Rule	Para	1998	2001	-	Mar	Sun>=1	0:00	0	-
 # From Rives McDow (2002-02-28):
@@ -931,7 +946,9 @@ Rule	Para	2002	2003	-	Sep	Sun>=1	0:00	1:00	S
 # There are several sources that claim that Paraguay made
 # a timezone rule change in autumn 2004.
 # From Steffen Thorsen (2005-01-05):
-# Decree 1,867 (2004-03-05) <http://www.labor.com.py/noticias.asp?id=27>
+# Decree 1,867 (2004-03-05)
+# From Carlos Raul Perasso via Jesper Norgaard Welen (2006-10-13)
+# <http://www.presidencia.gov.py/decretos/D1867.pdf>
 Rule	Para	2004	max	-	Oct	Sun>=15	0:00	1:00	S
 Rule	Para	2005	max	-	Mar	Sun>=8	0:00	0	-
 
@@ -949,8 +966,8 @@ Zone America/Asuncion	-3:50:40 -	LMT	1890
 # When we were in Peru in 1985-1986, they apparently switched over
 # sometime between December 29 and January 3 while we were on the Amazon.
 #
-# From Paul Eggert (2003-11-02):
-# Shanks doesn't have this transition.  Assume 1986 was like 1987.
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger don't have this transition.  Assume 1986 was like 1987.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Peru	1938	only	-	Jan	 1	0:00	1:00	S
@@ -961,7 +978,7 @@ Rule	Peru	1986	1987	-	Jan	 1	0:00	1:00	S
 Rule	Peru	1986	1987	-	Apr	 1	0:00	0	-
 Rule	Peru	1990	only	-	Jan	 1	0:00	1:00	S
 Rule	Peru	1990	only	-	Apr	 1	0:00	0	-
-# IATA is ambiguous for 1993/1995; go with Shanks.
+# IATA is ambiguous for 1993/1995; go with Shanks & Pottenger.
 Rule	Peru	1994	only	-	Jan	 1	0:00	1:00	S
 Rule	Peru	1994	only	-	Apr	 1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -994,23 +1011,23 @@ Zone America/Port_of_Spain -4:06:04 -	LMT	1912 Mar 2
 # Uruguay
 # From Paul Eggert (1993-11-18):
 # Uruguay wins the prize for the strangest peacetime manipulation of the rules.
-# From Shanks:
+# From Shanks & Pottenger:
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman gives 1923 Oct 1; go with Shanks.
+# Whitman gives 1923 Oct 1; go with Shanks & Pottenger.
 Rule	Uruguay	1923	only	-	Oct	 2	 0:00	0:30	HS
 Rule	Uruguay	1924	1926	-	Apr	 1	 0:00	0	-
 Rule	Uruguay	1924	1925	-	Oct	 1	 0:00	0:30	HS
 Rule	Uruguay	1933	1935	-	Oct	lastSun	 0:00	0:30	HS
-# Shanks gives 1935 Apr 1 0:00 and 1936 Mar 30 0:00; go with Whitman.
+# Shanks & Pottenger give 1935 Apr 1 0:00 & 1936 Mar 30 0:00; go with Whitman.
 Rule	Uruguay	1934	1936	-	Mar	Sat>=25	23:30s	0	-
 Rule	Uruguay	1936	only	-	Nov	 1	 0:00	0:30	HS
 Rule	Uruguay	1937	1941	-	Mar	lastSun	 0:00	0	-
-# Whitman gives 1937 Oct 3; go with Shanks.
+# Whitman gives 1937 Oct 3; go with Shanks & Pottenger.
 Rule	Uruguay	1937	1940	-	Oct	lastSun	 0:00	0:30	HS
 # Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13,
-# and 1943 Apr 13 ``to present time''; go with Shanks.
-Rule	Uruguay	1941	only	-	Aug	 1	 0:00	0	-
-Rule	Uruguay	1942	only	-	Jan	 1	 0:00	0:30	HS
+# and 1943 Apr 13 ``to present time''; go with Shanks & Pottenger.
+Rule	Uruguay	1941	only	-	Aug	 1	 0:00	0:30	HS
+Rule	Uruguay	1942	only	-	Jan	 1	 0:00	0	-
 Rule	Uruguay	1942	only	-	Dec	14	 0:00	1:00	S
 Rule	Uruguay	1943	only	-	Mar	14	 0:00	0	-
 Rule	Uruguay	1959	only	-	May	24	 0:00	1:00	S
@@ -1036,7 +1053,7 @@ Rule	Uruguay	1988	only	-	Mar	14	 0:00	0	-
 Rule	Uruguay	1988	only	-	Dec	11	 0:00	1:00	S
 Rule	Uruguay	1989	only	-	Mar	12	 0:00	0	-
 Rule	Uruguay	1989	only	-	Oct	29	 0:00	1:00	S
-# Shanks says no DST was observed in 1990/1 and 1991/2,
+# Shanks & Pottenger say no DST was observed in 1990/1 and 1991/2,
 # and that 1992/3's DST was from 10-25 to 03-01.  Go with IATA.
 Rule	Uruguay	1990	1992	-	Mar	Sun>=1	 0:00	0	-
 Rule	Uruguay	1990	1991	-	Oct	Sun>=21	 0:00	1:00	S
@@ -1057,6 +1074,10 @@ Rule	Uruguay	2005	only	-	Mar	27	 2:00	0	-
 # 02:00 local time, official time in Uruguay will be at GMT -2.
 Rule	Uruguay	2005	only	-	Oct	 9	 2:00	1:00	S
 Rule	Uruguay	2006	only	-	Mar	12	 2:00	0	-
+# From Jesper Norgaard Welen (2006-09-06):
+# http://www.presidencia.gub.uy/_web/decretos/2006/09/CM%20210_08%2006%202006_00001.PDF
+Rule	Uruguay	2006	max	-	Oct	Sun>=1	 2:00	1:00	S
+Rule	Uruguay	2007	max	-	Mar	Sun>=8	 2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
 			-3:44:44 -	MMT	1920 May  1	# Montevideo MT
diff --git a/timezone/tzfile.h b/timezone/tzfile.h
index fb6ca9880f..3a9eee305a 100644
--- a/timezone/tzfile.h
+++ b/timezone/tzfile.h
@@ -21,7 +21,7 @@
 
 #ifndef lint
 #ifndef NOID
-static char	tzfilehid[] = "@(#)tzfile.h	7.18";
+static char	tzfilehid[] = "@(#)tzfile.h	8.1";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -49,7 +49,8 @@ static char	tzfilehid[] = "@(#)tzfile.h	7.18";
 
 struct tzhead {
 	char	tzh_magic[4];		/* TZ_MAGIC */
-	char	tzh_reserved[16];	/* reserved for future use */
+	char	tzh_version[1];		/* '\0' or '2' as of 2005 */
+	char	tzh_reserved[15];	/* reserved--must be zero */
 	char	tzh_ttisgmtcnt[4];	/* coded number of trans. time flags */
 	char	tzh_ttisstdcnt[4];	/* coded number of trans. time flags */
 	char	tzh_leapcnt[4];		/* coded number of leap seconds */
@@ -84,18 +85,22 @@ struct tzhead {
 */
 
 /*
+** If tzh_version is '2' or greater, the above is followed by a second instance
+** of tzhead and a second instance of the data in which each coded transition
+** time uses 8 rather than 4 chars,
+** then a POSIX-TZ-environment-variable-style string for use in handling
+** instants after the last transition time stored in the file
+** (with nothing between the newlines if there is no POSIX representation for
+** such instants).
+*/
+
+/*
 ** In the current implementation, "tzset()" refuses to deal with files that
 ** exceed any of the limits below.
 */
 
 #ifndef TZ_MAX_TIMES
-/*
-** The TZ_MAX_TIMES value below is enough to handle a bit more than a
-** year's worth of solar time (corrected daily to the nearest second) or
-** 138 years of Pacific Presidential Election time
-** (where there are three time zone transitions every fourth year).
-*/
-#define TZ_MAX_TIMES	370
+#define TZ_MAX_TIMES	1200
 #endif /* !defined TZ_MAX_TIMES */
 
 #ifndef TZ_MAX_TYPES
diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh
index f6e28bfdab..b99af8273b 100644
--- a/timezone/tzselect.ksh
+++ b/timezone/tzselect.ksh
@@ -1,6 +1,6 @@
 #! @KSH@
 
-# '@(#)tzselect.ksh	1.8'
+# '@(#)tzselect.ksh	8.1'
 
 # Ask the user about the time zone, and output the resulting TZ value to stdout.
 # Interact with the user via stderr and stdin.
diff --git a/timezone/zdump.c b/timezone/zdump.c
index d525da1bae..ae4d286b12 100644
--- a/timezone/zdump.c
+++ b/timezone/zdump.c
@@ -1,4 +1,4 @@
-static char	elsieid[] = "@(#)zdump.c	7.74";
+static char	elsieid[] = "@(#)zdump.c	8.2";
 
 /*
 ** This code has been made independent of the rest of the time
@@ -15,7 +15,7 @@ static char	elsieid[] = "@(#)zdump.c	7.74";
 #include "ctype.h"	/* for isalpha et al. */
 #ifndef isascii
 #define isascii(x) 1
-#endif
+#endif /* !defined isascii */
 
 #ifndef ZDUMP_LO_YEAR
 #define ZDUMP_LO_YEAR	(-500)
@@ -130,11 +130,7 @@ static char	elsieid[] = "@(#)zdump.c	7.74";
 #endif /* !defined TZ_DOMAIN */
 
 #ifndef P
-#ifdef __STDC__
 #define P(x)	x
-#else /* !defined __STDC__ */
-#define P(x)	()
-#endif /* !defined __STDC__ */
 #endif /* !defined P */
 
 extern char **	environ;
@@ -418,14 +414,21 @@ _("%s: use of -v on system with floating time_t other than float or double\n"),
 		}
 	} else if (0 > (time_t) -1) {
 		/*
-		** time_t is signed.
+		** time_t is signed.  Assume overflow wraps around.
 		*/
-		register time_t	hibit;
+		time_t t = 0;
+		time_t t1 = 1;
 
-		for (hibit = 1; (hibit * 2) != 0; hibit *= 2)
-			continue;
-		absolute_min_time = hibit;
-		absolute_max_time = -(hibit + 1);
+		while (t < t1) {
+			t = t1;
+			t1 = 2 * t1 + 1;
+		}
+
+		absolute_max_time = t;
+		t = -t;
+		absolute_min_time = t - 1;
+		if (t < absolute_min_time)
+			absolute_min_time = t;
 	} else {
 		/*
 		** time_t is unsigned.
@@ -468,10 +471,7 @@ const long	y;
 }
 
 static time_t
-hunt(name, lot, hit)
-char *	name;
-time_t	lot;
-time_t	hit;
+hunt(char *name, time_t lot, time_t hit)
 {
 	time_t			t;
 	long			diff;
@@ -541,10 +541,7 @@ struct tm *	oldp;
 }
 
 static void
-show(zone, t, v)
-char *	zone;
-time_t	t;
-int	v;
+show(char *zone, time_t t, int v)
 {
 	register struct tm *	tmp;
 
diff --git a/timezone/zic.c b/timezone/zic.c
index acb76fb3ba..f7393ea7ba 100644
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -1,15 +1,18 @@
-static char	elsieid[] = "@(#)zic.c	7.128";
-
 /*
-** Regardless of the type of time_t, we do our work using this type.
+** This file is in the public domain, so clarified as of
+** 2006-07-17 by Arthur David Olson.
 */
 
-typedef int	zic_t;
+static char	elsieid[] = "@(#)zic.c	8.7";
 
 #include "private.h"
 #include "locale.h"
 #include "tzfile.h"
 
+#define	ZIC_VERSION	'2'
+
+typedef int_fast64_t	zic_t;
+
 #ifndef ZIC_MAX_ABBR_LEN_WO_WARN
 #define ZIC_MAX_ABBR_LEN_WO_WARN	6
 #endif /* !defined ZIC_MAX_ABBR_LEN_WO_WARN */
@@ -36,6 +39,11 @@ typedef int	zic_t;
 #define isascii(x) 1
 #endif
 
+#define OFFSET_STRLEN_MAXIMUM	(7 + INT_STRLEN_MAXIMUM(long))
+#define RULE_STRLEN_MAXIMUM	8	/* "Mdd.dd.d" */
+
+#define end(cp)	(strchr((cp), '\0'))
+
 struct rule {
 	const char *	r_filename;
 	int		r_linenum;
@@ -44,6 +52,8 @@ struct rule {
 	int		r_loyear;	/* for example, 1986 */
 	int		r_hiyear;	/* for example, 1986 */
 	const char *	r_yrtype;
+	int		r_lowasnum;
+	int		r_hiwasnum;
 
 	int		r_month;	/* 0..11 */
 
@@ -103,9 +113,10 @@ static void	adjleap P((void));
 static void	associate P((void));
 static int	ciequal P((const char * ap, const char * bp));
 static void	convert P((long val, char * buf));
+static void	convert64 P((zic_t val, char * buf));
 static void	dolink P((const char * fromfile, const char * tofile));
 static void	doabbr P((char * abbr, const char * format,
-			const char * letters, int isdst));
+			const char * letters, int isdst, int doquotes));
 static void	eat P((const char * name, int num));
 static void	eats P((const char * name, int num,
 			const char * rname, int rnum));
@@ -121,6 +132,7 @@ static void	inrule P((char ** fields, int nfields));
 static int	inzcont P((char ** fields, int nfields));
 static int	inzone P((char ** fields, int nfields));
 static int	inzsub P((char ** fields, int nfields, int iscont));
+static int	is32 P((zic_t x));
 static int	itsabbr P((const char * abbr, const char * word));
 static int	itsdir P((const char * name));
 static int	lowerit P((int c));
@@ -130,16 +142,22 @@ static void	newabbr P((const char * abbr));
 static long	oadd P((long t1, long t2));
 static void	outzone P((const struct zone * zp, int ntzones));
 static void	puttzcode P((long code, FILE * fp));
+static void	puttzcode64 P((zic_t code, FILE * fp));
 static int	rcomp P((const void * leftp, const void * rightp));
 static zic_t	rpytime P((const struct rule * rp, int wantedy));
 static void	rulesub P((struct rule * rp,
 			const char * loyearp, const char * hiyearp,
 			const char * typep, const char * monthp,
 			const char * dayp, const char * timep));
+static int 	stringoffset P((char * result, long offset));
+static int	stringrule P((char * result, const struct rule * rp,
+			long dstoff, long gmtoff));
+static void 	stringzone P((char * result,
+			const struct zone * zp, int ntzones));
 static void	setboundaries P((void));
 static zic_t	tadd P((zic_t t1, long t2));
 static void	usage P((void));
-static void	writezone P((const char * name));
+static void	writezone P((const char * name, const char * string));
 static int	yearistype P((int year, const char * type));
 
 #if !HAVE_STRERROR
@@ -150,13 +168,16 @@ static int		charcnt;
 static int		errors;
 static const char *	filename;
 static int		leapcnt;
+static int		leapseen;
+static int		leapminyear;
+static int		leapmaxyear;
 static int		linenum;
+static int		max_abbrvar_len;
+static int		max_format_len;
 static zic_t		max_time;
 static int		max_year;
-static int		max_year_representable;
 static zic_t		min_time;
 static int		min_year;
-static int		min_year_representable;
 static int		noise;
 static const char *	rfilename;
 static int		rlinenum;
@@ -453,7 +474,7 @@ static void
 usage P((void))
 {
 	(void) fprintf(stderr, _("%s: usage is %s \
-[ --version ] [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n\
+[ --version ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n\
 \t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"),
 		progname, progname);
 	exit(EXIT_FAILURE);
@@ -464,7 +485,6 @@ static const char *	lcltime;
 static const char *	directory;
 static const char *	leapsec;
 static const char *	yitcommand;
-static int		sflag = FALSE;
 
 int
 main(argc, argv)
@@ -486,6 +506,11 @@ char *	argv[];
 	(void) textdomain(TZ_DOMAIN);
 #endif /* HAVE_GETTEXT */
 	progname = argv[0];
+	if (TYPE_BIT(zic_t) < 64) {
+		(void) fprintf(stderr, "%s: %s\n", progname,
+			_("wild compilation-time specification of zic_t"));
+		exit(EXIT_FAILURE);
+	}
 	for (i = 1; i < argc; ++i)
 		if (strcmp(argv[i], "--version") == 0) {
 			(void) printf("%s\n", elsieid);
@@ -549,7 +574,7 @@ _("%s: More than one -L option specified\n"),
 				noise = TRUE;
 				break;
 			case 's':
-				sflag = TRUE;
+				(void) printf("%s: -s ignored\n", progname);
 				break;
 		}
 	if (optind == argc - 1 && strcmp(argv[optind], "=") == 0)
@@ -671,54 +696,17 @@ warning(_("hard link failed, symbolic link used"));
 	ifree(toname);
 }
 
-#ifndef INT_MAX
-#define INT_MAX	((int) (((unsigned)~0)>>1))
-#endif /* !defined INT_MAX */
-
-#ifndef INT_MIN
-#define INT_MIN	((int) ~(((unsigned)~0)>>1))
-#endif /* !defined INT_MIN */
-
-/*
-** The tz file format currently allows at most 32-bit quantities.
-** This restriction should be removed before signed 32-bit values
-** wrap around in 2038, but unfortunately this will require a
-** change to the tz file format.
-*/
-
-#define MAX_BITS_IN_FILE	32
-#define TIME_T_BITS_IN_FILE	((TYPE_BIT(zic_t) < MAX_BITS_IN_FILE) ? \
-					TYPE_BIT(zic_t) : MAX_BITS_IN_FILE)
+#define TIME_T_BITS_IN_FILE	64
 
 static void
 setboundaries P((void))
 {
 	register int	i;
 
-	if (TYPE_SIGNED(zic_t)) {
-		min_time = -1;
-		for (i = 0; i < TIME_T_BITS_IN_FILE - 1; ++i)
-			min_time *= 2;
-		max_time = -(min_time + 1);
-		if (sflag)
-			min_time = 0;
-	} else {
-		min_time = 0;
-		max_time = 2 - sflag;
-		for (i = 0; i < TIME_T_BITS_IN_FILE - 1; ++i)
-			max_time *= 2;
-		--max_time;
-	}
-	{
-		time_t	t;
-
-		t = (time_t) min_time;
-		min_year = TM_YEAR_BASE + gmtime(&t)->tm_year;
-		t = (time_t) max_time;
-		max_year = TM_YEAR_BASE + gmtime(&t)->tm_year;
-	}
-	min_year_representable = min_year;
-	max_year_representable = max_year;
+	min_time = -1;
+	for (i = 0; i < TIME_T_BITS_IN_FILE - 1; ++i)
+		min_time *= 2;
+	max_time = -(min_time + 1);
 }
 
 static int
@@ -993,6 +981,8 @@ const int		nfields;
 		fields[RF_MONTH], fields[RF_DAY], fields[RF_TOD]);
 	r.r_name = ecpyalloc(fields[RF_NAME]);
 	r.r_abbrvar = ecpyalloc(fields[RF_ABBRVAR]);
+	if (max_abbrvar_len < strlen(r.r_abbrvar))
+		max_abbrvar_len = strlen(r.r_abbrvar);
 	rules = (struct rule *) (void *) erealloc((char *) rules,
 		(int) ((nrules + 1) * sizeof *rules));
 	rules[nrules++] = r;
@@ -1098,6 +1088,8 @@ const int		iscont;
 	}
 	z.z_rule = ecpyalloc(fields[i_rule]);
 	z.z_format = ecpyalloc(fields[i_format]);
+	if (max_format_len < strlen(z.z_format))
+		max_format_len = strlen(z.z_format);
 	hasuntil = nfields > i_untilyear;
 	if (hasuntil) {
 		z.z_untilrule.r_filename = filename;
@@ -1159,6 +1151,11 @@ const int		nfields;
 		error(_("invalid leaping year"));
 		return;
 	}
+	if (!leapseen || leapmaxyear < year)
+		leapmaxyear = year;
+	if (!leapseen || leapminyear > year)
+		leapminyear = year;
+	leapseen = TRUE;
 	j = EPOCH_YEAR;
 	while (j != year) {
 		if (year > j) {
@@ -1313,7 +1310,8 @@ const char * const		timep;
 	*/
 	cp = loyearp;
 	lp = byword(cp, begin_years);
-	if (lp != NULL) switch ((int) lp->l_value) {
+	rp->r_lowasnum = lp == NULL;
+	if (!rp->r_lowasnum) switch ((int) lp->l_value) {
 		case YR_MINIMUM:
 			rp->r_loyear = INT_MIN;
 			break;
@@ -1328,14 +1326,11 @@ const char * const		timep;
 	} else if (sscanf(cp, scheck(cp, "%d"), &rp->r_loyear) != 1) {
 		error(_("invalid starting year"));
 		return;
-	} else if (noise) {
-		if (rp->r_loyear < min_year_representable)
-			warning(_("starting year too low to be represented"));
-		else if (rp->r_loyear > max_year_representable)
-			warning(_("starting year too high to be represented"));
 	}
 	cp = hiyearp;
-	if ((lp = byword(cp, end_years)) != NULL) switch ((int) lp->l_value) {
+	lp = byword(cp, end_years);
+	rp->r_hiwasnum = lp == NULL;
+	if (!rp->r_hiwasnum) switch ((int) lp->l_value) {
 		case YR_MINIMUM:
 			rp->r_hiyear = INT_MIN;
 			break;
@@ -1353,11 +1348,6 @@ const char * const		timep;
 	} else if (sscanf(cp, scheck(cp, "%d"), &rp->r_hiyear) != 1) {
 		error(_("invalid ending year"));
 		return;
-	} else if (noise) {
-		if (rp->r_loyear < min_year_representable)
-			warning(_("ending year too low to be represented"));
-		else if (rp->r_loyear > max_year_representable)
-			warning(_("ending year too high to be represented"));
 	}
 	if (rp->r_loyear > rp->r_hiyear) {
 		error(_("starting year greater than ending year"));
@@ -1372,8 +1362,6 @@ const char * const		timep;
 		}
 		rp->r_yrtype = ecpyalloc(typep);
 	}
-	if (rp->r_loyear < min_year && rp->r_loyear > 0)
-		min_year = rp->r_loyear;
 	/*
 	** Day work.
 	** Accept things such as:
@@ -1427,13 +1415,25 @@ const long	val;
 char * const	buf;
 {
 	register int	i;
-	register long	shift;
+	register int	shift;
 
 	for (i = 0, shift = 24; i < 4; ++i, shift -= 8)
 		buf[i] = val >> shift;
 }
 
 static void
+convert64(val, buf)
+const zic_t	val;
+char * const	buf;
+{
+	register int	i;
+	register int	shift;
+
+	for (i = 0, shift = 56; i < 8; ++i, shift -= 8)
+		buf[i] = val >> shift;
+}
+
+static void
 puttzcode(val, fp)
 const long	val;
 FILE * const	fp;
@@ -1444,28 +1444,50 @@ FILE * const	fp;
 	(void) fwrite((void *) buf, (size_t) sizeof buf, (size_t) 1, fp);
 }
 
+static void
+puttzcode64(val, fp)
+const zic_t	val;
+FILE * const	fp;
+{
+	char	buf[8];
+
+	convert64(val, buf);
+	(void) fwrite((void *) buf, (size_t) sizeof buf, (size_t) 1, fp);
+}
+
 static int
 atcomp(avp, bvp)
-void *	avp;
-void *	bvp;
+const void *	avp;
+const void *	bvp;
 {
-	if (((struct attype *) avp)->at < ((struct attype *) bvp)->at)
-		return -1;
-	else if (((struct attype *) avp)->at > ((struct attype *) bvp)->at)
-		return 1;
-	else	return 0;
+	const zic_t	a = ((const struct attype *) avp)->at;
+	const zic_t	b = ((const struct attype *) bvp)->at;
+
+	return (a < b) ? -1 : (a > b);
+}
+
+static int
+is32(x)
+const zic_t	x;
+{
+	return INT32_MIN <= x && x <= INT32_MAX;
 }
 
 static void
-writezone(name)
+writezone(name, string)
 const char * const	name;
+const char * const	string;
 {
-	register FILE *		fp;
-	register int		i, j;
-	static char *		fullname;
-	static struct tzhead	tzh;
-	zic_t			ats[TZ_MAX_TIMES];
-	unsigned char		types[TZ_MAX_TIMES];
+	register FILE *			fp;
+	register int			i, j;
+	register int			leapcnt32, leapi32;
+	register int			timecnt32, timei32;
+	register int			pass;
+	static char *			fullname;
+	static const struct tzhead	tzh0;
+	static struct tzhead		tzh;
+	zic_t				ats[TZ_MAX_TIMES];
+	unsigned char			types[TZ_MAX_TIMES];
 
 	/*
 	** Sort.
@@ -1509,6 +1531,36 @@ const char * const	name;
 		ats[i] = attypes[i].at;
 		types[i] = attypes[i].type;
 	}
+	/*
+	** Correct for leap seconds.
+	*/
+	for (i = 0; i < timecnt; ++i) {
+		j = leapcnt;
+		while (--j >= 0)
+			if (ats[i] > trans[j] - corr[j]) {
+				ats[i] = tadd(ats[i], corr[j]);
+				break;
+			}
+	}
+	/*
+	** Figure out 32-bit-limited starts and counts.
+	*/
+	timecnt32 = timecnt;
+	timei32 = 0;
+	leapcnt32 = leapcnt;
+	leapi32 = 0;
+	while (timecnt32 > 0 && !is32(ats[timecnt32 - 1]))
+		--timecnt32;
+	while (timecnt32 > 0 && !is32(ats[timei32])) {
+		--timecnt32;
+		++timei32;
+	}
+	while (leapcnt32 > 0 && !is32(trans[leapcnt32 - 1]))
+		--leapcnt32;
+	while (leapcnt32 > 0 && !is32(trans[leapi32])) {
+		--leapcnt32;
+		++leapi32;
+	}
 	fullname = erealloc(fullname,
 		(int) (strlen(directory) + 1 + strlen(name) + 1));
 	(void) sprintf(fullname, "%s/%s", directory, name);
@@ -1533,67 +1585,150 @@ const char * const	name;
 			exit(EXIT_FAILURE);
 		}
 	}
-	convert(eitol(typecnt), tzh.tzh_ttisgmtcnt);
-	convert(eitol(typecnt), tzh.tzh_ttisstdcnt);
-	convert(eitol(leapcnt), tzh.tzh_leapcnt);
-	convert(eitol(timecnt), tzh.tzh_timecnt);
-	convert(eitol(typecnt), tzh.tzh_typecnt);
-	convert(eitol(charcnt), tzh.tzh_charcnt);
-	(void) strncpy(tzh.tzh_magic, TZ_MAGIC, sizeof tzh.tzh_magic);
+	for (pass = 1; pass <= 2; ++pass) {
+		register int	thistimei, thistimecnt;
+		register int	thisleapi, thisleapcnt;
+		register int	thistimelim, thisleaplim;
+		int		writetype[TZ_MAX_TIMES];
+		int		typemap[TZ_MAX_TYPES];
+		register int	thistypecnt;
+		char		thischars[TZ_MAX_CHARS];
+		char		thischarcnt;
+		int 		indmap[TZ_MAX_CHARS];
+
+		if (pass == 1) {
+			thistimei = timei32;
+			thistimecnt = timecnt32;
+			thisleapi = leapi32;
+			thisleapcnt = leapcnt32;
+		} else {
+			thistimei = 0;
+			thistimecnt = timecnt;
+			thisleapi = 0;
+			thisleapcnt = leapcnt;
+		}
+		thistimelim = thistimei + thistimecnt;
+		thisleaplim = thisleapi + thisleapcnt;
+		for (i = 0; i < typecnt; ++i)
+			writetype[i] = thistimecnt == timecnt;
+		if (thistimecnt == 0) {
+			/*
+			** No transition times fall in the current
+			** (32- or 64-bit) window.
+			*/
+			if (typecnt != 0)
+				writetype[typecnt - 1] = TRUE;
+		} else {
+			for (i = thistimei - 1; i < thistimelim; ++i)
+				if (i >= 0)
+					writetype[types[i]] = TRUE;
+			/*
+			** For America/Godthab and Antarctica/Palmer
+			*/
+			if (thistimei == 0)
+				writetype[0] = TRUE;
+		}
+		thistypecnt = 0;
+		for (i = 0; i < typecnt; ++i)
+			typemap[i] = writetype[i] ?  thistypecnt++ : -1;
+		for (i = 0; i < sizeof indmap / sizeof indmap[0]; ++i)
+			indmap[i] = -1;
+		thischarcnt = 0;
+		for (i = 0; i < typecnt; ++i) {
+			register char *	thisabbr;
+
+			if (!writetype[i])
+				continue;
+			if (indmap[abbrinds[i]] >= 0)
+				continue;
+			thisabbr = &chars[abbrinds[i]];
+			for (j = 0; j < thischarcnt; ++j)
+				if (strcmp(&thischars[j], thisabbr) == 0)
+					break;
+			if (j == thischarcnt) {
+				(void) strcpy(&thischars[(int) thischarcnt],
+					thisabbr);
+				thischarcnt += strlen(thisabbr) + 1;
+			}
+			indmap[abbrinds[i]] = j;
+		}
 #define DO(field)	(void) fwrite((void *) tzh.field, \
 				(size_t) sizeof tzh.field, (size_t) 1, fp)
-	DO(tzh_magic);
-	DO(tzh_reserved);
-	DO(tzh_ttisgmtcnt);
-	DO(tzh_ttisstdcnt);
-	DO(tzh_leapcnt);
-	DO(tzh_timecnt);
-	DO(tzh_typecnt);
-	DO(tzh_charcnt);
+		tzh = tzh0;
+		(void) strncpy(tzh.tzh_magic, TZ_MAGIC, sizeof tzh.tzh_magic);
+		tzh.tzh_version[0] = ZIC_VERSION;
+		convert(eitol(thistypecnt), tzh.tzh_ttisgmtcnt);
+		convert(eitol(thistypecnt), tzh.tzh_ttisstdcnt);
+		convert(eitol(thisleapcnt), tzh.tzh_leapcnt);
+		convert(eitol(thistimecnt), tzh.tzh_timecnt);
+		convert(eitol(thistypecnt), tzh.tzh_typecnt);
+		convert(eitol(thischarcnt), tzh.tzh_charcnt);
+		DO(tzh_magic);
+		DO(tzh_version);
+		DO(tzh_reserved);
+		DO(tzh_ttisgmtcnt);
+		DO(tzh_ttisstdcnt);
+		DO(tzh_leapcnt);
+		DO(tzh_timecnt);
+		DO(tzh_typecnt);
+		DO(tzh_charcnt);
 #undef DO
-	for (i = 0; i < timecnt; ++i) {
-		j = leapcnt;
-		while (--j >= 0)
-			if (ats[i] >= trans[j]) {
-				ats[i] = tadd(ats[i], corr[j]);
-				break;
-			}
-		puttzcode((long) ats[i], fp);
-	}
-	if (timecnt > 0)
-		(void) fwrite((void *) types, (size_t) sizeof types[0],
-			(size_t) timecnt, fp);
-	for (i = 0; i < typecnt; ++i) {
-		puttzcode((long) gmtoffs[i], fp);
-		(void) putc(isdsts[i], fp);
-		(void) putc(abbrinds[i], fp);
-	}
-	if (charcnt != 0)
-		(void) fwrite((void *) chars, (size_t) sizeof chars[0],
-			(size_t) charcnt, fp);
-	for (i = 0; i < leapcnt; ++i) {
-		if (roll[i]) {
-			if (timecnt == 0 || trans[i] < ats[0]) {
-				j = 0;
-				while (isdsts[j])
-					if (++j >= typecnt) {
-						j = 0;
-						break;
-					}
-			} else {
-				j = 1;
-				while (j < timecnt && trans[i] >= ats[j])
-					++j;
-				j = types[j - 1];
+		for (i = thistimei; i < thistimelim; ++i)
+			if (pass == 1)
+				puttzcode((long) ats[i], fp);
+			else	puttzcode64(ats[i], fp);
+		for (i = thistimei; i < thistimelim; ++i) {
+			unsigned char	uc;
+
+			uc = typemap[types[i]];
+			(void) fwrite((void *) &uc,
+				(size_t) sizeof uc,
+				(size_t) 1,
+				fp);
+		}
+		for (i = 0; i < typecnt; ++i)
+			if (writetype[i]) {
+				puttzcode(gmtoffs[i], fp);
+				(void) putc(isdsts[i], fp);
+				(void) putc((unsigned char) indmap[abbrinds[i]], fp);
 			}
-			puttzcode((long) tadd(trans[i], -gmtoffs[j]), fp);
-		} else	puttzcode((long) trans[i], fp);
-		puttzcode((long) corr[i], fp);
-	}
-	for (i = 0; i < typecnt; ++i)
-		(void) putc(ttisstds[i], fp);
-	for (i = 0; i < typecnt; ++i)
-		(void) putc(ttisgmts[i], fp);
+		if (thischarcnt != 0)
+			(void) fwrite((void *) thischars,
+				(size_t) sizeof thischars[0],
+				(size_t) thischarcnt, fp);
+		for (i = thisleapi; i < thisleaplim; ++i) {
+			register zic_t	todo;
+
+			if (roll[i]) {
+				if (timecnt == 0 || trans[i] < ats[0]) {
+					j = 0;
+					while (isdsts[j])
+						if (++j >= typecnt) {
+							j = 0;
+							break;
+						}
+				} else {
+					j = 1;
+					while (j < timecnt &&
+						trans[i] >= ats[j])
+							++j;
+					j = types[j - 1];
+				}
+				todo = tadd(trans[i], -gmtoffs[j]);
+			} else	todo = trans[i];
+			if (pass == 1)
+				puttzcode((long) todo, fp);
+			else	puttzcode64(todo, fp);
+			puttzcode(corr[i], fp);
+		}
+		for (i = 0; i < typecnt; ++i)
+			if (writetype[i])
+				(void) putc(ttisstds[i], fp);
+		for (i = 0; i < typecnt; ++i)
+			if (writetype[i])
+				(void) putc(ttisgmts[i], fp);
+	}
+	(void) fprintf(fp, "\n%s\n", string);
 	if (ferror(fp) || fclose(fp)) {
 		(void) fprintf(stderr, _("%s: Error writing %s\n"),
 			progname, fullname);
@@ -1602,21 +1737,223 @@ const char * const	name;
 }
 
 static void
-doabbr(abbr, format, letters, isdst)
+doabbr(abbr, format, letters, isdst, doquotes)
 char * const		abbr;
 const char * const	format;
 const char * const	letters;
 const int		isdst;
+const int		doquotes;
 {
-	if (strchr(format, '/') == NULL) {
+	register char *	cp;
+	register char *	slashp;
+	register int	len;
+
+	slashp = strchr(format, '/');
+	if (slashp == NULL) {
 		if (letters == NULL)
 			(void) strcpy(abbr, format);
 		else	(void) sprintf(abbr, format, letters);
-	} else if (isdst)
-		(void) strcpy(abbr, strchr(format, '/') + 1);
-	else {
-		(void) strcpy(abbr, format);
-		*strchr(abbr, '/') = '\0';
+	} else if (isdst) {
+		(void) strcpy(abbr, slashp + 1);
+	} else {
+		if (slashp > format)
+			(void) strncpy(abbr, format,
+				(unsigned) (slashp - format));
+		abbr[slashp - format] = '\0';
+	}
+	if (!doquotes)
+		return;
+	for (cp = abbr; *cp != '\0'; ++cp)
+		if (strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZ", *cp) == NULL &&
+			strchr("abcdefghijklmnopqrstuvwxyz", *cp) == NULL)
+				break;
+	len = strlen(abbr);
+	if (len > 0 && *cp == '\0')
+		return;
+	abbr[len + 2] = '\0';
+	abbr[len + 1] = '>';
+	for ( ; len > 0; --len)
+		abbr[len] = abbr[len - 1];
+	abbr[0] = '<';
+}
+
+static void
+updateminmax(x)
+const int	x;
+{
+	if (min_year > x)
+		min_year = x;
+	if (max_year < x)
+		max_year = x;
+}
+
+static int
+stringoffset(result, offset)
+char *	result;
+long	offset;
+{
+	register int	hours;
+	register int	minutes;
+	register int	seconds;
+
+	result[0] = '\0';
+	if (offset < 0) {
+		(void) strcpy(result, "-");
+		offset = -offset;
+	}
+	seconds = offset % SECSPERMIN;
+	offset /= SECSPERMIN;
+	minutes = offset % MINSPERHOUR;
+	offset /= MINSPERHOUR;
+	hours = offset;
+	if (hours >= HOURSPERDAY) {
+		result[0] = '\0';
+		return -1;
+	}
+	(void) sprintf(end(result), "%d", hours);
+	if (minutes != 0 || seconds != 0) {
+		(void) sprintf(end(result), ":%02d", minutes);
+		if (seconds != 0)
+			(void) sprintf(end(result), ":%02d", seconds);
+	}
+	return 0;
+}
+
+static int
+stringrule(result, rp, dstoff, gmtoff)
+char *				result;
+const struct rule * const	rp;
+const long			dstoff;
+const long			gmtoff;
+{
+	register long	tod;
+
+	result = end(result);
+	if (rp->r_dycode == DC_DOM) {
+		register int	month, total;
+
+		if (rp->r_dayofmonth == 29 && rp->r_month == TM_FEBRUARY)
+			return -1;
+		total = 0;
+		for (month = 0; month < rp->r_month; ++month)
+			total += len_months[0][month];
+		(void) sprintf(result, "J%d", total + rp->r_dayofmonth);
+	} else {
+		register int	week;
+
+		if (rp->r_dycode == DC_DOWGEQ) {
+			week = 1 + rp->r_dayofmonth / DAYSPERWEEK;
+			if ((week - 1) * DAYSPERWEEK + 1 != rp->r_dayofmonth)
+				return -1;
+		} else if (rp->r_dycode == DC_DOWLEQ) {
+			if (rp->r_dayofmonth == len_months[1][rp->r_month])
+				week = 5;
+			else {
+				week = 1 + rp->r_dayofmonth / DAYSPERWEEK;
+				if (week * DAYSPERWEEK - 1 != rp->r_dayofmonth)
+					return -1;
+			}
+		} else	return -1;	/* "cannot happen" */
+		(void) sprintf(result, "M%d.%d.%d",
+			rp->r_month + 1, week, rp->r_wday);
+	}
+	tod = rp->r_tod;
+	if (rp->r_todisgmt)
+		tod += gmtoff;
+	if (rp->r_todisstd && rp->r_stdoff == 0)
+		tod += dstoff;
+	if (tod < 0) {
+		result[0] = '\0';
+		return -1;
+	}
+	if (tod != 2 * SECSPERMIN * MINSPERHOUR) {
+		(void) strcat(result, "/");
+		if (stringoffset(end(result), tod) != 0)
+			return -1;
+	}
+	return 0;
+}
+
+static void
+stringzone(result, zpfirst, zonecount)
+char *				result;
+const struct zone * const	zpfirst;
+const int			zonecount;
+{
+	register const struct zone *	zp;
+	register struct rule *		rp;
+	register struct rule *		stdrp;
+	register struct rule *		dstrp;
+	register int			i;
+	register const char *		abbrvar;
+
+	result[0] = '\0';
+	zp = zpfirst + zonecount - 1;
+	stdrp = dstrp = NULL;
+	for (i = 0; i < zp->z_nrules; ++i) {
+		rp = &zp->z_rules[i];
+		if (rp->r_hiwasnum || rp->r_hiyear != INT_MAX)
+			continue;
+		if (rp->r_yrtype != NULL)
+			continue;
+		if (rp->r_stdoff == 0) {
+			if (stdrp == NULL)
+				stdrp = rp;
+			else	return;
+		} else {
+			if (dstrp == NULL)
+				dstrp = rp;
+			else	return;
+		}
+	}
+	if (stdrp == NULL && dstrp == NULL) {
+		/*
+		** There are no rules running through "max".
+		** Let's find the latest rule.
+		*/
+		for (i = 0; i < zp->z_nrules; ++i) {
+			rp = &zp->z_rules[i];
+			if (stdrp == NULL || rp->r_hiyear > stdrp->r_hiyear ||
+				(rp->r_hiyear == stdrp->r_hiyear &&
+				rp->r_month > stdrp->r_month))
+					stdrp = rp;
+		}
+		if (stdrp != NULL && stdrp->r_stdoff != 0)
+			return;	/* We end up in DST (a POSIX no-no). */
+		/*
+		** Horrid special case: if year is 2037,
+		** presume this is a zone handled on a year-by-year basis;
+		** do not try to apply a rule to the zone.
+		*/
+		if (stdrp != NULL && stdrp->r_hiyear == 2037)
+			return;
+	}
+	if (stdrp == NULL && zp->z_nrules != 0)
+		return;
+	abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar;
+	doabbr(result, zp->z_format, abbrvar, FALSE, TRUE);
+	if (stringoffset(end(result), -zp->z_gmtoff) != 0) {
+		result[0] = '\0';
+		return;
+	}
+	if (dstrp == NULL)
+		return;
+	doabbr(end(result), zp->z_format, dstrp->r_abbrvar, TRUE, TRUE);
+	if (dstrp->r_stdoff != SECSPERMIN * MINSPERHOUR)
+		if (stringoffset(end(result),
+			-(zp->z_gmtoff + dstrp->r_stdoff)) != 0) {
+				result[0] = '\0';
+				return;
+		}
+	(void) strcat(result, ",");
+	if (stringrule(result, dstrp, dstrp->r_stdoff, zp->z_gmtoff) != 0) {
+		result[0] = '\0';
+		return;
+	}
+	(void) strcat(result, ",");
+	if (stringrule(result, stdrp, dstrp->r_stdoff, zp->z_gmtoff) != 0) {
+		result[0] = '\0';
+		return;
 	}
 }
 
@@ -1637,8 +1974,17 @@ const int			zonecount;
 	register int			startttisstd;
 	register int			startttisgmt;
 	register int			type;
-	char				startbuf[BUFSIZ];
-
+	register char *			startbuf;
+	register char *			ab;
+	register char *			envvar;
+	register int			max_abbr_len;
+	register int			max_envvar_len;
+
+	max_abbr_len = 2 + max_format_len + max_abbrvar_len;
+	max_envvar_len = 2 * max_abbr_len + 5 * 9;
+	startbuf = emalloc(max_abbr_len + 1);
+	ab = emalloc(max_abbr_len + 1);
+	envvar = emalloc(max_envvar_len + 1);
 	INITIALIZE(untiltime);
 	INITIALIZE(starttime);
 	/*
@@ -1653,6 +1999,48 @@ const int			zonecount;
 	*/
 	startttisstd = FALSE;
 	startttisgmt = FALSE;
+	min_year = max_year = EPOCH_YEAR;
+	if (leapseen) {
+		updateminmax(leapminyear);
+		updateminmax(leapmaxyear);
+	}
+	for (i = 0; i < zonecount; ++i) {
+		zp = &zpfirst[i];
+		updateminmax(zp->z_untilrule.r_loyear);
+		for (j = 0; j < zp->z_nrules; ++j) {
+			rp = &zp->z_rules[j];
+			if (rp->r_lowasnum)
+				updateminmax(rp->r_loyear);
+			if (rp->r_hiwasnum)
+				updateminmax(rp->r_hiyear);
+		}
+	}
+	/*
+	** Generate lots of data if a rule can't cover all future times.
+	*/
+	stringzone(envvar, zpfirst, zonecount);
+	if (noise && envvar[0] == '\0') {
+		register char *	wp;
+
+wp = ecpyalloc(_("no POSIX environment variable for zone"));
+		wp = ecatalloc(wp, " ");
+		wp = ecatalloc(wp, zpfirst->z_name); 
+		warning(wp);
+		ifree(wp);
+	}
+	if (envvar[0] == '\0') {
+		if (min_year >= INT_MIN + YEARSPERREPEAT)
+			min_year -= YEARSPERREPEAT;
+		else	min_year = INT_MIN;
+		if (max_year <= INT_MAX - YEARSPERREPEAT)
+			max_year += YEARSPERREPEAT;
+		else	max_year = INT_MAX;
+	}
+	/*
+	** For the benefit of older systems, generate data through 2037.
+	*/
+	if (max_year < 2037)
+		max_year = 2037;
 	for (i = 0; i < zonecount; ++i) {
 		/*
 		** A guess that may well be corrected later.
@@ -1670,7 +2058,7 @@ const int			zonecount;
 		if (zp->z_nrules == 0) {
 			stdoff = zp->z_stdoff;
 			doabbr(startbuf, zp->z_format,
-				(char *) NULL, stdoff != 0);
+				(char *) NULL, stdoff != 0, FALSE);
 			type = addtype(oadd(zp->z_gmtoff, stdoff),
 				startbuf, stdoff != 0, startttisstd,
 				startttisgmt);
@@ -1700,7 +2088,6 @@ const int			zonecount;
 				register int	k;
 				register zic_t	jtime, ktime;
 				register long	offset;
-				char		buf[BUFSIZ];
 
 				INITIALIZE(ktime);
 				if (useuntil) {
@@ -1756,24 +2143,27 @@ const int			zonecount;
 							stdoff);
 						doabbr(startbuf, zp->z_format,
 							rp->r_abbrvar,
-							rp->r_stdoff != 0);
+							rp->r_stdoff != 0,
+							FALSE);
 						continue;
 					}
 					if (*startbuf == '\0' &&
 						startoff == oadd(zp->z_gmtoff,
-						stdoff))
+						stdoff)) {
 							doabbr(startbuf,
 								zp->z_format,
 								rp->r_abbrvar,
 								rp->r_stdoff !=
-								0);
+								0,
+								FALSE);
+					}
 				}
 				eats(zp->z_filename, zp->z_linenum,
 					rp->r_filename, rp->r_linenum);
-				doabbr(buf, zp->z_format, rp->r_abbrvar,
-					rp->r_stdoff != 0);
+				doabbr(ab, zp->z_format, rp->r_abbrvar,
+					rp->r_stdoff != 0, FALSE);
 				offset = oadd(zp->z_gmtoff, rp->r_stdoff);
-				type = addtype(offset, buf, rp->r_stdoff != 0,
+				type = addtype(offset, ab, rp->r_stdoff != 0,
 					rp->r_todisstd, rp->r_todisgmt);
 				addtt(ktime, type);
 			}
@@ -1806,7 +2196,10 @@ error(_("can't determine time zone abbreviation to use just after until time"));
 				starttime = tadd(starttime, -gmtoff);
 		}
 	}
-	writezone(zpfirst->z_name);
+	writezone(zpfirst->z_name, envvar);
+	ifree(startbuf);
+	ifree(ab);
+	ifree(envvar);
 }
 
 static void
@@ -2185,8 +2578,6 @@ register const int			wantedy;
 will not work with pre-2004 versions of zic"));
 		}
 	}
-	if (dayoff < 0 && !TYPE_SIGNED(zic_t))
-		return min_time;
 	if (dayoff < min_time / SECSPERDAY)
 		return min_time;
 	if (dayoff > max_time / SECSPERDAY)
diff --git a/timezone/zone.tab b/timezone/zone.tab
index 09cdf6940a..aecb5bb94c 100644
--- a/timezone/zone.tab
+++ b/timezone/zone.tab
@@ -1,4 +1,4 @@
-# @(#)zone.tab	8.1
+# @(#)zone.tab	8.5
 #
 # TZ zone descriptions
 #
@@ -44,7 +44,7 @@ AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
 AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF, SL)
 AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
-AR	-3124-06411	America/Argentina/Tucuman	Tucuman (TM)
+AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
 AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
 AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
 AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
@@ -99,27 +99,28 @@ BT	+2728+08939	Asia/Thimphu
 BW	-2545+02555	Africa/Gaborone
 BY	+5354+02734	Europe/Minsk
 BZ	+1730-08812	America/Belize
-CA	+4734-05243	America/St_Johns	Newfoundland Island
-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), W Labrador, E Quebec & PEI
+CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
 CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
 CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
-CA	+5320-06025	America/Goose_Bay	Atlantic Time - E Labrador
+CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
 CA	+4531-07334	America/Montreal	Eastern Time - Quebec - most locations
 CA	+4339-07923	America/Toronto	Eastern Time - Ontario - most locations
 CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
 CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
 CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
 CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut
-CA	+6408-08310	America/Coral_Harbour	Eastern Standard Time - Southampton Island
-CA	+6245-09210	America/Rankin_Inlet	Central Time - central Nunavut
+CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
 CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
-CA	+4843-09429	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
 CA	+6903-10505	America/Cambridge_Bay	Central Time - west Nunavut
 CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
 CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
 CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
 CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
-CA	+6825-11330	America/Inuvik	Mountain Time - west Northwest Territories
+CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
 CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
 CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
 CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
@@ -136,13 +137,12 @@ CL	-3327-07040	America/Santiago	most locations
 CL	-2710-10927	Pacific/Easter	Easter Island & Sala y Gomez
 CM	+0403+00942	Africa/Douala
 CN	+3114+12128	Asia/Shanghai	east China - Beijing, Guangdong, Shanghai, etc.
-CN	+4545+12641	Asia/Harbin	Heilongjiang
-CN	+2934+10635	Asia/Chongqing	central China - Gansu, Guizhou, Sichuan, Yunnan, etc.
-CN	+4348+08735	Asia/Urumqi	Tibet & most of Xinjiang Uyghur
-CN	+3929+07559	Asia/Kashgar	southwest Xinjiang Uyghur
+CN	+4545+12641	Asia/Harbin	Heilongjiang (except Mohe), Jilin
+CN	+2934+10635	Asia/Chongqing	central China - Sichuan, Yunnan, Guangxi, Shaanxi, Guizhou, etc.
+CN	+4348+08735	Asia/Urumqi	most of Tibet & Xinjiang
+CN	+3929+07559	Asia/Kashgar	west Tibet & Xinjiang
 CO	+0436-07405	America/Bogota
 CR	+0956-08405	America/Costa_Rica
-CS	+4450+02030	Europe/Belgrade
 CU	+2308-08222	America/Havana
 CV	+1455-02331	Atlantic/Cape_Verde
 CX	-1025+10543	Indian/Christmas
@@ -177,11 +177,12 @@ GB	+512830-0001845	Europe/London
 GD	+1203-06145	America/Grenada
 GE	+4143+04449	Asia/Tbilisi
 GF	+0456-05220	America/Cayenne
+GG	+4927-00232	Europe/Guernsey
 GH	+0533-00013	Africa/Accra
 GI	+3608-00521	Europe/Gibraltar
 GL	+6411-05144	America/Godthab	most locations
 GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
-GL	+7030-02215	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
 GL	+7634-06847	America/Thule	Thule / Pituffik
 GM	+1328-01639	Africa/Banjul
 GN	+0931-01343	Africa/Conakry
@@ -204,12 +205,14 @@ ID	-0507+11924	Asia/Makassar	east & south Borneo, Celebes, Bali, Nusa Tengarra,
 ID	-0232+14042	Asia/Jayapura	Irian Jaya & the Moluccas
 IE	+5320-00615	Europe/Dublin
 IL	+3146+03514	Asia/Jerusalem
+IM	+5409-00428	Europe/Isle_of_Man
 IN	+2232+08822	Asia/Calcutta
 IO	-0720+07225	Indian/Chagos
 IQ	+3321+04425	Asia/Baghdad
 IR	+3540+05126	Asia/Tehran
 IS	+6409-02151	Atlantic/Reykjavik
 IT	+4154+01229	Europe/Rome
+JE	+4912-00237	Europe/Jersey
 JM	+1800-07648	America/Jamaica
 JO	+3157+03556	Asia/Amman
 JP	+353916+1394441	Asia/Tokyo
@@ -244,6 +247,7 @@ LY	+3254+01311	Africa/Tripoli
 MA	+3339-00735	Africa/Casablanca
 MC	+4342+00723	Europe/Monaco
 MD	+4700+02850	Europe/Chisinau
+ME	+4247+01928	Europe/Podgorica
 MG	-1855+04731	Indian/Antananarivo
 MH	+0709+17112	Pacific/Majuro	most locations
 MH	+0905+16720	Pacific/Kwajalein	Kwajalein
@@ -257,7 +261,7 @@ MO	+2214+11335	Asia/Macau
 MP	+1512+14545	Pacific/Saipan
 MQ	+1436-06105	America/Martinique
 MR	+1806-01557	Africa/Nouakchott
-MS	+1644-06213	America/Montserrat
+MS	+1643-06213	America/Montserrat
 MT	+3554+01431	Europe/Malta
 MU	-2010+05730	Indian/Mauritius
 MV	+0410+07330	Indian/Maldives
@@ -308,9 +312,11 @@ PY	-2516-05740	America/Asuncion
 QA	+2517+05132	Asia/Qatar
 RE	-2052+05528	Indian/Reunion
 RO	+4426+02606	Europe/Bucharest
+RS	+4450+02030	Europe/Belgrade
 RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
 RU	+5545+03735	Europe/Moscow	Moscow+00 - west Russia
-RU	+5312+05009	Europe/Samara	Moscow+01 - Caspian Sea
+RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+RU	+5312+05009	Europe/Samara	Moscow+01 - Samara, Udmurtia
 RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
 RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
 RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
@@ -376,10 +382,11 @@ US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford Cou
 US	+411745-0863730	America/Indiana/Knox	Eastern Time - Indiana - Starke County
 US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
 US	+415100-0873900	America/Chicago	Central Time
-US	+384038-0873143	America/Indiana/Vincennes	Central Time - Indiana - Daviess, Dubois, Knox, Martin, Perry & Pulaski
+US	+384038-0873143	America/Indiana/Vincennes	Central Time - Indiana - Daviess, Dubois, Knox, Martin, Perry & Pulaski Counties
 US	+382931-0871643	America/Indiana/Petersburg	Central Time - Indiana - Pike County
 US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
 US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
 US	+394421-1045903	America/Denver	Mountain Time
 US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
 US	+364708-1084111	America/Shiprock	Mountain Time - Navajo