summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--BUGS12
-rw-r--r--ChangeLog588
-rw-r--r--FAQ.in12
-rw-r--r--NEWS10
-rw-r--r--Versions.def1
-rwxr-xr-xconfigure4
-rw-r--r--configure.in4
-rw-r--r--crypt/sha256-crypt.c5
-rw-r--r--crypt/sha256c-test.c1
-rw-r--r--crypt/sha512-crypt.c5
-rw-r--r--crypt/sha512c-test.c1
-rw-r--r--elf/Makefile2
-rw-r--r--elf/dl-load.c2
-rw-r--r--elf/elf.h2
-rw-r--r--elf/rtld.c65
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in3
-rw-r--r--iconv/loop.c7
-rw-r--r--iconvdata/Makefile26
-rw-r--r--iconvdata/bug-iconv6.c52
-rw-r--r--iconvdata/ebcdic-es-a.c8
-rw-r--r--iconvdata/ebcdic-es.c8
-rw-r--r--iconvdata/ebcdic-is-friss.c8
-rw-r--r--iconvdata/ebcdic-uk.c8
-rw-r--r--iconvdata/gconv-modules26
-rw-r--r--iconvdata/hp-greek8.c29
-rw-r--r--iconvdata/hp-roman8.c8
-rw-r--r--iconvdata/hp-roman9.c29
-rw-r--r--iconvdata/hp-thai8.c29
-rw-r--r--iconvdata/hp-turkish8.c29
-rw-r--r--iconvdata/iso8859-16.c9
-rw-r--r--iconvdata/iso8859-9e.c7
-rwxr-xr-xiconvdata/tst-tables.sh4
-rw-r--r--iconvdata/viscii.c9
-rw-r--r--include/ifaddrs.h11
-rw-r--r--include/netdb.h15
-rw-r--r--include/stdlib.h3
-rw-r--r--inet/Makefile4
-rw-r--r--inet/ether_hton.c4
-rw-r--r--inet/ether_line.c15
-rw-r--r--inet/ether_ntoh.c4
-rw-r--r--inet/gethstbyad_r.c4
-rw-r--r--inet/gethstbynm2_r.c4
-rw-r--r--inet/gethstbynm_r.c4
-rw-r--r--inet/gethstent_r.c4
-rw-r--r--inet/getnetgrent_r.c33
-rw-r--r--inet/tst-ether_line.c38
-rw-r--r--intl/dcigettext.c34
-rw-r--r--intl/locale.alias9
-rw-r--r--locale/programs/ld-collate.c2
-rw-r--r--localedata/ChangeLog45
-rw-r--r--localedata/SUPPORTED2
-rw-r--r--localedata/charmaps/HP-GREEK8226
-rw-r--r--localedata/charmaps/HP-ROMAN9263
-rw-r--r--localedata/charmaps/HP-THAI8255
-rw-r--r--localedata/charmaps/HP-TURKISH8254
-rw-r--r--localedata/charmaps/UTF-85784
-rw-r--r--localedata/locales/as_IN7
-rw-r--r--localedata/locales/bo_CN170
-rw-r--r--localedata/locales/bo_IN94
-rw-r--r--localedata/locales/dz_BT35
-rw-r--r--localedata/locales/ig_NG5
-rw-r--r--localedata/locales/lo_LA8
-rw-r--r--localedata/locales/si_LK4
-rw-r--r--localedata/locales/ug_CN11
-rw-r--r--malloc/arena.c84
-rw-r--r--malloc/malloc.c4
-rw-r--r--manual/arith.texi5
-rw-r--r--manual/errno.texi2
-rw-r--r--manual/libc.texinfo6
-rw-r--r--manual/process.texi2
-rw-r--r--manual/socket.texi2
-rw-r--r--manual/startup.texi8
-rw-r--r--manual/stdio.texi2
-rw-r--r--manual/sysinfo.texi5
-rw-r--r--manual/syslog.texi2
-rw-r--r--manual/texinfo.tex2937
-rw-r--r--manual/time.texi2
-rw-r--r--math/libm-test.inc23
-rw-r--r--nis/nss_compat/compat-initgroups.c17
-rw-r--r--nptl/ChangeLog93
-rw-r--r--nptl/Makefile1
-rw-r--r--nptl/allocatestack.c7
-rw-r--r--nptl/sysdeps/pthread/createthread.c7
-rw-r--r--nptl/sysdeps/pthread/malloc-machine.h19
-rw-r--r--nptl/sysdeps/pthread/pthread.h6
-rw-r--r--nptl/sysdeps/unix/sysv/linux/fork.h3
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S52
-rw-r--r--nptl/sysdeps/unix/sysv/linux/kernel-posix-timers.h10
-rw-r--r--nptl/sysdeps/unix/sysv/linux/lowlevellock.c35
-rw-r--r--nptl/sysdeps/unix/sysv/linux/register-atfork.c15
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S54
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S4
-rw-r--r--nptl/sysdeps/unix/sysv/linux/timer_create.c7
-rw-r--r--nptl/sysdeps/unix/sysv/linux/timer_delete.c23
-rw-r--r--nptl/sysdeps/unix/sysv/linux/timer_routines.c45
-rw-r--r--nptl/sysdeps/unix/sysv/linux/unregister-atfork.c13
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S57
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S2
-rw-r--r--nptl/tst-basic7.c56
-rw-r--r--nscd/Makefile4
-rw-r--r--nscd/aicache.c21
-rw-r--r--nscd/cache.c68
-rw-r--r--nscd/connections.c234
-rw-r--r--nscd/gai.c2
-rw-r--r--nscd/gethstbyad_r.c15
-rw-r--r--nscd/gethstbynm3_r.c (renamed from nscd/gethstbynm2_r.c)14
-rw-r--r--nscd/grpcache.c2
-rw-r--r--nscd/hstcache.c33
-rw-r--r--nscd/initgrcache.c4
-rw-r--r--nscd/mem.c55
-rw-r--r--nscd/nscd.c4
-rw-r--r--nscd/nscd.conf6
-rw-r--r--nscd/nscd.h21
-rw-r--r--nscd/nscd.init9
-rw-r--r--nscd/nscd_setup_thread.c3
-rw-r--r--nscd/pwdcache.c2
-rw-r--r--nscd/selinux.c8
-rw-r--r--nscd/servicescache.c2
-rw-r--r--nss/Versions5
-rw-r--r--nss/XXX-lookup.c23
-rw-r--r--nss/getXXbyYY_r.c63
-rw-r--r--nss/getXXent_r.c7
-rw-r--r--nss/getnssent_r.c18
-rw-r--r--nss/nsswitch.c27
-rw-r--r--nss/nsswitch.h11
-rw-r--r--nss/service-lookup.c3
-rw-r--r--po/ca.po8621
-rw-r--r--po/cs.po565
-rw-r--r--po/ko.po8038
-rw-r--r--po/nl.po572
-rw-r--r--po/pl.po562
-rw-r--r--po/sv.po564
-rw-r--r--po/tr.po578
-rw-r--r--po/zh_CN.po565
-rw-r--r--posix/Makefile1
-rw-r--r--posix/gai.conf34
-rw-r--r--posix/regex.h2
-rw-r--r--posix/tst-rfc3484-2.c20
-rw-r--r--posix/tst-rfc3484-3.c137
-rw-r--r--posix/tst-rfc3484.c12
-rw-r--r--posix/unistd.h4
-rw-r--r--resolv/Versions1
-rw-r--r--resolv/nss_dns/dns-host.c27
-rw-r--r--resolv/res_hconf.c80
-rwxr-xr-xscripts/config.sub10
-rw-r--r--stdio-common/Makefile2
-rw-r--r--stdio-common/bug20.c32
-rw-r--r--stdio-common/bug21.c16
-rw-r--r--stdio-common/bug22.c32
-rw-r--r--stdio-common/printf_fp.c17
-rw-r--r--stdio-common/vfprintf.c50
-rw-r--r--stdio-common/vfscanf.c19
-rw-r--r--stdlib/Versions3
-rw-r--r--stdlib/msort.c36
-rw-r--r--stdlib/qsort.c16
-rw-r--r--stdlib/stdlib.h8
-rw-r--r--stdlib/tst-setcontext.c18
-rw-r--r--sunrpc/clnt_udp.c2
-rw-r--r--sunrpc/netname.c4
-rw-r--r--sunrpc/publickey.c6
-rw-r--r--sysdeps/i386/backtrace.c35
-rw-r--r--sysdeps/i386/i586/memcpy_chk.S1
-rw-r--r--sysdeps/i386/i586/mempcpy_chk.S1
-rw-r--r--sysdeps/i386/i586/memset_chk.S1
-rw-r--r--sysdeps/ia64/backtrace.c25
-rw-r--r--sysdeps/ieee754/dbl-64/sincos.tbl4
-rw-r--r--sysdeps/mach/hurd/bits/fcntl.h9
-rw-r--r--sysdeps/mach/hurd/fcntl.c12
-rw-r--r--sysdeps/mach/hurd/kernel-features.h31
-rw-r--r--sysdeps/posix/getaddrinfo.c441
-rw-r--r--sysdeps/pthread/aio_misc.c8
-rw-r--r--sysdeps/s390/bits/string.h20
-rw-r--r--sysdeps/sparc/dl-procinfo.c4
-rw-r--r--sysdeps/sparc/dl-procinfo.h4
-rw-r--r--sysdeps/sparc/sparc32/sparcv9/sparcv9v2/memcpy.S2
-rw-r--r--sysdeps/sparc/sparc32/sparcv9/sparcv9v2/memset.S2
-rw-r--r--sysdeps/sparc/sparc64/sparcv9v2/memcpy.S743
-rw-r--r--sysdeps/sparc/sparc64/sparcv9v2/memset.S1
-rw-r--r--sysdeps/unix/sysv/linux/Makefile6
-rw-r--r--sysdeps/unix/sysv/linux/adjtime.c24
-rw-r--r--sysdeps/unix/sysv/linux/bits/sched.h56
-rw-r--r--sysdeps/unix/sysv/linux/check_native.c172
-rw-r--r--sysdeps/unix/sysv/linux/check_pf.c124
-rw-r--r--sysdeps/unix/sysv/linux/i386/makecontext.S16
-rw-r--r--sysdeps/unix/sysv/linux/ia64/syscalls.list3
-rw-r--r--sysdeps/unix/sysv/linux/kernel-features.h5
-rw-r--r--sysdeps/unix/sysv/linux/netiucv/iucv.h39
-rw-r--r--sysdeps/unix/sysv/linux/nscd_setup_thread.c8
-rw-r--r--sysdeps/unix/sysv/linux/open64.c23
-rw-r--r--sysdeps/unix/sysv/linux/open64_2.c32
-rw-r--r--sysdeps/unix/sysv/linux/opensock.c7
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list2
-rw-r--r--sysdeps/unix/sysv/linux/readahead.c8
-rw-r--r--sysdeps/unix/sysv/linux/s390/opensock.c2
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list3
-rw-r--r--sysdeps/unix/sysv/linux/s390/sa_len.c2
-rw-r--r--sysdeps/unix/sysv/linux/sa_len.c7
-rw-r--r--sysdeps/unix/sysv/linux/sys/epoll.h4
-rw-r--r--sysdeps/unix/sysv/linux/sys/signalfd.h2
-rw-r--r--sysdeps/unix/sysv/linux/sys/timex.h3
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/aio_read.c7
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/aio_read64.c1
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/aio_write.c7
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/aio_write64.c1
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/creat64.c1
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/getdirentries.c3
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/getdirentries64.c1
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/lio_listio.c13
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/lio_listio64.c1
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/open64.c1
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/openat.c16
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/openat64.c1
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/syscalls.list4
-rw-r--r--sysdeps/wordsize-64/alphasort.c3
-rw-r--r--sysdeps/wordsize-64/alphasort64.c1
-rw-r--r--sysdeps/wordsize-64/fseeko.c3
-rw-r--r--sysdeps/wordsize-64/fseeko64.c1
-rw-r--r--sysdeps/wordsize-64/ftello.c3
-rw-r--r--sysdeps/wordsize-64/ftello64.c1
-rw-r--r--sysdeps/wordsize-64/ftw.c16
-rw-r--r--sysdeps/wordsize-64/ftw64.c1
-rw-r--r--sysdeps/wordsize-64/iofgetpos.c12
-rw-r--r--sysdeps/wordsize-64/iofgetpos64.c1
-rw-r--r--sysdeps/wordsize-64/iofopen.c4
-rw-r--r--sysdeps/wordsize-64/iofopen64.c1
-rw-r--r--sysdeps/wordsize-64/iofsetpos.c12
-rw-r--r--sysdeps/wordsize-64/iofsetpos64.c1
-rw-r--r--sysdeps/wordsize-64/lockf.c3
-rw-r--r--sysdeps/wordsize-64/lockf64.c1
-rw-r--r--sysdeps/wordsize-64/mkostemp.c3
-rw-r--r--sysdeps/wordsize-64/mkostemp64.c1
-rw-r--r--sysdeps/wordsize-64/mkstemp.c3
-rw-r--r--sysdeps/wordsize-64/mkstemp64.c1
-rw-r--r--sysdeps/wordsize-64/scandir.c6
-rw-r--r--sysdeps/wordsize-64/scandir64.c1
-rw-r--r--sysdeps/wordsize-64/tmpfile.c3
-rw-r--r--sysdeps/wordsize-64/tmpfile64.c1
-rw-r--r--sysdeps/wordsize-64/versionsort.c3
-rw-r--r--sysdeps/wordsize-64/versionsort64.c1
-rw-r--r--sysdeps/x86_64/dl-trampoline.S54
-rw-r--r--sysdeps/x86_64/memset.S6
-rw-r--r--time/Makefile4
-rw-r--r--time/bug-getdate1.c146
-rw-r--r--time/getdate.c21
-rw-r--r--time/tzfile.c2
-rw-r--r--version.h4
-rw-r--r--wcsmbs/wchar.h7
248 files changed, 22459 insertions, 13117 deletions
diff --git a/BUGS b/BUGS
index d0d5056ffc..6d6ce83772 100644
--- a/BUGS
+++ b/BUGS
@@ -1,7 +1,7 @@
 	    List of known bugs (certainly very incomplete)
 	    ----------------------------------------------
 
-Time-stamp: <2005-09-23 13:25:42 drepper>
+Time-stamp: <2007-10-27 18:37:51 drepper>
 
 This following list contains those bugs which I'm aware of.  Please
 make sure that bugs you report are not listed here.  If you can fix one
@@ -12,12 +12,10 @@ GNU project.  There is an easy to use WWW interface available at
 
        http://sourceware.org/bugzilla/
 
-I would appreciate it very much if you could verify the problem was not
-reported before by looking through the database.  To make the information
-in this database as useful as possible please report bugs always using the
-`glibcbug' shell script which gets installed with GNU libc.  Before reporting
-a bug please check the FAQ since it discusses also a lot of problematic
-situations.
+I would appreciate it very much if you could verify the problem was
+not reported before by looking through the database. Before reporting
+a bug please check the FAQ since it discusses also a lot of
+problematic situations.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/ChangeLog b/ChangeLog
index 714c014f88..62141b67f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,591 @@
+2007-12-11  Ulrich Drepper  <drepper@redhat.com>
+
+	* iconvdata/hp-thai8.c: New file.
+	* iconvdata/Makefile: Add rules for hp-thai8.c.
+	* iconvdata/tst-tables.sh: Add entry for HP-THAI8.
+	* iconvdata/gconv-modules: Likewise.
+
+	[BZ #5464]
+	* iconvdata/hp-greek8.c: New file.
+	* iconvdata/Makefile: Add rules for hp-greek8.c.
+	* iconvdata/tst-tables.sh: Add entry for HP-GREEK8.
+	* iconvdata/gconv-modules: Likewise.
+
+	[BZ #5463]
+	* iconvdata/hp-turkish8.c: New file.
+	* iconvdata/Makefile: Add rules for hp-turkish8.c.
+	* iconvdata/tst-tables.sh: Add entry for HP-TURKISH8.
+	* iconvdata/gconv-modules: Likewise.
+
+	* malloc/arena.c (grow_heap): Split out code to shrink heap into...
+	(shrink_heap): ... this new function.
+	(heap_trim): Call shrink_heap instead of grow_heap.
+
+	* malloc/malloc.c (_int_malloc): sYSMALLOc might fail, in this
+	case don't call alloc_perturb.
+
+2007-12-10  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/adjtime.c: Use ADJ_OFFSET_SS_READ if
+	possible.
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_ADJ_OFFSET_SS_READ): Define for 2.6.24.
+	* sysdeps/unix/sysv/linux/sys/timex.h (ADJ_OFFSET_SS_READ): Define.
+
+2007-12-08  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5424]
+	* stdio-common/vfprintf.c: Do not overflow when adding to done.
+	* stdio-common/Makefile (tests): Add bug22.
+	* stdio-common/bug22.c: New file.
+
+	[BZ #5451]
+	* time/getdate.c: Fix filling in default values.
+	* time/bug-getdate1.c: New file.
+	* time/Makefile: Add rules to build and run bug-getdate1.
+
+	* iconvdata/ebcdic-is-friss.c: Use 8bit-gap instead of 8bit-generic.
+	* iconvdata/ebcdic-es.c: Likewise.
+	* iconvdata/ebcdic-es-a.c: Likewise.
+	* iconvdata/ebcdic-uk.c: Likewise.
+	* iconvdata/iso8859-16.c: Likewise.
+	* iconvdata/viscii.c: Likewise.
+	* iconvdata/iso8859-9e.c: Likewise.
+	* iconvdata/Makefile: Adjust appropriately.
+
+	[BZ #5428]
+	* wcsmbs/wchar.h: Unconditionally undefine __need_mbstate and
+	__need_wint_t.
+
+2007-12-07  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5427]
+	* iconvdata/hp-roman9.c: New file.
+	* iconvdata/Makefile: Add rules for hp-roman9.c.
+	* iconvdata/tst-tables.sh: Add HP-ROMAN9.
+	* iconvdata/gconv-modules: Likewise.
+
+	* iconvdata/hp-roman8.c: Use 8bit-gap instead of 8bit-generic.
+	* iconvdata/Makefile: Adjust appropriately.
+
+	[BZ #5441]
+	* stdio-common/vfscanf.c (_IO_vfwscanf): Don't free ptrs_to_free
+	structure, it's allocated with alloca.
+	* stdio-common/Makefile (tests): Add bug21.
+	* stdio-common/bug21.c: New file.
+
+2007-12-06  Aurelien Jarno  <aurelien@aurel32.net>
+
+	[BZ #5452]
+	* sysdeps/unix/sysv/linux/bits/sched.h: Use __extension__
+	keyword for gcc's braced-groups.
+
+2007-12-07  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5454]
+	* inet/ether_line.c: Strip hostname of whitespaces.
+	* inet/Makefile (tests): Add tst-ether_line.
+	* inet/tst-ether_line.c: New file.
+
+2007-12-03  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5439]
+	* sysdeps/unix/sysv/linux/sys/signalfd.h: Fix use of __nonnull.
+
+	[BZ #5435]
+	* sysdeps/unix/sysv/linux/i386/makecontext.S: Align stack.
+
+	* stdlib/tst-setcontext.c: Catch the case where the links gets
+	messed up and we do not reach main again.
+
+	* po/ca.po: Update from translation team.
+
+2007-11-26  Ulrich Drepper  <drepper@redhat.com>
+
+	* posix/unistd.h: Declare fsync also for __USE_XOPEN2K.
+	* posix/regex.h (REG_ENOSYS): Likewise.
+	* wcsmbs/wchar.h: Define __need_file also for __USE_XOPEN2K.
+
+2007-11-25  Ulrich Drepper  <drepper@redhat.com>
+
+	* nscd/nscd.h (MAX_STACK_USE): Define.
+	* nscd/mem.c (MAX_STACK_USE): Remove definition here.
+	(gc): Initialize stack_used based on allocation in prune_cache.
+	* nscd/cache.c (prune_cache): Use heap for mark array if necessary.
+	Clear array before use.
+
+	* nscd/aicache.c (addhstaiX): Update statistics counter in case
+	memory allocation failed.
+	* nscd/hstcache.c (cache_addhst): Likewise.
+	* nscd/grpcache.c (cache_addgr): Likewise.
+	* nscd/servicescache.c (cache_addserv): Likewise.
+	* nscd/pwdcache.c (cache_addpw): Likewise.
+	* nscd/initgrcache.c (addinitgroupsX): Likewise.
+
+2007-11-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list: Add open
+	and creat system calls.
+
+	* sysdeps/unix/sysv/linux/check_native.c: Include <asm/types.h>.
+
+2007-11-23  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* sysdeps/unix/sysv/linux/Makefile [subdir=inet] (sysdep_headers):
+	Add netiucv/iucv.h.
+	* sysdeps/unix/sysv/linux/netiucv/iucv.h: New file.
+	* sysdeps/unix/sysv/linux/opensock.c (__opensock): Add AF_IUCV
+	protocol.
+	* sysdeps/unix/sysv/linux/sa_len.c (__libc_sa_len): Likewise.
+	* sysdeps/unix/sysv/linux/s390/opensock.c: New file.
+	* sysdeps/unix/sysv/linux/s390/sa_len.c: New file.
+
+2007-11-22  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* sysdeps/s390/bits/string.h (strlen, strcpy, strncpy, strcat,
+	strncat): Define as macros to avoid compile errors.
+
+	* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list:  Add open and
+	creat entries.
+
+2007-11-22  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5382]
+	* nscd/nscd.h (NSCD_THREAD_STACKSIZE): Define.
+	* nscd/connections.c (start_threads): Use NSCD_THREAD_STACKSIZE.
+	* nscd/mem.c (gc): Don't allocate arrays on the stack if they can
+	overflow it.
+	Partially based on a patch by Petr Baudis <pasky@suse.cz>.
+
+	* sysdeps/unix/sysv/linux/nscd_setup_thread.c (setup_thread):
+	Return zero in case the thread library is not NPTL.
+
+	[BZ #5375]
+	* resolv/res_hconf.c (_res_hconf_reorder_addrs): Fix locking when
+	initializing interface list.
+
+	[BZ #5378]
+	* nis/nss_compat/compat-initgroups.c (getgrent_next_nss): Don't
+	use result of nss_getgrgid_r if nothing was found.  For other
+	error return with a failure.
+	Partially based on a patch by Petr Baudis <pasky@suse.cz>.
+
+	* locale/programs/ld-collate.c (collate_read): Fix loop to match
+	macro name.
+
+2007-11-19  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/posix/getaddrinfo.c (defaults_scopes, scopes): New variables.
+	(get_scope): For IPv4 scope, use scopes table.
+	(fini): Free scopes table if necessary.
+	(free_scopelist): New function.
+	(scopecmp): New function.
+	(gaiconf_init): Also handle scopev4 entries.
+	* posix/tst-rfc3484.c (do_test): Initialize scopes.
+	* posix/tst-rfc3484-2.c (do_test): Likewise.
+	* posix/gai.conf: Document scopev4 defaults.
+	* posix/Makefile (tests): Add tst-rfc3484-3.
+	* posix/tst-rfc3484-3.c: New file.
+
+	* sysdeps/posix/getaddrinfo.c (default_labels): Describe entry for
+	Teredo tunnels.
+	* posix/gai.conf: Update for current default tables.
+
+2007-11-19  Ulrich Drepper  <drepper@redhat.com>
+
+	* po/tr.po: Update from translation team.
+
+2007-11-18  Roland McGrath  <roland@frob.com>
+
+	* manual/arith.texi (Remainder Functions): Spelling fix.
+	From Shaun Silk <genix@mysoul.com.au>.
+
+	* sysdeps/mach/hurd/bits/fcntl.h (O_CLOEXEC): Fix value.
+
+2007-11-17  Ulrich Drepper  <drepper@redhat.com>
+
+	* po/zh_CN.po: Update from translation team.
+
+	* sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers):
+	Add sys/signalfd.h and sys/eventfd.h.
+
+2007-11-15  Bruno Haible  <bruno@clisp.org>
+
+	[BZ #5346]
+	* intl/dcigettext.c (struct known_translation_t): Turn msgid into a
+	union.
+	(transcmp): Use the appropriate part of s1->msgid and s2->msgid.
+	(DCIGETTEXT): Change the allocation of the 'search' variable so that
+	it needs only fixed stack space. Delay the initialization of
+	msgid_len until it is needed.
+
+2007-11-15  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/ieee754/dbl-64/sincos.tbl: Fix size of union.
+	Reported by Christoph Quirin Lauter <christoph.lauter@ens-lyon.fr>.
+
+2007-11-15  Ulrich Drepper  <drepper@redhat.com>
+
+	* po/ko.po: Update from translation team.
+
+2007-11-14  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/check_native.c (__check_native): Simplify
+	significantly.  The device type is also part of the ifinfomsg data.
+
+	* po/sv.po: Update from translation team.
+	* po/nl.po: Likewise.
+
+	* nscd/cache.c (prune_cache): If cache is empty, instruct caller
+	to wake up in 24 hours.
+
+	* nscd/gai.c (__ioctl): Define.  Include check_native.c.
+
+2007-11-13  Ulrich Drepper  <drepper@redhat.com>
+
+	* po/cs.po: Update from translation team.
+	* po/pl.po: Likewise.
+
+	* include/ifaddrs.h: Remove in6ai_temporary.
+	(struct in6addrinfo): Add index element.
+	Declare __check_native.
+	* inet/Makefile (aux): Add check_native.
+	* sysdeps/unix/sysv/linux/check_native.c: New file.
+	* sysdeps/unix/sysv/linux/check_pf.c: No need to recognize
+	IFA_F_TEMPORARY.  Pass back ifa_index.
+	* sysdeps/posix/getaddrinfo.c: Remove netlink compatibility code.
+	(rfc3484_sort): Add new parameter.  Implement rule 7 correctly:
+	call __check_native if necessary.
+	(getaddrinfo): Fill in index field.  Use qsort_r instead of qsort
+	to sort addresses.  Pass information about the results.
+	* posix/tst-rfc3484.c: Adjust for addition of index field and change
+	of rfc3484_sort interface.
+	* posix/tst-rfc3484-2.c: Likewise.
+
+	* stdlib/stdlib.h: Define __compar_d_fn_t.  Declare qsort_r.
+	* include/stdlib.h: Add hidden_proto for qsort_t and adjust protoype
+	for _quicksort.
+	* stdlib/msort.c (qsort): Now a wrapper around qsort_r.
+	(qsort_r): Renamed from qsort.  Take additional parameter and pass it
+	on as third parameter to compare function and _quicksort.
+	* stdlib/qsort.c (_quicksort): Take additional parameter and pass on
+	to the compare function.
+	* stdlib/Versions [libc] (GLIBC_2.8): Add qsort_r.
+	* Versions.def: Add GLIBC_2.8 for libc.
+
+	* posix/tst-rfc3484.c: Adjust for addition of prefixlen field.
+	* posix/tst-rfc3484-2.c: Likewise.
+
+	* include/kernel-features.h: Moved to...
+	* sysdeps/mach/hurd/kernel-features.h: ...here.
+
+2007-09-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/i386/i586/memcpy_chk.S: New file.
+	* sysdeps/i386/i586/mempcpy_chk.S: Likewise.
+	* sysdeps/i386/i586/memset_chk.S: Likewise.
+
+2007-11-12  Ulrich Drepper  <drepper@redhat.com>
+
+	* include/ifaddrs.c (struct in6addrinfo): Add prefixlen field.
+	* sysdeps/unix/sysv/linux/check_pf.c (make_request): Always return
+	list of interfaces.  Also store prefix length.
+	* sysdeps/posix/getaddrinfo.c (sort_result): Add prefixlen element.
+	(rfc3484_sort): In rule 9, for IPv4 addresses count only matching
+	prefix if source and destination address are in the same subnet.
+	(getaddrinfo): Always call __check_pf.  Fill in prefixlen field.
+	Always look for matching record in in6ai list.
+	Correct source_addr_len value for IPv6->IPv4 converted records.
+
+2007-11-11  Roland McGrath  <roland@frob.com>
+
+	* include/kernel-features.h: New file.
+
+2007-11-10  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/pthread/aio_misc.c (handle_fildes_io): Avoid unnecessary
+	complications for 64-bit platforms.
+
+	* sysdeps/unix/sysv/linux/open64.c: Move __open64_2 implementation to..
+	* sysdeps/unix/sysv/linux/open64_2.c: ...here.  New file.
+	* sysdeps/unix/sysv/linux/Makefile [subdir=io] (sysdep_routines): Add
+	open64_2.
+	* sysdeps/unix/sysv/linux/ia64/syscalls.list: Add open and creat
+	entries.
+	* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
+	* sysdeps/wordsize-64/alphasort.c: New file.
+	* sysdeps/wordsize-64/alphasort64.c: New file.
+	* sysdeps/wordsize-64/fseeko.c: New file.
+	* sysdeps/wordsize-64/fseeko64.c: New file.
+	* sysdeps/wordsize-64/ftello.c: New file.
+	* sysdeps/wordsize-64/ftello64.c: New file.
+	* sysdeps/wordsize-64/ftw.c: New file.
+	* sysdeps/wordsize-64/ftw64.c: New file.
+	* sysdeps/wordsize-64/iofgetpos.c: New file.
+	* sysdeps/wordsize-64/iofgetpos64.c: New file.
+	* sysdeps/wordsize-64/iofopen.c: New file.
+	* sysdeps/wordsize-64/iofopen64.c: New file.
+	* sysdeps/wordsize-64/iofsetpos.c: New file.
+	* sysdeps/wordsize-64/iofsetpos64.c: New file.
+	* sysdeps/wordsize-64/lockf.c: New file.
+	* sysdeps/wordsize-64/lockf64.c: New file.
+	* sysdeps/wordsize-64/mkostemp.c: New file.
+	* sysdeps/wordsize-64/mkostemp64.c: New file.
+	* sysdeps/wordsize-64/mkstemp.c: New file.
+	* sysdeps/wordsize-64/mkstemp64.c: New file.
+	* sysdeps/wordsize-64/scandir.c: New file.
+	* sysdeps/wordsize-64/scandir64.c: New file.
+	* sysdeps/wordsize-64/tmpfile.c: New file.
+	* sysdeps/wordsize-64/tmpfile64.c: New file.
+	* sysdeps/wordsize-64/versionsort.c: New file.
+	* sysdeps/wordsize-64/versionsort64.c: New file.
+	* sysdeps/unix/sysv/linux/wordsize-64/aio_read.c: New file.
+	* sysdeps/unix/sysv/linux/wordsize-64/aio_read64.c: New file.
+	* sysdeps/unix/sysv/linux/wordsize-64/aio_write.c: New file.
+	* sysdeps/unix/sysv/linux/wordsize-64/aio_write64.c: New file.
+	* sysdeps/unix/sysv/linux/wordsize-64/creat64.c: New file.
+	* sysdeps/unix/sysv/linux/wordsize-64/getdirentries.c: New file.
+	* sysdeps/unix/sysv/linux/wordsize-64/getdirentries64.c: New file.
+	* sysdeps/unix/sysv/linux/wordsize-64/lio_listio.c: New file.
+	* sysdeps/unix/sysv/linux/wordsize-64/lio_listio64.c: New file.
+	* sysdeps/unix/sysv/linux/wordsize-64/open64.c: New file.
+	* sysdeps/unix/sysv/linux/wordsize-64/openat.c: New file.
+	* sysdeps/unix/sysv/linux/wordsize-64/openat64.c: New file.
+
+	* crypt/sha256-crypt.c: Fix a comment.
+	* crypt/sha512-crypt.c: Likewise.
+
+2007-11-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/memset.S: Add sfence after movnti.
+
+2007-11-07  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5277]
+	* iconv/loop.c (STANDARD_TO_LOOP_ERR_HANDLER): If conversion failed
+	because output buffer is too small break, don't loop.
+	* iconvdata/Makefile (tests): Add bug-iconv6.
+	* iconvdata/bug-iconv6.c: New file.
+
+2007-11-06  Ulrich Drepper  <drepper@redhat.com>
+
+	* stdio-common/vfprintf.c (vfprintf): Compute necessary buffer size
+	with size_t type.
+	* stdio-common/printf_fp.c (__print_fp): Change chars_needed type to
+	size_t.  Add casts where needed.
+
+	* nscd/selinux.c (nscd_request_avc_has_perm): When compiled with
+	old headers, don't call avc_has_perm if we don't have the
+	permission information.
+
+2007-11-05  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf/rtld.c (dl_main): Use the page size to find the map start.
+
+2007-11-05  Ulrich Drepper  <drepper@redhat.com>
+
+	* time/tzfile.c (__tzfile_read): Fix check for version 0 data files.
+	Patch by Szymon Siwek <sls@poczta.wp.pl>.
+
+	* nscd/aicache.c (addhstaiX): Check herrno after IPv4 lookup only
+	when the lookup call failed.
+
+	* nscd/nscd.h (struct database_dyn): Rename prunelock to prune_lock.
+	Add prune_cond and wakeup_time.
+	(CACHE_PRUNE_INTERNAL): Define.
+	Update declarations of prune_cache and setup_thread.
+	* nscd/connections.c (dbs): Update initializers.
+	(CACHE_PRUNE_INTERNAL): Moved to nscd.h.
+	(nscd_init): Default number of threads is now 4.
+	(invalidate_cache): Take lock before calling prune_cache.
+	(handle_request): If SELinux forbids the request, say so.
+	(readylist_cond): Use static initializer.
+	(nscd_run_prune): New function.  Used only by pruning threads.
+	(nscd_run_worder): Renamed from nscd_run.  Remove support for pruning
+	here.
+	(fd_ready): Update nscd_run reference.
+	(start_threads): No need to initialize readylist_cond.
+	Start pruning threads separately.
+	* nscd/nscd_setup_thread.c: Change return value type to int and always
+	return 0.
+	* sysdeps/unix/sysv/linux/nscd_setup_thread.c: Change return value type
+	to int and return nonzero value if we can use the TID address hack.
+	* nscd/cache.c (cache_add): If next wakeup time of cleanup thread for
+	the database is later than the new entry's timeout, update the
+	wakeup time and wake the cleanup thread.
+	(prune_cache): Return seconds the next entry in the database is still
+	valid.  Remove locking for pruning here.
+	* nscd/nscd.conf: Document default number of threads.
+
+2007-10-31  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/x86_64/dl-trampoline.S (_dl_runtime_profile): Make sure
+	stack is properly aligned for the target function.
+	Correct unwind info.
+
+	* elf/rtld.c (dl_main): Initialize stack and pointer guard early
+	when using auditing libraries.
+
+2007-10-29  Ulrich Drepper  <drepper@redhat.com>
+
+	* resolv/Versions [libresolv] (GLIBC_PRIVATE): Add
+	_nss_dns_getnetbyaddr2_r.
+	* resolv/nss_dns/dns-host.c: Define _nss_dns_getnetbyaddr2_r.  Pass
+	extra parameter to getanswer_r.
+	(_nss_dns_getnetbyaddr_r): Now a wrapper around
+	_nss_dns_getnetbyaddr2_r.
+
+	* nscd/Makefile (nscd-modules): Replace gethstbynm2_r with
+	gethstbynm3_r.
+	* nscd/gethstbynm2_r.c: Remove.
+	* nscd/gethstbynm3_r.c: New file.
+	* nscd/aicache.c (addhstaiX): Use __gethostbyaddr2_r instead of
+	__gethostbyaddr_r.
+	* nscd/gethstbyad_r.c: Generate __gethostbyaddr2_r function.  Define
+	__gethostbyaddr_r compatibility wrapper.
+	* nscd/hstcache.c (cache_addhst): Add ttl parameter.  Use it when
+	determining timeout of entry.
+	(lookup): Take new parameter and pass it to __gethostbyname3_r and
+	__gethostbyaddr2_r.
+	(addhstbyX): Pass reference to variable for TTL to lookup and
+	cache_addhst.
+	* nss/Versions [glibc] (GLIBC_PRIVATE): Export __nss_passwd_lookup2,
+	__nss_group_lookup2, __nss_hosts_lookup2, __nss_services_lookup2,
+	and __nss_next2.  Remove __nss_services_lookup.
+	* nss/XXX-lookup.c: Name function now *_lookup2.  Add new parameter.
+	Add compat wrapper.
+	* nss/getXXbyYY_r.c: Changes to call new *_lookup2 functions and
+	__nss_next2.
+	* nss/getXXent_r.c: Likewise.
+	* nss/getnssent_r.c: Likewise.
+	* nss/nsswitch.c (__nss_lookup): Add new parameter.  If first function
+	does not exist in module, try the optional second name.
+	(__nss_next2): New function.
+	(__nss_next): Now wrapper around __nss_next2.
+	* nss/nsswitch.h: Adjust __nss_lookup prototype.
+	Declare __nss_next2.
+	Adjust definition of db_lookup_function type.
+	* nss/service-lookup.c: Define NO_COMPAT.
+	* include/netdb.h: Declare __gethostbyaddr2_r and __gethostbyname3_r.
+	* inet/ether_hton.c: Use __nss_next2 instead of __nss_next.
+	* inet/ether_ntoh.c: Likewise.
+	* sunrpc/netname.c: Likewise.
+	* sunrpc/publickey.c: Likewise.
+	* inet/getnetgrent.c: Likewise.  Adjust calls to __nss_lookup.
+	* inet/gethstbyad_r.c (DB_LOOKUP_FCT): Change to __nss_hosts_lookup2.
+	* inet/gethstbynm2_r.c (DB_LOOKUP_FCT): Likewise.
+	* inet/gethstbynm_r.c (DB_LOOKUP_FCT): Likewise.
+	* inet/gethstent_r.c (DB_LOOKUP_FCT): Likewise.
+
+	* nscd/aicache.c (addhstaiX): Fix default TTL handling.
+
+	* inet/getnetgrent.c (setup): Encrypt static pointer.
+
+2007-10-28  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5204]
+	* crypt/sha256c-test.c: Define TIMEOUT to 6 for ancient hardware.
+	* crypt/sha512c-test.c: Likewise.
+
+	[BZ #5225]
+	* stdio-common/vfscanf.c (_IO_vfwscanf): Don't misuse wp pointer
+	to keep track of end of %[ format string element.
+	* stdio-common/Makefile (tests): Add bug20.
+	* stdio-common/bug20.c: New file.
+
+	[BZ #5222]
+	* elf/dl-load.c (_dl_rtld_di_serinfo): Correct handling of short
+	path elements in counting mode.
+
+2007-10-27  Andreas Jaeger  <aj@suse.de>
+
+	[BZ #5040]
+	* sysdeps/unix/sysv/linux/sys/epoll.h (EPOLLRDHUP): Add value.
+
+	[BZ #3112]
+	* sysdeps/ia64/backtrace.c (init): Free shared library if incorrect.
+	(__cleanup): Free shared library when exiting.
+	* sysdeps/i386/backtrace.c (init): Free shared library if incorrect.
+	(__cleanup): Free shared library when exiting.
+
+2006-04-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #2549]
+	* math/libm-test.inc (check_float_internal): Support
+	denormalized return.
+
+2007-10-23  Andreas Jaeger  <aj@suse.de>
+
+	[BZ #5208]
+	* sysdeps/unix/sysv/linux/readahead.c (__readahead): Use
+	__LONG_LONG_PAIR to handle little endian byte order.
+	Suggested by abhishekrai@google.com
+
+2007-10-27  Ulrich Drepper  <drepper@redhat.com>
+
+	* malloc/arena.c [!NO_THREADS]: Use ATFORK_MEM if defined.
+
+2007-10-26  Ulrich Drepper  <drepper@redhat.com>
+
+	* nscd/cache.c (prune_cache): Move test for modified file outside
+	of locking.
+
+2007-10-21  Andreas Jaeger  <aj@suse.de>
+
+	* manual/texinfo.tex: Update to latest version.
+
+	* manual/sysinfo.texi (System Parameters): Fix Formatting.
+
+	* manual/arith.texi (Status bit operations): Fix formatting.
+
+	* manual/errno.texi (Error Messages): Fix formatting.
+
+	* manual/sysinfo.texi (System Parameters): Fix formatting.
+
+	* manual/libc.texinfo: Update VERSION and UPDATED.
+
+2007-10-19  Roland McGrath  <roland@redhat.com>
+
+	* elf/Makefile ($(objpfx)ld.so): Use $(AWK).
+
+2007-10-06  David S. Miller  <davem@davemloft.net>
+
+	* configure.in: Add sparcv9v2 and sparc64v2.
+	* scripts/config.sub: Likewise.
+	* configure: Regenerate.
+	* elf/elf.h (HWCAP_SPARC_N2): New.
+	* sysdeps/sparc/dl-procinfo.h (_DL_HWCAP_COUNT): Bump to 8.
+	* sysdeps/sparc/dl-procinfo.c (_dl_sparc_cap_flags): Add 'v9v2'.
+	(HWCAP_IMPORTANT): Add HWCAP_SPARC_N2.
+	* sysdeps/sparc/sparc32/sparcv9/sparcv9v2/memcpy.S: New file.
+	* sysdeps/sparc/sparc32/sparcv9/sparcv9v2/memset.S: New file.
+	* sysdeps/sparc/sparc64/sparcv9v2/memcpy.S: New file.
+	* sysdeps/sparc/sparc64/sparcv9v2/memset.S: New file.
+
+2007-10-18  Ulrich Drepper  <drepper@redhat.com>
+
+	* sunrpc/clnt_udp.c (clntudp_call): Don't block in recvfrom call
+	even if the poll result indicates there is data to read.
+	Patch by Jeff Moyer <jmoyer@redhat.com>.
+
+2007-10-18  Roland McGrath  <roland@redhat.com>
+
+	* elf/elf.h (NT_PPC_VMX): New macro.
+
+2007-10-17  Ulrich Drepper  <drepper@redhat.com>
+
+	* version.h (VERSION): Set to 2.7.90.
+
+2007-10-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/x86_64/memset.S (bzero): Renamed to __bzero.  Add
+	weak_alias.
+
+2007-10-17  Roland McGrath  <roland@frob.com>
+
+	* sysdeps/mach/hurd/bits/fcntl.h [__USE_GNU__] (F_DUPFD_CLOEXEC): New.
+	* sysdeps/mach/hurd/fcntl.c (__libc_fcntl): Implement it.
+
 2007-10-17  Ulrich Drepper  <drepper@redhat.com>
 
 	* version.h (VERSION): Bump to 2.7.
diff --git a/FAQ.in b/FAQ.in
index 227132bc08..d0b2805ca7 100644
--- a/FAQ.in
+++ b/FAQ.in
@@ -287,12 +287,12 @@ down the build process and need more disk space.
 failure should be looked into.  Depending on the failures, you probably
 should not install the library at all.
 
-You should consider using the `glibcbug' script to report the failure,
-providing as much detail as possible.  If you run a test directly, please
-remember to set up the environment correctly.  You want to test the compiled
-library - and not your installed one.  The best way is to copy the exact
-command line which failed and run the test from the subdirectory for this
-test in the sources.
+You should consider reporting it in bugzilla
+<http://sourceware.org/bugzilla/> providing as much detail as possible.
+If you run a test directly, please remember to set up the environment
+correctly. You want to test the compiled library - and not your installed
+one. The best way is to copy the exact command line which failed and run
+the test from the subdirectory for this test in the sources.
 
 There are some failures which are not directly related to the GNU libc:
 - Some compilers produce buggy code.  No compiler gets single precision
diff --git a/NEWS b/NEWS
index 82dbdb1202..c137977adf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,16 @@
-GNU C Library NEWS -- history of user-visible changes.  2007-10-5
+GNU C Library NEWS -- history of user-visible changes.  2007-12-07
 Copyright (C) 1992-2006, 2007 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send GNU C library bug reports via <http://sources.redhat.com/bugzilla/>
 using `glibc' in the "product" field.
 
+Version 2.8
+
+* New locales: bo_CN, bo_IN.
+
+* New encoding: HP-ROMAN9.
+
 Version 2.7
 
 * More checking functions: fread, fread_unlocked, open*, mq_open.
@@ -19,7 +25,7 @@ Version 2.7
 * PPC optimizations to math and string functions.
   Implemented by Steven Munroe.
 
-* New interfaces: mkostemp, mkostemp64.  Like mkstemp* but allow additonal
+* New interfaces: mkostemp, mkostemp64.  Like mkstemp* but allow additional
   options to be passed.  Implemented by Ulrich Drepper.
 
 * More CPU set manipulation functions.  Implemented by Ulrich Drepper.
diff --git a/Versions.def b/Versions.def
index af377826e0..0de15f8f7f 100644
--- a/Versions.def
+++ b/Versions.def
@@ -24,6 +24,7 @@ libc {
   GLIBC_2.5
   GLIBC_2.6
   GLIBC_2.7
+  GLIBC_2.8
 %ifdef USE_IN_LIBIO
   HURD_CTHREADS_0.3
 %endif
diff --git a/configure b/configure
index 0401d797fa..898c364a70 100755
--- a/configure
+++ b/configure
@@ -2525,12 +2525,16 @@ sparcv8plusb | sparcv9b)
 		base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9b ;;
 sparcv9v)
 		base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9v ;;
+sparcv9v2)
+		base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9v2 ;;
 sparc64)
 		base_machine=sparc machine=sparc/sparc64 ;;
 sparc64b)
 		base_machine=sparc machine=sparc/sparc64/sparcv9b ;;
 sparc64v)
 		base_machine=sparc machine=sparc/sparc64/sparcv9v ;;
+sparc64v2)
+		base_machine=sparc machine=sparc/sparc64/sparcv9v2 ;;
 *)		base_machine=$machine ;;
 esac
 
diff --git a/configure.in b/configure.in
index 2f8f7793df..c40bae2589 100644
--- a/configure.in
+++ b/configure.in
@@ -507,12 +507,16 @@ sparcv8plusb | sparcv9b)
 		base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9b ;;
 sparcv9v)
 		base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9v ;;
+sparcv9v2)
+		base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9v2 ;;
 sparc64)
 		base_machine=sparc machine=sparc/sparc64 ;;
 sparc64b)
 		base_machine=sparc machine=sparc/sparc64/sparcv9b ;;
 sparc64v)
 		base_machine=sparc machine=sparc/sparc64/sparcv9v ;;
+sparc64v2)
+		base_machine=sparc machine=sparc/sparc64/sparcv9v2 ;;
 *)		base_machine=$machine ;;
 esac
 changequote([,])dnl
diff --git a/crypt/sha256-crypt.c b/crypt/sha256-crypt.c
index 0db13e4664..dbd29e0efd 100644
--- a/crypt/sha256-crypt.c
+++ b/crypt/sha256-crypt.c
@@ -129,9 +129,8 @@ __sha256_crypt_r (key, salt, buffer, buflen)
   /* Add the key string.  */
   __sha256_process_bytes (key, key_len, &ctx);
 
-  /* The last part is the salt string.  This must be at most 8
-     characters and it ends at the first `$' character (for
-     compatibility with existing implementations).  */
+  /* The last part is the salt string.  This must be at most 16
+     characters and it ends at the first `$' character.  */
   __sha256_process_bytes (salt, salt_len, &ctx);
 
 
diff --git a/crypt/sha256c-test.c b/crypt/sha256c-test.c
index 58aec07dae..357f0d8b7e 100644
--- a/crypt/sha256c-test.c
+++ b/crypt/sha256c-test.c
@@ -57,5 +57,6 @@ do_test (void)
   return result;
 }
 
+#define TIMEOUT 6
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"
diff --git a/crypt/sha512-crypt.c b/crypt/sha512-crypt.c
index 4b8949f5f1..ea96e525fb 100644
--- a/crypt/sha512-crypt.c
+++ b/crypt/sha512-crypt.c
@@ -129,9 +129,8 @@ __sha512_crypt_r (key, salt, buffer, buflen)
   /* Add the key string.  */
   __sha512_process_bytes (key, key_len, &ctx);
 
-  /* The last part is the salt string.  This must be at most 8
-     characters and it ends at the first `$' character (for
-     compatibility with existing implementations).  */
+  /* The last part is the salt string.  This must be at most 16
+     characters and it ends at the first `$' character.  */
   __sha512_process_bytes (salt, salt_len, &ctx);
 
 
diff --git a/crypt/sha512c-test.c b/crypt/sha512c-test.c
index 4c888feb41..c829242e2a 100644
--- a/crypt/sha512c-test.c
+++ b/crypt/sha512c-test.c
@@ -58,5 +58,6 @@ do_test (void)
   return result;
 }
 
+#define TIMEOUT 6
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"
diff --git a/elf/Makefile b/elf/Makefile
index 2943acc66b..e5812e3668 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -308,7 +308,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map)
 		  -Wl,-soname=$(rtld-installed-name) -T $@.lds
 	rm -f $@.lds
 	readelf -s $@ \
-	  | awk '($$7 ~ /^UND(|EF)$$/ && $$1 != "0:" && $$4 != "REGISTER") { print; p=1 } END { exit p != 0 }'
+	  | $(AWK) '($$7 ~ /^UND(|EF)$$/ && $$1 != "0:" && $$4 != "REGISTER") { print; p=1 } END { exit p != 0 }'
 
 # interp.c exists just to get this string into the libraries.
 CFLAGS-interp.c = -D'RUNTIME_LINKER="$(slibdir)/$(rtld-installed-name)"' \
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 98d25b827d..94531b271f 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -2274,7 +2274,7 @@ _dl_rtld_di_serinfo (struct link_map *loader, Dl_serinfo *si, bool counting)
 	      if (counting)
 		{
 		  si->dls_cnt++;
-		  si->dls_size += r->dirnamelen < 2 ? r->dirnamelen : 2;
+		  si->dls_size += MAX (2, r->dirnamelen);
 		}
 	      else
 		{
diff --git a/elf/elf.h b/elf/elf.h
index c541774d98..2defde0da7 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -604,6 +604,7 @@ typedef struct
 #define NT_LWPSINFO	17		/* Contains copy of lwpinfo struct */
 #define NT_PRFPXREG	20		/* Contains copy of fprxregset struct */
 #define NT_PRXFPREG	0x46e62b7f	/* Contains copy of user_fxsr_struct */
+#define NT_PPC_VMX	0x100		/* PowerPC Altivec/VMX registers */
 
 /* Legal values for the note segment descriptor types for object files.  */
 
@@ -1277,6 +1278,7 @@ typedef struct
 #define HWCAP_SPARC_V9		16	/* The CPU is v9, so v8plus is ok.  */
 #define HWCAP_SPARC_ULTRA3	32
 #define HWCAP_SPARC_BLKINIT	64	/* Sun4v with block-init/load-twin.  */
+#define HWCAP_SPARC_N2		128
 
 /* MIPS R3000 specific definitions.  */
 
diff --git a/elf/rtld.c b/elf/rtld.c
index 7612a69324..98817d9fa0 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -833,6 +833,35 @@ rtld_lock_default_unlock_recursive (void *lock)
 #endif
 
 
+static void
+security_init (void)
+{
+  /* Set up the stack checker's canary.  */
+  uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
+#ifdef THREAD_SET_STACK_GUARD
+  THREAD_SET_STACK_GUARD (stack_chk_guard);
+#else
+  __stack_chk_guard = stack_chk_guard;
+#endif
+
+  /* Set up the pointer guard as well, if necessary.  */
+  if (GLRO(dl_pointer_guard))
+    {
+      // XXX If it is cheap, we should use a separate value.
+      uintptr_t pointer_chk_guard = stack_chk_guard;
+#ifndef HP_TIMING_NONAVAIL
+      hp_timing_t now;
+      HP_TIMING_NOW (now);
+      pointer_chk_guard ^= now;
+#endif
+#ifdef THREAD_SET_POINTER_GUARD
+      THREAD_SET_POINTER_GUARD (pointer_chk_guard);
+#endif
+      __pointer_chk_guard_local = pointer_chk_guard;
+    }
+}
+
+
 /* The library search path.  */
 static const char *library_path attribute_relro;
 /* The list preloaded objects.  */
@@ -1137,7 +1166,8 @@ of this helper program; chances are you did not intend to run this program.\n\
 	  ElfW(Addr) allocend;
 
 	  /* Remember where the main program starts in memory.  */
-	  mapstart = (main_map->l_addr + (ph->p_vaddr & ~(ph->p_align - 1)));
+	  mapstart = (main_map->l_addr
+		      + (ph->p_vaddr & ~(GLRO(dl_pagesize) - 1)));
 	  if (main_map->l_map_start > mapstart)
 	    main_map->l_map_start = mapstart;
 
@@ -1405,6 +1435,12 @@ of this helper program; chances are you did not intend to run this program.\n\
 	 initialize the data structures now.  */
       tcbp = init_tls ();
 
+      /* Initialize security features.  We need to do it this early
+	 since otherwise the constructors of the audit libraries will
+	 use different values (especially the pointer guard) and will
+	 fail later on.  */
+      security_init ();
+
       do
 	{
 	  int tls_idx = GL(dl_tls_max_dtv_idx);
@@ -1815,29 +1851,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
   if (tcbp == NULL)
     tcbp = init_tls ();
 
-  /* Set up the stack checker's canary.  */
-  uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
-#ifdef THREAD_SET_STACK_GUARD
-  THREAD_SET_STACK_GUARD (stack_chk_guard);
-#else
-  __stack_chk_guard = stack_chk_guard;
-#endif
-
-  /* Set up the pointer guard as well, if necessary.  */
-  if (GLRO(dl_pointer_guard))
-    {
-      // XXX If it is cheap, we should use a separate value.
-      uintptr_t pointer_chk_guard = stack_chk_guard;
-#ifndef HP_TIMING_NONAVAIL
-      hp_timing_t now;
-      HP_TIMING_NOW (now);
-      pointer_chk_guard ^= now;
-#endif
-#ifdef THREAD_SET_POINTER_GUARD
-      THREAD_SET_POINTER_GUARD (pointer_chk_guard);
-#endif
-      __pointer_chk_guard_local = pointer_chk_guard;
-    }
+  if (__builtin_expect (audit_list == NULL, 1))
+    /* Initialize security features.  But only if we have not done it
+       earlier.  */
+    security_init ();
 
   if (__builtin_expect (mode, normal) != normal)
     {
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 482fb092d4..4de9226b80 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
 glibc-base := HEAD
 DIST_BRANCH := devel
 COLLECTION := dist-f8
-fedora-sync-date := 2007-10-17 20:29 UTC
-fedora-sync-tag := fedora-glibc-20071017T2029
+fedora-sync-date := 2007-12-12 10:51 UTC
+fedora-sync-tag := fedora-glibc-20071212T1051
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 0b8e7b43af..6905a490b9 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1010,6 +1010,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Dec 12 2007 Jakub Jelinek <jakub@redhat.com> 2.7.90-1
+- update to trunk
+
 * Wed Oct 17 2007 Jakub Jelinek <jakub@redhat.com> 2.7-1
 - glibc 2.7 release
 - fix tzfile.c for times after last transition (#333561)
diff --git a/iconv/loop.c b/iconv/loop.c
index 9785bf865c..df8c8dce9f 100644
--- a/iconv/loop.c
+++ b/iconv/loop.c
@@ -225,7 +225,12 @@
       }									      \
     /* If any of them recognized the input continue with the loop.  */	      \
     if (result != __GCONV_ILLEGAL_INPUT)				      \
-      continue;								      \
+      {									      \
+	if (__builtin_expect (result == __GCONV_FULL_OUTPUT, 0))	      \
+	  break;							      \
+									      \
+	continue;							      \
+      }									      \
 									      \
     /* Next see whether we have to ignore the error.  If not, stop.  */	      \
     if (! ignore_errors_p ())						      \
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index bf52d52f8f..4ac5de30e5 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -25,14 +25,14 @@ subdir	:= iconvdata
 modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
 	   ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10		 \
 	   ISO8859-11 ISO8859-13 ISO8859-14 ISO8859-15 ISO8859-16	 \
-	   T.61 ISO_6937 SJIS KOI-8 HP-ROMAN8 EBCDIC-AT-DE		 \
+	   T.61 ISO_6937 SJIS KOI-8 HP-ROMAN8 HP-ROMAN9 EBCDIC-AT-DE	 \
 	   EBCDIC-AT-DE-A EBCDIC-CA-FR EUC-KR UHC JOHAB libJIS libKSC	 \
 	   BIG5 EUC-JP libGB EUC-CN libCNS EUC-TW ISO646 EBCDIC-DK-NO	 \
 	   EBCDIC-DK-NO-A EBCDIC-ES EBCDIC-ES-A EBCDIC-ES-S EBCDIC-FI-SE \
 	   EBCDIC-FI-SE-A EBCDIC-FR EBCDIC-IS-FRISS EBCDIC-IT EBCDIC-PT	 \
 	   EBCDIC-UK EBCDIC-US IBM037 IBM038 IBM274 IBM275 IBM423	 \
 	   IBM500 IBM870 IBM871 IBM891 IBM903 IBM904 IBM905 IBM1047	 \
-	   IBM874 CP737 CP775 ISO-2022-KR				 \
+	   IBM874 CP737 CP775 ISO-2022-KR HP-TURKISH8 HP-THAI8 HP-GREEK8 \
 	   KOI8-R LATIN-GREEK LATIN-GREEK-1 IBM256 IBM273 IBM277 IBM278	 \
 	   IBM280 IBM281 IBM284 IBM285 IBM290 IBM297 IBM420 IBM424	 \
 	   IBM437 IBM850 IBM851 IBM852 IBM855 IBM857 IBM860 IBM861	 \
@@ -67,7 +67,7 @@ include ../Makeconfig
 
 ifeq (yes,$(build-shared))
 tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
-	tst-iconv6 bug-iconv5
+	tst-iconv6 bug-iconv5 bug-iconv6
 ifeq ($(have-thread-library),yes)
 tests += bug-iconv3
 endif
@@ -198,7 +198,8 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map    \
 	      ibm12712.c ibm12712.h ibm16804.c ibm16804.h                   \
 	      ibm1364.c ibm1364.h ibm1371.c ibm1371.h ibm1388.c ibm1388.h   \
 	      ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c mik.c   \
-	      brf.c mac-centraleurope.c
+	      brf.c mac-centraleurope.c hp-roman9.c hp-turkish8.c	    \
+	      hp-thai8.c hp-greek8.c
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
@@ -217,13 +218,11 @@ install-others	= $(addprefix $(inst_gconvdir)/, $(modules.so))	\
 # We can build the conversion tables for numerous charsets automatically.
 
 gen-8bit-modules := iso8859-2 iso8859-3 iso8859-4 iso8859-6 iso8859-9 koi-8 \
-		    hp-roman8 ebcdic-at-de ebcdic-at-de-a ebcdic-ca-fr	    \
-		    ebcdic-dk-no ebcdic-dk-no-a ebcdic-es ebcdic-es-a	    \
-		    ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a ebcdic-fr	    \
-		    ebcdic-is-friss ebcdic-it ebcdic-pt ebcdic-uk ebcdic-us \
+		    ebcdic-at-de ebcdic-at-de-a ebcdic-ca-fr ebcdic-dk-no   \
+		    ebcdic-dk-no-a ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a  \
+		    ebcdic-fr ebcdic-it ebcdic-pt ebcdic-us \
 		    ibm037 ibm038 ibm274 ibm275 ibm423 ibm500 ibm870 ibm871 \
-		    ibm891 ibm903 ibm904 ibm905 ibm1047 iso8859-16 viscii   \
-		    iso8859-9e
+		    ibm891 ibm903 ibm904 ibm905 ibm1047   \
 
 gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273	   \
 			ibm277 ibm278 ibm280 ibm281 ibm284 ibm285 ibm290   \
@@ -240,8 +239,11 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273	   \
 			iso8859-13 iso8859-14 iso8859-15 mac-uk sami-ws2   \
 			iso-ir-197 tis-620 koi8-u ibm874 cp10007 koi8-t	   \
 			georgian-ps georgian-academy iso-ir-209 mac-sami   \
-			iso8859-11 ibm866nav pt154 rk1048 mik brf \
-			mac-centraleurope koi8-ru
+			iso8859-11 ibm866nav pt154 rk1048 mik brf	   \
+			mac-centraleurope koi8-ru hp-roman8 hp-roman9	   \
+			ebcdic-es ebcdic-es-a ebcdic-is-friss ebcdic-uk    \
+			iso8859-16 viscii iso8859-9e hp-turkish8	   \
+			hp-thai8 hp-greek8
 
 gen-special-modules := iso8859-7jp
 
diff --git a/iconvdata/bug-iconv6.c b/iconvdata/bug-iconv6.c
new file mode 100644
index 0000000000..f920954bc2
--- /dev/null
+++ b/iconvdata/bug-iconv6.c
@@ -0,0 +1,52 @@
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <iconv.h>
+#include <locale.h>
+
+static const char testbuf[] = {
+	0xEF, 0xBE, 0x9F, 0xD0, 0xB4, 0xEF, 0xBE, 0x9F, 0x29, 0xEF, 0xBE, 0x8E,
+	0xEF, 0xBE, 0x9F, 0xEF, 0xBD, 0xB6, 0xEF, 0xBD, 0xB0, 0xEF, 0xBE, 0x9D
+};
+
+static int
+do_test (void)
+{
+  setlocale (LC_ALL, "en_US.UTF-8");
+  iconv_t ic = iconv_open ("ISO-2022-JP//TRANSLIT", "UTF-8");
+  if (ic == (iconv_t) -1)
+    {
+      puts ("iconv_open failed");
+      return 1;
+    }
+  size_t outremain = sizeof testbuf;
+  char outbuf[outremain];
+  char *inp = (char *) testbuf;
+  char *outp = outbuf;
+  size_t inremain = sizeof testbuf;
+
+  int ret = iconv (ic, &inp, &inremain, &outp, &outremain);
+
+  int result = 0;
+  if (ret == (size_t) -1)
+    {
+      if (errno == E2BIG)
+	puts ("buffer too small reported.  OK");
+      else
+	{
+	  printf ("iconv failed with %d (%m)\n", errno);
+	  result = 0;
+	}
+    }
+  else
+    {
+      printf ("iconv returned %d\n", ret);
+      result = 1;
+    }
+
+  return result;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/iconvdata/ebcdic-es-a.c b/iconvdata/ebcdic-es-a.c
index ca8c980e6d..d056820cff 100644
--- a/iconvdata/ebcdic-es-a.c
+++ b/iconvdata/ebcdic-es-a.c
@@ -1,5 +1,5 @@
 /* Conversion from and to EBCDIC-ES-A.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -20,10 +20,10 @@
 
 #include <stdint.h>
 
-/* Get the conversion table.  */
-#include <ebcdic-es-a.h>
+/* Specify the conversion table.  */
+#define TABLES <ebcdic-es-a.h>
 
 #define CHARSET_NAME	"EBCDIC-ES-A//"
 #define HAS_HOLES	1	/* Not all 256 character are defined.  */
 
-#include <8bit-generic.c>
+#include <8bit-gap.c>
diff --git a/iconvdata/ebcdic-es.c b/iconvdata/ebcdic-es.c
index 4b471452bb..bb447c0376 100644
--- a/iconvdata/ebcdic-es.c
+++ b/iconvdata/ebcdic-es.c
@@ -1,5 +1,5 @@
 /* Conversion from and to EBCDIC-ES.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -20,10 +20,10 @@
 
 #include <stdint.h>
 
-/* Get the conversion table.  */
-#include <ebcdic-es.h>
+/* Specify the conversion table.  */
+#define TABLES <ebcdic-es.h>
 
 #define CHARSET_NAME	"EBCDIC-ES//"
 #define HAS_HOLES	1	/* Not all 256 character are defined.  */
 
-#include <8bit-generic.c>
+#include <8bit-gap.c>
diff --git a/iconvdata/ebcdic-is-friss.c b/iconvdata/ebcdic-is-friss.c
index cf9416f9ba..0a05ab2c9d 100644
--- a/iconvdata/ebcdic-is-friss.c
+++ b/iconvdata/ebcdic-is-friss.c
@@ -1,5 +1,5 @@
 /* Conversion from and to EBCDIC-IS-FRISS.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -20,10 +20,10 @@
 
 #include <stdint.h>
 
-/* Get the conversion table.  */
-#include <ebcdic-is-friss.h>
+/* Specify the conversion table.  */
+#define TABLES <ebcdic-is-friss.h>
 
 #define CHARSET_NAME	"EBCDIC-IS-FRISS//"
 #define HAS_HOLES	1	/* Not all 256 character are defined.  */
 
-#include <8bit-generic.c>
+#include <8bit-gap.c>
diff --git a/iconvdata/ebcdic-uk.c b/iconvdata/ebcdic-uk.c
index 7137a80981..ea9ff705ae 100644
--- a/iconvdata/ebcdic-uk.c
+++ b/iconvdata/ebcdic-uk.c
@@ -1,5 +1,5 @@
 /* Conversion from and to EBCDIC-UK.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -20,10 +20,10 @@
 
 #include <stdint.h>
 
-/* Get the conversion table.  */
-#include <ebcdic-uk.h>
+/* Specify the conversion table.  */
+#define TABLES <ebcdic-uk.h>
 
 #define CHARSET_NAME	"EBCDIC-UK//"
 #define HAS_HOLES	1	/* Not all 256 character are defined.  */
 
-#include <8bit-generic.c>
+#include <8bit-gap.c>
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index a8fcd8f0b3..a14dbbe9d6 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1927,3 +1927,29 @@ alias	ISO8859-9E//		ISO-8859-9E//
 alias	ISO88599E//		ISO-8859-9E//
 module	ISO-8859-9E//		INTERNAL		ISO8859-9E	1
 module	INTERNAL		ISO-8859-9E//		ISO8859-9E	1
+
+#	from			to			module		cost
+alias	ROMAN9//		HP-ROMAN9//
+alias	R9//			HP-ROMAN9//
+alias	HPROMAN9//		HP-ROMAN9//
+module	HP-ROMAN9//		INTERNAL		HP-ROMAN9	1
+module	INTERNAL		HP-ROMAN9//		HP-ROMAN9	1
+
+#	from			to			module		cost
+alias	TURKISH8//		HP-TURKISH8//
+alias	HPTURKISH8//		HP-TURKISH8//
+alias	OSF10010006//		HP-TURKISH8//
+module	HP-TURKISH8//		INTERNAL		HP-TURKISH8	1
+module	INTERNAL		HP-TURKISH8//		HP-TURKISH8	1
+
+#	from			to			module		cost
+alias	THAI8//			HP-THAI8//
+alias	HPTHAI8//		HP-THAI8//
+module	HP-THAI8//		INTERNAL		HP-THAI8	1
+module	INTERNAL		HP-THAI8//		HP-THAI8	1
+
+#	from			to			module		cost
+alias	HPGREEK8//		HP-GREEK8//
+alias	OSF10010004//		HP-GREEK8//
+module	HP-GREEK8//		INTERNAL		HP-GREEK8	1
+module	INTERNAL		HP-GREEK8//		HP-GREEK8	1
diff --git a/iconvdata/hp-greek8.c b/iconvdata/hp-greek8.c
new file mode 100644
index 0000000000..617608c341
--- /dev/null
+++ b/iconvdata/hp-greek8.c
@@ -0,0 +1,29 @@
+/* Conversion from and to HP-GREEK8.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2007.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Specify the conversion table.  */
+#define TABLES <hp-greek8.h>
+
+#define CHARSET_NAME	"HP-GREEK8//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/hp-roman8.c b/iconvdata/hp-roman8.c
index 9833a071fb..ec29d82773 100644
--- a/iconvdata/hp-roman8.c
+++ b/iconvdata/hp-roman8.c
@@ -1,5 +1,5 @@
 /* Conversion from and to HP-ROMAN8.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -20,10 +20,10 @@
 
 #include <stdint.h>
 
-/* Get the conversion table.  */
-#include <hp-roman8.h>
+/* Specify the conversion table.  */
+#define TABLES <hp-roman8.h>
 
 #define CHARSET_NAME	"HP-ROMAN8//"
 #define HAS_HOLES	1	/* Not all 256 character are defined.  */
 
-#include <8bit-generic.c>
+#include <8bit-gap.c>
diff --git a/iconvdata/hp-roman9.c b/iconvdata/hp-roman9.c
new file mode 100644
index 0000000000..2f14815762
--- /dev/null
+++ b/iconvdata/hp-roman9.c
@@ -0,0 +1,29 @@
+/* Conversion from and to HP-ROMAN9.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2007.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Specify the conversion table.  */
+#define TABLES <hp-roman9.h>
+
+#define CHARSET_NAME	"HP-ROMAN9//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/hp-thai8.c b/iconvdata/hp-thai8.c
new file mode 100644
index 0000000000..a8f0b4a511
--- /dev/null
+++ b/iconvdata/hp-thai8.c
@@ -0,0 +1,29 @@
+/* Conversion from and to HP-THAI8.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2007.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Specify the conversion table.  */
+#define TABLES <hp-thai8.h>
+
+#define CHARSET_NAME	"HP-THAI8//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/hp-turkish8.c b/iconvdata/hp-turkish8.c
new file mode 100644
index 0000000000..5de0f14bdf
--- /dev/null
+++ b/iconvdata/hp-turkish8.c
@@ -0,0 +1,29 @@
+/* Conversion from and to HP-TURKISH8.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2007.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Specify the conversion table.  */
+#define TABLES <hp-turkish8.h>
+
+#define CHARSET_NAME	"HP-TURKISH8//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/iso8859-16.c b/iconvdata/iso8859-16.c
index 39857a628a..41ed591629 100644
--- a/iconvdata/iso8859-16.c
+++ b/iconvdata/iso8859-16.c
@@ -1,5 +1,5 @@
 /* Conversion from and to ISO 8859-16.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
@@ -18,11 +18,12 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-/* Get the conversion table.  */
 #include <stdint.h>
-#include <iso8859-16.h>
+
+/* Specify the conversion table.  */
+#define TABLES <iso8859-16.h>
 
 #define CHARSET_NAME "ISO-8859-16//"
 #define HAS_HOLES	0	/* All 256 character are defined.  */
 
-#include <8bit-generic.c>
+#include <8bit-gap.c>
diff --git a/iconvdata/iso8859-9e.c b/iconvdata/iso8859-9e.c
index 7048edac6f..300466399f 100644
--- a/iconvdata/iso8859-9e.c
+++ b/iconvdata/iso8859-9e.c
@@ -18,11 +18,12 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-/* Get the conversion table.  */
 #include <stdint.h>
-#include <iso8859-9e.h>
+
+/* Specify the conversion table.  */
+#define TABLES <iso8859-9e.h>
 
 #define CHARSET_NAME "ISO-8859-9E//"
 #define HAS_HOLES	0	/* All 256 character are defined.  */
 
-#include <8bit-generic.c>
+#include <8bit-gap.c>
diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index f240e51f36..59bc3f4bac 100755
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -80,6 +80,10 @@ cat <<EOF |
   LATIN-GREEK
   LATIN-GREEK-1
   HP-ROMAN8
+  HP-ROMAN9
+  HP-TURKISH8
+  HP-THAI8
+  HP-GREEK8
   EBCDIC-AT-DE
   EBCDIC-AT-DE-A
   EBCDIC-CA-FR
diff --git a/iconvdata/viscii.c b/iconvdata/viscii.c
index 8e7d87e92b..672513d4d4 100644
--- a/iconvdata/viscii.c
+++ b/iconvdata/viscii.c
@@ -1,5 +1,5 @@
 /* Conversion from and to VISCII.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
@@ -18,11 +18,12 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-/* Get the conversion table.  */
 #include <stdint.h>
-#include <viscii.h>
+
+/* Specify the conversion table.  */
+#define TABLES <viscii.h>
 
 #define CHARSET_NAME	"VISCII//"
 #define HAS_HOLES	0	/* All 256 character are defined.  */
 
-#include <8bit-generic.c>
+#include <8bit-gap.c>
diff --git a/include/ifaddrs.h b/include/ifaddrs.h
index 71bdaeb180..50e4c48e82 100644
--- a/include/ifaddrs.h
+++ b/include/ifaddrs.h
@@ -10,14 +10,19 @@ struct in6addrinfo
 {
   enum {
     in6ai_deprecated = 1,
-    in6ai_temporary = 2,
-    in6ai_homeaddress = 4
-  } flags;
+    in6ai_homeaddress = 2
+  } flags:8;
+  uint8_t prefixlen;
+  uint16_t :16;
+  uint32_t index;
   uint32_t addr[4];
 };
 
 extern void __check_pf (bool *seen_ipv4, bool *seen_ipv6,
 			struct in6addrinfo **in6ai, size_t *in6ailen)
   attribute_hidden;
+extern void __check_native (uint32_t a1_index, int *a1_native,
+			    uint32_t a2_index, int *a2_native)
+  attribute_hidden;
 
 #endif	/* ifaddrs.h */
diff --git a/include/netdb.h b/include/netdb.h
index 0bf84c21c0..9bbe31b438 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -62,6 +62,14 @@ extern int __old_gethostbyaddr_r (__const void *__restrict __addr,
 				  struct hostent **__restrict __result,
 				  int *__restrict __h_errnop);
 
+extern int __gethostbyaddr2_r (__const void *__restrict __addr,
+			       socklen_t __len, int __type,
+			       struct hostent *__restrict __result_buf,
+			       char *__restrict __buf, size_t __buflen,
+			       struct hostent **__restrict __result,
+			       int *__restrict __h_errnop,
+			       int32_t *ttlp);
+
 extern int __gethostbyname_r (__const char *__restrict __name,
 			      struct hostent *__restrict __result_buf,
 			      char *__restrict __buf, size_t __buflen,
@@ -84,6 +92,13 @@ extern int __old_gethostbyname2_r (__const char *__restrict __name, int __af,
 				   struct hostent **__restrict __result,
 				   int *__restrict __h_errnop);
 
+extern int __gethostbyname3_r (__const char *__restrict __name, int __af,
+			       struct hostent *__restrict __result_buf,
+			       char *__restrict __buf, size_t __buflen,
+			       struct hostent **__restrict __result,
+			       int *__restrict __h_errnop,
+			       int32_t *ttlp, char **canonp);
+
 extern int __getnetent_r (struct netent *__restrict __result_buf,
 			  char *__restrict __buf, size_t __buflen,
 			  struct netent **__restrict __result,
diff --git a/include/stdlib.h b/include/stdlib.h
index a9754b71dd..883bc34d4a 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -32,6 +32,7 @@ libc_hidden_proto (abort)
 libc_hidden_proto (getenv)
 libc_hidden_proto (bsearch)
 libc_hidden_proto (qsort)
+libc_hidden_proto (qsort_r)
 libc_hidden_proto (lrand48_r)
 libc_hidden_proto (wctomb)
 libc_hidden_proto (__secure_getenv)
@@ -83,7 +84,7 @@ extern int __add_to_environ (const char *name, const char *value,
 			     const char *combines, int replace);
 
 extern void _quicksort (void *const pbase, size_t total_elems,
-			size_t size, __compar_fn_t cmp);
+			size_t size, __compar_d_fn_t cmp, void *arg);
 
 extern int __on_exit (void (*__func) (int __status, void *__arg), void *__arg);
 
diff --git a/inet/Makefile b/inet/Makefile
index 5823b69e9c..d7139c1d7f 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -49,10 +49,10 @@ routines := htonl htons		\
 	    getipv4sourcefilter setipv4sourcefilter \
 	    getsourcefilter setsourcefilter inet6_opt inet6_rth
 
-aux := check_pf ifreq
+aux := check_pf check_native ifreq
 
 tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
-	 tst-gethnm test-ifaddrs bug-if1 test-inet6_opt
+	 tst-gethnm test-ifaddrs bug-if1 test-inet6_opt tst-ether_line
 
 include ../Rules
 
diff --git a/inet/ether_hton.c b/inet/ether_hton.c
index 64f5ab5d36..2bff47d472 100644
--- a/inet/ether_hton.c
+++ b/inet/ether_hton.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1999, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1999, 2002, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -71,7 +71,7 @@ ether_hostton (const char *hostname, struct ether_addr *addr)
 
       status = (*fct.f) (hostname, &etherent, buffer, sizeof buffer, &errno);
 
-      no_more = __nss_next (&nip, "gethostton_r", &fct.ptr, status, 0);
+      no_more = __nss_next2 (&nip, "gethostton_r", NULL, &fct.ptr, status, 0);
     }
 
   if (status == NSS_STATUS_SUCCESS)
diff --git a/inet/ether_line.c b/inet/ether_line.c
index 7e871a6bd7..13c5f394cf 100644
--- a/inet/ether_line.c
+++ b/inet/ether_line.c
@@ -61,19 +61,20 @@ ether_line (const char *line, struct ether_addr *addr, char *hostname)
 	++line;
     }
 
-  /* Remove trailing white space.  */
-  cp = __strchrnul (line, '#');
-  while (cp > line && isspace (cp[-1]))
-    --cp;
+  /* Skip initial whitespace.  */
+  while (isspace (*line))
+    ++line;
 
-  if (cp == line)
+  if (*line == '#' || *line == '\0')
     /* No hostname.  */
     return -1;
 
+  /* The hostname is up to the next non-space character.  */
   /* XXX This can cause trouble because the hostname might be too long
      but we have no possibility to check it here.  */
-  memcpy (hostname, line, cp - line);
-  hostname [cp - line] = '\0';
+  while (*line != '\0' && *line != '#' && !isspace (*line))
+    *hostname++ = *line++;
+  *hostname = '\0';
 
   return 0;
 }
diff --git a/inet/ether_ntoh.c b/inet/ether_ntoh.c
index ad4165cb3e..9bc26b9fb6 100644
--- a/inet/ether_ntoh.c
+++ b/inet/ether_ntoh.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1999, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1999,2001,2002,2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -72,7 +72,7 @@ ether_ntohost (char *hostname, const struct ether_addr *addr)
 
       status = (*fct.f) (addr, &etherent, buffer, sizeof buffer, &errno);
 
-      no_more = __nss_next (&nip, "getntohost_r", &fct.ptr, status, 0);
+      no_more = __nss_next2 (&nip, "getntohost_r", NULL, &fct.ptr, status, 0);
     }
 
   if (status == NSS_STATUS_SUCCESS)
diff --git a/inet/gethstbyad_r.c b/inet/gethstbyad_r.c
index 020ac489ef..b1f0f496f1 100644
--- a/inet/gethstbyad_r.c
+++ b/inet/gethstbyad_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2000,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000,2002,2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -48,6 +48,6 @@
     }
 
 /* Special name for the lookup function.  */
-#define DB_LOOKUP_FCT __nss_hosts_lookup
+#define DB_LOOKUP_FCT __nss_hosts_lookup2
 
 #include "../nss/getXXbyYY_r.c"
diff --git a/inet/gethstbynm2_r.c b/inet/gethstbynm2_r.c
index e1e691b2b5..de33dfc93b 100644
--- a/inet/gethstbynm2_r.c
+++ b/inet/gethstbynm2_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 2002, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -41,6 +41,6 @@
 #define HAVE_AF			1
 
 /* Special name for the lookup function.  */
-#define DB_LOOKUP_FCT __nss_hosts_lookup
+#define DB_LOOKUP_FCT __nss_hosts_lookup2
 
 #include "../nss/getXXbyYY_r.c"
diff --git a/inet/gethstbynm_r.c b/inet/gethstbynm_r.c
index 5bc65f1391..16cc194641 100644
--- a/inet/gethstbynm_r.c
+++ b/inet/gethstbynm_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 2002, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -40,6 +40,6 @@
 #define HAVE_LOOKUP_BUFFER	1
 
 /* Special name for the lookup function.  */
-#define DB_LOOKUP_FCT __nss_hosts_lookup
+#define DB_LOOKUP_FCT __nss_hosts_lookup2
 
 #include "../nss/getXXbyYY_r.c"
diff --git a/inet/gethstent_r.c b/inet/gethstent_r.c
index a7424a4188..943cf04550 100644
--- a/inet/gethstent_r.c
+++ b/inet/gethstent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 2002, 2007 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
@@ -30,6 +30,6 @@
 #define NEED__RES	1
 
 /* Special name for the lookup function.  */
-#define DB_LOOKUP_FCT __nss_hosts_lookup
+#define DB_LOOKUP_FCT __nss_hosts_lookup2
 
 #include "../nss/getXXent_r.c"
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index 97b2b809f0..38701857cb 100644
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004, 2005
+/* Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004, 2005, 2007
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -18,13 +18,16 @@
    02111-1307 USA.  */
 
 #include <assert.h>
+#include <atomic.h>
 #include <bits/libc-lock.h>
 #include <errno.h>
 #include <netdb.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include "netgroup.h"
 #include "nsswitch.h"
+#include <sysdep.h>
 
 
 /* Protect above variable against multiple uses at the same time.  */
@@ -44,25 +47,32 @@ static int
 setup (void **fctp, service_user **nipp)
 {
   /* Remember the first service_entry, it's always the same.  */
+  static bool startp_initialized;
   static service_user *startp;
   int no_more;
 
-  if (startp == NULL)
+  if (!startp_initialized)
     {
       /* Executing this more than once at the same time must yield the
 	 same result every time.  So we need no locking.  */
       no_more = __nss_netgroup_lookup (nipp, "setnetgrent", fctp);
       startp = no_more ? (service_user *) -1 : *nipp;
+      PTR_MANGLE (startp);
+      atomic_write_barrier ();
+      startp_initialized = true;
     }
-  else if (startp == (service_user *) -1)
-    /* No services at all.  */
-    return 1;
   else
     {
+      service_user *nip = startp;
+      PTR_DEMANGLE (nip);
+      if (nip == (service_user *) -1)
+	/* No services at all.  */
+	return 1;
+
       /* Reset to the beginning of the service list.  */
-      *nipp = startp;
+      *nipp = nip;
       /* Look up the first function.  */
-      no_more = __nss_lookup (nipp, "setnetgrent", fctp);
+      no_more = __nss_lookup (nipp, "setnetgrent", NULL, fctp);
     }
   return no_more;
 }
@@ -122,11 +132,12 @@ __internal_setnetgrent_reuse (const char *group, struct __netgrent *datap,
     {
       assert (datap->data == NULL);
 
-      /* Ignore status, we force check in `__nss_next'.  */
+      /* Ignore status, we force check in `__nss_next2'.  */
       status = (*fct.f) (group, datap);
 
       service_user *old_nip = datap->nip;
-      no_more = __nss_next (&datap->nip, "setnetgrent", &fct.ptr, status, 0);
+      no_more = __nss_next2 (&datap->nip, "setnetgrent", NULL, &fct.ptr,
+			     status, 0);
 
       if (status == NSS_STATUS_SUCCESS && ! no_more)
 	{
@@ -423,8 +434,8 @@ innetgr (const char *netgroup, const char *host, const char *user,
 	    break;
 
 	  /* Look for the next service.  */
-	  no_more = __nss_next (&entry.nip, "setnetgrent",
-				&setfct.ptr, status, 0);
+	  no_more = __nss_next2 (&entry.nip, "setnetgrent", NULL,
+				 &setfct.ptr, status, 0);
 	}
 
       if (result == 0 && entry.needed_groups != NULL)
diff --git a/inet/tst-ether_line.c b/inet/tst-ether_line.c
new file mode 100644
index 0000000000..ff0560b16a
--- /dev/null
+++ b/inet/tst-ether_line.c
@@ -0,0 +1,38 @@
+#include <stdio.h>
+#include <string.h>
+#include <netinet/ether.h>
+
+
+static int
+do_test (void)
+{
+  struct ether_addr a;
+  char buf[1000];
+  if (ether_line ("00:01:02:03:04:05       aaaaa   \n", &a, buf) != 0)
+    {
+      puts ("ether_line failed");
+      return 1;
+    }
+
+  int res = 0;
+  int i;
+  for (i = 0; i < ETH_ALEN; ++i)
+    {
+      printf ("%02x%s",
+	      (int) a.ether_addr_octet[i], i + 1 == ETH_ALEN ? "" : ":");
+      if (a.ether_addr_octet[i] != i)
+	{
+	  printf ("octet %d is %d, expected %d\n",
+		  i, (int) a.ether_addr_octet[i], i);
+	  res = 1;
+	}
+    }
+
+  printf (" \"%s\"\n", buf);
+  res |= strcmp (buf, "aaaaa") != 0;
+
+  return res;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index a2cd8014c3..7004cd49cf 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -203,7 +203,12 @@ struct known_translation_t
   size_t translation_length;
 
   /* Pointer to the string in question.  */
-  char msgid[ZERO];
+  union
+    {
+      char appended[ZERO];  /* used if domain != NULL */
+      const char *ptr;      /* used if domain == NULL */
+    }
+  msgid;
 };
 
 /* Root of the search tree with known translations.  We can use this
@@ -231,7 +236,8 @@ transcmp (p1, p2)
   s1 = (const struct known_translation_t *) p1;
   s2 = (const struct known_translation_t *) p2;
 
-  result = strcmp (s1->msgid, s2->msgid);
+  result = strcmp (s1->domain != NULL ? s1->msgid.appended : s1->msgid.ptr,
+		   s2->domain != NULL ? s2->msgid.appended : s2->msgid.ptr);
   if (result == 0)
     {
       result = strcmp (s1->domainname, s2->domainname);
@@ -422,9 +428,8 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
   size_t retlen;
   int saved_errno;
 #if defined HAVE_TSEARCH || defined _LIBC
-  struct known_translation_t *search;
+  struct known_translation_t search;
   struct known_translation_t **foundp = NULL;
-  size_t msgid_len;
 # ifdef HAVE_PER_THREAD_LOCALE
   const char *localename;
 # endif
@@ -453,20 +458,17 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
     domainname = _nl_current_default_domain;
 
 #if defined HAVE_TSEARCH || defined _LIBC
-  msgid_len = strlen (msgid1) + 1;
-
   /* Try to find the translation among those which we found at
      some time.  */
-  search = (struct known_translation_t *)
-	   alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
-  memcpy (search->msgid, msgid1, msgid_len);
-  search->domainname = domainname;
-  search->category = category;
+  search.domain = NULL;
+  search.msgid.ptr = msgid1;
+  search.domainname = domainname;
+  search.category = category;
 # ifdef HAVE_PER_THREAD_LOCALE
 #  ifdef _LIBC
   localename = __current_locale_name (category);
 #  endif
-  search->localename = localename;
+  search.localename = localename;
 # endif
 
   /* Since tfind/tsearch manage a balanced tree, concurrent tfind and
@@ -474,11 +476,10 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
   __libc_rwlock_define_initialized (static, tree_lock);
   __libc_rwlock_rdlock (tree_lock);
 
-  foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
+  foundp = (struct known_translation_t **) tfind (&search, &root, transcmp);
 
   __libc_rwlock_unlock (tree_lock);
 
-  freea (search);
   if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
     {
       /* Now deal with plural.  */
@@ -662,9 +663,11 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 	      if (foundp == NULL)
 		{
 		  /* Create a new entry and add it to the search tree.  */
+		  size_t msgid_len;
 		  size_t size;
 		  struct known_translation_t *newp;
 
+		  msgid_len = strlen (msgid1) + 1;
 		  size = offsetof (struct known_translation_t, msgid)
 			 + msgid_len + domainname_len + 1;
 # ifdef HAVE_PER_THREAD_LOCALE
@@ -678,7 +681,8 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 		      char *new_localename;
 # endif
 
-		      new_domainname = mempcpy (newp->msgid, msgid1, msgid_len);
+		      new_domainname =
+			mempcpy (newp->msgid.appended, msgid1, msgid_len);
 		      memcpy (new_domainname, domainname, domainname_len + 1);
 # ifdef HAVE_PER_THREAD_LOCALE
 		      new_localename = new_domainname + domainname_len + 1;
diff --git a/intl/locale.alias b/intl/locale.alias
index b43e79bbe5..582fcd75c2 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -1,5 +1,5 @@
 # Locale name alias data base.
-# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001,2003,2007 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,10 +21,9 @@
 # A single line contains two fields: an alias and a substitution value.
 # All entries are case independent.
 
-# Note: This file is far from being complete.  If you have a value for
-# your own site which you think might be useful for others too, share
-# it with the rest of us.  Send it using the `glibcbug' script to
-# bugs@gnu.org.
+# Note: This file is obsolete and is kept around for the time being for
+# backward compatibility.  Nobody should rely on the names defined here.
+# Locales should always be specified by their full name.
 
 bokmal		nb_NO.ISO-8859-1
 bokmål		nb_NO.ISO-8859-1
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index bf22a2c47b..227e764a6c 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -4008,6 +4008,8 @@ error while adding equivalent collating symbol"));
 			     arg->val.str.lenmb) == 0
 		    && curdef->str[arg->val.str.lenmb] == '\0')
 		  break;
+		else
+		  curdef = curdef->next;
 
 	      if ((nowtok == tok_ifdef && curdef != NULL)
 		  || (nowtok == tok_ifndef && curdef == NULL))
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 784f71d1b4..5a3e8c86e0 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,48 @@
+2007-12-11  Ulrich Drepper  <drepper@redhat.com>
+
+	* charmsp/HP-THAI8: New file.
+
+	[BZ #5464]
+	* charmaps/HP-GREEK8: New file.
+
+	[BZ #5463]
+	* charmaps/HP-TURKISH8: New file.
+
+2007-12-10  Ulrich Drepper  <drepper@redhat.com>
+
+	* charmaps/UTF-8: Add Unicode 5.1 entries.
+
+2007-12-07  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5427]
+	* charmaps/HP-ROMAN9: New file.
+
+2007-12-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/si_LK (mon): Fix February and November spelling.
+	Patch by Danishka Navin <snavin@redhat.com>.
+
+2007-11-07  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5238]
+	* locales/ug_CN: Fix typo in collating symbol definition.
+
+	[BZ #5237]
+	* locales/lo_LA: Fix typos in collation symbols.
+
+2007-11-06  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/dz_BT: Fix representation of data.
+
+	* SUPPORTED (SUPPORTED-LOCALES): Add bo_CN and bo_IN.
+	* locales/bo_CN: New file.
+	* locales/bo_IN: New file.
+
+2007-10-28  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5224]
+	* locales/ig_NG: Add missing collating elements and symbols.
+
 2007-10-14  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #4098]
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 44a76a0c94..02103d55d3 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -59,6 +59,8 @@ bg_BG.UTF-8/UTF-8 \
 bg_BG/CP1251 \
 bn_BD/UTF-8 \
 bn_IN/UTF-8 \
+bo_CN/UTF-8 \
+bo_IN/UTF-8 \
 br_FR.UTF-8/UTF-8 \
 br_FR/ISO-8859-1 \
 br_FR@euro/ISO-8859-15 \
diff --git a/localedata/charmaps/HP-GREEK8 b/localedata/charmaps/HP-GREEK8
new file mode 100644
index 0000000000..d43e7c39b8
--- /dev/null
+++ b/localedata/charmaps/HP-GREEK8
@@ -0,0 +1,226 @@
+<code_set_name> HP-GREEK8
+<comment_char> %
+<escape_char> /
+
+CHARMAP
+<U0000>     /x00         NULL (NUL)
+<U0001>     /x01         START OF HEADING (SOH)
+<U0002>     /x02         START OF TEXT (STX)
+<U0003>     /x03         END OF TEXT (ETX)
+<U0004>     /x04         END OF TRANSMISSION (EOT)
+<U0005>     /x05         ENQUIRY (ENQ)
+<U0006>     /x06         ACKNOWLEDGE (ACK)
+<U0007>     /x07         BELL (BEL)
+<U0008>     /x08         BACKSPACE (BS)
+<U0009>     /x09         CHARACTER TABULATION (HT)
+<U000A>     /x0a         LINE FEED (LF)
+<U000B>     /x0b         LINE TABULATION (VT)
+<U000C>     /x0c         FORM FEED (FF)
+<U000D>     /x0d         CARRIAGE RETURN (CR)
+<U000E>     /x0e         SHIFT OUT (SO)
+<U000F>     /x0f         SHIFT IN (SI)
+<U0010>     /x10         DATALINK ESCAPE (DLE)
+<U0011>     /x11         DEVICE CONTROL ONE (DC1)
+<U0012>     /x12         DEVICE CONTROL TWO (DC2)
+<U0013>     /x13         DEVICE CONTROL THREE (DC3)
+<U0014>     /x14         DEVICE CONTROL FOUR (DC4)
+<U0015>     /x15         NEGATIVE ACKNOWLEDGE (NAK)
+<U0016>     /x16         SYNCHRONOUS IDLE (SYN)
+<U0017>     /x17         END OF TRANSMISSION BLOCK (ETB)
+<U0018>     /x18         CANCEL (CAN)
+<U0019>     /x19         END OF MEDIUM (EM)
+<U001A>     /x1a         SUBSTITUTE (SUB)
+<U001B>     /x1b         ESCAPE (ESC)
+<U001C>     /x1c         FILE SEPARATOR (IS4)
+<U001D>     /x1d         GROUP SEPARATOR (IS3)
+<U001E>     /x1e         RECORD SEPARATOR (IS2)
+<U001F>     /x1f         UNIT SEPARATOR (IS1)
+<U0020>     /x20         SPACE
+<U0021>     /x21         EXCLAMATION MARK
+<U0022>     /x22         QUOTATION MARK
+<U0023>     /x23         NUMBER SIGN
+<U0024>     /x24         DOLLAR SIGN
+<U0025>     /x25         PERCENT SIGN
+<U0026>     /x26         AMPERSAND
+<U0027>     /x27         APOSTROPHE
+<U0028>     /x28         LEFT PARENTHESIS
+<U0029>     /x29         RIGHT PARENTHESIS
+<U002A>     /x2a         ASTERISK
+<U002B>     /x2b         PLUS SIGN
+<U002C>     /x2c         COMMA
+<U002D>     /x2d         HYPHEN-MINUS
+<U002E>     /x2e         FULL STOP
+<U002F>     /x2f         SOLIDUS
+<U0030>     /x30         DIGIT ZERO
+<U0031>     /x31         DIGIT ONE
+<U0032>     /x32         DIGIT TWO
+<U0033>     /x33         DIGIT THREE
+<U0034>     /x34         DIGIT FOUR
+<U0035>     /x35         DIGIT FIVE
+<U0036>     /x36         DIGIT SIX
+<U0037>     /x37         DIGIT SEVEN
+<U0038>     /x38         DIGIT EIGHT
+<U0039>     /x39         DIGIT NINE
+<U003A>     /x3a         COLON
+<U003B>     /x3b         SEMICOLON
+<U003C>     /x3c         LESS-THAN SIGN
+<U003D>     /x3d         EQUALS SIGN
+<U003E>     /x3e         GREATER-THAN SIGN
+<U003F>     /x3f         QUESTION MARK
+<U0040>     /x40         COMMERCIAL AT
+<U0041>     /x41         LATIN CAPITAL LETTER A
+<U0042>     /x42         LATIN CAPITAL LETTER B
+<U0043>     /x43         LATIN CAPITAL LETTER C
+<U0044>     /x44         LATIN CAPITAL LETTER D
+<U0045>     /x45         LATIN CAPITAL LETTER E
+<U0046>     /x46         LATIN CAPITAL LETTER F
+<U0047>     /x47         LATIN CAPITAL LETTER G
+<U0048>     /x48         LATIN CAPITAL LETTER H
+<U0049>     /x49         LATIN CAPITAL LETTER I
+<U004A>     /x4a         LATIN CAPITAL LETTER J
+<U004B>     /x4b         LATIN CAPITAL LETTER K
+<U004C>     /x4c         LATIN CAPITAL LETTER L
+<U004D>     /x4d         LATIN CAPITAL LETTER M
+<U004E>     /x4e         LATIN CAPITAL LETTER N
+<U004F>     /x4f         LATIN CAPITAL LETTER O
+<U0050>     /x50         LATIN CAPITAL LETTER P
+<U0051>     /x51         LATIN CAPITAL LETTER Q
+<U0052>     /x52         LATIN CAPITAL LETTER R
+<U0053>     /x53         LATIN CAPITAL LETTER S
+<U0054>     /x54         LATIN CAPITAL LETTER T
+<U0055>     /x55         LATIN CAPITAL LETTER U
+<U0056>     /x56         LATIN CAPITAL LETTER V
+<U0057>     /x57         LATIN CAPITAL LETTER W
+<U0058>     /x58         LATIN CAPITAL LETTER X
+<U0059>     /x59         LATIN CAPITAL LETTER Y
+<U005A>     /x5a         LATIN CAPITAL LETTER Z
+<U005B>     /x5b         LEFT SQUARE BRACKET
+<U005C>     /x5c         REVERSE SOLIDUS
+<U005D>     /x5d         RIGHT SQUARE BRACKET
+<U005E>     /x5e         CIRCUMFLEX ACCENT
+<U005F>     /x5f         LOW LINE
+<U0060>     /x60         GRAVE ACCENT
+<U0061>     /x61         LATIN SMALL LETTER A
+<U0062>     /x62         LATIN SMALL LETTER B
+<U0063>     /x63         LATIN SMALL LETTER C
+<U0064>     /x64         LATIN SMALL LETTER D
+<U0065>     /x65         LATIN SMALL LETTER E
+<U0066>     /x66         LATIN SMALL LETTER F
+<U0067>     /x67         LATIN SMALL LETTER G
+<U0068>     /x68         LATIN SMALL LETTER H
+<U0069>     /x69         LATIN SMALL LETTER I
+<U006A>     /x6a         LATIN SMALL LETTER J
+<U006B>     /x6b         LATIN SMALL LETTER K
+<U006C>     /x6c         LATIN SMALL LETTER L
+<U006D>     /x6d         LATIN SMALL LETTER M
+<U006E>     /x6e         LATIN SMALL LETTER N
+<U006F>     /x6f         LATIN SMALL LETTER O
+<U0070>     /x70         LATIN SMALL LETTER P
+<U0071>     /x71         LATIN SMALL LETTER Q
+<U0072>     /x72         LATIN SMALL LETTER R
+<U0073>     /x73         LATIN SMALL LETTER S
+<U0074>     /x74         LATIN SMALL LETTER T
+<U0075>     /x75         LATIN SMALL LETTER U
+<U0076>     /x76         LATIN SMALL LETTER V
+<U0077>     /x77         LATIN SMALL LETTER W
+<U0078>     /x78         LATIN SMALL LETTER X
+<U0079>     /x79         LATIN SMALL LETTER Y
+<U007A>     /x7a         LATIN SMALL LETTER Z
+<U007B>     /x7b         LEFT CURLY BRACKET
+<U007C>     /x7c         VERTICAL LINE
+<U007D>     /x7d         RIGHT CURLY BRACKET
+<U007E>     /x7e         TILDE
+<U007F>     /x7f         DELETE (DEL)
+<U0080>     /x80         PADDING CHARACTER (PAD)
+<U0081>     /x81         HIGH OCTET PRESET (HOP)
+<U0082>     /x82         BREAK PERMITTED HERE (BPH)
+<U0083>     /x83         NO BREAK HERE (NBH)
+<U0084>     /x84         INDEX (IND)
+<U0085>     /x85         NEXT LINE (NEL)
+<U0086>     /x86         START OF SELECTED AREA (SSA)
+<U0087>     /x87         END OF SELECTED AREA (ESA)
+<U0088>     /x88         CHARACTER TABULATION SET (HTS)
+<U0089>     /x89         CHARACTER TABULATION WITH JUSTIFICATION (HTJ)
+<U008A>     /x8a         LINE TABULATION SET (VTS)
+<U008B>     /x8b         PARTIAL LINE FORWARD (PLD)
+<U008C>     /x8c         PARTIAL LINE BACKWARD (PLU)
+<U008D>     /x8d         REVERSE LINE FEED (RI)
+<U008E>     /x8e         SINGLE-SHIFT TWO (SS2)
+<U008F>     /x8f         SINGLE-SHIFT THREE (SS3)
+<U0090>     /x90         DEVICE CONTROL STRING (DCS)
+<U0091>     /x91         PRIVATE USE ONE (PU1)
+<U0092>     /x92         PRIVATE USE TWO (PU2)
+<U0093>     /x93         SET TRANSMIT STATE (STS)
+<U0094>     /x94         CANCEL CHARACTER (CCH)
+<U0095>     /x95         MESSAGE WAITING (MW)
+<U0096>     /x96         START OF GUARDED AREA (SPA)
+<U0097>     /x97         END OF GUARDED AREA (EPA)
+<U0098>     /x98         START OF STRING (SOS)
+<U0099>     /x99         SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI)
+<U009A>     /x9a         SINGLE CHARACTER INTRODUCER (SCI)
+<U009B>     /x9b         CONTROL SEQUENCE INTRODUCER (CSI)
+<U009C>     /x9c         STRING TERMINATOR (ST)
+<U009D>     /x9d         OPERATING SYSTEM COMMAND (OSC)
+<U009E>     /x9e         PRIVACY MESSAGE (PM)
+<U009F>     /x9f         APPLICATION PROGRAM COMMAND (APC)
+<U00A0>     /xa0         NO-BREAK SPACE
+<U03CA>     /xbc         GREEK SMALL LETTER IOTA WITH DIALYTIKA
+<U03CB>     /xbe         GREEK SMALL LETTER UPSILON WITH DIALYTIKA
+<U0391>     /xc1         GREEK CAPITAL LETTER ALPHA
+<U0392>     /xc2         GREEK CAPITAL LETTER BETA
+<U0393>     /xc3         GREEK CAPITAL LETTER GAMMA
+<U0394>     /xc4         GREEK CAPITAL LETTER DELTA
+<U0395>     /xc5         GREEK CAPITAL LETTER EPSILON
+<U0396>     /xc6         GREEK CAPITAL LETTER ZETA
+<U0397>     /xc7         GREEK CAPITAL LETTER ETA
+<U0398>     /xc8         GREEK CAPITAL LETTER THETA
+<U0399>     /xc9         GREEK CAPITAL LETTER IOTA
+<U039A>     /xcb         GREEK CAPITAL LETTER KAPPA
+<U039B>     /xcc         GREEK CAPITAL LETTER LAMDA
+<U039C>     /xcd         GREEK CAPITAL LETTER MU
+<U039D>     /xce         GREEK CAPITAL LETTER NU
+<U039E>     /xcf         GREEK CAPITAL LETTER XI
+<U039F>     /xd0         GREEK CAPITAL LETTER OMICRON
+<U03A0>     /xd1         GREEK CAPITAL LETTER PI
+<U03A1>     /xd2         GREEK CAPITAL LETTER RHO
+<U03A3>     /xd3         GREEK CAPITAL LETTER SIGMA
+<U03A4>     /xd4         GREEK CAPITAL LETTER TAU
+<U03A5>     /xd5         GREEK CAPITAL LETTER UPSILON
+<U03A6>     /xd6         GREEK CAPITAL LETTER PHI
+<U03A7>     /xd8         GREEK CAPITAL LETTER CHI
+<U03A8>     /xd9         GREEK CAPITAL LETTER PSI
+<U03A9>     /xda         GREEK CAPITAL LETTER OMEGA
+<U03AC>     /xdb         GREEK SMALL LETTER ALPHA WITH TONOS
+<U03AE>     /xdc         GREEK SMALL LETTER ETA WITH TONOS
+<U03CC>     /xdd         GREEK SMALL LETTER OMICRON WITH TONOS
+<U03CD>     /xe0         GREEK SMALL LETTER UPSILON WITH TONOS
+<U03B1>     /xe1         GREEK SMALL LETTER ALPHA
+<U03B2>     /xe2         GREEK SMALL LETTER BETA
+<U03B3>     /xe3         GREEK SMALL LETTER GAMMA
+<U03B4>     /xe4         GREEK SMALL LETTER DELTA
+<U03B5>     /xe5         GREEK SMALL LETTER EPSILON
+<U03B6>     /xe6         GREEK SMALL LETTER ZETA
+<U03B7>     /xe7         GREEK SMALL LETTER ETA
+<U03B8>     /xe8         GREEK SMALL LETTER THETA
+<U03B9>     /xe9         GREEK SMALL LETTER IOTA
+<U03BA>     /xeb         GREEK SMALL LETTER KAPPA
+<U03BB>     /xec         GREEK SMALL LETTER LAMDA
+<U03BC>     /xed         GREEK SMALL LETTER MU
+<U03BD>     /xee         GREEK SMALL LETTER NU
+<U03BE>     /xef         GREEK SMALL LETTER XI
+<U03BF>     /xf0         GREEK SMALL LETTER OMICRON
+<U03C0>     /xf1         GREEK SMALL LETTER PI
+<U03C1>     /xf2         GREEK SMALL LETTER RHO
+<U03C3>     /xf3         GREEK SMALL LETTER SIGMA
+<U03C4>     /xf4         GREEK SMALL LETTER TAU
+<U03C5>     /xf5         GREEK SMALL LETTER UPSILON
+<U03C6>     /xf6         GREEK SMALL LETTER PHI
+<U03C2>     /xf7         GREEK SMALL LETTER FINAL SIGMA
+<U03C7>     /xf8         GREEK SMALL LETTER CHI
+<U03C8>     /xf9         GREEK SMALL LETTER PSI
+<U03C9>     /xfa         GREEK SMALL LETTER OMEGA
+<U03AD>     /xfb         GREEK SMALL LETTER EPSILON WITH TONOS
+<U03AF>     /xfc         GREEK SMALL LETTER IOTA WITH TONOS
+<U03CE>     /xfd         GREEK SMALL LETTER OMEGA WITH TONOS
+<U03F3>     /xfe         GREEK LETTER YOT
+END CHARMAP
diff --git a/localedata/charmaps/HP-ROMAN9 b/localedata/charmaps/HP-ROMAN9
new file mode 100644
index 0000000000..1e1dd881d1
--- /dev/null
+++ b/localedata/charmaps/HP-ROMAN9
@@ -0,0 +1,263 @@
+<code_set_name> HP-ROMAN9
+<comment_char> %
+<escape_char> /
+
+% alias ROMAN9
+% alias R9
+CHARMAP
+<U0000>     /x00         NULL (NUL)
+<U0001>     /x01         START OF HEADING (SOH)
+<U0002>     /x02         START OF TEXT (STX)
+<U0003>     /x03         END OF TEXT (ETX)
+<U0004>     /x04         END OF TRANSMISSION (EOT)
+<U0005>     /x05         ENQUIRY (ENQ)
+<U0006>     /x06         ACKNOWLEDGE (ACK)
+<U0007>     /x07         BELL (BEL)
+<U0008>     /x08         BACKSPACE (BS)
+<U0009>     /x09         CHARACTER TABULATION (HT)
+<U000A>     /x0a         LINE FEED (LF)
+<U000B>     /x0b         LINE TABULATION (VT)
+<U000C>     /x0c         FORM FEED (FF)
+<U000D>     /x0d         CARRIAGE RETURN (CR)
+<U000E>     /x0e         SHIFT OUT (SO)
+<U000F>     /x0f         SHIFT IN (SI)
+<U0010>     /x10         DATALINK ESCAPE (DLE)
+<U0011>     /x11         DEVICE CONTROL ONE (DC1)
+<U0012>     /x12         DEVICE CONTROL TWO (DC2)
+<U0013>     /x13         DEVICE CONTROL THREE (DC3)
+<U0014>     /x14         DEVICE CONTROL FOUR (DC4)
+<U0015>     /x15         NEGATIVE ACKNOWLEDGE (NAK)
+<U0016>     /x16         SYNCHRONOUS IDLE (SYN)
+<U0017>     /x17         END OF TRANSMISSION BLOCK (ETB)
+<U0018>     /x18         CANCEL (CAN)
+<U0019>     /x19         END OF MEDIUM (EM)
+<U001A>     /x1a         SUBSTITUTE (SUB)
+<U001B>     /x1b         ESCAPE (ESC)
+<U001C>     /x1c         FILE SEPARATOR (IS4)
+<U001D>     /x1d         GROUP SEPARATOR (IS3)
+<U001E>     /x1e         RECORD SEPARATOR (IS2)
+<U001F>     /x1f         UNIT SEPARATOR (IS1)
+<U0020>     /x20         SPACE
+<U0021>     /x21         EXCLAMATION MARK
+<U0022>     /x22         QUOTATION MARK
+<U0023>     /x23         NUMBER SIGN
+<U0024>     /x24         DOLLAR SIGN
+<U0025>     /x25         PERCENT SIGN
+<U0026>     /x26         AMPERSAND
+<U0027>     /x27         APOSTROPHE
+<U0028>     /x28         LEFT PARENTHESIS
+<U0029>     /x29         RIGHT PARENTHESIS
+<U002A>     /x2a         ASTERISK
+<U002B>     /x2b         PLUS SIGN
+<U002C>     /x2c         COMMA
+<U002D>     /x2d         HYPHEN-MINUS
+<U002E>     /x2e         FULL STOP
+<U002F>     /x2f         SOLIDUS
+<U0030>     /x30         DIGIT ZERO
+<U0031>     /x31         DIGIT ONE
+<U0032>     /x32         DIGIT TWO
+<U0033>     /x33         DIGIT THREE
+<U0034>     /x34         DIGIT FOUR
+<U0035>     /x35         DIGIT FIVE
+<U0036>     /x36         DIGIT SIX
+<U0037>     /x37         DIGIT SEVEN
+<U0038>     /x38         DIGIT EIGHT
+<U0039>     /x39         DIGIT NINE
+<U003A>     /x3a         COLON
+<U003B>     /x3b         SEMICOLON
+<U003C>     /x3c         LESS-THAN SIGN
+<U003D>     /x3d         EQUALS SIGN
+<U003E>     /x3e         GREATER-THAN SIGN
+<U003F>     /x3f         QUESTION MARK
+<U0040>     /x40         COMMERCIAL AT
+<U0041>     /x41         LATIN CAPITAL LETTER A
+<U0042>     /x42         LATIN CAPITAL LETTER B
+<U0043>     /x43         LATIN CAPITAL LETTER C
+<U0044>     /x44         LATIN CAPITAL LETTER D
+<U0045>     /x45         LATIN CAPITAL LETTER E
+<U0046>     /x46         LATIN CAPITAL LETTER F
+<U0047>     /x47         LATIN CAPITAL LETTER G
+<U0048>     /x48         LATIN CAPITAL LETTER H
+<U0049>     /x49         LATIN CAPITAL LETTER I
+<U004A>     /x4a         LATIN CAPITAL LETTER J
+<U004B>     /x4b         LATIN CAPITAL LETTER K
+<U004C>     /x4c         LATIN CAPITAL LETTER L
+<U004D>     /x4d         LATIN CAPITAL LETTER M
+<U004E>     /x4e         LATIN CAPITAL LETTER N
+<U004F>     /x4f         LATIN CAPITAL LETTER O
+<U0050>     /x50         LATIN CAPITAL LETTER P
+<U0051>     /x51         LATIN CAPITAL LETTER Q
+<U0052>     /x52         LATIN CAPITAL LETTER R
+<U0053>     /x53         LATIN CAPITAL LETTER S
+<U0054>     /x54         LATIN CAPITAL LETTER T
+<U0055>     /x55         LATIN CAPITAL LETTER U
+<U0056>     /x56         LATIN CAPITAL LETTER V
+<U0057>     /x57         LATIN CAPITAL LETTER W
+<U0058>     /x58         LATIN CAPITAL LETTER X
+<U0059>     /x59         LATIN CAPITAL LETTER Y
+<U005A>     /x5a         LATIN CAPITAL LETTER Z
+<U005B>     /x5b         LEFT SQUARE BRACKET
+<U005C>     /x5c         REVERSE SOLIDUS
+<U005D>     /x5d         RIGHT SQUARE BRACKET
+<U005E>     /x5e         CIRCUMFLEX ACCENT
+<U005F>     /x5f         LOW LINE
+<U0060>     /x60         GRAVE ACCENT
+<U0061>     /x61         LATIN SMALL LETTER A
+<U0062>     /x62         LATIN SMALL LETTER B
+<U0063>     /x63         LATIN SMALL LETTER C
+<U0064>     /x64         LATIN SMALL LETTER D
+<U0065>     /x65         LATIN SMALL LETTER E
+<U0066>     /x66         LATIN SMALL LETTER F
+<U0067>     /x67         LATIN SMALL LETTER G
+<U0068>     /x68         LATIN SMALL LETTER H
+<U0069>     /x69         LATIN SMALL LETTER I
+<U006A>     /x6a         LATIN SMALL LETTER J
+<U006B>     /x6b         LATIN SMALL LETTER K
+<U006C>     /x6c         LATIN SMALL LETTER L
+<U006D>     /x6d         LATIN SMALL LETTER M
+<U006E>     /x6e         LATIN SMALL LETTER N
+<U006F>     /x6f         LATIN SMALL LETTER O
+<U0070>     /x70         LATIN SMALL LETTER P
+<U0071>     /x71         LATIN SMALL LETTER Q
+<U0072>     /x72         LATIN SMALL LETTER R
+<U0073>     /x73         LATIN SMALL LETTER S
+<U0074>     /x74         LATIN SMALL LETTER T
+<U0075>     /x75         LATIN SMALL LETTER U
+<U0076>     /x76         LATIN SMALL LETTER V
+<U0077>     /x77         LATIN SMALL LETTER W
+<U0078>     /x78         LATIN SMALL LETTER X
+<U0079>     /x79         LATIN SMALL LETTER Y
+<U007A>     /x7a         LATIN SMALL LETTER Z
+<U007B>     /x7b         LEFT CURLY BRACKET
+<U007C>     /x7c         VERTICAL LINE
+<U007D>     /x7d         RIGHT CURLY BRACKET
+<U007E>     /x7e         TILDE
+<U007F>     /x7f         DELETE (DEL)
+<U0080>     /x80         PADDING CHARACTER (PAD)
+<U0081>     /x81         HIGH OCTET PRESET (HOP)
+<U0082>     /x82         BREAK PERMITTED HERE (BPH)
+<U0083>     /x83         NO BREAK HERE (NBH)
+<U0084>     /x84         INDEX (IND)
+<U0085>     /x85         NEXT LINE (NEL)
+<U0086>     /x86         START OF SELECTED AREA (SSA)
+<U0087>     /x87         END OF SELECTED AREA (ESA)
+<U0088>     /x88         CHARACTER TABULATION SET (HTS)
+<U0089>     /x89         CHARACTER TABULATION WITH JUSTIFICATION (HTJ)
+<U008A>     /x8a         LINE TABULATION SET (VTS)
+<U008B>     /x8b         PARTIAL LINE FORWARD (PLD)
+<U008C>     /x8c         PARTIAL LINE BACKWARD (PLU)
+<U008D>     /x8d         REVERSE LINE FEED (RI)
+<U008E>     /x8e         SINGLE-SHIFT TWO (SS2)
+<U008F>     /x8f         SINGLE-SHIFT THREE (SS3)
+<U0090>     /x90         DEVICE CONTROL STRING (DCS)
+<U0091>     /x91         PRIVATE USE ONE (PU1)
+<U0092>     /x92         PRIVATE USE TWO (PU2)
+<U0093>     /x93         SET TRANSMIT STATE (STS)
+<U0094>     /x94         CANCEL CHARACTER (CCH)
+<U0095>     /x95         MESSAGE WAITING (MW)
+<U0096>     /x96         START OF GUARDED AREA (SPA)
+<U0097>     /x97         END OF GUARDED AREA (EPA)
+<U0098>     /x98         START OF STRING (SOS)
+<U0099>     /x99         SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI)
+<U009A>     /x9a         SINGLE CHARACTER INTRODUCER (SCI)
+<U009B>     /x9b         CONTROL SEQUENCE INTRODUCER (CSI)
+<U009C>     /x9c         STRING TERMINATOR (ST)
+<U009D>     /x9d         OPERATING SYSTEM COMMAND (OSC)
+<U009E>     /x9e         PRIVACY MESSAGE (PM)
+<U009F>     /x9f         APPLICATION PROGRAM COMMAND (APC)
+<U00A0>     /xa0         NO-BREAK SPACE
+<U00C0>     /xa1         LATIN CAPITAL LETTER A WITH GRAVE
+<U00C2>     /xa2         LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+<U00C8>     /xa3         LATIN CAPITAL LETTER E WITH GRAVE
+<U00CA>     /xa4         LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+<U00CB>     /xa5         LATIN CAPITAL LETTER E WITH DIAERESIS
+<U00CE>     /xa6         LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+<U00CF>     /xa7         LATIN CAPITAL LETTER I WITH DIAERESIS
+<U00B4>     /xa8         ACUTE ACCENT
+<U02CB>     /xa9         MODIFIER LETTER GRAVE ACCENT (Mandarin Chinese fourth tone)
+<U02C6>     /xaa         MODIFIER LETTER CIRCUMFLEX ACCENT
+<U00A8>     /xab         DIAERESIS
+<U02DC>     /xac         SMALL TILDE
+<U00D9>     /xad         LATIN CAPITAL LETTER U WITH GRAVE
+<U00DB>     /xae         LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+<U20A4>     /xaf         LIRA SIGN
+<U00AF>     /xb0         MACRON
+<U00DD>     /xb1         LATIN CAPITAL LETTER Y WITH ACUTE
+<U00FD>     /xb2         LATIN SMALL LETTER Y WITH ACUTE
+<U00B0>     /xb3         DEGREE SIGN
+<U00C7>     /xb4         LATIN CAPITAL LETTER C WITH CEDILLA
+<U00E7>     /xb5         LATIN SMALL LETTER C WITH CEDILLA
+<U00D1>     /xb6         LATIN CAPITAL LETTER N WITH TILDE
+<U00F1>     /xb7         LATIN SMALL LETTER N WITH TILDE
+<U00A1>     /xb8         INVERTED EXCLAMATION MARK
+<U00BF>     /xb9         INVERTED QUESTION MARK
+<U20A0>     /xba         EURO-CURRENCY SIGN
+<U00A3>     /xbb         POUND SIGN
+<U00A5>     /xbc         YEN SIGN
+<U00A7>     /xbd         SECTION SIGN
+<U0192>     /xbe         LATIN SMALL LETTER F WITH HOOK
+<U00A2>     /xbf         CENT SIGN
+<U00E2>     /xc0         LATIN SMALL LETTER A WITH CIRCUMFLEX
+<U00EA>     /xc1         LATIN SMALL LETTER E WITH CIRCUMFLEX
+<U00F4>     /xc2         LATIN SMALL LETTER O WITH CIRCUMFLEX
+<U00FB>     /xc3         LATIN SMALL LETTER U WITH CIRCUMFLEX
+<U00E1>     /xc4         LATIN SMALL LETTER A WITH ACUTE
+<U00E9>     /xc5         LATIN SMALL LETTER E WITH ACUTE
+<U00F3>     /xc6         LATIN SMALL LETTER O WITH ACUTE
+<U00FA>     /xc7         LATIN SMALL LETTER U WITH ACUTE
+<U00E0>     /xc8         LATIN SMALL LETTER A WITH GRAVE
+<U00E8>     /xc9         LATIN SMALL LETTER E WITH GRAVE
+<U00F2>     /xca         LATIN SMALL LETTER O WITH GRAVE
+<U00F9>     /xcb         LATIN SMALL LETTER U WITH GRAVE
+<U00E4>     /xcc         LATIN SMALL LETTER A WITH DIAERESIS
+<U00EB>     /xcd         LATIN SMALL LETTER E WITH DIAERESIS
+<U00F6>     /xce         LATIN SMALL LETTER O WITH DIAERESIS
+<U00FC>     /xcf         LATIN SMALL LETTER U WITH DIAERESIS
+<U00C5>     /xd0         LATIN CAPITAL LETTER A WITH RING ABOVE
+<U00EE>     /xd1         LATIN SMALL LETTER I WITH CIRCUMFLEX
+<U00D8>     /xd2         LATIN CAPITAL LETTER O WITH STROKE
+<U00C6>     /xd3         LATIN CAPITAL LETTER AE
+<U00E5>     /xd4         LATIN SMALL LETTER A WITH RING ABOVE
+<U00ED>     /xd5         LATIN SMALL LETTER I WITH ACUTE
+<U00F8>     /xd6         LATIN SMALL LETTER O WITH STROKE
+<U00E6>     /xd7         LATIN SMALL LETTER AE
+<U00C4>     /xd8         LATIN CAPITAL LETTER A WITH DIAERESIS
+<U00EC>     /xd9         LATIN SMALL LETTER I WITH GRAVE
+<U00D6>     /xda         LATIN CAPITAL LETTER O WITH DIAERESIS
+<U00DC>     /xdb         LATIN CAPITAL LETTER U WITH DIAERESIS
+<U00C9>     /xdc         LATIN CAPITAL LETTER E WITH ACUTE
+<U00EF>     /xdd         LATIN SMALL LETTER I WITH DIAERESIS
+<U00DF>     /xde         LATIN SMALL LETTER SHARP S (German)
+<U00D4>     /xdf         LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+<U00C1>     /xe0         LATIN CAPITAL LETTER A WITH ACUTE
+<U00C3>     /xe1         LATIN CAPITAL LETTER A WITH TILDE
+<U00E3>     /xe2         LATIN SMALL LETTER A WITH TILDE
+<U00D0>     /xe3         LATIN CAPITAL LETTER ETH (Icelandic)
+<U00F0>     /xe4         LATIN SMALL LETTER ETH (Icelandic)
+<U00CD>     /xe5         LATIN CAPITAL LETTER I WITH ACUTE
+<U00CC>     /xe6         LATIN CAPITAL LETTER I WITH GRAVE
+<U00D3>     /xe7         LATIN CAPITAL LETTER O WITH ACUTE
+<U00D2>     /xe8         LATIN CAPITAL LETTER O WITH GRAVE
+<U00D5>     /xe9         LATIN CAPITAL LETTER O WITH TILDE
+<U00F5>     /xea         LATIN SMALL LETTER O WITH TILDE
+<U0160>     /xeb         LATIN CAPITAL LETTER S WITH CARON
+<U0161>     /xec         LATIN SMALL LETTER S WITH CARON
+<U00DA>     /xed         LATIN CAPITAL LETTER U WITH ACUTE
+<U0178>     /xee         LATIN CAPITAL LETTER Y WITH DIAERESIS
+<U00FF>     /xef         LATIN SMALL LETTER Y WITH DIAERESIS
+<U00DE>     /xf0         LATIN CAPITAL LETTER THORN (Icelandic)
+<U00FE>     /xf1         LATIN SMALL LETTER THORN (Icelandic)
+<U00B7>     /xf2         MIDDLE DOT
+<U00B5>     /xf3         MICRO SIGN
+<U00B6>     /xf4         PILCROW SIGN
+<U00BE>     /xf5         VULGAR FRACTION THREE QUARTERS
+<U2014>     /xf6         EM DASH
+<U00BC>     /xf7         VULGAR FRACTION ONE QUARTER
+<U00BD>     /xf8         VULGAR FRACTION ONE HALF
+<U00AA>     /xf9         FEMININE ORDINAL INDICATOR
+<U00BA>     /xfa         MASCULINE ORDINAL INDICATOR
+<U00AB>     /xfb         LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+<U25A0>     /xfc         BLACK SQUARE
+<U00BB>     /xfd         RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+<U00B1>     /xfe         PLUS-MINUS SIGN
+END CHARMAP
diff --git a/localedata/charmaps/HP-THAI8 b/localedata/charmaps/HP-THAI8
new file mode 100644
index 0000000000..f6d2534fea
--- /dev/null
+++ b/localedata/charmaps/HP-THAI8
@@ -0,0 +1,255 @@
+<code_set_name> HP-THAI8
+<comment_char> %
+<escape_char> /
+
+% alias THAI8
+CHARMAP
+<U0000>     /x00         NULL (NUL)
+<U0001>     /x01         START OF HEADING (SOH)
+<U0002>     /x02         START OF TEXT (STX)
+<U0003>     /x03         END OF TEXT (ETX)
+<U0004>     /x04         END OF TRANSMISSION (EOT)
+<U0005>     /x05         ENQUIRY (ENQ)
+<U0006>     /x06         ACKNOWLEDGE (ACK)
+<U0007>     /x07         BELL (BEL)
+<U0008>     /x08         BACKSPACE (BS)
+<U0009>     /x09         CHARACTER TABULATION (HT)
+<U000A>     /x0a         LINE FEED (LF)
+<U000B>     /x0b         LINE TABULATION (VT)
+<U000C>     /x0c         FORM FEED (FF)
+<U000D>     /x0d         CARRIAGE RETURN (CR)
+<U000E>     /x0e         SHIFT OUT (SO)
+<U000F>     /x0f         SHIFT IN (SI)
+<U0010>     /x10         DATALINK ESCAPE (DLE)
+<U0011>     /x11         DEVICE CONTROL ONE (DC1)
+<U0012>     /x12         DEVICE CONTROL TWO (DC2)
+<U0013>     /x13         DEVICE CONTROL THREE (DC3)
+<U0014>     /x14         DEVICE CONTROL FOUR (DC4)
+<U0015>     /x15         NEGATIVE ACKNOWLEDGE (NAK)
+<U0016>     /x16         SYNCHRONOUS IDLE (SYN)
+<U0017>     /x17         END OF TRANSMISSION BLOCK (ETB)
+<U0018>     /x18         CANCEL (CAN)
+<U0019>     /x19         END OF MEDIUM (EM)
+<U001A>     /x1a         SUBSTITUTE (SUB)
+<U001B>     /x1b         ESCAPE (ESC)
+<U001C>     /x1c         FILE SEPARATOR (IS4)
+<U001D>     /x1d         GROUP SEPARATOR (IS3)
+<U001E>     /x1e         RECORD SEPARATOR (IS2)
+<U001F>     /x1f         UNIT SEPARATOR (IS1)
+<U0020>     /x20         SPACE
+<U0021>     /x21         EXCLAMATION MARK
+<U0022>     /x22         QUOTATION MARK
+<U0023>     /x23         NUMBER SIGN
+<U0024>     /x24         DOLLAR SIGN
+<U0025>     /x25         PERCENT SIGN
+<U0026>     /x26         AMPERSAND
+<U0027>     /x27         APOSTROPHE
+<U0028>     /x28         LEFT PARENTHESIS
+<U0029>     /x29         RIGHT PARENTHESIS
+<U002A>     /x2a         ASTERISK
+<U002B>     /x2b         PLUS SIGN
+<U002C>     /x2c         COMMA
+<U002D>     /x2d         HYPHEN-MINUS
+<U002E>     /x2e         FULL STOP
+<U002F>     /x2f         SOLIDUS
+<U0030>     /x30         DIGIT ZERO
+<U0031>     /x31         DIGIT ONE
+<U0032>     /x32         DIGIT TWO
+<U0033>     /x33         DIGIT THREE
+<U0034>     /x34         DIGIT FOUR
+<U0035>     /x35         DIGIT FIVE
+<U0036>     /x36         DIGIT SIX
+<U0037>     /x37         DIGIT SEVEN
+<U0038>     /x38         DIGIT EIGHT
+<U0039>     /x39         DIGIT NINE
+<U003A>     /x3a         COLON
+<U003B>     /x3b         SEMICOLON
+<U003C>     /x3c         LESS-THAN SIGN
+<U003D>     /x3d         EQUALS SIGN
+<U003E>     /x3e         GREATER-THAN SIGN
+<U003F>     /x3f         QUESTION MARK
+<U0040>     /x40         COMMERCIAL AT
+<U0041>     /x41         LATIN CAPITAL LETTER A
+<U0042>     /x42         LATIN CAPITAL LETTER B
+<U0043>     /x43         LATIN CAPITAL LETTER C
+<U0044>     /x44         LATIN CAPITAL LETTER D
+<U0045>     /x45         LATIN CAPITAL LETTER E
+<U0046>     /x46         LATIN CAPITAL LETTER F
+<U0047>     /x47         LATIN CAPITAL LETTER G
+<U0048>     /x48         LATIN CAPITAL LETTER H
+<U0049>     /x49         LATIN CAPITAL LETTER I
+<U004A>     /x4a         LATIN CAPITAL LETTER J
+<U004B>     /x4b         LATIN CAPITAL LETTER K
+<U004C>     /x4c         LATIN CAPITAL LETTER L
+<U004D>     /x4d         LATIN CAPITAL LETTER M
+<U004E>     /x4e         LATIN CAPITAL LETTER N
+<U004F>     /x4f         LATIN CAPITAL LETTER O
+<U0050>     /x50         LATIN CAPITAL LETTER P
+<U0051>     /x51         LATIN CAPITAL LETTER Q
+<U0052>     /x52         LATIN CAPITAL LETTER R
+<U0053>     /x53         LATIN CAPITAL LETTER S
+<U0054>     /x54         LATIN CAPITAL LETTER T
+<U0055>     /x55         LATIN CAPITAL LETTER U
+<U0056>     /x56         LATIN CAPITAL LETTER V
+<U0057>     /x57         LATIN CAPITAL LETTER W
+<U0058>     /x58         LATIN CAPITAL LETTER X
+<U0059>     /x59         LATIN CAPITAL LETTER Y
+<U005A>     /x5a         LATIN CAPITAL LETTER Z
+<U005B>     /x5b         LEFT SQUARE BRACKET
+<U005C>     /x5c         REVERSE SOLIDUS
+<U005D>     /x5d         RIGHT SQUARE BRACKET
+<U005E>     /x5e         CIRCUMFLEX ACCENT
+<U005F>     /x5f         LOW LINE
+<U0060>     /x60         GRAVE ACCENT
+<U0061>     /x61         LATIN SMALL LETTER A
+<U0062>     /x62         LATIN SMALL LETTER B
+<U0063>     /x63         LATIN SMALL LETTER C
+<U0064>     /x64         LATIN SMALL LETTER D
+<U0065>     /x65         LATIN SMALL LETTER E
+<U0066>     /x66         LATIN SMALL LETTER F
+<U0067>     /x67         LATIN SMALL LETTER G
+<U0068>     /x68         LATIN SMALL LETTER H
+<U0069>     /x69         LATIN SMALL LETTER I
+<U006A>     /x6a         LATIN SMALL LETTER J
+<U006B>     /x6b         LATIN SMALL LETTER K
+<U006C>     /x6c         LATIN SMALL LETTER L
+<U006D>     /x6d         LATIN SMALL LETTER M
+<U006E>     /x6e         LATIN SMALL LETTER N
+<U006F>     /x6f         LATIN SMALL LETTER O
+<U0070>     /x70         LATIN SMALL LETTER P
+<U0071>     /x71         LATIN SMALL LETTER Q
+<U0072>     /x72         LATIN SMALL LETTER R
+<U0073>     /x73         LATIN SMALL LETTER S
+<U0074>     /x74         LATIN SMALL LETTER T
+<U0075>     /x75         LATIN SMALL LETTER U
+<U0076>     /x76         LATIN SMALL LETTER V
+<U0077>     /x77         LATIN SMALL LETTER W
+<U0078>     /x78         LATIN SMALL LETTER X
+<U0079>     /x79         LATIN SMALL LETTER Y
+<U007A>     /x7a         LATIN SMALL LETTER Z
+<U007B>     /x7b         LEFT CURLY BRACKET
+<U007C>     /x7c         VERTICAL LINE
+<U007D>     /x7d         RIGHT CURLY BRACKET
+<U007E>     /x7e         TILDE
+<U007F>     /x7f         DELETE (DEL)
+<U0080>     /x80         PADDING CHARACTER (PAD)
+<U0081>     /x81         HIGH OCTET PRESET (HOP)
+<U0082>     /x82         BREAK PERMITTED HERE (BPH)
+<U0083>     /x83         NO BREAK HERE (NBH)
+<U0084>     /x84         INDEX (IND)
+<U0085>     /x85         NEXT LINE (NEL)
+<U0086>     /x86         START OF SELECTED AREA (SSA)
+<U0087>     /x87         END OF SELECTED AREA (ESA)
+<U0088>     /x88         CHARACTER TABULATION SET (HTS)
+<U0089>     /x89         CHARACTER TABULATION WITH JUSTIFICATION (HTJ)
+<U008A>     /x8a         LINE TABULATION SET (VTS)
+<U008B>     /x8b         PARTIAL LINE FORWARD (PLD)
+<U008C>     /x8c         PARTIAL LINE BACKWARD (PLU)
+<U008D>     /x8d         REVERSE LINE FEED (RI)
+<U008E>     /x8e         SINGLE-SHIFT TWO (SS2)
+<U008F>     /x8f         SINGLE-SHIFT THREE (SS3)
+<U0090>     /x90         DEVICE CONTROL STRING (DCS)
+<U0091>     /x91         PRIVATE USE ONE (PU1)
+<U0092>     /x92         PRIVATE USE TWO (PU2)
+<U0093>     /x93         SET TRANSMIT STATE (STS)
+<U0094>     /x94         CANCEL CHARACTER (CCH)
+<U0095>     /x95         MESSAGE WAITING (MW)
+<U0096>     /x96         START OF GUARDED AREA (SPA)
+<U0097>     /x97         END OF GUARDED AREA (EPA)
+<U0098>     /x98         START OF STRING (SOS)
+<U0099>     /x99         SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI)
+<U009A>     /x9a         SINGLE CHARACTER INTRODUCER (SCI)
+<U009B>     /x9b         CONTROL SEQUENCE INTRODUCER (CSI)
+<U009C>     /x9c         STRING TERMINATOR (ST)
+<U009D>     /x9d         OPERATING SYSTEM COMMAND (OSC)
+<U009E>     /x9e         PRIVACY MESSAGE (PM)
+<U009F>     /x9f         APPLICATION PROGRAM COMMAND (APC)
+<U00A0>     /xa0         NO-BREAK SPACE
+<U0E01>     /xa1         THAI CHARACTER KO KAI
+<U0E02>     /xa2         THAI CHARACTER KHO KHAI
+<U0E03>     /xa3         THAI CHARACTER KHO KHUAT
+<U0E04>     /xa4         THAI CHARACTER KHO KHWAI
+<U0E05>     /xa5         THAI CHARACTER KHO KHON
+<U0E06>     /xa6         THAI CHARACTER KHO RAKHANG
+<U0E07>     /xa7         THAI CHARACTER NGO NGU
+<U0E08>     /xa8         THAI CHARACTER CHO CHAN
+<U0E09>     /xa9         THAI CHARACTER CHO CHING
+<U0E0A>     /xaa         THAI CHARACTER CHO CHANG
+<U0E0B>     /xab         THAI CHARACTER SO SO
+<U0E0C>     /xac         THAI CHARACTER CHO CHOE
+<U0E0D>     /xad         THAI CHARACTER YO YING
+<U0E0E>     /xae         THAI CHARACTER DO CHADA
+<U0E0F>     /xaf         THAI CHARACTER TO PATAK
+<U0E10>     /xb0         THAI CHARACTER THO THAN
+<U0E11>     /xb1         THAI CHARACTER THO NANGMONTHO
+<U0E12>     /xb2         THAI CHARACTER THO PHUTHAO
+<U0E13>     /xb3         THAI CHARACTER NO NEN
+<U0E14>     /xb4         THAI CHARACTER DO DEK
+<U0E15>     /xb5         THAI CHARACTER TO TAO
+<U0E16>     /xb6         THAI CHARACTER THO THUNG
+<U0E17>     /xb7         THAI CHARACTER THO THAHAN
+<U0E18>     /xb8         THAI CHARACTER THO THONG
+<U0E19>     /xb9         THAI CHARACTER NO NU
+<U0E1A>     /xba         THAI CHARACTER BO BAIMAI
+<U0E1B>     /xbb         THAI CHARACTER PO PLA
+<U0E1C>     /xbc         THAI CHARACTER PHO PHUNG
+<U0E1D>     /xbd         THAI CHARACTER FO FA
+<U0E1E>     /xbe         THAI CHARACTER PHO PHAN
+<U0E1F>     /xbf         THAI CHARACTER FO FAN
+<U0E20>     /xc0         THAI CHARACTER PHO SAMPHAO
+<U0E21>     /xc1         THAI CHARACTER MO MA
+<U0E22>     /xc2         THAI CHARACTER YO YAK
+<U0E23>     /xc3         THAI CHARACTER RO RUA
+<U0E24>     /xc4         THAI CHARACTER RU
+<U0E25>     /xc5         THAI CHARACTER LO LING
+<U0E26>     /xc6         THAI CHARACTER LU
+<U0E27>     /xc7         THAI CHARACTER WO WAEN
+<U0E28>     /xc8         THAI CHARACTER SO SALA
+<U0E29>     /xc9         THAI CHARACTER SO RUSI
+<U0E2A>     /xca         THAI CHARACTER SO SUA
+<U0E2B>     /xcb         THAI CHARACTER HO HIP
+<U0E2C>     /xcc         THAI CHARACTER LO CHULA
+<U0E2D>     /xcd         THAI CHARACTER O ANG
+<U0E2E>     /xce         THAI CHARACTER HO NOKHUK
+<U0E2F>     /xcf         THAI CHARACTER PAIYANNOI
+<U0E30>     /xd0         THAI CHARACTER SARA A
+<U0E31>     /xd1         THAI CHARACTER MAI HAN-AKAT
+<U0E32>     /xd2         THAI CHARACTER SARA AA
+<U0E33>     /xd3         THAI CHARACTER SARA AM
+<U0E34>     /xd4         THAI CHARACTER SARA I
+<U0E35>     /xd5         THAI CHARACTER SARA II
+<U0E36>     /xd6         THAI CHARACTER SARA UE
+<U0E37>     /xd7         THAI CHARACTER SARA UEE
+<U0E38>     /xd8         THAI CHARACTER SARA U
+<U0E39>     /xd9         THAI CHARACTER SARA UU
+<U0E3A>     /xda         THAI CHARACTER PHINTHU
+<U0E3F>     /xdf         THAI CURRENCY SYMBOL BAHT
+<U0E40>     /xe0         THAI CHARACTER SARA E
+<U0E41>     /xe1         THAI CHARACTER SARA AE
+<U0E42>     /xe2         THAI CHARACTER SARA O
+<U0E43>     /xe3         THAI CHARACTER SARA AI MAIMUAN
+<U0E44>     /xe4         THAI CHARACTER SARA AI MAIMALAI
+<U0E45>     /xe5         THAI CHARACTER LAKKHANGYAO
+<U0E46>     /xe6         THAI CHARACTER MAIYAMOK
+<U0E47>     /xe7         THAI CHARACTER MAITAIKHU
+<U0E48>     /xe8         THAI CHARACTER MAI EK
+<U0E49>     /xe9         THAI CHARACTER MAI THO
+<U0E4A>     /xea         THAI CHARACTER MAI TRI
+<U0E4B>     /xeb         THAI CHARACTER MAI CHATTAWA
+<U0E4C>     /xec         THAI CHARACTER THANTHAKHAT
+<U0E4D>     /xed         THAI CHARACTER NIKHAHIT
+<U0E4E>     /xee         THAI CHARACTER YAMAKKAN
+<U0E4F>     /xef         THAI CHARACTER FONGMAN
+<U0E50>     /xf0         THAI DIGIT ZERO
+<U0E51>     /xf1         THAI DIGIT ONE
+<U0E52>     /xf2         THAI DIGIT TWO
+<U0E53>     /xf3         THAI DIGIT THREE
+<U0E54>     /xf4         THAI DIGIT FOUR
+<U0E55>     /xf5         THAI DIGIT FIVE
+<U0E56>     /xf6         THAI DIGIT SIX
+<U0E57>     /xf7         THAI DIGIT SEVEN
+<U0E58>     /xf8         THAI DIGIT EIGHT
+<U0E59>     /xf9         THAI DIGIT NINE
+<U0E5A>     /xfa         THAI CHARACTER ANGKHANKHU
+<U0E5B>     /xfb         THAI CHARACTER KHOMUT
+END CHARMAP
diff --git a/localedata/charmaps/HP-TURKISH8 b/localedata/charmaps/HP-TURKISH8
new file mode 100644
index 0000000000..2978d97ab4
--- /dev/null
+++ b/localedata/charmaps/HP-TURKISH8
@@ -0,0 +1,254 @@
+<code_set_name> HP-TURKISH8
+<comment_char> %
+<escape_char> /
+
+% alias TURKISH8
+CHARMAP
+<U0000>     /x00         NULL (NUL)
+<U0001>     /x01         START OF HEADING (SOH)
+<U0002>     /x02         START OF TEXT (STX)
+<U0003>     /x03         END OF TEXT (ETX)
+<U0004>     /x04         END OF TRANSMISSION (EOT)
+<U0005>     /x05         ENQUIRY (ENQ)
+<U0006>     /x06         ACKNOWLEDGE (ACK)
+<U0007>     /x07         BELL (BEL)
+<U0008>     /x08         BACKSPACE (BS)
+<U0009>     /x09         CHARACTER TABULATION (HT)
+<U000A>     /x0a         LINE FEED (LF)
+<U000B>     /x0b         LINE TABULATION (VT)
+<U000C>     /x0c         FORM FEED (FF)
+<U000D>     /x0d         CARRIAGE RETURN (CR)
+<U000E>     /x0e         SHIFT OUT (SO)
+<U000F>     /x0f         SHIFT IN (SI)
+<U0010>     /x10         DATALINK ESCAPE (DLE)
+<U0011>     /x11         DEVICE CONTROL ONE (DC1)
+<U0012>     /x12         DEVICE CONTROL TWO (DC2)
+<U0013>     /x13         DEVICE CONTROL THREE (DC3)
+<U0014>     /x14         DEVICE CONTROL FOUR (DC4)
+<U0015>     /x15         NEGATIVE ACKNOWLEDGE (NAK)
+<U0016>     /x16         SYNCHRONOUS IDLE (SYN)
+<U0017>     /x17         END OF TRANSMISSION BLOCK (ETB)
+<U0018>     /x18         CANCEL (CAN)
+<U0019>     /x19         END OF MEDIUM (EM)
+<U001A>     /x1a         SUBSTITUTE (SUB)
+<U001B>     /x1b         ESCAPE (ESC)
+<U001C>     /x1c         FILE SEPARATOR (IS4)
+<U001D>     /x1d         GROUP SEPARATOR (IS3)
+<U001E>     /x1e         RECORD SEPARATOR (IS2)
+<U001F>     /x1f         UNIT SEPARATOR (IS1)
+<U0020>     /x20         SPACE
+<U0021>     /x21         EXCLAMATION MARK
+<U0022>     /x22         QUOTATION MARK
+<U0023>     /x23         NUMBER SIGN
+<U0024>     /x24         DOLLAR SIGN
+<U0025>     /x25         PERCENT SIGN
+<U0026>     /x26         AMPERSAND
+<U0027>     /x27         APOSTROPHE
+<U0028>     /x28         LEFT PARENTHESIS
+<U0029>     /x29         RIGHT PARENTHESIS
+<U002A>     /x2a         ASTERISK
+<U002B>     /x2b         PLUS SIGN
+<U002C>     /x2c         COMMA
+<U002D>     /x2d         HYPHEN-MINUS
+<U002E>     /x2e         FULL STOP
+<U002F>     /x2f         SOLIDUS
+<U0030>     /x30         DIGIT ZERO
+<U0031>     /x31         DIGIT ONE
+<U0032>     /x32         DIGIT TWO
+<U0033>     /x33         DIGIT THREE
+<U0034>     /x34         DIGIT FOUR
+<U0035>     /x35         DIGIT FIVE
+<U0036>     /x36         DIGIT SIX
+<U0037>     /x37         DIGIT SEVEN
+<U0038>     /x38         DIGIT EIGHT
+<U0039>     /x39         DIGIT NINE
+<U003A>     /x3a         COLON
+<U003B>     /x3b         SEMICOLON
+<U003C>     /x3c         LESS-THAN SIGN
+<U003D>     /x3d         EQUALS SIGN
+<U003E>     /x3e         GREATER-THAN SIGN
+<U003F>     /x3f         QUESTION MARK
+<U0040>     /x40         COMMERCIAL AT
+<U0041>     /x41         LATIN CAPITAL LETTER A
+<U0042>     /x42         LATIN CAPITAL LETTER B
+<U0043>     /x43         LATIN CAPITAL LETTER C
+<U0044>     /x44         LATIN CAPITAL LETTER D
+<U0045>     /x45         LATIN CAPITAL LETTER E
+<U0046>     /x46         LATIN CAPITAL LETTER F
+<U0047>     /x47         LATIN CAPITAL LETTER G
+<U0048>     /x48         LATIN CAPITAL LETTER H
+<U0049>     /x49         LATIN CAPITAL LETTER I
+<U004A>     /x4a         LATIN CAPITAL LETTER J
+<U004B>     /x4b         LATIN CAPITAL LETTER K
+<U004C>     /x4c         LATIN CAPITAL LETTER L
+<U004D>     /x4d         LATIN CAPITAL LETTER M
+<U004E>     /x4e         LATIN CAPITAL LETTER N
+<U004F>     /x4f         LATIN CAPITAL LETTER O
+<U0050>     /x50         LATIN CAPITAL LETTER P
+<U0051>     /x51         LATIN CAPITAL LETTER Q
+<U0052>     /x52         LATIN CAPITAL LETTER R
+<U0053>     /x53         LATIN CAPITAL LETTER S
+<U0054>     /x54         LATIN CAPITAL LETTER T
+<U0055>     /x55         LATIN CAPITAL LETTER U
+<U0056>     /x56         LATIN CAPITAL LETTER V
+<U0057>     /x57         LATIN CAPITAL LETTER W
+<U0058>     /x58         LATIN CAPITAL LETTER X
+<U0059>     /x59         LATIN CAPITAL LETTER Y
+<U005A>     /x5a         LATIN CAPITAL LETTER Z
+<U005B>     /x5b         LEFT SQUARE BRACKET
+<U005C>     /x5c         REVERSE SOLIDUS
+<U005D>     /x5d         RIGHT SQUARE BRACKET
+<U005E>     /x5e         CIRCUMFLEX ACCENT
+<U005F>     /x5f         LOW LINE
+<U0060>     /x60         GRAVE ACCENT
+<U0061>     /x61         LATIN SMALL LETTER A
+<U0062>     /x62         LATIN SMALL LETTER B
+<U0063>     /x63         LATIN SMALL LETTER C
+<U0064>     /x64         LATIN SMALL LETTER D
+<U0065>     /x65         LATIN SMALL LETTER E
+<U0066>     /x66         LATIN SMALL LETTER F
+<U0067>     /x67         LATIN SMALL LETTER G
+<U0068>     /x68         LATIN SMALL LETTER H
+<U0069>     /x69         LATIN SMALL LETTER I
+<U006A>     /x6a         LATIN SMALL LETTER J
+<U006B>     /x6b         LATIN SMALL LETTER K
+<U006C>     /x6c         LATIN SMALL LETTER L
+<U006D>     /x6d         LATIN SMALL LETTER M
+<U006E>     /x6e         LATIN SMALL LETTER N
+<U006F>     /x6f         LATIN SMALL LETTER O
+<U0070>     /x70         LATIN SMALL LETTER P
+<U0071>     /x71         LATIN SMALL LETTER Q
+<U0072>     /x72         LATIN SMALL LETTER R
+<U0073>     /x73         LATIN SMALL LETTER S
+<U0074>     /x74         LATIN SMALL LETTER T
+<U0075>     /x75         LATIN SMALL LETTER U
+<U0076>     /x76         LATIN SMALL LETTER V
+<U0077>     /x77         LATIN SMALL LETTER W
+<U0078>     /x78         LATIN SMALL LETTER X
+<U0079>     /x79         LATIN SMALL LETTER Y
+<U007A>     /x7a         LATIN SMALL LETTER Z
+<U007B>     /x7b         LEFT CURLY BRACKET
+<U007C>     /x7c         VERTICAL LINE
+<U007D>     /x7d         RIGHT CURLY BRACKET
+<U007E>     /x7e         TILDE
+<U007F>     /x7f         DELETE (DEL)
+<U0080>     /x80         PADDING CHARACTER (PAD)
+<U0081>     /x81         HIGH OCTET PRESET (HOP)
+<U0082>     /x82         BREAK PERMITTED HERE (BPH)
+<U0083>     /x83         NO BREAK HERE (NBH)
+<U0084>     /x84         INDEX (IND)
+<U0085>     /x85         NEXT LINE (NEL)
+<U0086>     /x86         START OF SELECTED AREA (SSA)
+<U0087>     /x87         END OF SELECTED AREA (ESA)
+<U0088>     /x88         CHARACTER TABULATION SET (HTS)
+<U0089>     /x89         CHARACTER TABULATION WITH JUSTIFICATION (HTJ)
+<U008A>     /x8a         LINE TABULATION SET (VTS)
+<U008B>     /x8b         PARTIAL LINE FORWARD (PLD)
+<U008C>     /x8c         PARTIAL LINE BACKWARD (PLU)
+<U008D>     /x8d         REVERSE LINE FEED (RI)
+<U008E>     /x8e         SINGLE-SHIFT TWO (SS2)
+<U008F>     /x8f         SINGLE-SHIFT THREE (SS3)
+<U0090>     /x90         DEVICE CONTROL STRING (DCS)
+<U0091>     /x91         PRIVATE USE ONE (PU1)
+<U0092>     /x92         PRIVATE USE TWO (PU2)
+<U0093>     /x93         SET TRANSMIT STATE (STS)
+<U0094>     /x94         CANCEL CHARACTER (CCH)
+<U0095>     /x95         MESSAGE WAITING (MW)
+<U0096>     /x96         START OF GUARDED AREA (SPA)
+<U0097>     /x97         END OF GUARDED AREA (EPA)
+<U0098>     /x98         START OF STRING (SOS)
+<U0099>     /x99         SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI)
+<U009A>     /x9a         SINGLE CHARACTER INTRODUCER (SCI)
+<U009B>     /x9b         CONTROL SEQUENCE INTRODUCER (CSI)
+<U009C>     /x9c         STRING TERMINATOR (ST)
+<U009D>     /x9d         OPERATING SYSTEM COMMAND (OSC)
+<U009E>     /x9e         PRIVACY MESSAGE (PM)
+<U009F>     /x9f         APPLICATION PROGRAM COMMAND (APC)
+<U00A0>     /xa0         NO-BREAK SPACE
+<U00C7>     /xa1         LATIN CAPITAL LETTER C WITH CEDILLA
+<U011E>     /xa2         LATIN CAPITAL LETTER G WITH BREVE
+<U00C8>     /xa3         LATIN CAPITAL LETTER E WITH GRAVE
+<U00CA>     /xa4         LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+<U00CB>     /xa5         LATIN CAPITAL LETTER E WITH DIAERESIS
+<U00CE>     /xa6         LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+<U00CF>     /xa7         LATIN CAPITAL LETTER I WITH DIAERESIS
+<U00B4>     /xa8         ACUTE ACCENT
+<U02CB>     /xa9         MODIFIER LETTER GRAVE ACCENT (Mandarin Chinese fourth tone)
+<U02C6>     /xaa         MODIFIER LETTER CIRCUMFLEX ACCENT
+<U00A8>     /xab         DIAERESIS
+<U02DC>     /xac         SMALL TILDE
+<U00D9>     /xad         LATIN CAPITAL LETTER U WITH GRAVE
+<U00DB>     /xae         LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+<U20A4>     /xaf         LIRA SIGN
+<U00DD>     /xb1         LATIN CAPITAL LETTER Y WITH ACUTE
+<U00FD>     /xb2         LATIN SMALL LETTER Y WITH ACUTE
+<U00B0>     /xb3         DEGREE SIGN
+<U00D1>     /xb6         LATIN CAPITAL LETTER N WITH TILDE
+<U00F1>     /xb7         LATIN SMALL LETTER N WITH TILDE
+<U00A1>     /xb8         INVERTED EXCLAMATION MARK
+<U00BF>     /xb9         INVERTED QUESTION MARK
+<U00A4>     /xba         CURRENCY SIGN
+<U00A3>     /xbb         POUND SIGN
+<U00A5>     /xbc         YEN SIGN
+<U00A7>     /xbd         SECTION SIGN
+<U0192>     /xbe         LATIN SMALL LETTER F WITH HOOK
+<U00A2>     /xbf         CENT SIGN
+<U00EA>     /xc1         LATIN SMALL LETTER E WITH CIRCUMFLEX
+<U00F4>     /xc2         LATIN SMALL LETTER O WITH CIRCUMFLEX
+<U00E1>     /xc4         LATIN SMALL LETTER A WITH ACUTE
+<U00E9>     /xc5         LATIN SMALL LETTER E WITH ACUTE
+<U00F3>     /xc6         LATIN SMALL LETTER O WITH ACUTE
+<U00FA>     /xc7         LATIN SMALL LETTER U WITH ACUTE
+<U00E0>     /xc8         LATIN SMALL LETTER A WITH GRAVE
+<U00E8>     /xc9         LATIN SMALL LETTER E WITH GRAVE
+<U00F2>     /xca         LATIN SMALL LETTER O WITH GRAVE
+<U00F9>     /xcb         LATIN SMALL LETTER U WITH GRAVE
+<U00E4>     /xcc         LATIN SMALL LETTER A WITH DIAERESIS
+<U00EB>     /xcd         LATIN SMALL LETTER E WITH DIAERESIS
+<U00C5>     /xd0         LATIN CAPITAL LETTER A WITH RING ABOVE
+<U00EE>     /xd1         LATIN SMALL LETTER I WITH CIRCUMFLEX
+<U00D8>     /xd2         LATIN CAPITAL LETTER O WITH STROKE
+<U00C6>     /xd3         LATIN CAPITAL LETTER AE (ash) *
+<U00E5>     /xd4         LATIN SMALL LETTER A WITH RING ABOVE
+<U00ED>     /xd5         LATIN SMALL LETTER I WITH ACUTE
+<U00F8>     /xd6         LATIN SMALL LETTER O WITH STROKE
+<U00E6>     /xd7         LATIN SMALL LETTER AE (ash) *
+<U00C4>     /xd8         LATIN CAPITAL LETTER A WITH DIAERESIS
+<U00EC>     /xd9         LATIN SMALL LETTER I WITH GRAVE
+<U0130>     /xdb         LATIN CAPITAL LETTER I WITH DOT ABOVE
+<U00D6>     /xdc         LATIN CAPITAL LETTER O WITH DIAERESIS
+<U015E>     /xdd         LATIN CAPITAL LETTER S WITH CEDILLA *
+<U00DC>     /xde         LATIN CAPITAL LETTER U WITH DIAERESIS
+<U00E7>     /xdf         LATIN SMALL LETTER C WITH CEDILLA
+<U011F>     /xe0         LATIN SMALL LETTER G WITH BREVE
+<U00C3>     /xe1         LATIN CAPITAL LETTER A WITH TILDE
+<U00E3>     /xe2         LATIN SMALL LETTER A WITH TILDE
+<U00D0>     /xe3         LATIN CAPITAL LETTER ETH (Icelandic)
+<U00F0>     /xe4         LATIN SMALL LETTER ETH (Icelandic)
+<U00CD>     /xe5         LATIN CAPITAL LETTER I WITH ACUTE
+<U00CC>     /xe6         LATIN CAPITAL LETTER I WITH GRAVE
+<U00D3>     /xe7         LATIN CAPITAL LETTER O WITH ACUTE
+<U00D2>     /xe8         LATIN CAPITAL LETTER O WITH GRAVE
+<U00D5>     /xe9         LATIN CAPITAL LETTER O WITH TILDE
+<U00F5>     /xea         LATIN SMALL LETTER O WITH TILDE
+<U0160>     /xeb         LATIN CAPITAL LETTER S WITH CARON
+<U0161>     /xec         LATIN SMALL LETTER S WITH CARON
+<U00DA>     /xed         LATIN CAPITAL LETTER U WITH ACUTE
+<U0178>     /xee         LATIN CAPITAL LETTER Y WITH DIAERESIS
+<U00FF>     /xef         LATIN SMALL LETTER Y WITH DIAERESIS
+<U00DE>     /xf0         LATIN CAPITAL LETTER THORN (Icelandic)
+<U00FE>     /xf1         LATIN SMALL LETTER THORN (Icelandic)
+<U00B7>     /xf2         MIDDLE DOT
+<U00B5>     /xf3         MICRO SIGN
+<U00B6>     /xf4         PILCROW SIGN
+<U00BE>     /xf5         VULGAR FRACTION THREE QUARTERS
+<U2014>     /xf6         EM DASH
+<U00BC>     /xf7         VULGAR FRACTION ONE QUARTER
+<U00BD>     /xf8         VULGAR FRACTION ONE HALF
+<U00AA>     /xf9         FEMININE ORDINAL INDICATOR
+<U00BA>     /xfa         MASCULINE ORDINAL INDICATOR
+<U0131>     /xfb         LATIN SMALL LETTER DOTLESS I
+<U00F6>     /xfc         LATIN SMALL LETTER O WITH DIAERESIS
+<U015F>     /xfd         LATIN SMALL LETTER S WITH CEDILLA *
+<U00FC>     /xfe         LATIN SMALL LETTER U WITH DIAERESIS
+END CHARMAP
diff --git a/localedata/charmaps/UTF-8 b/localedata/charmaps/UTF-8
index 05bd81d98e..4ace37697e 100644
--- a/localedata/charmaps/UTF-8
+++ b/localedata/charmaps/UTF-8
@@ -886,13 +886,20 @@ CHARMAP
 <U036D>     /xcd/xad     COMBINING LATIN SMALL LETTER T
 <U036E>     /xcd/xae     COMBINING LATIN SMALL LETTER V
 <U036F>     /xcd/xaf     COMBINING LATIN SMALL LETTER X
+<U0370>     /xcd/xb0     GREEK CAPITAL LETTER HETA
+<U0371>     /xcd/xb1     GREEK SMALL LETTER HETA
+<U0372>     /xcd/xb2     GREEK CAPITAL LETTER ARCHAIC SAMPI
+<U0373>     /xcd/xb3     GREEK SMALL LETTER ARCHAIC SAMPI
 <U0374>     /xcd/xb4     GREEK NUMERAL SIGN
 <U0375>     /xcd/xb5     GREEK LOWER NUMERAL SIGN
+<U0376>     /xcd/xb6     GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA
+<U0377>     /xcd/xb7     GREEK SMALL LETTER PAMPHYLIAN DIGAMMA
 <U037A>     /xcd/xba     GREEK YPOGEGRAMMENI
 <U037B>     /xcd/xbb     GREEK SMALL REVERSED LUNATE SIGMA SYMBOL
 <U037C>     /xcd/xbc     GREEK SMALL DOTTED LUNATE SIGMA SYMBOL
 <U037D>     /xcd/xbd     GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL
 <U037E>     /xcd/xbe     GREEK QUESTION MARK
+<U037F>     /xcd/xbf     GREEK CAPITAL KAI SYMBOL
 <U0384>     /xce/x84     GREEK TONOS
 <U0385>     /xce/x85     GREEK DIALYTIKA TONOS
 <U0386>     /xce/x86     GREEK CAPITAL LETTER ALPHA WITH TONOS
@@ -1148,6 +1155,7 @@ CHARMAP
 <U0484>     /xd2/x84     COMBINING CYRILLIC PALATALIZATION
 <U0485>     /xd2/x85     COMBINING CYRILLIC DASIA PNEUMATA
 <U0486>     /xd2/x86     COMBINING CYRILLIC PSILI PNEUMATA
+<U0487>     /xd2/x87     COMBINING CYRILLIC POKRYTIE
 <U0488>     /xd2/x88     COMBINING CYRILLIC HUNDRED THOUSANDS SIGN
 <U0489>     /xd2/x89     COMBINING CYRILLIC MILLIONS SIGN
 <U048A>     /xd2/x8a     CYRILLIC CAPITAL LETTER SHORT I WITH TAIL
@@ -1288,6 +1296,22 @@ CHARMAP
 <U0511>     /xd4/x91     CYRILLIC SMALL LETTER REVERSED ZE
 <U0512>     /xd4/x92     CYRILLIC CAPITAL LETTER EL WITH HOOK
 <U0513>     /xd4/x93     CYRILLIC SMALL LETTER EL WITH HOOK
+<U0514>     /xd4/x94     CYRILLIC CAPITAL LETTER LHA
+<U0515>     /xd4/x95     CYRILLIC SMALL LETTER LHA
+<U0516>     /xd4/x96     CYRILLIC CAPITAL LETTER RHA
+<U0517>     /xd4/x97     CYRILLIC SMALL LETTER RHA
+<U0518>     /xd4/x98     CYRILLIC CAPITAL LETTER YAE
+<U0519>     /xd4/x99     CYRILLIC SMALL LETTER YAE
+<U051A>     /xd4/x9a     CYRILLIC CAPITAL LETTER QA
+<U051B>     /xd4/x9b     CYRILLIC SMALL LETTER QA
+<U051C>     /xd4/x9c     CYRILLIC CAPITAL LETTER WE
+<U051D>     /xd4/x9d     CYRILLIC SMALL LETTER WE
+<U051E>     /xd4/x9e     CYRILLIC CAPITAL LETTER ALEUT KA
+<U051F>     /xd4/x9f     CYRILLIC SMALL LETTER ALEUT KA
+<U0520>     /xd4/xa0     CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK
+<U0521>     /xd4/xa1     CYRILLIC SMALL LETTER EL WITH MIDDLE HOOK
+<U0522>     /xd4/xa2     CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK
+<U0523>     /xd4/xa3     CYRILLIC SMALL LETTER EN WITH MIDDLE HOOK
 <U0531>     /xd4/xb1     ARMENIAN CAPITAL LETTER AYB
 <U0532>     /xd4/xb2     ARMENIAN CAPITAL LETTER BEN
 <U0533>     /xd4/xb3     ARMENIAN CAPITAL LETTER GIM
@@ -1465,7 +1489,12 @@ CHARMAP
 <U0601>     /xd8/x81     ARABIC SIGN SANAH
 <U0602>     /xd8/x82     ARABIC FOOTNOTE MARKER
 <U0603>     /xd8/x83     ARABIC SIGN SAFHA
-<U060B>     /xd8/x8B     AFGHANI SIGN
+<U0606>     /xd8/x86     ARABIC-INDIC CUBE ROOT
+<U0607>     /xd8/x87     ARABIC-INDIC FOURTH ROOT
+<U0608>     /xd8/x88     ARABIC RAY
+<U0609>     /xd8/x89     ARABIC-INDIC PER MILLE SIGN
+<U060A>     /xd8/x8a     ARABIC-INDIC PER TEN THOUSAND SIGN
+<U060B>     /xd8/x8b     AFGHANI SIGN
 <U060C>     /xd8/x8c     ARABIC COMMA
 <U060D>     /xd8/x8d     ARABIC DATE SEPARATOR
 <U060E>     /xd8/x8e     ARABIC POETIC VERSE SIGN
@@ -1476,6 +1505,11 @@ CHARMAP
 <U0613>     /xd8/x93     ARABIC SIGN RADI ALLAHOU ANHU
 <U0614>     /xd8/x94     ARABIC SIGN TAKHALLUS
 <U0615>     /xd8/x95     ARABIC SMALL HIGH TAH
+<U0616>     /xd8/x96     ARABIC SMALL HIGH LIGATURE ALEF WITH LAM WITH YEH
+<U0617>     /xd8/x97     ARABIC SMALL HIGH ZAIN
+<U0618>     /xd8/x98     ARABIC SMALL FATHA
+<U0619>     /xd8/x99     ARABIC SMALL DAMMA
+<U061A>     /xd8/x9a     ARABIC SMALL KASRA
 <U061B>     /xd8/x9b     ARABIC SEMICOLON
 <U061E>     /xd8/x9e     ARABIC TRIPLE DOT PUNCTUATION MARK
 <U061F>     /xd8/x9f     ARABIC QUESTION MARK
@@ -1505,6 +1539,11 @@ CHARMAP
 <U0638>     /xd8/xb8     ARABIC LETTER ZAH
 <U0639>     /xd8/xb9     ARABIC LETTER AIN
 <U063A>     /xd8/xba     ARABIC LETTER GHAIN
+<U063B>     /xd8/xbb     ARABIC LETTER KEHEH WITH TWO DOTS ABOVE
+<U063C>     /xd8/xbc     ARABIC LETTER KEHEH WITH THREE DOTS BELOW
+<U063D>     /xd8/xbd     ARABIC LETTER FARSI YEH WITH INVERTED V
+<U063E>     /xd8/xbe     ARABIC LETTER FARSI YEH WITH TWO DOTS ABOVE
+<U063F>     /xd8/xbf     ARABIC LETTER FARSI YEH WITH THREE DOTS ABOVE
 <U0640>     /xd9/x80     ARABIC TATWEEL
 <U0641>     /xd9/x81     ARABIC LETTER FEH
 <U0642>     /xd9/x82     ARABIC LETTER QAF
@@ -1803,6 +1842,24 @@ CHARMAP
 <U076B>     /xdd/xab     ARABIC LETTER REH WITH TWO DOTS VERTICALLY ABOVE
 <U076C>     /xdd/xac     ARABIC LETTER REH WITH HAMZA ABOVE
 <U076D>     /xdd/xad     ARABIC LETTER SEEN WITH TWO DOTS VERTICALLY ABOVE
+<U076E>     /xdd/xae     ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH BELOW
+<U076F>     /xdd/xaf     ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH AND TWO DOTS
+<U0770>     /xdd/xb0     ARABIC LETTER SEEN WITH SMALL ARABIC LETTER TAH AND TWO DOTS
+<U0771>     /xdd/xb1     ARABIC LETTER REH WITH SMALL ARABIC LETTER TAH AND TWO DOTS
+<U0772>     /xdd/xb2     ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH ABOVE
+<U0773>     /xdd/xb3     ARABIC LETTER ALEF WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE
+<U0774>     /xdd/xb4     ARABIC LETTER ALEF WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE
+<U0775>     /xdd/xb5     ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE
+<U0776>     /xdd/xb6     ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE
+<U0777>     /xdd/xb7     ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT FOUR BELOW
+<U0778>     /xdd/xb8     ARABIC LETTER WAW WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE
+<U0779>     /xdd/xb9     ARABIC LETTER WAW WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE
+<U077A>     /xdd/xba     ARABIC LETTER YEH BARREE WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE
+<U077B>     /xdd/xbb     ARABIC LETTER YEH BARREE WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE
+<U077C>     /xdd/xbc     ARABIC LETTER HAH WITH EXTENDED ARABIC-INDIC DIGIT FOUR BELOW
+<U077D>     /xdd/xbd     ARABIC LETTER SEEN WITH EXTENDED ARABIC-INDIC DIGIT FOUR ABOVE
+<U077E>     /xdd/xbe     ARABIC LETTER SEEN WITH INVERTED V
+<U077F>     /xdd/xbf     ARABIC LETTER KAF WITH TWO DOTS ABOVE
 <U0780>     /xde/x80     THAANA LETTER HAA
 <U0781>     /xde/x81     THAANA LETTER SHAVIYANI
 <U0782>     /xde/x82     THAANA LETTER NOONU
@@ -2017,6 +2074,8 @@ CHARMAP
 <U096E>     /xe0/xa5/xae DEVANAGARI DIGIT EIGHT
 <U096F>     /xe0/xa5/xaf DEVANAGARI DIGIT NINE
 <U0970>     /xe0/xa5/xb0 DEVANAGARI ABBREVIATION SIGN
+<U0971>     /xe0/xa5/xb1 DEVANAGARI SIGN HIGH SPACING DOT
+<U0972>     /xe0/xa5/xb2 DEVANAGARI LETTER CANDRA A
 <U097B>     /xe0/xa5/xbb DEVANAGARI LETTER GGA
 <U097C>     /xe0/xa5/xbc DEVANAGARI LETTER JJA
 <U097D>     /xe0/xa5/xbd DEVANAGARI LETTER GLOTTAL STOP
@@ -2170,6 +2229,7 @@ CHARMAP
 <U0A4B>     /xe0/xa9/x8b GURMUKHI VOWEL SIGN OO
 <U0A4C>     /xe0/xa9/x8c GURMUKHI VOWEL SIGN AU
 <U0A4D>     /xe0/xa9/x8d GURMUKHI SIGN VIRAMA
+<U0A51>     /xe0/xa9/x91 GURMUKHI SIGN UDAAT
 <U0A59>     /xe0/xa9/x99 GURMUKHI LETTER KHHA
 <U0A5A>     /xe0/xa9/x9a GURMUKHI LETTER GHHA
 <U0A5B>     /xe0/xa9/x9b GURMUKHI LETTER ZA
@@ -2190,6 +2250,7 @@ CHARMAP
 <U0A72>     /xe0/xa9/xb2 GURMUKHI IRI
 <U0A73>     /xe0/xa9/xb3 GURMUKHI URA
 <U0A74>     /xe0/xa9/xb4 GURMUKHI EK ONKAR
+<U0A75>     /xe0/xa9/xb5 GURMUKHI SIGN YAKASH
 <U0A81>     /xe0/xaa/x81 GUJARATI SIGN CANDRABINDU
 <U0A82>     /xe0/xaa/x82 GUJARATI SIGN ANUSVARA
 <U0A83>     /xe0/xaa/x83 GUJARATI SIGN VISARGA
@@ -2330,6 +2391,7 @@ CHARMAP
 <U0B41>     /xe0/xad/x81 ORIYA VOWEL SIGN U
 <U0B42>     /xe0/xad/x82 ORIYA VOWEL SIGN UU
 <U0B43>     /xe0/xad/x83 ORIYA VOWEL SIGN VOCALIC R
+<U0B44>     /xe0/xad/x84 ORIYA VOWEL SIGN VOCALIC RR
 <U0B47>     /xe0/xad/x87 ORIYA VOWEL SIGN E
 <U0B48>     /xe0/xad/x88 ORIYA VOWEL SIGN AI
 <U0B4B>     /xe0/xad/x8b ORIYA VOWEL SIGN O
@@ -2342,6 +2404,8 @@ CHARMAP
 <U0B5F>     /xe0/xad/x9f ORIYA LETTER YYA
 <U0B60>     /xe0/xad/xa0 ORIYA LETTER VOCALIC RR
 <U0B61>     /xe0/xad/xa1 ORIYA LETTER VOCALIC LL
+<U0B62>     /xe0/xad/xa2 ORIYA VOWEL SIGN VOCALIC L
+<U0B63>     /xe0/xad/xa3 ORIYA VOWEL SIGN VOCALIC LL
 <U0B66>     /xe0/xad/xa6 ORIYA DIGIT ZERO
 <U0B67>     /xe0/xad/xa7 ORIYA DIGIT ONE
 <U0B68>     /xe0/xad/xa8 ORIYA DIGIT TWO
@@ -2403,6 +2467,7 @@ CHARMAP
 <U0BCB>     /xe0/xaf/x8b TAMIL VOWEL SIGN OO
 <U0BCC>     /xe0/xaf/x8c TAMIL VOWEL SIGN AU
 <U0BCD>     /xe0/xaf/x8d TAMIL SIGN VIRAMA
+<U0BD0>     /xe0/xaf/x90 TAMIL OM
 <U0BD7>     /xe0/xaf/x97 TAMIL AU LENGTH MARK
 <U0BE6>     /xe0/xaf/xa6 TAMIL DIGIT ZERO
 <U0BE7>     /xe0/xaf/xa7 TAMIL DIGIT ONE
@@ -2477,6 +2542,7 @@ CHARMAP
 <U0C37>     /xe0/xb0/xb7 TELUGU LETTER SSA
 <U0C38>     /xe0/xb0/xb8 TELUGU LETTER SA
 <U0C39>     /xe0/xb0/xb9 TELUGU LETTER HA
+<U0C3D>     /xe0/xb0/xbd TELUGU SIGN AVAGRAHA
 <U0C3E>     /xe0/xb0/xbe TELUGU VOWEL SIGN AA
 <U0C3F>     /xe0/xb0/xbf TELUGU VOWEL SIGN I
 <U0C40>     /xe0/xb1/x80 TELUGU VOWEL SIGN II
@@ -2493,8 +2559,12 @@ CHARMAP
 <U0C4D>     /xe0/xb1/x8d TELUGU SIGN VIRAMA
 <U0C55>     /xe0/xb1/x95 TELUGU LENGTH MARK
 <U0C56>     /xe0/xb1/x96 TELUGU AI LENGTH MARK
+<U0C58>     /xe0/xb1/x98 TELUGU LETTER TSA
+<U0C59>     /xe0/xb1/x99 TELUGU LETTER DZA
 <U0C60>     /xe0/xb1/xa0 TELUGU LETTER VOCALIC RR
 <U0C61>     /xe0/xb1/xa1 TELUGU LETTER VOCALIC LL
+<U0C62>     /xe0/xb1/xa2 TELUGU VOWEL SIGN VOCALIC L
+<U0C63>     /xe0/xb1/xa3 TELUGU VOWEL SIGN VOCALIC LL
 <U0C66>     /xe0/xb1/xa6 TELUGU DIGIT ZERO
 <U0C67>     /xe0/xb1/xa7 TELUGU DIGIT ONE
 <U0C68>     /xe0/xb1/xa8 TELUGU DIGIT TWO
@@ -2505,6 +2575,14 @@ CHARMAP
 <U0C6D>     /xe0/xb1/xad TELUGU DIGIT SEVEN
 <U0C6E>     /xe0/xb1/xae TELUGU DIGIT EIGHT
 <U0C6F>     /xe0/xb1/xaf TELUGU DIGIT NINE
+<U0C78>     /xe0/xb1/xb8 TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR
+<U0C79>     /xe0/xb1/xb9 TELUGU FRACTION DIGIT ONE FOR ODD POWERS OF FOUR
+<U0C7A>     /xe0/xb1/xba TELUGU FRACTION DIGIT TWO FOR ODD POWERS OF FOUR
+<U0C7B>     /xe0/xb1/xbb TELUGU FRACTION DIGIT THREE FOR ODD POWERS OF FOUR
+<U0C7C>     /xe0/xb1/xbc TELUGU FRACTION DIGIT ONE FOR EVEN POWERS OF FOUR
+<U0C7D>     /xe0/xb1/xbd TELUGU FRACTION DIGIT TWO FOR EVEN POWERS OF FOUR
+<U0C7E>     /xe0/xb1/xbe TELUGU FRACTION DIGIT THREE FOR EVEN POWERS OF FOUR
+<U0C7F>     /xe0/xb1/xbf TELUGU SIGN TUUMU
 <U0C82>     /xe0/xb2/x82 KANNADA SIGN ANUSVARA
 <U0C83>     /xe0/xb2/x83 KANNADA SIGN VISARGA
 <U0C85>     /xe0/xb2/x85 KANNADA LETTER A
@@ -2643,12 +2721,14 @@ CHARMAP
 <U0D37>     /xe0/xb4/xb7 MALAYALAM LETTER SSA
 <U0D38>     /xe0/xb4/xb8 MALAYALAM LETTER SA
 <U0D39>     /xe0/xb4/xb9 MALAYALAM LETTER HA
+<U0D3D>     /xe0/xb4/xbd MALAYALAM SIGN AVAGRAHA
 <U0D3E>     /xe0/xb4/xbe MALAYALAM VOWEL SIGN AA
 <U0D3F>     /xe0/xb4/xbf MALAYALAM VOWEL SIGN I
 <U0D40>     /xe0/xb5/x80 MALAYALAM VOWEL SIGN II
 <U0D41>     /xe0/xb5/x81 MALAYALAM VOWEL SIGN U
 <U0D42>     /xe0/xb5/x82 MALAYALAM VOWEL SIGN UU
 <U0D43>     /xe0/xb5/x83 MALAYALAM VOWEL SIGN VOCALIC R
+<U0D44>     /xe0/xb5/x84 MALAYALAM VOWEL SIGN VOCALIC RR
 <U0D46>     /xe0/xb5/x86 MALAYALAM VOWEL SIGN E
 <U0D47>     /xe0/xb5/x87 MALAYALAM VOWEL SIGN EE
 <U0D48>     /xe0/xb5/x88 MALAYALAM VOWEL SIGN AI
@@ -2659,6 +2739,8 @@ CHARMAP
 <U0D57>     /xe0/xb5/x97 MALAYALAM AU LENGTH MARK
 <U0D60>     /xe0/xb5/xa0 MALAYALAM LETTER VOCALIC RR
 <U0D61>     /xe0/xb5/xa1 MALAYALAM LETTER VOCALIC LL
+<U0D62>     /xe0/xb5/xa2 MALAYALAM VOWEL SIGN VOCALIC L
+<U0D63>     /xe0/xb5/xa3 MALAYALAM VOWEL SIGN VOCALIC LL
 <U0D66>     /xe0/xb5/xa6 MALAYALAM DIGIT ZERO
 <U0D67>     /xe0/xb5/xa7 MALAYALAM DIGIT ONE
 <U0D68>     /xe0/xb5/xa8 MALAYALAM DIGIT TWO
@@ -2669,6 +2751,19 @@ CHARMAP
 <U0D6D>     /xe0/xb5/xad MALAYALAM DIGIT SEVEN
 <U0D6E>     /xe0/xb5/xae MALAYALAM DIGIT EIGHT
 <U0D6F>     /xe0/xb5/xaf MALAYALAM DIGIT NINE
+<U0D70>     /xe0/xb5/xb0 MALAYALAM NUMBER TEN
+<U0D71>     /xe0/xb5/xb1 MALAYALAM NUMBER ONE HUNDRED
+<U0D72>     /xe0/xb5/xb2 MALAYALAM NUMBER ONE THOUSAND
+<U0D73>     /xe0/xb5/xb3 MALAYALAM FRACTION ONE QUARTER
+<U0D74>     /xe0/xb5/xb4 MALAYALAM FRACTION ONE HALF
+<U0D75>     /xe0/xb5/xb5 MALAYALAM FRACTION THREE QUARTERS
+<U0D79>     /xe0/xb5/xb9 MALAYALAM DATE MARK
+<U0D7A>     /xe0/xb5/xba MALAYALAM LETTER CHILLU NN
+<U0D7B>     /xe0/xb5/xbb MALAYALAM LETTER CHILLU N
+<U0D7C>     /xe0/xb5/xbc MALAYALAM LETTER CHILLU RR
+<U0D7D>     /xe0/xb5/xbd MALAYALAM LETTER CHILLU L
+<U0D7E>     /xe0/xb5/xbe MALAYALAM LETTER CHILLU LL
+<U0D7F>     /xe0/xb5/xbf MALAYALAM LETTER CHILLU K
 <U0D82>     /xe0/xb6/x82 SINHALA SIGN ANUSVARAYA
 <U0D83>     /xe0/xb6/x83 SINHALA SIGN VISARGAYA
 <U0D85>     /xe0/xb6/x85 SINHALA LETTER AYANNA
@@ -3007,6 +3102,8 @@ CHARMAP
 <U0F68>     /xe0/xbd/xa8 TIBETAN LETTER A
 <U0F69>     /xe0/xbd/xa9 TIBETAN LETTER KSSA
 <U0F6A>     /xe0/xbd/xaa TIBETAN LETTER FIXED-FORM RA
+<U0F6B>     /xe0/xbd/xab TIBETAN LETTER KKA
+<U0F6C>     /xe0/xbd/xac TIBETAN LETTER RRA
 <U0F71>     /xe0/xbd/xb1 TIBETAN VOWEL SIGN AA
 <U0F72>     /xe0/xbd/xb2 TIBETAN VOWEL SIGN I
 <U0F73>     /xe0/xbd/xb3 TIBETAN VOWEL SIGN II
@@ -3093,9 +3190,13 @@ CHARMAP
 <U0FCA>     /xe0/xbf/x8a TIBETAN SYMBOL NOR BU NYIS -KHYIL
 <U0FCB>     /xe0/xbf/x8b TIBETAN SYMBOL NOR BU GSUM -KHYIL
 <U0FCC>     /xe0/xbf/x8c TIBETAN SYMBOL NOR BU BZHI -KHYIL
+<U0FCE>     /xe0/xbf/x8e TIBETAN SIGN RDEL NAG RDEL DKAR
 <U0FCF>     /xe0/xbf/x8f TIBETAN SIGN RDEL NAG GSUM
 <U0FD0>     /xe0/xbf/x90 TIBETAN MARK BSKA- SHOG GI MGO RGYAN
 <U0FD1>     /xe0/xbf/x91 TIBETAN MARK MNYAM YIG GI MGO RGYAN
+<U0FD2>     /xe0/xbf/x92 TIBETAN MARK NYIS TSHEG
+<U0FD3>     /xe0/xbf/x93 TIBETAN MARK INITIAL BRDA RNYING YIG MGO MDUN MA
+<U0FD4>     /xe0/xbf/x94 TIBETAN MARK CLOSING BRDA RNYING YIG MGO SGAB MA
 <U1000>     /xe1/x80/x80 MYANMAR LETTER KA
 <U1001>     /xe1/x80/x81 MYANMAR LETTER KHA
 <U1002>     /xe1/x80/x82 MYANMAR LETTER GA
@@ -3130,13 +3231,16 @@ CHARMAP
 <U101F>     /xe1/x80/x9f MYANMAR LETTER HA
 <U1020>     /xe1/x80/xa0 MYANMAR LETTER LLA
 <U1021>     /xe1/x80/xa1 MYANMAR LETTER A
+<U1022>     /xe1/x80/xa2 MYANMAR LETTER SHAN A
 <U1023>     /xe1/x80/xa3 MYANMAR LETTER I
 <U1024>     /xe1/x80/xa4 MYANMAR LETTER II
 <U1025>     /xe1/x80/xa5 MYANMAR LETTER U
 <U1026>     /xe1/x80/xa6 MYANMAR LETTER UU
 <U1027>     /xe1/x80/xa7 MYANMAR LETTER E
+<U1028>     /xe1/x80/xa8 MYANMAR LETTER MON E
 <U1029>     /xe1/x80/xa9 MYANMAR LETTER O
 <U102A>     /xe1/x80/xaa MYANMAR LETTER AU
+<U102B>     /xe1/x80/xab MYANMAR VOWEL SIGN TALL AA
 <U102C>     /xe1/x80/xac MYANMAR VOWEL SIGN AA
 <U102D>     /xe1/x80/xad MYANMAR VOWEL SIGN I
 <U102E>     /xe1/x80/xae MYANMAR VOWEL SIGN II
@@ -3144,10 +3248,19 @@ CHARMAP
 <U1030>     /xe1/x80/xb0 MYANMAR VOWEL SIGN UU
 <U1031>     /xe1/x80/xb1 MYANMAR VOWEL SIGN E
 <U1032>     /xe1/x80/xb2 MYANMAR VOWEL SIGN AI
+<U1033>     /xe1/x80/xb3 MYANMAR VOWEL SIGN MON II
+<U1034>     /xe1/x80/xb4 MYANMAR VOWEL SIGN MON O
+<U1035>     /xe1/x80/xb5 MYANMAR VOWEL SIGN E ABOVE
 <U1036>     /xe1/x80/xb6 MYANMAR SIGN ANUSVARA
 <U1037>     /xe1/x80/xb7 MYANMAR SIGN DOT BELOW
 <U1038>     /xe1/x80/xb8 MYANMAR SIGN VISARGA
 <U1039>     /xe1/x80/xb9 MYANMAR SIGN VIRAMA
+<U103A>     /xe1/x80/xba MYANMAR SIGN ASAT
+<U103B>     /xe1/x80/xbb MYANMAR CONSONANT SIGN MEDIAL YA
+<U103C>     /xe1/x80/xbc MYANMAR CONSONANT SIGN MEDIAL RA
+<U103D>     /xe1/x80/xbd MYANMAR CONSONANT SIGN MEDIAL WA
+<U103E>     /xe1/x80/xbe MYANMAR CONSONANT SIGN MEDIAL HA
+<U103F>     /xe1/x80/xbf MYANMAR LETTER GREAT SA
 <U1040>     /xe1/x81/x80 MYANMAR DIGIT ZERO
 <U1041>     /xe1/x81/x81 MYANMAR DIGIT ONE
 <U1042>     /xe1/x81/x82 MYANMAR DIGIT TWO
@@ -3174,6 +3287,72 @@ CHARMAP
 <U1057>     /xe1/x81/x97 MYANMAR VOWEL SIGN VOCALIC RR
 <U1058>     /xe1/x81/x98 MYANMAR VOWEL SIGN VOCALIC L
 <U1059>     /xe1/x81/x99 MYANMAR VOWEL SIGN VOCALIC LL
+<U105A>     /xe1/x81/x9a MYANMAR LETTER MON NGA
+<U105B>     /xe1/x81/x9b MYANMAR LETTER MON JHA
+<U105C>     /xe1/x81/x9c MYANMAR LETTER MON BBA
+<U105D>     /xe1/x81/x9d MYANMAR LETTER MON BBE
+<U105E>     /xe1/x81/x9e MYANMAR CONSONANT SIGN MON MEDIAL NA
+<U105F>     /xe1/x81/x9f MYANMAR CONSONANT SIGN MON MEDIAL MA
+<U1060>     /xe1/x81/xa0 MYANMAR CONSONANT SIGN MON MEDIAL LA
+<U1061>     /xe1/x81/xa1 MYANMAR LETTER SGAW KAREN SHA
+<U1062>     /xe1/x81/xa2 MYANMAR VOWEL SIGN SGAW KAREN EU
+<U1063>     /xe1/x81/xa3 MYANMAR TONE MARK SGAW KAREN HATHI
+<U1064>     /xe1/x81/xa4 MYANMAR TONE MARK SGAW KAREN KE PHO
+<U1065>     /xe1/x81/xa5 MYANMAR LETTER WESTERN PWO KAREN THA
+<U1066>     /xe1/x81/xa6 MYANMAR LETTER WESTERN PWO KAREN PWA
+<U1067>     /xe1/x81/xa7 MYANMAR VOWEL SIGN WESTERN PWO KAREN EU
+<U1068>     /xe1/x81/xa8 MYANMAR VOWEL SIGN WESTERN PWO KAREN UE
+<U1069>     /xe1/x81/xa9 MYANMAR SIGN WESTERN PWO KAREN TONE-1
+<U106A>     /xe1/x81/xaa MYANMAR SIGN WESTERN PWO KAREN TONE-2
+<U106B>     /xe1/x81/xab MYANMAR SIGN WESTERN PWO KAREN TONE-3
+<U106C>     /xe1/x81/xac MYANMAR SIGN WESTERN PWO KAREN TONE-4
+<U106D>     /xe1/x81/xad MYANMAR SIGN WESTERN PWO KAREN TONE-5
+<U106E>     /xe1/x81/xae MYANMAR LETTER EASTERN PWO KAREN NNA
+<U106F>     /xe1/x81/xaf MYANMAR LETTER EASTERN PWO KAREN YWA
+<U1070>     /xe1/x81/xb0 MYANMAR LETTER EASTERN PWO KAREN GHWA
+<U1071>     /xe1/x81/xb1 MYANMAR VOWEL SIGN GEBA KAREN I
+<U1072>     /xe1/x81/xb2 MYANMAR VOWEL SIGN KAYAH OE
+<U1073>     /xe1/x81/xb3 MYANMAR VOWEL SIGN KAYAH U
+<U1074>     /xe1/x81/xb4 MYANMAR VOWEL SIGN KAYAH EE
+<U1075>     /xe1/x81/xb5 MYANMAR LETTER SHAN KA
+<U1076>     /xe1/x81/xb6 MYANMAR LETTER SHAN KHA
+<U1077>     /xe1/x81/xb7 MYANMAR LETTER SHAN GA
+<U1078>     /xe1/x81/xb8 MYANMAR LETTER SHAN CA
+<U1079>     /xe1/x81/xb9 MYANMAR LETTER SHAN ZA
+<U107A>     /xe1/x81/xba MYANMAR LETTER SHAN NYA
+<U107B>     /xe1/x81/xbb MYANMAR LETTER SHAN DA
+<U107C>     /xe1/x81/xbc MYANMAR LETTER SHAN NA
+<U107D>     /xe1/x81/xbd MYANMAR LETTER SHAN PHA
+<U107E>     /xe1/x81/xbe MYANMAR LETTER SHAN FA
+<U107F>     /xe1/x81/xbf MYANMAR LETTER SHAN BA
+<U1080>     /xe1/x81/x80 MYANMAR LETTER SHAN THA
+<U1081>     /xe1/x81/x81 MYANMAR LETTER SHAN HA
+<U1082>     /xe1/x81/x82 MYANMAR CONSONANT SIGN SHAN MEDIAL WA
+<U1083>     /xe1/x81/x83 MYANMAR VOWEL SIGN SHAN AA
+<U1084>     /xe1/x81/x84 MYANMAR VOWEL SIGN SHAN E
+<U1085>     /xe1/x81/x85 MYANMAR VOWEL SIGN SHAN E ABOVE
+<U1086>     /xe1/x81/x86 MYANMAR VOWEL SIGN SHAN FINAL Y
+<U1087>     /xe1/x81/x87 MYANMAR SIGN SHAN TONE-2
+<U1088>     /xe1/x81/x88 MYANMAR SIGN SHAN TONE-3
+<U1089>     /xe1/x81/x89 MYANMAR SIGN SHAN TONE-5
+<U108A>     /xe1/x81/x8a MYANMAR SIGN SHAN TONE-6
+<U108B>     /xe1/x81/x8b MYANMAR SIGN SHAN COUNCIL TONE-2
+<U108C>     /xe1/x81/x8c MYANMAR SIGN SHAN COUNCIL TONE-3
+<U108D>     /xe1/x81/x8d MYANMAR SIGN SHAN COUNCIL EMPHATIC TONE
+<U108E>     /xe1/x81/x8e MYANMAR LETTER RUMAI PALAUNG FA
+<U108F>     /xe1/x81/x8f MYANMAR SIGN RUMAI PALAUNG TONE-5
+<U1090>     /xe1/x81/x90 MYANMAR SHAN DIGIT ZERO
+<U1091>     /xe1/x81/x91 MYANMAR SHAN DIGIT ONE
+<U1092>     /xe1/x81/x92 MYANMAR SHAN DIGIT TWO
+<U1093>     /xe1/x81/x93 MYANMAR SHAN DIGIT THREE
+<U1094>     /xe1/x81/x94 MYANMAR SHAN DIGIT FOUR
+<U1095>     /xe1/x81/x95 MYANMAR SHAN DIGIT FIVE
+<U1096>     /xe1/x81/x96 MYANMAR SHAN DIGIT SIX
+<U1097>     /xe1/x81/x97 MYANMAR SHAN DIGIT SEVEN
+<U1098>     /xe1/x81/x98 MYANMAR SHAN DIGIT EIGHT
+<U1099>     /xe1/x81/x99 MYANMAR SHAN DIGIT NINE
+<U109E>     /xe1/x81/x9e MYANMAR SYMBOL SHAN ONE
+<U109F>     /xe1/x81/x9f MYANMAR SYMBOL SHAN EXCLAMATION
 <U10A0>     /xe1/x82/xa0 GEORGIAN CAPITAL LETTER AN
 <U10A1>     /xe1/x82/xa1 GEORGIAN CAPITAL LETTER BAN
 <U10A2>     /xe1/x82/xa2 GEORGIAN CAPITAL LETTER GAN
@@ -5054,6 +5233,7 @@ CHARMAP
 <U18A7>     /xe1/xa2/xa7 MONGOLIAN LETTER ALI GALI HALF YA
 <U18A8>     /xe1/xa2/xa8 MONGOLIAN LETTER MANCHU ALI GALI BHA
 <U18A9>     /xe1/xa2/xa9 MONGOLIAN LETTER ALI GALI DAGALGA
+<U18AA>     /xe1/xa2/xaa MONGOLIAN LETTER MANCHU ALI GALI LHA
 <U1900>     /xe1/xa4/x80 LIMBU VOWEL-CARRIER LETTER
 <U1901>     /xe1/xa4/x81 LIMBU LETTER KA
 <U1902>     /xe1/xa4/x82 LIMBU LETTER KHA
@@ -5418,6 +5598,183 @@ CHARMAP
 <U1B7A>     /xe1/xad/xba BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLAK
 <U1B7B>     /xe1/xad/xbb BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLUK
 <U1B7C>     /xe1/xad/xbc BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING
+<U1B80>     /xe1/xae/x80 SUNDANESE SIGN PANYECEK
+<U1B81>     /xe1/xae/x81 SUNDANESE SIGN PANGLAYAR
+<U1B82>     /xe1/xae/x82 SUNDANESE SIGN PANGWISAD
+<U1B83>     /xe1/xae/x83 SUNDANESE LETTER A
+<U1B84>     /xe1/xae/x84 SUNDANESE LETTER I
+<U1B85>     /xe1/xae/x85 SUNDANESE LETTER U
+<U1B86>     /xe1/xae/x86 SUNDANESE LETTER AE
+<U1B87>     /xe1/xae/x87 SUNDANESE LETTER O
+<U1B88>     /xe1/xae/x88 SUNDANESE LETTER E
+<U1B89>     /xe1/xae/x89 SUNDANESE LETTER EU
+<U1B8A>     /xe1/xae/x8a SUNDANESE LETTER KA
+<U1B8B>     /xe1/xae/x8b SUNDANESE LETTER QA
+<U1B8C>     /xe1/xae/x8c SUNDANESE LETTER GA
+<U1B8D>     /xe1/xae/x8d SUNDANESE LETTER NGA
+<U1B8E>     /xe1/xae/x8e SUNDANESE LETTER CA
+<U1B8F>     /xe1/xae/x8f SUNDANESE LETTER JA
+<U1B90>     /xe1/xae/x90 SUNDANESE LETTER ZA
+<U1B91>     /xe1/xae/x91 SUNDANESE LETTER NYA
+<U1B92>     /xe1/xae/x92 SUNDANESE LETTER TA
+<U1B93>     /xe1/xae/x93 SUNDANESE LETTER DA
+<U1B94>     /xe1/xae/x94 SUNDANESE LETTER NA
+<U1B95>     /xe1/xae/x95 SUNDANESE LETTER PA
+<U1B96>     /xe1/xae/x96 SUNDANESE LETTER FA
+<U1B97>     /xe1/xae/x97 SUNDANESE LETTER VA
+<U1B98>     /xe1/xae/x98 SUNDANESE LETTER BA
+<U1B99>     /xe1/xae/x99 SUNDANESE LETTER MA
+<U1B9A>     /xe1/xae/x9a SUNDANESE LETTER YA
+<U1B9B>     /xe1/xae/x9b SUNDANESE LETTER RA
+<U1B9C>     /xe1/xae/x9c SUNDANESE LETTER LA
+<U1B9D>     /xe1/xae/x9d SUNDANESE LETTER WA
+<U1B9E>     /xe1/xae/x9e SUNDANESE LETTER SA
+<U1B9F>     /xe1/xae/x9f SUNDANESE LETTER XA
+<U1BA0>     /xe1/xae/xa0 SUNDANESE LETTER HA
+<U1BA1>     /xe1/xae/xa1 SUNDANESE CONSONANT SIGN PAMINGKAL
+<U1BA2>     /xe1/xae/xa2 SUNDANESE CONSONANT SIGN PANYAKRA
+<U1BA3>     /xe1/xae/xa3 SUNDANESE CONSONANT SIGN PANYIKU
+<U1BA4>     /xe1/xae/xa4 SUNDANESE VOWEL SIGN PANGHULU
+<U1BA5>     /xe1/xae/xa5 SUNDANESE VOWEL SIGN PANYUKU
+<U1BA6>     /xe1/xae/xa6 SUNDANESE VOWEL SIGN PANAELAENG
+<U1BA7>     /xe1/xae/xa7 SUNDANESE VOWEL SIGN PANOLONG
+<U1BA8>     /xe1/xae/xa8 SUNDANESE VOWEL SIGN PAMEPET
+<U1BA9>     /xe1/xae/xa9 SUNDANESE VOWEL SIGN PANEULEUNG
+<U1BAA>     /xe1/xae/xaa SUNDANESE SIGN PAMAAEH
+<U1BAE>     /xe1/xae/xae SUNDANESE LETTER KHA
+<U1BAF>     /xe1/xae/xaf SUNDANESE LETTER SYA
+<U1BB0>     /xe1/xae/xb0 SUNDANESE DIGIT ZERO
+<U1BB1>     /xe1/xae/xb1 SUNDANESE DIGIT ONE
+<U1BB2>     /xe1/xae/xb2 SUNDANESE DIGIT TWO
+<U1BB3>     /xe1/xae/xb3 SUNDANESE DIGIT THREE
+<U1BB4>     /xe1/xae/xb4 SUNDANESE DIGIT FOUR
+<U1BB5>     /xe1/xae/xb5 SUNDANESE DIGIT FIVE
+<U1BB6>     /xe1/xae/xb6 SUNDANESE DIGIT SIX
+<U1BB7>     /xe1/xae/xb7 SUNDANESE DIGIT SEVEN
+<U1BB8>     /xe1/xae/xb8 SUNDANESE DIGIT EIGHT
+<U1BB9>     /xe1/xae/xb9 SUNDANESE DIGIT NINE
+<U1C00>     /xe1/xb0/x80 LEPCHA LETTER KA
+<U1C01>     /xe1/xb0/x81 LEPCHA LETTER KLA
+<U1C02>     /xe1/xb0/x82 LEPCHA LETTER KHA
+<U1C03>     /xe1/xb0/x83 LEPCHA LETTER GA
+<U1C04>     /xe1/xb0/x84 LEPCHA LETTER GLA
+<U1C05>     /xe1/xb0/x85 LEPCHA LETTER NGA
+<U1C06>     /xe1/xb0/x86 LEPCHA LETTER CA
+<U1C07>     /xe1/xb0/x87 LEPCHA LETTER CHA
+<U1C08>     /xe1/xb0/x88 LEPCHA LETTER JA
+<U1C09>     /xe1/xb0/x89 LEPCHA LETTER NYA
+<U1C0A>     /xe1/xb0/x8a LEPCHA LETTER TA
+<U1C0B>     /xe1/xb0/x8b LEPCHA LETTER THA
+<U1C0C>     /xe1/xb0/x8c LEPCHA LETTER DA
+<U1C0D>     /xe1/xb0/x8d LEPCHA LETTER NA
+<U1C0E>     /xe1/xb0/x8e LEPCHA LETTER PA
+<U1C0F>     /xe1/xb0/x8f LEPCHA LETTER PLA
+<U1C10>     /xe1/xb0/x90 LEPCHA LETTER PHA
+<U1C11>     /xe1/xb0/x91 LEPCHA LETTER FA
+<U1C12>     /xe1/xb0/x92 LEPCHA LETTER FLA
+<U1C13>     /xe1/xb0/x93 LEPCHA LETTER BA
+<U1C14>     /xe1/xb0/x94 LEPCHA LETTER BLA
+<U1C15>     /xe1/xb0/x95 LEPCHA LETTER MA
+<U1C16>     /xe1/xb0/x96 LEPCHA LETTER MLA
+<U1C17>     /xe1/xb0/x97 LEPCHA LETTER TSA
+<U1C18>     /xe1/xb0/x98 LEPCHA LETTER TSHA
+<U1C19>     /xe1/xb0/x99 LEPCHA LETTER DZA
+<U1C1A>     /xe1/xb0/x9a LEPCHA LETTER YA
+<U1C1B>     /xe1/xb0/x9b LEPCHA LETTER RA
+<U1C1C>     /xe1/xb0/x9c LEPCHA LETTER LA
+<U1C1D>     /xe1/xb0/x9d LEPCHA LETTER HA
+<U1C1E>     /xe1/xb0/x9e LEPCHA LETTER HLA
+<U1C1F>     /xe1/xb0/x9f LEPCHA LETTER VA
+<U1C20>     /xe1/xb0/xa0 LEPCHA LETTER SA
+<U1C21>     /xe1/xb0/xa1 LEPCHA LETTER SHA
+<U1C22>     /xe1/xb0/xa2 LEPCHA LETTER WA
+<U1C23>     /xe1/xb0/xa3 LEPCHA LETTER A
+<U1C24>     /xe1/xb0/xa4 LEPCHA SUBJOINED LETTER YA
+<U1C25>     /xe1/xb0/xa5 LEPCHA SUBJOINED LETTER RA
+<U1C26>     /xe1/xb0/xa6 LEPCHA VOWEL SIGN AA
+<U1C27>     /xe1/xb0/xa7 LEPCHA VOWEL SIGN I
+<U1C28>     /xe1/xb0/xa8 LEPCHA VOWEL SIGN O
+<U1C29>     /xe1/xb0/xa9 LEPCHA VOWEL SIGN OO
+<U1C2A>     /xe1/xb0/xaa LEPCHA VOWEL SIGN U
+<U1C2B>     /xe1/xb0/xab LEPCHA VOWEL SIGN UU
+<U1C2C>     /xe1/xb0/xac LEPCHA VOWEL SIGN E
+<U1C2D>     /xe1/xb0/xad LEPCHA CONSONANT SIGN K
+<U1C2E>     /xe1/xb0/xae LEPCHA CONSONANT SIGN M
+<U1C2F>     /xe1/xb0/xaf LEPCHA CONSONANT SIGN L
+<U1C30>     /xe1/xb0/xb0 LEPCHA CONSONANT SIGN N
+<U1C31>     /xe1/xb0/xb1 LEPCHA CONSONANT SIGN P
+<U1C32>     /xe1/xb0/xb2 LEPCHA CONSONANT SIGN R
+<U1C33>     /xe1/xb0/xb3 LEPCHA CONSONANT SIGN T
+<U1C34>     /xe1/xb0/xb4 LEPCHA CONSONANT SIGN NYIN-DO
+<U1C35>     /xe1/xb0/xb5 LEPCHA CONSONANT SIGN KANG
+<U1C36>     /xe1/xb0/xb6 LEPCHA SIGN RAN
+<U1C37>     /xe1/xb0/xb7 LEPCHA SIGN NUKTA
+<U1C3B>     /xe1/xb0/xbb LEPCHA PUNCTUATION TA-ROL
+<U1C3C>     /xe1/xb0/xbc LEPCHA PUNCTUATION NYET THYOOM TA-ROL
+<U1C3D>     /xe1/xb0/xbd LEPCHA PUNCTUATION CER-WA
+<U1C3E>     /xe1/xb0/xbe LEPCHA PUNCTUATION TSHOOK CER-WA
+<U1C3F>     /xe1/xb0/xbf LEPCHA PUNCTUATION TSHOOK
+<U1C40>     /xe1/xb1/x80 LEPCHA DIGIT ZERO
+<U1C41>     /xe1/xb1/x81 LEPCHA DIGIT ONE
+<U1C42>     /xe1/xb1/x82 LEPCHA DIGIT TWO
+<U1C43>     /xe1/xb1/x83 LEPCHA DIGIT THREE
+<U1C44>     /xe1/xb1/x84 LEPCHA DIGIT FOUR
+<U1C45>     /xe1/xb1/x85 LEPCHA DIGIT FIVE
+<U1C46>     /xe1/xb1/x86 LEPCHA DIGIT SIX
+<U1C47>     /xe1/xb1/x87 LEPCHA DIGIT SEVEN
+<U1C48>     /xe1/xb1/x88 LEPCHA DIGIT EIGHT
+<U1C49>     /xe1/xb1/x89 LEPCHA DIGIT NINE
+<U1C4D>     /xe1/xb1/x8d LEPCHA LETTER TTA
+<U1C4E>     /xe1/xb1/x8e LEPCHA LETTER TTHA
+<U1C4F>     /xe1/xb1/x8f LEPCHA LETTER DDA
+<U1C50>     /xe1/xb1/x90 OL CHIKI DIGIT ZERO
+<U1C51>     /xe1/xb1/x91 OL CHIKI DIGIT ONE
+<U1C52>     /xe1/xb1/x92 OL CHIKI DIGIT TWO
+<U1C53>     /xe1/xb1/x93 OL CHIKI DIGIT THREE
+<U1C54>     /xe1/xb1/x94 OL CHIKI DIGIT FOUR
+<U1C55>     /xe1/xb1/x95 OL CHIKI DIGIT FIVE
+<U1C56>     /xe1/xb1/x96 OL CHIKI DIGIT SIX
+<U1C57>     /xe1/xb1/x97 OL CHIKI DIGIT SEVEN
+<U1C58>     /xe1/xb1/x98 OL CHIKI DIGIT EIGHT
+<U1C59>     /xe1/xb1/x99 OL CHIKI DIGIT NINE
+<U1C5A>     /xe1/xb1/x9a OL CHIKI LETTER LA
+<U1C5B>     /xe1/xb1/x9b OL CHIKI LETTER AT
+<U1C5C>     /xe1/xb1/x9c OL CHIKI LETTER AG
+<U1C5D>     /xe1/xb1/x9d OL CHIKI LETTER ANG
+<U1C5E>     /xe1/xb1/x9e OL CHIKI LETTER AL
+<U1C5F>     /xe1/xb1/x9f OL CHIKI LETTER LAA
+<U1C60>     /xe1/xb1/xa0 OL CHIKI LETTER AAK
+<U1C61>     /xe1/xb1/xa1 OL CHIKI LETTER AAJ
+<U1C62>     /xe1/xb1/xa2 OL CHIKI LETTER AAM
+<U1C63>     /xe1/xb1/xa3 OL CHIKI LETTER AAW
+<U1C64>     /xe1/xb1/xa4 OL CHIKI LETTER LI
+<U1C65>     /xe1/xb1/xa5 OL CHIKI LETTER IS
+<U1C66>     /xe1/xb1/xa6 OL CHIKI LETTER IH
+<U1C67>     /xe1/xb1/xa7 OL CHIKI LETTER INY
+<U1C68>     /xe1/xb1/xa8 OL CHIKI LETTER IR
+<U1C69>     /xe1/xb1/xa9 OL CHIKI LETTER LU
+<U1C6A>     /xe1/xb1/xaa OL CHIKI LETTER UC
+<U1C6B>     /xe1/xb1/xab OL CHIKI LETTER UD
+<U1C6C>     /xe1/xb1/xac OL CHIKI LETTER UNN
+<U1C6D>     /xe1/xb1/xad OL CHIKI LETTER UY
+<U1C6E>     /xe1/xb1/xae OL CHIKI LETTER LE
+<U1C6F>     /xe1/xb1/xaf OL CHIKI LETTER EP
+<U1C70>     /xe1/xb1/xb0 OL CHIKI LETTER EDD
+<U1C71>     /xe1/xb1/xb1 OL CHIKI LETTER EN
+<U1C72>     /xe1/xb1/xb2 OL CHIKI LETTER ERR
+<U1C73>     /xe1/xb1/xb3 OL CHIKI LETTER LO
+<U1C74>     /xe1/xb1/xb4 OL CHIKI LETTER OTT
+<U1C75>     /xe1/xb1/xb5 OL CHIKI LETTER OB
+<U1C76>     /xe1/xb1/xb6 OL CHIKI LETTER OV
+<U1C77>     /xe1/xb1/xb7 OL CHIKI LETTER OH
+<U1C78>     /xe1/xb1/xb8 OL CHIKI MU TTUDDAG
+<U1C79>     /xe1/xb1/xb9 OL CHIKI GAAHLAA TTUDDAAG
+<U1C7A>     /xe1/xb1/xba OL CHIKI MU-GAAHLAA TTUDDAAG
+<U1C7B>     /xe1/xb1/xbb OL CHIKI RELAA
+<U1C7C>     /xe1/xb1/xbc OL CHIKI PHAARKAA
+<U1C7D>     /xe1/xb1/xbd OL CHIKI AHAD
+<U1C7E>     /xe1/xb1/xbe OL CHIKI PUNCTUATION MUCAAD
+<U1C7F>     /xe1/xb1/xbf OL CHIKI PUNCTUATION DOUBLE MUCAAD
 <U1D00>     /xe1/xb4/x80 LATIN LETTER SMALL CAPITAL A
 <U1D01>     /xe1/xb4/x81 LATIN LETTER SMALL CAPITAL AE
 <U1D02>     /xe1/xb4/x82 LATIN SMALL LETTER TURNED AE
@@ -5621,6 +5978,34 @@ CHARMAP
 <U1DC8>     /xe1/xb7/x88 COMBINING GRAVE-ACUTE-GRAVE
 <U1DC9>     /xe1/xb7/x89 COMBINING ACUTE-GRAVE-ACUTE
 <U1DCA>     /xe1/xb7/x8a COMBINING LATIN SMALL LETTER R BELOW
+<U1DCB>     /xe1/xb7/x8b COMBINING BREVE-MACRON
+<U1DCC>     /xe1/xb7/x8c COMBINING MACRON-BREVE
+<U1DCD>     /xe1/xb7/x8d COMBINING DOUBLE CIRCUMFLEX ABOVE
+<U1DCE>     /xe1/xb7/x8e COMBINING OGONEK ABOVE
+<U1DCF>     /xe1/xb7/x8f COMBINING ZIGZAG BELOW
+<U1DD0>     /xe1/xb7/x90 COMBINING IS BELOW
+<U1DD1>     /xe1/xb7/x91 COMBINING UR ABOVE
+<U1DD2>     /xe1/xb7/x92 COMBINING US ABOVE
+<U1DD3>     /xe1/xb7/x93 COMBINING LATIN SMALL LETTER FLATTENED OPEN A ABOVE
+<U1DD4>     /xe1/xb7/x94 COMBINING LATIN SMALL LETTER AE
+<U1DD5>     /xe1/xb7/x95 COMBINING LATIN SMALL LETTER AO
+<U1DD6>     /xe1/xb7/x96 COMBINING LATIN SMALL LETTER AV
+<U1DD7>     /xe1/xb7/x97 COMBINING LATIN SMALL LETTER C CEDILLA
+<U1DD8>     /xe1/xb7/x98 COMBINING LATIN SMALL LETTER INSULAR D
+<U1DD9>     /xe1/xb7/x99 COMBINING LATIN SMALL LETTER ETH
+<U1DDA>     /xe1/xb7/x9a COMBINING LATIN SMALL LETTER G
+<U1DDB>     /xe1/xb7/x9b COMBINING LATIN LETTER SMALL CAPITAL G
+<U1DDC>     /xe1/xb7/x9c COMBINING LATIN SMALL LETTER K
+<U1DDD>     /xe1/xb7/x9d COMBINING LATIN SMALL LETTER L
+<U1DDE>     /xe1/xb7/x9e COMBINING LATIN LETTER SMALL CAPITAL L
+<U1DDF>     /xe1/xb7/x9f COMBINING LATIN LETTER SMALL CAPITAL M
+<U1DE0>     /xe1/xb7/xa0 COMBINING LATIN SMALL LETTER N
+<U1DE1>     /xe1/xb7/xa1 COMBINING LATIN LETTER SMALL CAPITAL N
+<U1DE2>     /xe1/xb7/xa2 COMBINING LATIN LETTER SMALL CAPITAL R
+<U1DE3>     /xe1/xb7/xa3 COMBINING LATIN SMALL LETTER R ROTUNDA
+<U1DE4>     /xe1/xb7/xa4 COMBINING LATIN SMALL LETTER S
+<U1DE5>     /xe1/xb7/xa5 COMBINING LATIN SMALL LETTER LONG S
+<U1DE6>     /xe1/xb7/xa6 COMBINING LATIN SMALL LETTER Z
 <U1DFE>     /xe1/xb7/xbe COMBINING LEFT ARROWHEAD ABOVE
 <U1DFF>     /xe1/xb7/xbf COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW
 <U1E00>     /xe1/xb8/x80 LATIN CAPITAL LETTER A WITH RING BELOW
@@ -5779,6 +6164,10 @@ CHARMAP
 <U1E99>     /xe1/xba/x99 LATIN SMALL LETTER Y WITH RING ABOVE
 <U1E9A>     /xe1/xba/x9a LATIN SMALL LETTER A WITH RIGHT HALF RING
 <U1E9B>     /xe1/xba/x9b LATIN SMALL LETTER LONG S WITH DOT ABOVE
+<U1E9C>     /xe1/xba/x9c LATIN SMALL LETTER LONG S WITH DIAGONAL STROKE
+<U1E9D>     /xe1/xba/x9d LATIN SMALL LETTER LONG S WITH HIGH STROKE
+<U1E9E>     /xe1/xba/x9e LATIN CAPITAL LETTER SHARP S
+<U1E9F>     /xe1/xba/x9f LATIN SMALL LETTER DELTA
 <U1EA0>     /xe1/xba/xa0 LATIN CAPITAL LETTER A WITH DOT BELOW
 <U1EA1>     /xe1/xba/xa1 LATIN SMALL LETTER A WITH DOT BELOW
 <U1EA2>     /xe1/xba/xa2 LATIN CAPITAL LETTER A WITH HOOK ABOVE
@@ -5869,6 +6258,12 @@ CHARMAP
 <U1EF7>     /xe1/xbb/xb7 LATIN SMALL LETTER Y WITH HOOK ABOVE
 <U1EF8>     /xe1/xbb/xb8 LATIN CAPITAL LETTER Y WITH TILDE
 <U1EF9>     /xe1/xbb/xb9 LATIN SMALL LETTER Y WITH TILDE
+<U1EFA>     /xe1/xbb/xba LATIN CAPITAL LETTER MIDDLE-WELSH LL
+<U1EFB>     /xe1/xbb/xbb LATIN SMALL LETTER MIDDLE-WELSH LL
+<U1EFC>     /xe1/xbb/xbc LATIN CAPITAL LETTER MIDDLE-WELSH V
+<U1EFD>     /xe1/xbb/xbd LATIN SMALL LETTER MIDDLE-WELSH V
+<U1EFE>     /xe1/xbb/xbe LATIN CAPITAL LETTER Y WITH LOOP
+<U1EFF>     /xe1/xbb/xbf LATIN SMALL LETTER Y WITH LOOP
 <U1F00>     /xe1/xbc/x80 GREEK SMALL LETTER ALPHA WITH PSILI
 <U1F01>     /xe1/xbc/x81 GREEK SMALL LETTER ALPHA WITH DASIA
 <U1F02>     /xe1/xbc/x82 GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
@@ -6202,6 +6597,7 @@ CHARMAP
 <U2061>     /xe2/x81/xa1 FUNCTION APPLICATION
 <U2062>     /xe2/x81/xa2 INVISIBLE TIMES
 <U2063>     /xe2/x81/xa3 INVISIBLE SEPARATOR
+<U2064>     /xe2/x81/xa4 INVISIBLE PLUS
 <U206A>     /xe2/x81/xaa INHIBIT SYMMETRIC SWAPPING
 <U206B>     /xe2/x81/xab ACTIVATE SYMMETRIC SWAPPING
 <U206C>     /xe2/x81/xac INHIBIT ARABIC FORM SHAPING
@@ -6296,6 +6692,7 @@ CHARMAP
 <U20ED>     /xe2/x83/xad COMBINING LEFTWARDS HARPOON WITH BARB DOWNWARDS
 <U20EE>     /xe2/x83/xae COMBINING LEFT ARROW BELOW
 <U20EF>     /xe2/x83/xaf COMBINING RIGHT ARROW BELOW
+<U20F0>     /xe2/x83/xb0 COMBINING ASTERISK ABOVE
 <U2100>     /xe2/x84/x80 ACCOUNT OF
 <U2101>     /xe2/x84/x81 ADDRESSED TO THE SUBJECT
 <U2102>     /xe2/x84/x82 DOUBLE-STRUCK CAPITAL C
@@ -6375,6 +6772,7 @@ CHARMAP
 <U214C>     /xe2/x85/x8c PER SIGN
 <U214D>     /xe2/x85/x8d AKTIESELSKAB
 <U214E>     /xe2/x85/x8e TURNED SMALL F
+<U214F>     /xe2/x85/x8f SYMBOL FOR SAMARITAN SOURCE
 <U2153>     /xe2/x85/x93 VULGAR FRACTION ONE THIRD
 <U2154>     /xe2/x85/x94 VULGAR FRACTION TWO THIRDS
 <U2155>     /xe2/x85/x95 VULGAR FRACTION ONE FIFTH
@@ -6425,6 +6823,10 @@ CHARMAP
 <U2182>     /xe2/x86/x82 ROMAN NUMERAL TEN THOUSAND
 <U2183>     /xe2/x86/x83 ROMAN NUMERAL REVERSED ONE HUNDRED
 <U2184>     /xe2/x86/x84 LATIN SMALL LETTER REVERSED C
+<U2185>     /xe2/x86/x85 ROMAN NUMERAL SIX LATE FORM
+<U2186>     /xe2/x86/x86 ROMAN NUMERAL FIFTY EARLY FORM
+<U2187>     /xe2/x86/x87 ROMAN NUMERAL FIFTY THOUSAND
+<U2188>     /xe2/x86/x88 ROMAN NUMERAL ONE HUNDRED THOUSAND
 <U2190>     /xe2/x86/x90 LEFTWARDS ARROW
 <U2191>     /xe2/x86/x91 UPWARDS ARROW
 <U2192>     /xe2/x86/x92 RIGHTWARDS ARROW
@@ -7648,6 +8050,7 @@ CHARMAP
 <U269A>     /xe2/x9a/x9a STAFF OF HERMES
 <U269B>     /xe2/x9a/x9b ATOM SYMBOL
 <U269C>     /xe2/x9a/x9c FLEUR-DE-LIS
+<U269D>     /xe2/x9a/x9d OUTLINED WHITE STAR
 <U26A0>     /xe2/x9a/xa0 WARNING SIGN
 <U26A1>     /xe2/x9a/xa1 HIGH VOLTAGE SIGN
 <U26A2>     /xe2/x9a/xa2 DOUBLED FEMALE SIGN
@@ -7667,6 +8070,20 @@ CHARMAP
 <U26B0>     /xe2/x9a/xb0 COFFIN
 <U26B1>     /xe2/x9a/xb1 FUNERAL URN
 <U26B2>     /xe2/x9a/xb2 NEUTER
+<U26B3>     /xe2/x9a/xb3 CERES
+<U26B4>     /xe2/x9a/xb4 PALLAS
+<U26B5>     /xe2/x9a/xb5 JUNO
+<U26B6>     /xe2/x9a/xb6 VESTA
+<U26B7>     /xe2/x9a/xb7 CHIRON
+<U26B8>     /xe2/x9a/xb8 BLACK MOON LILITH
+<U26B9>     /xe2/x9a/xb9 SEXTILE
+<U26BA>     /xe2/x9a/xba SEMISEXTILE
+<U26BB>     /xe2/x9a/xbb QUINCUNX
+<U26BC>     /xe2/x9a/xbc SESQUIQUADRATE
+<U26C0>     /xe2/x9b/x80 WHITE DRAUGHTS MAN
+<U26C1>     /xe2/x9b/x81 WHITE DRAUGHTS KING
+<U26C2>     /xe2/x9b/x82 BLACK DRAUGHTS MAN
+<U26C3>     /xe2/x9b/x83 BLACK DRAUGHTS KING
 <U2701>     /xe2/x9c/x81 UPPER BLADE SCISSORS
 <U2702>     /xe2/x9c/x82 BLACK SCISSORS
 <U2703>     /xe2/x9c/x83 LOWER BLADE SCISSORS
@@ -7852,6 +8269,7 @@ CHARMAP
 <U27C8>     /xe2/x9f/x88 REVERSE SOLIDUS PRECEDING SUBSET
 <U27C9>     /xe2/x9f/x89 SUPERSET PRECEDING SOLIDUS
 <U27CA>     /xe2/x9f/x8a VERTICAL BAR WITH HORIZONTAL STROKE
+<U27CC>     /xe2/x9f/x8c LONG DIVISION
 <U27D0>     /xe2/x9f/x90 WHITE DIAMOND WITH CENTRED DOT
 <U27D1>     /xe2/x9f/x91 AND WITH DOT
 <U27D2>     /xe2/x9f/x92 ELEMENT OF OPENING UPWARDS
@@ -7880,6 +8298,10 @@ CHARMAP
 <U27E9>     /xe2/x9f/xa9 MATHEMATICAL RIGHT ANGLE BRACKET
 <U27EA>     /xe2/x9f/xaa MATHEMATICAL LEFT DOUBLE ANGLE BRACKET
 <U27EB>     /xe2/x9f/xab MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET
+<U27EC>     /xe2/x9f/xac MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET
+<U27ED>     /xe2/x9f/xad MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET
+<U27EE>     /xe2/x9f/xae MATHEMATICAL LEFT FLATTENED PARENTHESIS
+<U27EF>     /xe2/x9f/xaf MATHEMATICAL RIGHT FLATTENED PARENTHESIS
 <U27F0>     /xe2/x9f/xb0 UPWARDS QUADRUPLE ARROW
 <U27F1>     /xe2/x9f/xb1 DOWNWARDS QUADRUPLE ARROW
 <U27F2>     /xe2/x9f/xb2 ANTICLOCKWISE GAPPED CIRCLE ARROW
@@ -8691,10 +9113,61 @@ CHARMAP
 <U2B18>     /xe2/xac/x98 DIAMOND WITH TOP HALF BLACK
 <U2B19>     /xe2/xac/x99 DIAMOND WITH BOTTOM HALF BLACK
 <U2B1A>     /xe2/xac/x9a DOTTED SQUARE
+<U2B1B>     /xe2/xac/x9b BLACK LARGE SQUARE
+<U2B1C>     /xe2/xac/x9c WHITE LARGE SQUARE
+<U2B1D>     /xe2/xac/x9d BLACK VERY SMALL SQUARE
+<U2B1E>     /xe2/xac/x9e WHITE VERY SMALL SQUARE
+<U2B1F>     /xe2/xac/x9f BLACK PENTAGON
 <U2B20>     /xe2/xac/xa0 WHITE PENTAGON
 <U2B21>     /xe2/xac/xa1 WHITE HEXAGON
 <U2B22>     /xe2/xac/xa2 BLACK HEXAGON
 <U2B23>     /xe2/xac/xa3 HORIZONTAL BLACK HEXAGON
+<U2B24>     /xe2/xac/xa4 BLACK LARGE CIRCLE
+<U2B25>     /xe2/xac/xa5 BLACK MEDIUM DIAMOND
+<U2B26>     /xe2/xac/xa6 WHITE MEDIUM DIAMOND
+<U2B27>     /xe2/xac/xa7 BLACK MEDIUM LOZENGE
+<U2B28>     /xe2/xac/xa8 WHITE MEDIUM LOZENGE
+<U2B29>     /xe2/xac/xa9 BLACK SMALL DIAMOND
+<U2B2A>     /xe2/xac/xaa BLACK SMALL LOZENGE
+<U2B2B>     /xe2/xac/xab WHITE SMALL LOZENGE
+<U2B2C>     /xe2/xac/xac BLACK HORIZONTAL ELLIPSE
+<U2B2D>     /xe2/xac/xad WHITE HORIZONTAL ELLIPSE
+<U2B2E>     /xe2/xac/xae BLACK VERTICAL ELLIPSE
+<U2B2F>     /xe2/xac/xaf WHITE VERTICAL ELLIPSE
+<U2B30>     /xe2/xac/xb0 LEFT ARROW WITH SMALL CIRCLE
+<U2B31>     /xe2/xac/xb1 THREE LEFTWARDS ARROWS
+<U2B32>     /xe2/xac/xb2 LEFT ARROW WITH CIRCLED PLUS
+<U2B33>     /xe2/xac/xb3 LONG LEFTWARDS SQUIGGLE ARROW
+<U2B34>     /xe2/xac/xb4 LEFTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE
+<U2B35>     /xe2/xac/xb5 LEFTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE
+<U2B36>     /xe2/xac/xb6 LEFTWARDS TWO-HEADED ARROW FROM BAR
+<U2B37>     /xe2/xac/xb7 LEFTWARDS TWO-HEADED TRIPLE DASH ARROW
+<U2B38>     /xe2/xac/xb8 LEFTWARDS ARROW WITH DOTTED STEM
+<U2B39>     /xe2/xac/xb9 LEFTWARDS ARROW WITH TAIL WITH VERTICAL STROKE
+<U2B3A>     /xe2/xac/xba LEFTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE
+<U2B3B>     /xe2/xac/xbb LEFTWARDS TWO-HEADED ARROW WITH TAIL
+<U2B3C>     /xe2/xac/xbc LEFTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE
+<U2B3D>     /xe2/xac/xbd LEFTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE
+<U2B3E>     /xe2/xac/xbe LEFTWARDS ARROW THROUGH X
+<U2B3F>     /xe2/xac/xbf WAVE ARROW POINTING DIRECTLY LEFT
+<U2B40>     /xe2/xad/x80 EQUALS SIGN ABOVE LEFTWARDS ARROW
+<U2B41>     /xe2/xad/x81 REVERSE TILDE OPERATOR ABOVE LEFTWARDS ARROW
+<U2B42>     /xe2/xad/x82 LEFTWARDS ARROW ABOVE REVERSE ALMOST EQUAL TO
+<U2B43>     /xe2/xad/x83 RIGHTWARDS ARROW THROUGH GREATER-THAN
+<U2B44>     /xe2/xad/x84 RIGHTWARDS ARROW THROUGH SUPERSET
+<U2B45>     /xe2/xad/x85 LEFTWARDS QUADRUPLE ARROW
+<U2B46>     /xe2/xad/x86 RIGHTWARDS QUADRUPLE ARROW
+<U2B47>     /xe2/xad/x87 REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW
+<U2B48>     /xe2/xad/x88 RIGHTWARDS ARROW ABOVE REVERSE ALMOST EQUAL TO
+<U2B49>     /xe2/xad/x89 TILDE OPERATOR ABOVE LEFTWARDS ARROW
+<U2B4A>     /xe2/xad/x8a LEFTWARDS ARROW ABOVE ALMOST EQUAL TO
+<U2B4B>     /xe2/xad/x8b LEFTWARDS ARROW ABOVE REVERSE TILDE OPERATOR
+<U2B4C>     /xe2/xad/x8c RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR
+<U2B50>     /xe2/xad/x90 WHITE MEDIUM STAR
+<U2B51>     /xe2/xad/x91 BLACK SMALL STAR
+<U2B52>     /xe2/xad/x92 WHITE SMALL STAR
+<U2B53>     /xe2/xad/x93 BLACK RIGHT-POINTING PENTAGON
+<U2B54>     /xe2/xad/x94 WHITE RIGHT-POINTING PENTAGON
 <U2C00>     /xe2/xb0/x80 GLAGOLITIC CAPITAL LETTER AZU
 <U2C01>     /xe2/xb0/x81 GLAGOLITIC CAPITAL LETTER BUKY
 <U2C02>     /xe2/xb0/x82 GLAGOLITIC CAPITAL LETTER VEDE
@@ -8802,10 +9275,22 @@ CHARMAP
 <U2C6A>     /xe2/xb1/xaa LATIN SMALL LETTER K WITH DESCENDER
 <U2C6B>     /xe2/xb1/xab LATIN CAPITAL LETTER Z WITH DESCENDER
 <U2C6C>     /xe2/xb1/xac LATIN SMALL LETTER Z WITH DESCENDER
+<U2C6D>     /xe2/xb1/xad LATIN CAPITAL LETTER ALPHA
+<U2C6E>     /xe2/xb1/xae LATIN CAPITAL LETTER M WITH HOOK
+<U2C6F>     /xe2/xb1/xaf LATIN CAPITAL LETTER TURNED A
+<U2C71>     /xe2/xb1/xb1 LATIN SMALL LETTER V WITH RIGHT HOOK
+<U2C72>     /xe2/xb1/xb2 LATIN CAPITAL LETTER W WITH HOOK
+<U2C73>     /xe2/xb1/xb3 LATIN SMALL LETTER W WITH HOOK
 <U2C74>     /xe2/xb1/xb4 LATIN SMALL LETTER V WITH CURL
 <U2C75>     /xe2/xb1/xb5 LATIN CAPITAL LETTER HALF H
 <U2C76>     /xe2/xb1/xb6 LATIN SMALL LETTER HALF H
 <U2C77>     /xe2/xb1/xb7 LATIN SMALL LETTER TAILLESS PHI
+<U2C78>     /xe2/xb1/xb8 LATIN SMALL LETTER E WITH NOTCH
+<U2C79>     /xe2/xb1/xb9 LATIN SMALL LETTER TURNED R WITH TAIL
+<U2C7A>     /xe2/xb1/xba LATIN SMALL LETTER O WITH LOW RING INSIDE
+<U2C7B>     /xe2/xb1/xbb LATIN LETTER SMALL CAPITAL TURNED E
+<U2C7C>     /xe2/xb1/xbc LATIN SUBSCRIPT SMALL LETTER J
+<U2C7D>     /xe2/xb1/xbd MODIFIER LETTER CAPITAL V
 <U2C80>     /xe2/xb2/x80 COPTIC CAPITAL LETTER ALFA
 <U2C81>     /xe2/xb2/x81 COPTIC SMALL LETTER ALFA
 <U2C82>     /xe2/xb2/x82 COPTIC CAPITAL LETTER VIDA
@@ -9092,6 +9577,38 @@ CHARMAP
 <U2DDC>     /xe2/xb7/x9c ETHIOPIC SYLLABLE GYEE
 <U2DDD>     /xe2/xb7/x9d ETHIOPIC SYLLABLE GYE
 <U2DDE>     /xe2/xb7/x9e ETHIOPIC SYLLABLE GYO
+<U2DE0>     /xe2/xb7/xa0 COMBINING CYRILLIC LETTER BE
+<U2DE1>     /xe2/xb7/xa1 COMBINING CYRILLIC LETTER VE
+<U2DE2>     /xe2/xb7/xa2 COMBINING CYRILLIC LETTER GHE
+<U2DE3>     /xe2/xb7/xa3 COMBINING CYRILLIC LETTER DE
+<U2DE4>     /xe2/xb7/xa4 COMBINING CYRILLIC LETTER ZHE
+<U2DE5>     /xe2/xb7/xa5 COMBINING CYRILLIC LETTER ZE
+<U2DE6>     /xe2/xb7/xa6 COMBINING CYRILLIC LETTER KA
+<U2DE7>     /xe2/xb7/xa7 COMBINING CYRILLIC LETTER EL
+<U2DE8>     /xe2/xb7/xa8 COMBINING CYRILLIC LETTER EM
+<U2DE9>     /xe2/xb7/xa9 COMBINING CYRILLIC LETTER EN
+<U2DEA>     /xe2/xb7/xaa COMBINING CYRILLIC LETTER O
+<U2DEB>     /xe2/xb7/xab COMBINING CYRILLIC LETTER PE
+<U2DEC>     /xe2/xb7/xac COMBINING CYRILLIC LETTER ER
+<U2DED>     /xe2/xb7/xad COMBINING CYRILLIC LETTER ES
+<U2DEE>     /xe2/xb7/xae COMBINING CYRILLIC LETTER TE
+<U2DEF>     /xe2/xb7/xaf COMBINING CYRILLIC LETTER HA
+<U2DF0>     /xe2/xb7/xb0 COMBINING CYRILLIC LETTER TSE
+<U2DF1>     /xe2/xb7/xb1 COMBINING CYRILLIC LETTER CHE
+<U2DF2>     /xe2/xb7/xb2 COMBINING CYRILLIC LETTER SHA
+<U2DF3>     /xe2/xb7/xb3 COMBINING CYRILLIC LETTER SHCHA
+<U2DF4>     /xe2/xb7/xb4 COMBINING CYRILLIC LETTER FITA
+<U2DF5>     /xe2/xb7/xb5 COMBINING CYRILLIC LETTER ES-TE
+<U2DF6>     /xe2/xb7/xb6 COMBINING CYRILLIC LETTER A
+<U2DF7>     /xe2/xb7/xb7 COMBINING CYRILLIC LETTER IE
+<U2DF8>     /xe2/xb7/xb8 COMBINING CYRILLIC LETTER DJERV
+<U2DF9>     /xe2/xb7/xb9 COMBINING CYRILLIC LETTER MONOGRAPH UK
+<U2DFA>     /xe2/xb7/xba COMBINING CYRILLIC LETTER YAT
+<U2DFB>     /xe2/xb7/xbb COMBINING CYRILLIC LETTER YU
+<U2DFC>     /xe2/xb7/xbc COMBINING CYRILLIC LETTER IOTIFIED A
+<U2DFD>     /xe2/xb7/xbd COMBINING CYRILLIC LETTER LITTLE YUS
+<U2DFE>     /xe2/xb7/xbe COMBINING CYRILLIC LETTER BIG YUS
+<U2DFF>     /xe2/xb7/xbf COMBINING CYRILLIC LETTER IOTIFIED BIG YUS
 <U2E00>     /xe2/xb8/x80 RIGHT ANGLE SUBSTITUTION MARKER
 <U2E01>     /xe2/xb8/x81 RIGHT ANGLE DOTTED SUBSTITUTION MARKER
 <U2E02>     /xe2/xb8/x82 LEFT SUBSTITUTION BRACKET
@@ -9116,8 +9633,31 @@ CHARMAP
 <U2E15>     /xe2/xb8/x95 UPWARDS ANCORA
 <U2E16>     /xe2/xb8/x96 DOTTED RIGHT-POINTING ANGLE
 <U2E17>     /xe2/xb8/x97 DOUBLE OBLIQUE HYPHEN
+<U2E18>     /xe2/xb8/x98 INVERTED INTERROBANG
+<U2E19>     /xe2/xb8/x99 PALM BRANCH
+<U2E1A>     /xe2/xb8/x9a HYPHEN WITH DIAERESIS
+<U2E1B>     /xe2/xb8/x9b TILDE WITH RING ABOVE
 <U2E1C>     /xe2/xb8/x9c LEFT LOW PARAPHRASE BRACKET
 <U2E1D>     /xe2/xb8/x9d RIGHT LOW PARAPHRASE BRACKET
+<U2E1E>     /xe2/xb8/x9e TILDE WITH DOT ABOVE
+<U2E1F>     /xe2/xb8/x9f TILDE WITH DOT BELOW
+<U2E20>     /xe2/xb8/xa0 LEFT VERTICAL BAR WITH QUILL
+<U2E21>     /xe2/xb8/xa1 RIGHT VERTICAL BAR WITH QUILL
+<U2E22>     /xe2/xb8/xa2 TOP LEFT HALF BRACKET
+<U2E23>     /xe2/xb8/xa3 TOP RIGHT HALF BRACKET
+<U2E24>     /xe2/xb8/xa4 BOTTOM LEFT HALF BRACKET
+<U2E25>     /xe2/xb8/xa5 BOTTOM RIGHT HALF BRACKET
+<U2E26>     /xe2/xb8/xa6 LEFT SIDEWAYS U BRACKET
+<U2E27>     /xe2/xb8/xa7 RIGHT SIDEWAYS U BRACKET
+<U2E28>     /xe2/xb8/xa8 LEFT DOUBLE PARENTHESIS
+<U2E29>     /xe2/xb8/xa9 RIGHT DOUBLE PARENTHESIS
+<U2E2A>     /xe2/xb8/xaa TWO DOTS OVER ONE DOT PUNCTUATION
+<U2E2B>     /xe2/xb8/xab ONE DOT OVER TWO DOTS PUNCTUATION
+<U2E2C>     /xe2/xb8/xac SQUARED FOUR DOT PUNCTUATION
+<U2E2D>     /xe2/xb8/xad FIVE DOT MARK
+<U2E2E>     /xe2/xb8/xae REVERSED QUESTION MARK
+<U2E2F>     /xe2/xb8/xaf VERTICAL TILDE
+<U2E30>     /xe2/xb8/xb0 RING POINT
 <U2E80>     /xe2/xba/x80 CJK RADICAL REPEAT
 <U2E81>     /xe2/xba/x81 CJK RADICAL CLIFF
 <U2E82>     /xe2/xba/x82 CJK RADICAL SECOND ONE
@@ -9752,6 +10292,7 @@ CHARMAP
 <U312A>     /xe3/x84/xaa BOPOMOFO LETTER V
 <U312B>     /xe3/x84/xab BOPOMOFO LETTER NG
 <U312C>     /xe3/x84/xac BOPOMOFO LETTER GN
+<U312D>     /xe3/x84/xad BOPOMOFO LETTER IH
 <U3131>     /xe3/x84/xb1 HANGUL LETTER KIYEOK
 <U3132>     /xe3/x84/xb2 HANGUL LETTER SSANGKIYEOK
 <U3133>     /xe3/x84/xb3 HANGUL LETTER KIYEOK-SIOS
@@ -9886,22 +10427,42 @@ CHARMAP
 <U31B5>     /xe3/x86/xb5 BOPOMOFO FINAL LETTER T
 <U31B6>     /xe3/x86/xb6 BOPOMOFO FINAL LETTER K
 <U31B7>     /xe3/x86/xb7 BOPOMOFO FINAL LETTER H
-<U31C0>     /xe3/x86/xc0 CJK STROKE T
-<U31C1>     /xe3/x86/xc1 CJK STROKE WG
-<U31C2>     /xe3/x86/xc2 CJK STROKE XG
-<U31C3>     /xe3/x86/xc3 CJK STROKE BXG
-<U31C4>     /xe3/x86/xc4 CJK STROKE SW
-<U31C5>     /xe3/x86/xc5 CJK STROKE HZZ
-<U31C6>     /xe3/x86/xc6 CJK STROKE HZG
-<U31C7>     /xe3/x86/xc7 CJK STROKE HP
-<U31C8>     /xe3/x86/xc8 CJK STROKE HZWG
-<U31C9>     /xe3/x86/xc9 CJK STROKE SZWG
-<U31CA>     /xe3/x86/xca CJK STROKE HZT
-<U31CB>     /xe3/x86/xcb CJK STROKE HZZP
-<U31CC>     /xe3/x86/xcc CJK STROKE HPWG
-<U31CD>     /xe3/x86/xcd CJK STROKE HZW
-<U31CE>     /xe3/x86/xce CJK STROKE HZZZ
-<U31CF>     /xe3/x86/xcf CJK STROKE N
+<U31C0>     /xe3/x87/x80 CJK STROKE T
+<U31C1>     /xe3/x87/x81 CJK STROKE WG
+<U31C2>     /xe3/x87/x82 CJK STROKE XG
+<U31C3>     /xe3/x87/x83 CJK STROKE BXG
+<U31C4>     /xe3/x87/x84 CJK STROKE SW
+<U31C5>     /xe3/x87/x85 CJK STROKE HZZ
+<U31C6>     /xe3/x87/x86 CJK STROKE HZG
+<U31C7>     /xe3/x87/x87 CJK STROKE HP
+<U31C8>     /xe3/x87/x88 CJK STROKE HZWG
+<U31C9>     /xe3/x87/x89 CJK STROKE SZWG
+<U31CA>     /xe3/x87/x8a CJK STROKE HZT
+<U31CB>     /xe3/x87/x8b CJK STROKE HZZP
+<U31CC>     /xe3/x87/x8c CJK STROKE HPWG
+<U31CD>     /xe3/x87/x8d CJK STROKE HZW
+<U31CE>     /xe3/x87/x8e CJK STROKE HZZZ
+<U31CF>     /xe3/x87/x8f CJK STROKE N
+<U31D0>     /xe3/x87/x90 CJK STROKE H
+<U31D1>     /xe3/x87/x91 CJK STROKE S
+<U31D2>     /xe3/x87/x92 CJK STROKE P
+<U31D3>     /xe3/x87/x93 CJK STROKE SP
+<U31D4>     /xe3/x87/x94 CJK STROKE D
+<U31D5>     /xe3/x87/x95 CJK STROKE HZ
+<U31D6>     /xe3/x87/x96 CJK STROKE HG
+<U31D7>     /xe3/x87/x97 CJK STROKE SZ
+<U31D8>     /xe3/x87/x98 CJK STROKE SWZ
+<U31D9>     /xe3/x87/x99 CJK STROKE ST
+<U31DA>     /xe3/x87/x9a CJK STROKE SG
+<U31DB>     /xe3/x87/x9b CJK STROKE PD
+<U31DC>     /xe3/x87/x9c CJK STROKE PZ
+<U31DD>     /xe3/x87/x9d CJK STROKE TN
+<U31DE>     /xe3/x87/x9e CJK STROKE SZZ
+<U31DF>     /xe3/x87/x9f CJK STROKE SWG
+<U31E0>     /xe3/x87/xa0 CJK STROKE HXWG
+<U31E1>     /xe3/x87/xa1 CJK STROKE HZZZG
+<U31E2>     /xe3/x87/xa2 CJK STROKE PG
+<U31E3>     /xe3/x87/xa3 CJK STROKE Q
 <U31F0>     /xe3/x87/xb0 KATAKANA LETTER SMALL KU
 <U31F1>     /xe3/x87/xb1 KATAKANA LETTER SMALL SI
 <U31F2>     /xe3/x87/xb2 KATAKANA LETTER SMALL SU
@@ -10909,7 +11470,7 @@ CHARMAP
 <U9EC0>..<U9EFF> /xe9/xbb/x80 <CJK>
 <U9F00>..<U9F3F> /xe9/xbc/x80 <CJK>
 <U9F40>..<U9F7F> /xe9/xbd/x80 <CJK>
-<U9F80>..<U9FBB> /xe9/xbe/x80 <CJK>
+<U9F80>..<U9FC3> /xe9/xbe/x80 <CJK>
 <UA000>     /xea/x80/x80 YI SYLLABLE IT
 <UA001>     /xea/x80/x81 YI SYLLABLE IX
 <UA002>     /xea/x80/x82 YI SYLLABLE I
@@ -12130,6 +12691,384 @@ CHARMAP
 <UA4C4>     /xea/x93/x84 YI RADICAL ZZIET
 <UA4C5>     /xea/x93/x85 YI RADICAL NBIE
 <UA4C6>     /xea/x93/x86 YI RADICAL KE
+<UA500>     /xea/x94/x80 VAI SYLLABLE EE
+<UA501>     /xea/x94/x81 VAI SYLLABLE EEN
+<UA502>     /xea/x94/x82 VAI SYLLABLE HEE
+<UA503>     /xea/x94/x83 VAI SYLLABLE WEE
+<UA504>     /xea/x94/x84 VAI SYLLABLE WEEN
+<UA505>     /xea/x94/x85 VAI SYLLABLE PEE
+<UA506>     /xea/x94/x86 VAI SYLLABLE BHEE
+<UA507>     /xea/x94/x87 VAI SYLLABLE BEE
+<UA508>     /xea/x94/x88 VAI SYLLABLE MBEE
+<UA509>     /xea/x94/x89 VAI SYLLABLE KPEE
+<UA50A>     /xea/x94/x8a VAI SYLLABLE MGBEE
+<UA50B>     /xea/x94/x8b VAI SYLLABLE GBEE
+<UA50C>     /xea/x94/x8c VAI SYLLABLE FEE
+<UA50D>     /xea/x94/x8d VAI SYLLABLE VEE
+<UA50E>     /xea/x94/x8e VAI SYLLABLE TEE
+<UA50F>     /xea/x94/x8f VAI SYLLABLE THEE
+<UA510>     /xea/x94/x90 VAI SYLLABLE DHEE
+<UA511>     /xea/x94/x91 VAI SYLLABLE DHHEE
+<UA512>     /xea/x94/x92 VAI SYLLABLE LEE
+<UA513>     /xea/x94/x93 VAI SYLLABLE REE
+<UA514>     /xea/x94/x94 VAI SYLLABLE DEE
+<UA515>     /xea/x94/x95 VAI SYLLABLE NDEE
+<UA516>     /xea/x94/x96 VAI SYLLABLE SEE
+<UA517>     /xea/x94/x97 VAI SYLLABLE SHEE
+<UA518>     /xea/x94/x98 VAI SYLLABLE ZEE
+<UA519>     /xea/x94/x99 VAI SYLLABLE ZHEE
+<UA51A>     /xea/x94/x9a VAI SYLLABLE CEE
+<UA51B>     /xea/x94/x9b VAI SYLLABLE JEE
+<UA51C>     /xea/x94/x9c VAI SYLLABLE NJEE
+<UA51D>     /xea/x94/x9d VAI SYLLABLE YEE
+<UA51E>     /xea/x94/x9e VAI SYLLABLE KEE
+<UA51F>     /xea/x94/x9f VAI SYLLABLE NGGEE
+<UA520>     /xea/x94/xa0 VAI SYLLABLE GEE
+<UA521>     /xea/x94/xa1 VAI SYLLABLE MEE
+<UA522>     /xea/x94/xa2 VAI SYLLABLE NEE
+<UA523>     /xea/x94/xa3 VAI SYLLABLE NYEE
+<UA524>     /xea/x94/xa4 VAI SYLLABLE I
+<UA525>     /xea/x94/xa5 VAI SYLLABLE IN
+<UA526>     /xea/x94/xa6 VAI SYLLABLE HI
+<UA527>     /xea/x94/xa7 VAI SYLLABLE HIN
+<UA528>     /xea/x94/xa8 VAI SYLLABLE WI
+<UA529>     /xea/x94/xa9 VAI SYLLABLE WIN
+<UA52A>     /xea/x94/xaa VAI SYLLABLE PI
+<UA52B>     /xea/x94/xab VAI SYLLABLE BHI
+<UA52C>     /xea/x94/xac VAI SYLLABLE BI
+<UA52D>     /xea/x94/xad VAI SYLLABLE MBI
+<UA52E>     /xea/x94/xae VAI SYLLABLE KPI
+<UA52F>     /xea/x94/xaf VAI SYLLABLE MGBI
+<UA530>     /xea/x94/xb0 VAI SYLLABLE GBI
+<UA531>     /xea/x94/xb1 VAI SYLLABLE FI
+<UA532>     /xea/x94/xb2 VAI SYLLABLE VI
+<UA533>     /xea/x94/xb3 VAI SYLLABLE TI
+<UA534>     /xea/x94/xb4 VAI SYLLABLE THI
+<UA535>     /xea/x94/xb5 VAI SYLLABLE DHI
+<UA536>     /xea/x94/xb6 VAI SYLLABLE DHHI
+<UA537>     /xea/x94/xb7 VAI SYLLABLE LI
+<UA538>     /xea/x94/xb8 VAI SYLLABLE RI
+<UA539>     /xea/x94/xb9 VAI SYLLABLE DI
+<UA53A>     /xea/x94/xba VAI SYLLABLE NDI
+<UA53B>     /xea/x94/xbb VAI SYLLABLE SI
+<UA53C>     /xea/x94/xbc VAI SYLLABLE SHI
+<UA53D>     /xea/x94/xbd VAI SYLLABLE ZI
+<UA53E>     /xea/x94/xbe VAI SYLLABLE ZHI
+<UA53F>     /xea/x94/xbf VAI SYLLABLE CI
+<UA540>     /xea/x95/x80 VAI SYLLABLE JI
+<UA541>     /xea/x95/x81 VAI SYLLABLE NJI
+<UA542>     /xea/x95/x82 VAI SYLLABLE YI
+<UA543>     /xea/x95/x83 VAI SYLLABLE KI
+<UA544>     /xea/x95/x84 VAI SYLLABLE NGGI
+<UA545>     /xea/x95/x85 VAI SYLLABLE GI
+<UA546>     /xea/x95/x86 VAI SYLLABLE MI
+<UA547>     /xea/x95/x87 VAI SYLLABLE NI
+<UA548>     /xea/x95/x88 VAI SYLLABLE NYI
+<UA549>     /xea/x95/x89 VAI SYLLABLE A
+<UA54A>     /xea/x95/x8a VAI SYLLABLE AN
+<UA54B>     /xea/x95/x8b VAI SYLLABLE NGAN
+<UA54C>     /xea/x95/x8c VAI SYLLABLE HA
+<UA54D>     /xea/x95/x8d VAI SYLLABLE HAN
+<UA54E>     /xea/x95/x8e VAI SYLLABLE WA
+<UA54F>     /xea/x95/x8f VAI SYLLABLE WAN
+<UA550>     /xea/x95/x90 VAI SYLLABLE PA
+<UA551>     /xea/x95/x91 VAI SYLLABLE BHA
+<UA552>     /xea/x95/x92 VAI SYLLABLE BA
+<UA553>     /xea/x95/x93 VAI SYLLABLE MBA
+<UA554>     /xea/x95/x94 VAI SYLLABLE KPA
+<UA555>     /xea/x95/x95 VAI SYLLABLE KPAN
+<UA556>     /xea/x95/x96 VAI SYLLABLE MGBA
+<UA557>     /xea/x95/x97 VAI SYLLABLE GBA
+<UA558>     /xea/x95/x98 VAI SYLLABLE FA
+<UA559>     /xea/x95/x99 VAI SYLLABLE VA
+<UA55A>     /xea/x95/x9a VAI SYLLABLE TA
+<UA55B>     /xea/x95/x9b VAI SYLLABLE THA
+<UA55C>     /xea/x95/x9c VAI SYLLABLE DHA
+<UA55D>     /xea/x95/x9d VAI SYLLABLE DHHA
+<UA55E>     /xea/x95/x9e VAI SYLLABLE LA
+<UA55F>     /xea/x95/x9f VAI SYLLABLE RA
+<UA560>     /xea/x95/xa0 VAI SYLLABLE DA
+<UA561>     /xea/x95/xa1 VAI SYLLABLE NDA
+<UA562>     /xea/x95/xa2 VAI SYLLABLE SA
+<UA563>     /xea/x95/xa3 VAI SYLLABLE SHA
+<UA564>     /xea/x95/xa4 VAI SYLLABLE ZA
+<UA565>     /xea/x95/xa5 VAI SYLLABLE ZHA
+<UA566>     /xea/x95/xa6 VAI SYLLABLE CA
+<UA567>     /xea/x95/xa7 VAI SYLLABLE JA
+<UA568>     /xea/x95/xa8 VAI SYLLABLE NJA
+<UA569>     /xea/x95/xa9 VAI SYLLABLE YA
+<UA56A>     /xea/x95/xaa VAI SYLLABLE KA
+<UA56B>     /xea/x95/xab VAI SYLLABLE KAN
+<UA56C>     /xea/x95/xac VAI SYLLABLE NGGA
+<UA56D>     /xea/x95/xad VAI SYLLABLE GA
+<UA56E>     /xea/x95/xae VAI SYLLABLE MA
+<UA56F>     /xea/x95/xaf VAI SYLLABLE NA
+<UA570>     /xea/x95/xb0 VAI SYLLABLE NYA
+<UA571>     /xea/x95/xb1 VAI SYLLABLE OO
+<UA572>     /xea/x95/xb2 VAI SYLLABLE OON
+<UA573>     /xea/x95/xb3 VAI SYLLABLE HOO
+<UA574>     /xea/x95/xb4 VAI SYLLABLE WOO
+<UA575>     /xea/x95/xb5 VAI SYLLABLE WOON
+<UA576>     /xea/x95/xb6 VAI SYLLABLE POO
+<UA577>     /xea/x95/xb7 VAI SYLLABLE BHOO
+<UA578>     /xea/x95/xb8 VAI SYLLABLE BOO
+<UA579>     /xea/x95/xb9 VAI SYLLABLE MBOO
+<UA57A>     /xea/x95/xba VAI SYLLABLE KPOO
+<UA57B>     /xea/x95/xbb VAI SYLLABLE MGBOO
+<UA57C>     /xea/x95/xbc VAI SYLLABLE GBOO
+<UA57D>     /xea/x95/xbd VAI SYLLABLE FOO
+<UA57E>     /xea/x95/xbe VAI SYLLABLE VOO
+<UA57F>     /xea/x95/xbf VAI SYLLABLE TOO
+<UA580>     /xea/x96/x80 VAI SYLLABLE THOO
+<UA581>     /xea/x96/x81 VAI SYLLABLE DHOO
+<UA582>     /xea/x96/x82 VAI SYLLABLE DHHOO
+<UA583>     /xea/x96/x83 VAI SYLLABLE LOO
+<UA584>     /xea/x96/x84 VAI SYLLABLE ROO
+<UA585>     /xea/x96/x85 VAI SYLLABLE DOO
+<UA586>     /xea/x96/x86 VAI SYLLABLE NDOO
+<UA587>     /xea/x96/x87 VAI SYLLABLE SOO
+<UA588>     /xea/x96/x88 VAI SYLLABLE SHOO
+<UA589>     /xea/x96/x89 VAI SYLLABLE ZOO
+<UA58A>     /xea/x96/x8a VAI SYLLABLE ZHOO
+<UA58B>     /xea/x96/x8b VAI SYLLABLE COO
+<UA58C>     /xea/x96/x8c VAI SYLLABLE JOO
+<UA58D>     /xea/x96/x8d VAI SYLLABLE NJOO
+<UA58E>     /xea/x96/x8e VAI SYLLABLE YOO
+<UA58F>     /xea/x96/x8f VAI SYLLABLE KOO
+<UA590>     /xea/x96/x90 VAI SYLLABLE NGGOO
+<UA591>     /xea/x96/x91 VAI SYLLABLE GOO
+<UA592>     /xea/x96/x92 VAI SYLLABLE MOO
+<UA593>     /xea/x96/x93 VAI SYLLABLE NOO
+<UA594>     /xea/x96/x94 VAI SYLLABLE NYOO
+<UA595>     /xea/x96/x95 VAI SYLLABLE U
+<UA596>     /xea/x96/x96 VAI SYLLABLE UN
+<UA597>     /xea/x96/x97 VAI SYLLABLE HU
+<UA598>     /xea/x96/x98 VAI SYLLABLE HUN
+<UA599>     /xea/x96/x99 VAI SYLLABLE WU
+<UA59A>     /xea/x96/x9a VAI SYLLABLE WUN
+<UA59B>     /xea/x96/x9b VAI SYLLABLE PU
+<UA59C>     /xea/x96/x9c VAI SYLLABLE BHU
+<UA59D>     /xea/x96/x9d VAI SYLLABLE BU
+<UA59E>     /xea/x96/x9e VAI SYLLABLE MBU
+<UA59F>     /xea/x96/x9f VAI SYLLABLE KPU
+<UA5A0>     /xea/x96/xa0 VAI SYLLABLE MGBU
+<UA5A1>     /xea/x96/xa1 VAI SYLLABLE GBU
+<UA5A2>     /xea/x96/xa2 VAI SYLLABLE FU
+<UA5A3>     /xea/x96/xa3 VAI SYLLABLE VU
+<UA5A4>     /xea/x96/xa4 VAI SYLLABLE TU
+<UA5A5>     /xea/x96/xa5 VAI SYLLABLE THU
+<UA5A6>     /xea/x96/xa6 VAI SYLLABLE DHU
+<UA5A7>     /xea/x96/xa7 VAI SYLLABLE DHHU
+<UA5A8>     /xea/x96/xa8 VAI SYLLABLE LU
+<UA5A9>     /xea/x96/xa9 VAI SYLLABLE RU
+<UA5AA>     /xea/x96/xaa VAI SYLLABLE DU
+<UA5AB>     /xea/x96/xab VAI SYLLABLE NDU
+<UA5AC>     /xea/x96/xac VAI SYLLABLE SU
+<UA5AD>     /xea/x96/xad VAI SYLLABLE SHU
+<UA5AE>     /xea/x96/xae VAI SYLLABLE ZU
+<UA5AF>     /xea/x96/xaf VAI SYLLABLE ZHU
+<UA5B0>     /xea/x96/xb0 VAI SYLLABLE CU
+<UA5B1>     /xea/x96/xb1 VAI SYLLABLE JU
+<UA5B2>     /xea/x96/xb2 VAI SYLLABLE NJU
+<UA5B3>     /xea/x96/xb3 VAI SYLLABLE YU
+<UA5B4>     /xea/x96/xb4 VAI SYLLABLE KU
+<UA5B5>     /xea/x96/xb5 VAI SYLLABLE NGGU
+<UA5B6>     /xea/x96/xb6 VAI SYLLABLE GU
+<UA5B7>     /xea/x96/xb7 VAI SYLLABLE MU
+<UA5B8>     /xea/x96/xb8 VAI SYLLABLE NU
+<UA5B9>     /xea/x96/xb9 VAI SYLLABLE NYU
+<UA5BA>     /xea/x96/xba VAI SYLLABLE O
+<UA5BB>     /xea/x96/xbb VAI SYLLABLE ON
+<UA5BC>     /xea/x96/xbc VAI SYLLABLE NGON
+<UA5BD>     /xea/x96/xbd VAI SYLLABLE HO
+<UA5BE>     /xea/x96/xbe VAI SYLLABLE HON
+<UA5BF>     /xea/x96/xbf VAI SYLLABLE WO
+<UA5C0>     /xea/x97/x80 VAI SYLLABLE WON
+<UA5C1>     /xea/x97/x81 VAI SYLLABLE PO
+<UA5C2>     /xea/x97/x82 VAI SYLLABLE BHO
+<UA5C3>     /xea/x97/x83 VAI SYLLABLE BO
+<UA5C4>     /xea/x97/x84 VAI SYLLABLE MBO
+<UA5C5>     /xea/x97/x85 VAI SYLLABLE KPO
+<UA5C6>     /xea/x97/x86 VAI SYLLABLE MGBO
+<UA5C7>     /xea/x97/x87 VAI SYLLABLE GBO
+<UA5C8>     /xea/x97/x88 VAI SYLLABLE GBON
+<UA5C9>     /xea/x97/x89 VAI SYLLABLE FO
+<UA5CA>     /xea/x97/x8a VAI SYLLABLE VO
+<UA5CB>     /xea/x97/x8b VAI SYLLABLE TO
+<UA5CC>     /xea/x97/x8c VAI SYLLABLE THO
+<UA5CD>     /xea/x97/x8d VAI SYLLABLE DHO
+<UA5CE>     /xea/x97/x8e VAI SYLLABLE DHHO
+<UA5CF>     /xea/x97/x8f VAI SYLLABLE LO
+<UA5D0>     /xea/x97/x90 VAI SYLLABLE RO
+<UA5D1>     /xea/x97/x91 VAI SYLLABLE DO
+<UA5D2>     /xea/x97/x92 VAI SYLLABLE NDO
+<UA5D3>     /xea/x97/x93 VAI SYLLABLE SO
+<UA5D4>     /xea/x97/x94 VAI SYLLABLE SHO
+<UA5D5>     /xea/x97/x95 VAI SYLLABLE ZO
+<UA5D6>     /xea/x97/x96 VAI SYLLABLE ZHO
+<UA5D7>     /xea/x97/x97 VAI SYLLABLE CO
+<UA5D8>     /xea/x97/x98 VAI SYLLABLE JO
+<UA5D9>     /xea/x97/x99 VAI SYLLABLE NJO
+<UA5DA>     /xea/x97/x9a VAI SYLLABLE YO
+<UA5DB>     /xea/x97/x9b VAI SYLLABLE KO
+<UA5DC>     /xea/x97/x9c VAI SYLLABLE NGGO
+<UA5DD>     /xea/x97/x9d VAI SYLLABLE GO
+<UA5DE>     /xea/x97/x9e VAI SYLLABLE MO
+<UA5DF>     /xea/x97/x9f VAI SYLLABLE NO
+<UA5E0>     /xea/x97/xa0 VAI SYLLABLE NYO
+<UA5E1>     /xea/x97/xa1 VAI SYLLABLE E
+<UA5E2>     /xea/x97/xa2 VAI SYLLABLE EN
+<UA5E3>     /xea/x97/xa3 VAI SYLLABLE NGEN
+<UA5E4>     /xea/x97/xa4 VAI SYLLABLE HE
+<UA5E5>     /xea/x97/xa5 VAI SYLLABLE HEN
+<UA5E6>     /xea/x97/xa6 VAI SYLLABLE WE
+<UA5E7>     /xea/x97/xa7 VAI SYLLABLE WEN
+<UA5E8>     /xea/x97/xa8 VAI SYLLABLE PE
+<UA5E9>     /xea/x97/xa9 VAI SYLLABLE BHE
+<UA5EA>     /xea/x97/xaa VAI SYLLABLE BE
+<UA5EB>     /xea/x97/xab VAI SYLLABLE MBE
+<UA5EC>     /xea/x97/xac VAI SYLLABLE KPE
+<UA5ED>     /xea/x97/xad VAI SYLLABLE KPEN
+<UA5EE>     /xea/x97/xae VAI SYLLABLE MGBE
+<UA5EF>     /xea/x97/xaf VAI SYLLABLE GBE
+<UA5F0>     /xea/x97/xb0 VAI SYLLABLE GBEN
+<UA5F1>     /xea/x97/xb1 VAI SYLLABLE FE
+<UA5F2>     /xea/x97/xb2 VAI SYLLABLE VE
+<UA5F3>     /xea/x97/xb3 VAI SYLLABLE TE
+<UA5F4>     /xea/x97/xb4 VAI SYLLABLE THE
+<UA5F5>     /xea/x97/xb5 VAI SYLLABLE DHE
+<UA5F6>     /xea/x97/xb6 VAI SYLLABLE DHHE
+<UA5F7>     /xea/x97/xb7 VAI SYLLABLE LE
+<UA5F8>     /xea/x97/xb8 VAI SYLLABLE RE
+<UA5F9>     /xea/x97/xb9 VAI SYLLABLE DE
+<UA5FA>     /xea/x97/xba VAI SYLLABLE NDE
+<UA5FB>     /xea/x97/xbb VAI SYLLABLE SE
+<UA5FC>     /xea/x97/xbc VAI SYLLABLE SHE
+<UA5FD>     /xea/x97/xbd VAI SYLLABLE ZE
+<UA5FE>     /xea/x97/xbe VAI SYLLABLE ZHE
+<UA5FF>     /xea/x97/xbf VAI SYLLABLE CE
+<UA600>     /xea/x98/x80 VAI SYLLABLE JE
+<UA601>     /xea/x98/x81 VAI SYLLABLE NJE
+<UA602>     /xea/x98/x82 VAI SYLLABLE YE
+<UA603>     /xea/x98/x83 VAI SYLLABLE KE
+<UA604>     /xea/x98/x84 VAI SYLLABLE NGGE
+<UA605>     /xea/x98/x85 VAI SYLLABLE NGGEN
+<UA606>     /xea/x98/x86 VAI SYLLABLE GE
+<UA607>     /xea/x98/x87 VAI SYLLABLE GEN
+<UA608>     /xea/x98/x88 VAI SYLLABLE ME
+<UA609>     /xea/x98/x89 VAI SYLLABLE NE
+<UA60A>     /xea/x98/x8a VAI SYLLABLE NYE
+<UA60B>     /xea/x98/x8b VAI SYLLABLE NG
+<UA60C>     /xea/x98/x8c VAI SYLLABLE LENGTHENER
+<UA60D>     /xea/x98/x8d VAI COMMA
+<UA60E>     /xea/x98/x8e VAI FULL STOP
+<UA60F>     /xea/x98/x8f VAI QUESTION MARK
+<UA610>     /xea/x98/x90 VAI SYLLABLE NDOLE FA
+<UA611>     /xea/x98/x91 VAI SYLLABLE NDOLE KA
+<UA612>     /xea/x98/x92 VAI SYLLABLE NDOLE SOO
+<UA613>     /xea/x98/x93 VAI SYMBOL FEENG
+<UA614>     /xea/x98/x94 VAI SYMBOL KEENG
+<UA615>     /xea/x98/x95 VAI SYMBOL TING
+<UA616>     /xea/x98/x96 VAI SYMBOL NII
+<UA617>     /xea/x98/x97 VAI SYMBOL BANG
+<UA618>     /xea/x98/x98 VAI SYMBOL FAA
+<UA619>     /xea/x98/x99 VAI SYMBOL TAA
+<UA61A>     /xea/x98/x9a VAI SYMBOL DANG
+<UA61B>     /xea/x98/x9b VAI SYMBOL DOONG
+<UA61C>     /xea/x98/x9c VAI SYMBOL KUNG
+<UA61D>     /xea/x98/x9d VAI SYMBOL TONG
+<UA61E>     /xea/x98/x9e VAI SYMBOL DO-O
+<UA61F>     /xea/x98/x9f VAI SYMBOL JONG
+<UA620>     /xea/x98/xa0 VAI DIGIT ZERO
+<UA621>     /xea/x98/xa1 VAI DIGIT ONE
+<UA622>     /xea/x98/xa2 VAI DIGIT TWO
+<UA623>     /xea/x98/xa3 VAI DIGIT THREE
+<UA624>     /xea/x98/xa4 VAI DIGIT FOUR
+<UA625>     /xea/x98/xa5 VAI DIGIT FIVE
+<UA626>     /xea/x98/xa6 VAI DIGIT SIX
+<UA627>     /xea/x98/xa7 VAI DIGIT SEVEN
+<UA628>     /xea/x98/xa8 VAI DIGIT EIGHT
+<UA629>     /xea/x98/xa9 VAI DIGIT NINE
+<UA62A>     /xea/x98/xaa VAI SYLLABLE NDOLE MA
+<UA62B>     /xea/x98/xab VAI SYLLABLE NDOLE DO
+<UA640>     /xea/x99/x80 CYRILLIC CAPITAL LETTER ZEMLYA
+<UA641>     /xea/x99/x81 CYRILLIC SMALL LETTER ZEMLYA
+<UA642>     /xea/x99/x82 CYRILLIC CAPITAL LETTER DZELO
+<UA643>     /xea/x99/x83 CYRILLIC SMALL LETTER DZELO
+<UA644>     /xea/x99/x84 CYRILLIC CAPITAL LETTER REVERSED DZE
+<UA645>     /xea/x99/x85 CYRILLIC SMALL LETTER REVERSED DZE
+<UA646>     /xea/x99/x86 CYRILLIC CAPITAL LETTER IOTA
+<UA647>     /xea/x99/x87 CYRILLIC SMALL LETTER IOTA
+<UA648>     /xea/x99/x88 CYRILLIC CAPITAL LETTER DJERV
+<UA649>     /xea/x99/x89 CYRILLIC SMALL LETTER DJERV
+<UA64A>     /xea/x99/x8a CYRILLIC CAPITAL LETTER MONOGRAPH UK
+<UA64B>     /xea/x99/x8b CYRILLIC SMALL LETTER MONOGRAPH UK
+<UA64C>     /xea/x99/x8c CYRILLIC CAPITAL LETTER BROAD OMEGA
+<UA64D>     /xea/x99/x8d CYRILLIC SMALL LETTER BROAD OMEGA
+<UA64E>     /xea/x99/x8e CYRILLIC CAPITAL LETTER NEUTRAL YER
+<UA64F>     /xea/x99/x8f CYRILLIC SMALL LETTER NEUTRAL YER
+<UA650>     /xea/x99/x90 CYRILLIC CAPITAL LETTER YERU WITH BACK YER
+<UA651>     /xea/x99/x91 CYRILLIC SMALL LETTER YERU WITH BACK YER
+<UA652>     /xea/x99/x92 CYRILLIC CAPITAL LETTER IOTIFIED YAT
+<UA653>     /xea/x99/x93 CYRILLIC SMALL LETTER IOTIFIED YAT
+<UA654>     /xea/x99/x94 CYRILLIC CAPITAL LETTER REVERSED YU
+<UA655>     /xea/x99/x95 CYRILLIC SMALL LETTER REVERSED YU
+<UA656>     /xea/x99/x96 CYRILLIC CAPITAL LETTER IOTIFIED A
+<UA657>     /xea/x99/x97 CYRILLIC SMALL LETTER IOTIFIED A
+<UA658>     /xea/x99/x98 CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS
+<UA659>     /xea/x99/x99 CYRILLIC SMALL LETTER CLOSED LITTLE YUS
+<UA65A>     /xea/x99/x9a CYRILLIC CAPITAL LETTER BLENDED YUS
+<UA65B>     /xea/x99/x9b CYRILLIC SMALL LETTER BLENDED YUS
+<UA65C>     /xea/x99/x9c CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITTLE YUS
+<UA65D>     /xea/x99/x9d CYRILLIC SMALL LETTER IOTIFIED CLOSED LITTLE YUS
+<UA65E>     /xea/x99/x9e CYRILLIC CAPITAL LETTER YN
+<UA65F>     /xea/x99/x9f CYRILLIC SMALL LETTER YN
+<UA662>     /xea/x99/xa2 CYRILLIC CAPITAL LETTER SOFT DE
+<UA663>     /xea/x99/xa3 CYRILLIC SMALL LETTER SOFT DE
+<UA664>     /xea/x99/xa4 CYRILLIC CAPITAL LETTER SOFT EL
+<UA665>     /xea/x99/xa5 CYRILLIC SMALL LETTER SOFT EL
+<UA666>     /xea/x99/xa6 CYRILLIC CAPITAL LETTER SOFT EM
+<UA667>     /xea/x99/xa7 CYRILLIC SMALL LETTER SOFT EM
+<UA668>     /xea/x99/xa8 CYRILLIC CAPITAL LETTER MONOCULAR O
+<UA669>     /xea/x99/xa9 CYRILLIC SMALL LETTER MONOCULAR O
+<UA66A>     /xea/x99/xaa CYRILLIC CAPITAL LETTER BINOCULAR O
+<UA66B>     /xea/x99/xab CYRILLIC SMALL LETTER BINOCULAR O
+<UA66C>     /xea/x99/xac CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O
+<UA66D>     /xea/x99/xad CYRILLIC SMALL LETTER DOUBLE MONOCULAR O
+<UA66E>     /xea/x99/xae CYRILLIC LETTER MULTIOCULAR O
+<UA66F>     /xea/x99/xaf COMBINING CYRILLIC VZMET
+<UA670>     /xea/x99/xb0 COMBINING CYRILLIC TEN MILLIONS SIGN
+<UA671>     /xea/x99/xb1 COMBINING CYRILLIC HUNDRED MILLIONS SIGN
+<UA672>     /xea/x99/xb2 COMBINING CYRILLIC THOUSAND MILLIONS SIGN
+<UA673>     /xea/x99/xb3 SLAVONIC ASTERISK
+<UA67C>     /xea/x99/xbc COMBINING CYRILLIC KAVYKA
+<UA67D>     /xea/x99/xbd COMBINING CYRILLIC PAYEROK
+<UA67E>     /xea/x99/xbe CYRILLIC KAVYKA
+<UA67F>     /xea/x99/xbf CYRILLIC PAYEROK
+<UA680>     /xea/x9a/x80 CYRILLIC CAPITAL LETTER DWE
+<UA681>     /xea/x9a/x81 CYRILLIC SMALL LETTER DWE
+<UA682>     /xea/x9a/x82 CYRILLIC CAPITAL LETTER DZWE
+<UA683>     /xea/x9a/x83 CYRILLIC SMALL LETTER DZWE
+<UA684>     /xea/x9a/x84 CYRILLIC CAPITAL LETTER ZHWE
+<UA685>     /xea/x9a/x85 CYRILLIC SMALL LETTER ZHWE
+<UA686>     /xea/x9a/x86 CYRILLIC CAPITAL LETTER CCHE
+<UA687>     /xea/x9a/x87 CYRILLIC SMALL LETTER CCHE
+<UA688>     /xea/x9a/x88 CYRILLIC CAPITAL LETTER DZZE
+<UA689>     /xea/x9a/x89 CYRILLIC SMALL LETTER DZZE
+<UA68A>     /xea/x9a/x8a CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK
+<UA68B>     /xea/x9a/x8b CYRILLIC SMALL LETTER TE WITH MIDDLE HOOK
+<UA68C>     /xea/x9a/x8c CYRILLIC CAPITAL LETTER TWE
+<UA68D>     /xea/x9a/x8d CYRILLIC SMALL LETTER TWE
+<UA68E>     /xea/x9a/x8e CYRILLIC CAPITAL LETTER TSWE
+<UA68F>     /xea/x9a/x8f CYRILLIC SMALL LETTER TSWE
+<UA690>     /xea/x9a/x90 CYRILLIC CAPITAL LETTER TSSE
+<UA691>     /xea/x9a/x91 CYRILLIC SMALL LETTER TSSE
+<UA692>     /xea/x9a/x92 CYRILLIC CAPITAL LETTER TCHE
+<UA693>     /xea/x9a/x93 CYRILLIC SMALL LETTER TCHE
+<UA694>     /xea/x9a/x94 CYRILLIC CAPITAL LETTER HWE
+<UA695>     /xea/x9a/x95 CYRILLIC SMALL LETTER HWE
+<UA696>     /xea/x9a/x96 CYRILLIC CAPITAL LETTER SHWE
+<UA697>     /xea/x9a/x97 CYRILLIC SMALL LETTER SHWE
 <UA700>     /xea/x9c/x80 MODIFIER LETTER CHINESE TONE YIN PING
 <UA701>     /xea/x9c/x81 MODIFIER LETTER CHINESE TONE YANG PING
 <UA702>     /xea/x9c/x82 MODIFIER LETTER CHINESE TONE YIN SHANG
@@ -12157,8 +13096,125 @@ CHARMAP
 <UA718>     /xea/x9c/x98 MODIFIER LETTER DOT SLASH
 <UA719>     /xea/x9c/x99 MODIFIER LETTER DOT HORIZONTAL BAR
 <UA71A>     /xea/x9c/x9a MODIFIER LETTER LOWER RIGHT CORNER ANGLE
+<UA71B>     /xea/x9c/x9b MODIFIER LETTER RAISED UP ARROW
+<UA71C>     /xea/x9c/x9c MODIFIER LETTER RAISED DOWN ARROW
+<UA71D>     /xea/x9c/x9d MODIFIER LETTER RAISED EXCLAMATION MARK
+<UA71E>     /xea/x9c/x9e MODIFIER LETTER RAISED INVERTED EXCLAMATION MARK
+<UA71F>     /xea/x9c/x9f MODIFIER LETTER LOW INVERTED EXCLAMATION MARK
 <UA720>     /xea/x9c/xa0 MODIFIER LETTER STRESS AND HIGH TONE
 <UA721>     /xea/x9c/xa1 MODIFIER LETTER STRESS AND LOW TONE
+<UA722>     /xea/x9c/xa2 LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF
+<UA723>     /xea/x9c/xa3 LATIN SMALL LETTER EGYPTOLOGICAL ALEF
+<UA724>     /xea/x9c/xa4 LATIN CAPITAL LETTER EGYPTOLOGICAL AIN
+<UA725>     /xea/x9c/xa5 LATIN SMALL LETTER EGYPTOLOGICAL AIN
+<UA726>     /xea/x9c/xa6 LATIN CAPITAL LETTER HENG
+<UA727>     /xea/x9c/xa7 LATIN SMALL LETTER HENG
+<UA728>     /xea/x9c/xa8 LATIN CAPITAL LETTER TZ
+<UA729>     /xea/x9c/xa9 LATIN SMALL LETTER TZ
+<UA72A>     /xea/x9c/xaa LATIN CAPITAL LETTER TRESILLO
+<UA72B>     /xea/x9c/xab LATIN SMALL LETTER TRESILLO
+<UA72C>     /xea/x9c/xac LATIN CAPITAL LETTER CUATRILLO
+<UA72D>     /xea/x9c/xad LATIN SMALL LETTER CUATRILLO
+<UA72E>     /xea/x9c/xae LATIN CAPITAL LETTER CUATRILLO WITH COMMA
+<UA72F>     /xea/x9c/xaf LATIN SMALL LETTER CUATRILLO WITH COMMA
+<UA730>     /xea/x9c/xb0 LATIN LETTER SMALL CAPITAL F
+<UA731>     /xea/x9c/xb1 LATIN LETTER SMALL CAPITAL S
+<UA732>     /xea/x9c/xb2 LATIN CAPITAL LETTER AA
+<UA733>     /xea/x9c/xb3 LATIN SMALL LETTER AA
+<UA734>     /xea/x9c/xb4 LATIN CAPITAL LETTER AO
+<UA735>     /xea/x9c/xb5 LATIN SMALL LETTER AO
+<UA736>     /xea/x9c/xb6 LATIN CAPITAL LETTER AU
+<UA737>     /xea/x9c/xb7 LATIN SMALL LETTER AU
+<UA738>     /xea/x9c/xb8 LATIN CAPITAL LETTER AV
+<UA739>     /xea/x9c/xb9 LATIN SMALL LETTER AV
+<UA73A>     /xea/x9c/xba LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR
+<UA73B>     /xea/x9c/xbb LATIN SMALL LETTER AV WITH HORIZONTAL BAR
+<UA73C>     /xea/x9c/xbc LATIN CAPITAL LETTER AY
+<UA73D>     /xea/x9c/xbd LATIN SMALL LETTER AY
+<UA73E>     /xea/x9c/xbe LATIN CAPITAL LETTER REVERSED C WITH DOT
+<UA73F>     /xea/x9c/xbf LATIN SMALL LETTER REVERSED C WITH DOT
+<UA740>     /xea/x9d/x80 LATIN CAPITAL LETTER K WITH STROKE
+<UA741>     /xea/x9d/x81 LATIN SMALL LETTER K WITH STROKE
+<UA742>     /xea/x9d/x82 LATIN CAPITAL LETTER K WITH DIAGONAL STROKE
+<UA743>     /xea/x9d/x83 LATIN SMALL LETTER K WITH DIAGONAL STROKE
+<UA744>     /xea/x9d/x84 LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE
+<UA745>     /xea/x9d/x85 LATIN SMALL LETTER K WITH STROKE AND DIAGONAL STROKE
+<UA746>     /xea/x9d/x86 LATIN CAPITAL LETTER BROKEN L
+<UA747>     /xea/x9d/x87 LATIN SMALL LETTER BROKEN L
+<UA748>     /xea/x9d/x88 LATIN CAPITAL LETTER L WITH HIGH STROKE
+<UA749>     /xea/x9d/x89 LATIN SMALL LETTER L WITH HIGH STROKE
+<UA74A>     /xea/x9d/x8a LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY
+<UA74B>     /xea/x9d/x8b LATIN SMALL LETTER O WITH LONG STROKE OVERLAY
+<UA74C>     /xea/x9d/x8c LATIN CAPITAL LETTER O WITH LOOP
+<UA74D>     /xea/x9d/x8d LATIN SMALL LETTER O WITH LOOP
+<UA74E>     /xea/x9d/x8e LATIN CAPITAL LETTER OO
+<UA74F>     /xea/x9d/x8f LATIN SMALL LETTER OO
+<UA750>     /xea/x9d/x90 LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER
+<UA751>     /xea/x9d/x91 LATIN SMALL LETTER P WITH STROKE THROUGH DESCENDER
+<UA752>     /xea/x9d/x92 LATIN CAPITAL LETTER P WITH FLOURISH
+<UA753>     /xea/x9d/x93 LATIN SMALL LETTER P WITH FLOURISH
+<UA754>     /xea/x9d/x94 LATIN CAPITAL LETTER P WITH SQUIRREL TAIL
+<UA755>     /xea/x9d/x95 LATIN SMALL LETTER P WITH SQUIRREL TAIL
+<UA756>     /xea/x9d/x96 LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER
+<UA757>     /xea/x9d/x97 LATIN SMALL LETTER Q WITH STROKE THROUGH DESCENDER
+<UA758>     /xea/x9d/x98 LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE
+<UA759>     /xea/x9d/x99 LATIN SMALL LETTER Q WITH DIAGONAL STROKE
+<UA75A>     /xea/x9d/x9a LATIN CAPITAL LETTER R ROTUNDA
+<UA75B>     /xea/x9d/x9b LATIN SMALL LETTER R ROTUNDA
+<UA75C>     /xea/x9d/x9c LATIN CAPITAL LETTER RUM ROTUNDA
+<UA75D>     /xea/x9d/x9d LATIN SMALL LETTER RUM ROTUNDA
+<UA75E>     /xea/x9d/x9e LATIN CAPITAL LETTER V WITH DIAGONAL STROKE
+<UA75F>     /xea/x9d/x9f LATIN SMALL LETTER V WITH DIAGONAL STROKE
+<UA760>     /xea/x9d/xa0 LATIN CAPITAL LETTER VY
+<UA761>     /xea/x9d/xa1 LATIN SMALL LETTER VY
+<UA762>     /xea/x9d/xa2 LATIN CAPITAL LETTER VISIGOTHIC Z
+<UA763>     /xea/x9d/xa3 LATIN SMALL LETTER VISIGOTHIC Z
+<UA764>     /xea/x9d/xa4 LATIN CAPITAL LETTER THORN WITH STROKE
+<UA765>     /xea/x9d/xa5 LATIN SMALL LETTER THORN WITH STROKE
+<UA766>     /xea/x9d/xa6 LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER
+<UA767>     /xea/x9d/xa7 LATIN SMALL LETTER THORN WITH STROKE THROUGH DESCENDER
+<UA768>     /xea/x9d/xa8 LATIN CAPITAL LETTER VEND
+<UA769>     /xea/x9d/xa9 LATIN SMALL LETTER VEND
+<UA76A>     /xea/x9d/xaa LATIN CAPITAL LETTER ET
+<UA76B>     /xea/x9d/xab LATIN SMALL LETTER ET
+<UA76C>     /xea/x9d/xac LATIN CAPITAL LETTER IS
+<UA76D>     /xea/x9d/xad LATIN SMALL LETTER IS
+<UA76E>     /xea/x9d/xae LATIN CAPITAL LETTER CON
+<UA76F>     /xea/x9d/xaf LATIN SMALL LETTER CON
+<UA770>     /xea/x9d/xb0 MODIFIER LETTER US
+<UA771>     /xea/x9d/xb1 LATIN SMALL LETTER DUM
+<UA772>     /xea/x9d/xb2 LATIN SMALL LETTER LUM
+<UA773>     /xea/x9d/xb3 LATIN SMALL LETTER MUM
+<UA774>     /xea/x9d/xb4 LATIN SMALL LETTER NUM
+<UA775>     /xea/x9d/xb5 LATIN SMALL LETTER RUM
+<UA776>     /xea/x9d/xb6 LATIN LETTER SMALL CAPITAL RUM
+<UA777>     /xea/x9d/xb7 LATIN SMALL LETTER TUM
+<UA778>     /xea/x9d/xb8 LATIN SMALL LETTER UM
+<UA779>     /xea/x9d/xb9 LATIN CAPITAL LETTER INSULAR D
+<UA77A>     /xea/x9d/xba LATIN SMALL LETTER INSULAR D
+<UA77B>     /xea/x9d/xbb LATIN CAPITAL LETTER INSULAR F
+<UA77C>     /xea/x9d/xbc LATIN SMALL LETTER INSULAR F
+<UA77D>     /xea/x9d/xbd LATIN CAPITAL LETTER INSULAR G
+<UA77E>     /xea/x9d/xbe LATIN CAPITAL LETTER TURNED INSULAR G
+<UA77F>     /xea/x9d/xbf LATIN SMALL LETTER TURNED INSULAR G
+<UA780>     /xea/x9e/x80 LATIN CAPITAL LETTER TURNED L
+<UA781>     /xea/x9e/x81 LATIN SMALL LETTER TURNED L
+<UA782>     /xea/x9e/x82 LATIN CAPITAL LETTER INSULAR R
+<UA783>     /xea/x9e/x83 LATIN SMALL LETTER INSULAR R
+<UA784>     /xea/x9e/x84 LATIN CAPITAL LETTER INSULAR S
+<UA785>     /xea/x9e/x85 LATIN SMALL LETTER INSULAR S
+<UA786>     /xea/x9e/x86 LATIN CAPITAL LETTER INSULAR T
+<UA787>     /xea/x9e/x87 LATIN SMALL LETTER INSULAR T
+<UA788>     /xea/x9e/x88 MODIFIER LETTER LOW CIRCUMFLEX ACCENT
+<UA789>     /xea/x9e/x89 MODIFIER LETTER COLON
+<UA78A>     /xea/x9e/x8a MODIFIER LETTER SHORT EQUALS SIGN
+<UA78B>     /xea/x9e/x8b LATIN CAPITAL LETTER SALTILLO
+<UA78C>     /xea/x9e/x8c LATIN SMALL LETTER SALTILLO
+<UA7FB>     /xea/x9f/xbb LATIN EPIGRAPHIC LETTER REVERSED F
+<UA7FC>     /xea/x9f/xbc LATIN EPIGRAPHIC LETTER REVERSED P
+<UA7FD>     /xea/x9f/xbd LATIN EPIGRAPHIC LETTER INVERTED M
+<UA7FE>     /xea/x9f/xbe LATIN EPIGRAPHIC LETTER I LONGA
+<UA7FF>     /xea/x9f/xbf LATIN EPIGRAPHIC LETTER ARCHAIC M
 <UA800>     /xea/xa0/x80 SYLOTI NAGRI LETTER A
 <UA801>     /xea/xa0/x81 SYLOTI NAGRI LETTER I
 <UA802>     /xea/xa0/x82 SYLOTI NAGRI SIGN DVISVARA
@@ -12259,6 +13315,255 @@ CHARMAP
 <UA875>     /xea/xa1/xb5 PHAGS-PA DOUBLE HEAD MARK
 <UA876>     /xea/xa1/xb6 PHAGS-PA MARK SHAD
 <UA877>     /xea/xa1/xb7 PHAGS-PA MARK DOUBLE SHAD
+<UA880>     /xea/xa2/x80 SAURASHTRA SIGN ANUSVARA
+<UA881>     /xea/xa2/x81 SAURASHTRA SIGN VISARGA
+<UA882>     /xea/xa2/x82 SAURASHTRA LETTER A
+<UA883>     /xea/xa2/x83 SAURASHTRA LETTER AA
+<UA884>     /xea/xa2/x84 SAURASHTRA LETTER I
+<UA885>     /xea/xa2/x85 SAURASHTRA LETTER II
+<UA886>     /xea/xa2/x86 SAURASHTRA LETTER U
+<UA887>     /xea/xa2/x87 SAURASHTRA LETTER UU
+<UA888>     /xea/xa2/x88 SAURASHTRA LETTER VOCALIC R
+<UA889>     /xea/xa2/x89 SAURASHTRA LETTER VOCALIC RR
+<UA88A>     /xea/xa2/x8a SAURASHTRA LETTER VOCALIC L
+<UA88B>     /xea/xa2/x8b SAURASHTRA LETTER VOCALIC LL
+<UA88C>     /xea/xa2/x8c SAURASHTRA LETTER E
+<UA88D>     /xea/xa2/x8d SAURASHTRA LETTER EE
+<UA88E>     /xea/xa2/x8e SAURASHTRA LETTER AI
+<UA88F>     /xea/xa2/x8f SAURASHTRA LETTER O
+<UA890>     /xea/xa2/x90 SAURASHTRA LETTER OO
+<UA891>     /xea/xa2/x91 SAURASHTRA LETTER AU
+<UA892>     /xea/xa2/x92 SAURASHTRA LETTER KA
+<UA893>     /xea/xa2/x93 SAURASHTRA LETTER KHA
+<UA894>     /xea/xa2/x94 SAURASHTRA LETTER GA
+<UA895>     /xea/xa2/x95 SAURASHTRA LETTER GHA
+<UA896>     /xea/xa2/x96 SAURASHTRA LETTER NGA
+<UA897>     /xea/xa2/x97 SAURASHTRA LETTER CA
+<UA898>     /xea/xa2/x98 SAURASHTRA LETTER CHA
+<UA899>     /xea/xa2/x99 SAURASHTRA LETTER JA
+<UA89A>     /xea/xa2/x9a SAURASHTRA LETTER JHA
+<UA89B>     /xea/xa2/x9b SAURASHTRA LETTER NYA
+<UA89C>     /xea/xa2/x9c SAURASHTRA LETTER TTA
+<UA89D>     /xea/xa2/x9d SAURASHTRA LETTER TTHA
+<UA89E>     /xea/xa2/x9e SAURASHTRA LETTER DDA
+<UA89F>     /xea/xa2/x9f SAURASHTRA LETTER DDHA
+<UA8A0>     /xea/xa2/xa0 SAURASHTRA LETTER NNA
+<UA8A1>     /xea/xa2/xa1 SAURASHTRA LETTER TA
+<UA8A2>     /xea/xa2/xa2 SAURASHTRA LETTER THA
+<UA8A3>     /xea/xa2/xa3 SAURASHTRA LETTER DA
+<UA8A4>     /xea/xa2/xa4 SAURASHTRA LETTER DHA
+<UA8A5>     /xea/xa2/xa5 SAURASHTRA LETTER NA
+<UA8A6>     /xea/xa2/xa6 SAURASHTRA LETTER PA
+<UA8A7>     /xea/xa2/xa7 SAURASHTRA LETTER PHA
+<UA8A8>     /xea/xa2/xa8 SAURASHTRA LETTER BA
+<UA8A9>     /xea/xa2/xa9 SAURASHTRA LETTER BHA
+<UA8AA>     /xea/xa2/xaa SAURASHTRA LETTER MA
+<UA8AB>     /xea/xa2/xab SAURASHTRA LETTER YA
+<UA8AC>     /xea/xa2/xac SAURASHTRA LETTER RA
+<UA8AD>     /xea/xa2/xad SAURASHTRA LETTER LA
+<UA8AE>     /xea/xa2/xae SAURASHTRA LETTER VA
+<UA8AF>     /xea/xa2/xaf SAURASHTRA LETTER SHA
+<UA8B0>     /xea/xa2/xb0 SAURASHTRA LETTER SSA
+<UA8B1>     /xea/xa2/xb1 SAURASHTRA LETTER SA
+<UA8B2>     /xea/xa2/xb2 SAURASHTRA LETTER HA
+<UA8B3>     /xea/xa2/xb3 SAURASHTRA LETTER LLA
+<UA8B4>     /xea/xa2/xb4 SAURASHTRA CONSONANT SIGN HAARU
+<UA8B5>     /xea/xa2/xb5 SAURASHTRA VOWEL SIGN AA
+<UA8B6>     /xea/xa2/xb6 SAURASHTRA VOWEL SIGN I
+<UA8B7>     /xea/xa2/xb7 SAURASHTRA VOWEL SIGN II
+<UA8B8>     /xea/xa2/xb8 SAURASHTRA VOWEL SIGN U
+<UA8B9>     /xea/xa2/xb9 SAURASHTRA VOWEL SIGN UU
+<UA8BA>     /xea/xa2/xba SAURASHTRA VOWEL SIGN VOCALIC R
+<UA8BB>     /xea/xa2/xbb SAURASHTRA VOWEL SIGN VOCALIC RR
+<UA8BC>     /xea/xa2/xbc SAURASHTRA VOWEL SIGN VOCALIC L
+<UA8BD>     /xea/xa2/xbd SAURASHTRA VOWEL SIGN VOCALIC LL
+<UA8BE>     /xea/xa2/xbe SAURASHTRA VOWEL SIGN E
+<UA8BF>     /xea/xa2/xbf SAURASHTRA VOWEL SIGN EE
+<UA8C0>     /xea/xa3/x80 SAURASHTRA VOWEL SIGN AI
+<UA8C1>     /xea/xa3/x81 SAURASHTRA VOWEL SIGN O
+<UA8C2>     /xea/xa3/x82 SAURASHTRA VOWEL SIGN OO
+<UA8C3>     /xea/xa3/x83 SAURASHTRA VOWEL SIGN AU
+<UA8C4>     /xea/xa3/x84 SAURASHTRA SIGN VIRAMA
+<UA8CE>     /xea/xa3/x8e SAURASHTRA DANDA
+<UA8CF>     /xea/xa3/x8f SAURASHTRA DOUBLE DANDA
+<UA8D0>     /xea/xa3/x90 SAURASHTRA DIGIT ZERO
+<UA8D1>     /xea/xa3/x91 SAURASHTRA DIGIT ONE
+<UA8D2>     /xea/xa3/x92 SAURASHTRA DIGIT TWO
+<UA8D3>     /xea/xa3/x93 SAURASHTRA DIGIT THREE
+<UA8D4>     /xea/xa3/x94 SAURASHTRA DIGIT FOUR
+<UA8D5>     /xea/xa3/x95 SAURASHTRA DIGIT FIVE
+<UA8D6>     /xea/xa3/x96 SAURASHTRA DIGIT SIX
+<UA8D7>     /xea/xa3/x97 SAURASHTRA DIGIT SEVEN
+<UA8D8>     /xea/xa3/x98 SAURASHTRA DIGIT EIGHT
+<UA8D9>     /xea/xa3/x99 SAURASHTRA DIGIT NINE
+<UA900>     /xea/xa4/x80 KAYAH LI DIGIT ZERO
+<UA901>     /xea/xa4/x81 KAYAH LI DIGIT ONE
+<UA902>     /xea/xa4/x82 KAYAH LI DIGIT TWO
+<UA903>     /xea/xa4/x83 KAYAH LI DIGIT THREE
+<UA904>     /xea/xa4/x84 KAYAH LI DIGIT FOUR
+<UA905>     /xea/xa4/x85 KAYAH LI DIGIT FIVE
+<UA906>     /xea/xa4/x86 KAYAH LI DIGIT SIX
+<UA907>     /xea/xa4/x87 KAYAH LI DIGIT SEVEN
+<UA908>     /xea/xa4/x88 KAYAH LI DIGIT EIGHT
+<UA909>     /xea/xa4/x89 KAYAH LI DIGIT NINE
+<UA90A>     /xea/xa4/x8a KAYAH LI LETTER KA
+<UA90B>     /xea/xa4/x8b KAYAH LI LETTER KHA
+<UA90C>     /xea/xa4/x8c KAYAH LI LETTER GA
+<UA90D>     /xea/xa4/x8d KAYAH LI LETTER NGA
+<UA90E>     /xea/xa4/x8e KAYAH LI LETTER SA
+<UA90F>     /xea/xa4/x8f KAYAH LI LETTER SHA
+<UA910>     /xea/xa4/x90 KAYAH LI LETTER ZA
+<UA911>     /xea/xa4/x91 KAYAH LI LETTER NYA
+<UA912>     /xea/xa4/x92 KAYAH LI LETTER TA
+<UA913>     /xea/xa4/x93 KAYAH LI LETTER HTA
+<UA914>     /xea/xa4/x94 KAYAH LI LETTER NA
+<UA915>     /xea/xa4/x95 KAYAH LI LETTER PA
+<UA916>     /xea/xa4/x96 KAYAH LI LETTER PHA
+<UA917>     /xea/xa4/x97 KAYAH LI LETTER MA
+<UA918>     /xea/xa4/x98 KAYAH LI LETTER DA
+<UA919>     /xea/xa4/x99 KAYAH LI LETTER BA
+<UA91A>     /xea/xa4/x9a KAYAH LI LETTER RA
+<UA91B>     /xea/xa4/x9b KAYAH LI LETTER YA
+<UA91C>     /xea/xa4/x9c KAYAH LI LETTER LA
+<UA91D>     /xea/xa4/x9d KAYAH LI LETTER WA
+<UA91E>     /xea/xa4/x9e KAYAH LI LETTER THA
+<UA91F>     /xea/xa4/x9f KAYAH LI LETTER HA
+<UA920>     /xea/xa4/xa0 KAYAH LI LETTER VA
+<UA921>     /xea/xa4/xa1 KAYAH LI LETTER CA
+<UA922>     /xea/xa4/xa2 KAYAH LI LETTER A
+<UA923>     /xea/xa4/xa3 KAYAH LI LETTER OE
+<UA924>     /xea/xa4/xa4 KAYAH LI LETTER I
+<UA925>     /xea/xa4/xa5 KAYAH LI LETTER OO
+<UA926>     /xea/xa4/xa6 KAYAH LI VOWEL UE
+<UA927>     /xea/xa4/xa7 KAYAH LI VOWEL E
+<UA928>     /xea/xa4/xa8 KAYAH LI VOWEL U
+<UA929>     /xea/xa4/xa9 KAYAH LI VOWEL EE
+<UA92A>     /xea/xa4/xaa KAYAH LI VOWEL O
+<UA92B>     /xea/xa4/xab KAYAH LI TONE PLOPHU
+<UA92C>     /xea/xa4/xac KAYAH LI TONE CALYA
+<UA92D>     /xea/xa4/xad KAYAH LI TONE CALYA PLOPHU
+<UA92E>     /xea/xa4/xae KAYAH LI SIGN CWI
+<UA92F>     /xea/xa4/xaf KAYAH LI SIGN SHYA
+<UA930>     /xea/xa4/xb0 REJANG LETTER KA
+<UA931>     /xea/xa4/xb1 REJANG LETTER GA
+<UA932>     /xea/xa4/xb2 REJANG LETTER NGA
+<UA933>     /xea/xa4/xb3 REJANG LETTER TA
+<UA934>     /xea/xa4/xb4 REJANG LETTER DA
+<UA935>     /xea/xa4/xb5 REJANG LETTER NA
+<UA936>     /xea/xa4/xb6 REJANG LETTER PA
+<UA937>     /xea/xa4/xb7 REJANG LETTER BA
+<UA938>     /xea/xa4/xb8 REJANG LETTER MA
+<UA939>     /xea/xa4/xb9 REJANG LETTER CA
+<UA93A>     /xea/xa4/xba REJANG LETTER JA
+<UA93B>     /xea/xa4/xbb REJANG LETTER NYA
+<UA93C>     /xea/xa4/xbc REJANG LETTER SA
+<UA93D>     /xea/xa4/xbd REJANG LETTER RA
+<UA93E>     /xea/xa4/xbe REJANG LETTER LA
+<UA93F>     /xea/xa4/xbf REJANG LETTER YA
+<UA940>     /xea/xa5/x80 REJANG LETTER WA
+<UA941>     /xea/xa5/x81 REJANG LETTER HA
+<UA942>     /xea/xa5/x82 REJANG LETTER MBA
+<UA943>     /xea/xa5/x83 REJANG LETTER NGGA
+<UA944>     /xea/xa5/x84 REJANG LETTER NDA
+<UA945>     /xea/xa5/x85 REJANG LETTER NYJA
+<UA946>     /xea/xa5/x86 REJANG LETTER A
+<UA947>     /xea/xa5/x87 REJANG VOWEL SIGN I
+<UA948>     /xea/xa5/x88 REJANG VOWEL SIGN U
+<UA949>     /xea/xa5/x89 REJANG VOWEL SIGN E
+<UA94A>     /xea/xa5/x8a REJANG VOWEL SIGN AI
+<UA94B>     /xea/xa5/x8b REJANG VOWEL SIGN O
+<UA94C>     /xea/xa5/x8c REJANG VOWEL SIGN AU
+<UA94D>     /xea/xa5/x8d REJANG VOWEL SIGN EU
+<UA94E>     /xea/xa5/x8e REJANG VOWEL SIGN EA
+<UA94F>     /xea/xa5/x8f REJANG CONSONANT SIGN NG
+<UA950>     /xea/xa5/x90 REJANG CONSONANT SIGN N
+<UA951>     /xea/xa5/x91 REJANG CONSONANT SIGN R
+<UA952>     /xea/xa5/x92 REJANG CONSONANT SIGN H
+<UA953>     /xea/xa5/x93 REJANG VIRAMA
+<UA95F>     /xea/xa5/x9f REJANG SECTION MARK
+<UAA00>     /xea/xa8/x80 CHAM LETTER A
+<UAA01>     /xea/xa8/x81 CHAM LETTER I
+<UAA02>     /xea/xa8/x82 CHAM LETTER U
+<UAA03>     /xea/xa8/x83 CHAM LETTER E
+<UAA04>     /xea/xa8/x84 CHAM LETTER AI
+<UAA05>     /xea/xa8/x85 CHAM LETTER O
+<UAA06>     /xea/xa8/x86 CHAM LETTER KA
+<UAA07>     /xea/xa8/x87 CHAM LETTER KHA
+<UAA08>     /xea/xa8/x88 CHAM LETTER GA
+<UAA09>     /xea/xa8/x89 CHAM LETTER GHA
+<UAA0A>     /xea/xa8/x8a CHAM LETTER NGUE
+<UAA0B>     /xea/xa8/x8b CHAM LETTER NGA
+<UAA0C>     /xea/xa8/x8c CHAM LETTER CHA
+<UAA0D>     /xea/xa8/x8d CHAM LETTER CHHA
+<UAA0E>     /xea/xa8/x8e CHAM LETTER JA
+<UAA0F>     /xea/xa8/x8f CHAM LETTER JHA
+<UAA10>     /xea/xa8/x90 CHAM LETTER NHUE
+<UAA11>     /xea/xa8/x91 CHAM LETTER NHA
+<UAA12>     /xea/xa8/x92 CHAM LETTER NHJA
+<UAA13>     /xea/xa8/x93 CHAM LETTER TA
+<UAA14>     /xea/xa8/x94 CHAM LETTER THA
+<UAA15>     /xea/xa8/x95 CHAM LETTER DA
+<UAA16>     /xea/xa8/x96 CHAM LETTER DHA
+<UAA17>     /xea/xa8/x97 CHAM LETTER NUE
+<UAA18>     /xea/xa8/x98 CHAM LETTER NA
+<UAA19>     /xea/xa8/x99 CHAM LETTER DDA
+<UAA1A>     /xea/xa8/x9a CHAM LETTER PA
+<UAA1B>     /xea/xa8/x9b CHAM LETTER PPA
+<UAA1C>     /xea/xa8/x9c CHAM LETTER PHA
+<UAA1D>     /xea/xa8/x9d CHAM LETTER BA
+<UAA1E>     /xea/xa8/x9e CHAM LETTER BHA
+<UAA1F>     /xea/xa8/x9f CHAM LETTER MUE
+<UAA20>     /xea/xa8/xa0 CHAM LETTER MA
+<UAA21>     /xea/xa8/xa1 CHAM LETTER BBA
+<UAA22>     /xea/xa8/xa2 CHAM LETTER YA
+<UAA23>     /xea/xa8/xa3 CHAM LETTER RA
+<UAA24>     /xea/xa8/xa4 CHAM LETTER LA
+<UAA25>     /xea/xa8/xa5 CHAM LETTER VA
+<UAA26>     /xea/xa8/xa6 CHAM LETTER SSA
+<UAA27>     /xea/xa8/xa7 CHAM LETTER SA
+<UAA28>     /xea/xa8/xa8 CHAM LETTER HA
+<UAA29>     /xea/xa8/xa9 CHAM VOWEL SIGN AA
+<UAA2A>     /xea/xa8/xaa CHAM VOWEL SIGN I
+<UAA2B>     /xea/xa8/xab CHAM VOWEL SIGN II
+<UAA2C>     /xea/xa8/xac CHAM VOWEL SIGN EI
+<UAA2D>     /xea/xa8/xad CHAM VOWEL SIGN U
+<UAA2E>     /xea/xa8/xae CHAM VOWEL SIGN OE
+<UAA2F>     /xea/xa8/xaf CHAM VOWEL SIGN O
+<UAA30>     /xea/xa8/xb0 CHAM VOWEL SIGN AI
+<UAA31>     /xea/xa8/xb1 CHAM VOWEL SIGN AU
+<UAA32>     /xea/xa8/xb2 CHAM VOWEL SIGN UE
+<UAA33>     /xea/xa8/xb3 CHAM CONSONANT SIGN YA
+<UAA34>     /xea/xa8/xb4 CHAM CONSONANT SIGN RA
+<UAA35>     /xea/xa8/xb5 CHAM CONSONANT SIGN LA
+<UAA36>     /xea/xa8/xb6 CHAM CONSONANT SIGN WA
+<UAA40>     /xea/xa9/x80 CHAM LETTER FINAL K
+<UAA41>     /xea/xa9/x81 CHAM LETTER FINAL G
+<UAA42>     /xea/xa9/x82 CHAM LETTER FINAL NG
+<UAA43>     /xea/xa9/x83 CHAM CONSONANT SIGN FINAL NG
+<UAA44>     /xea/xa9/x84 CHAM LETTER FINAL CH
+<UAA45>     /xea/xa9/x85 CHAM LETTER FINAL T
+<UAA46>     /xea/xa9/x86 CHAM LETTER FINAL N
+<UAA47>     /xea/xa9/x87 CHAM LETTER FINAL P
+<UAA48>     /xea/xa9/x88 CHAM LETTER FINAL Y
+<UAA49>     /xea/xa9/x89 CHAM LETTER FINAL R
+<UAA4A>     /xea/xa9/x8a CHAM LETTER FINAL L
+<UAA4B>     /xea/xa9/x8b CHAM LETTER FINAL SS
+<UAA4C>     /xea/xa9/x8c CHAM CONSONANT SIGN FINAL M
+<UAA4D>     /xea/xa9/x8d CHAM CONSONANT SIGN FINAL H
+<UAA50>     /xea/xa9/x90 CHAM DIGIT ZERO
+<UAA51>     /xea/xa9/x91 CHAM DIGIT ONE
+<UAA52>     /xea/xa9/x92 CHAM DIGIT TWO
+<UAA53>     /xea/xa9/x93 CHAM DIGIT THREE
+<UAA54>     /xea/xa9/x94 CHAM DIGIT FOUR
+<UAA55>     /xea/xa9/x95 CHAM DIGIT FIVE
+<UAA56>     /xea/xa9/x96 CHAM DIGIT SIX
+<UAA57>     /xea/xa9/x97 CHAM DIGIT SEVEN
+<UAA58>     /xea/xa9/x98 CHAM DIGIT EIGHT
+<UAA59>     /xea/xa9/x99 CHAM DIGIT NINE
+<UAA5C>     /xea/xa9/x9c CHAM PUNCTUATION SPIRAL
+<UAA5D>     /xea/xa9/x9d CHAM PUNCTUATION DANDA
+<UAA5E>     /xea/xa9/x9e CHAM PUNCTUATION DOUBLE DANDA
+<UAA5F>     /xea/xa9/x9f CHAM PUNCTUATION TRIPLE DANDA
 <UAC00>     /xea/xb0/x80 HANGUL SYLLABLE GA
 <UAC01>     /xea/xb0/x81 HANGUL SYLLABLE GAG
 <UAC02>     /xea/xb0/x82 HANGUL SYLLABLE GAGG
@@ -24687,6 +25992,9 @@ CHARMAP
 <UFE21>     /xef/xb8/xa1 COMBINING LIGATURE RIGHT HALF
 <UFE22>     /xef/xb8/xa2 COMBINING DOUBLE TILDE LEFT HALF
 <UFE23>     /xef/xb8/xa3 COMBINING DOUBLE TILDE RIGHT HALF
+<UFE24>     /xef/xb8/xa4 COMBINING MACRON LEFT HALF
+<UFE25>     /xef/xb8/xa5 COMBINING MACRON RIGHT HALF
+<UFE26>     /xef/xb8/xa6 COMBINING CONJOINING MACRON
 <UFE30>     /xef/xb8/xb0 PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
 <UFE31>     /xef/xb8/xb1 PRESENTATION FORM FOR VERTICAL EM DASH
 <UFE32>     /xef/xb8/xb2 PRESENTATION FORM FOR VERTICAL EN DASH
@@ -25116,350 +26424,486 @@ CHARMAP
 <UFFFB>     /xef/xbf/xbb INTERLINEAR ANNOTATION TERMINATOR
 <UFFFC>     /xef/xbf/xbc OBJECT REPLACEMENT CHARACTER
 <UFFFD>     /xef/xbf/xbd REPLACEMENT CHARACTER
-<U00010000>     /xf0/x90/x80/x80 LINEAR B SYLLABLE B008 A
-<U00010000>     /xf0/x90/x80/x80 LINEAR B SYLLABLE B008 A
-<U00010001>     /xf0/x90/x80/x81 LINEAR B SYLLABLE B038 E
-<U00010002>     /xf0/x90/x80/x82 LINEAR B SYLLABLE B028 I
-<U00010003>     /xf0/x90/x80/x83 LINEAR B SYLLABLE B061 O
-<U00010004>     /xf0/x90/x80/x84 LINEAR B SYLLABLE B010 U
-<U00010005>     /xf0/x90/x80/x85 LINEAR B SYLLABLE B001 DA
-<U00010006>     /xf0/x90/x80/x86 LINEAR B SYLLABLE B045 DE
-<U00010007>     /xf0/x90/x80/x87 LINEAR B SYLLABLE B007 DI
-<U00010008>     /xf0/x90/x80/x88 LINEAR B SYLLABLE B014 DO
-<U00010009>     /xf0/x90/x80/x89 LINEAR B SYLLABLE B051 DU
-<U0001000A>     /xf0/x90/x80/x8a LINEAR B SYLLABLE B057 JA
-<U0001000B>     /xf0/x90/x80/x8b LINEAR B SYLLABLE B046 JE
-<U0001000D>     /xf0/x90/x80/x8d LINEAR B SYLLABLE B036 JO
-<U0001000E>     /xf0/x90/x80/x8e LINEAR B SYLLABLE B065 JU
-<U0001000F>     /xf0/x90/x80/x8f LINEAR B SYLLABLE B077 KA
-<U00010010>     /xf0/x90/x80/x90 LINEAR B SYLLABLE B044 KE
-<U00010011>     /xf0/x90/x80/x91 LINEAR B SYLLABLE B067 KI
-<U00010012>     /xf0/x90/x80/x92 LINEAR B SYLLABLE B070 KO
-<U00010013>     /xf0/x90/x80/x93 LINEAR B SYLLABLE B081 KU
-<U00010014>     /xf0/x90/x80/x94 LINEAR B SYLLABLE B080 MA
-<U00010015>     /xf0/x90/x80/x95 LINEAR B SYLLABLE B013 ME
-<U00010016>     /xf0/x90/x80/x96 LINEAR B SYLLABLE B073 MI
-<U00010017>     /xf0/x90/x80/x97 LINEAR B SYLLABLE B015 MO
-<U00010018>     /xf0/x90/x80/x98 LINEAR B SYLLABLE B023 MU
-<U00010019>     /xf0/x90/x80/x99 LINEAR B SYLLABLE B006 NA
-<U0001001A>     /xf0/x90/x80/x9a LINEAR B SYLLABLE B024 NE
-<U0001001B>     /xf0/x90/x80/x9b LINEAR B SYLLABLE B030 NI
-<U0001001C>     /xf0/x90/x80/x9c LINEAR B SYLLABLE B052 NO
-<U0001001D>     /xf0/x90/x80/x9d LINEAR B SYLLABLE B055 NU
-<U0001001E>     /xf0/x90/x80/x9e LINEAR B SYLLABLE B003 PA
-<U0001001F>     /xf0/x90/x80/x9f LINEAR B SYLLABLE B072 PE
-<U00010020>     /xf0/x90/x80/xa0 LINEAR B SYLLABLE B039 PI
-<U00010021>     /xf0/x90/x80/xa1 LINEAR B SYLLABLE B011 PO
-<U00010022>     /xf0/x90/x80/xa2 LINEAR B SYLLABLE B050 PU
-<U00010023>     /xf0/x90/x80/xa3 LINEAR B SYLLABLE B016 QA
-<U00010024>     /xf0/x90/x80/xa4 LINEAR B SYLLABLE B078 QE
-<U00010025>     /xf0/x90/x80/xa5 LINEAR B SYLLABLE B021 QI
-<U00010026>     /xf0/x90/x80/xa6 LINEAR B SYLLABLE B032 QO
-<U00010028>     /xf0/x90/x80/xa8 LINEAR B SYLLABLE B060 RA
-<U00010029>     /xf0/x90/x80/xa9 LINEAR B SYLLABLE B027 RE
-<U0001002A>     /xf0/x90/x80/xaa LINEAR B SYLLABLE B053 RI
-<U0001002B>     /xf0/x90/x80/xab LINEAR B SYLLABLE B002 RO
-<U0001002C>     /xf0/x90/x80/xac LINEAR B SYLLABLE B026 RU
-<U0001002D>     /xf0/x90/x80/xad LINEAR B SYLLABLE B031 SA
-<U0001002E>     /xf0/x90/x80/xae LINEAR B SYLLABLE B009 SE
-<U0001002F>     /xf0/x90/x80/xaf LINEAR B SYLLABLE B041 SI
-<U00010030>     /xf0/x90/x80/xb0 LINEAR B SYLLABLE B012 SO
-<U00010031>     /xf0/x90/x80/xb1 LINEAR B SYLLABLE B058 SU
-<U00010032>     /xf0/x90/x80/xb2 LINEAR B SYLLABLE B059 TA
-<U00010033>     /xf0/x90/x80/xb3 LINEAR B SYLLABLE B004 TE
-<U00010034>     /xf0/x90/x80/xb4 LINEAR B SYLLABLE B037 TI
-<U00010035>     /xf0/x90/x80/xb5 LINEAR B SYLLABLE B005 TO
-<U00010036>     /xf0/x90/x80/xb6 LINEAR B SYLLABLE B069 TU
-<U00010037>     /xf0/x90/x80/xb7 LINEAR B SYLLABLE B054 WA
-<U00010038>     /xf0/x90/x80/xb8 LINEAR B SYLLABLE B075 WE
-<U00010039>     /xf0/x90/x80/xb9 LINEAR B SYLLABLE B040 WI
-<U0001003A>     /xf0/x90/x80/xba LINEAR B SYLLABLE B042 WO
-<U0001003C>     /xf0/x90/x80/xbc LINEAR B SYLLABLE B017 ZA
-<U0001003D>     /xf0/x90/x80/xbd LINEAR B SYLLABLE B074 ZE
-<U0001003F>     /xf0/x90/x80/xbf LINEAR B SYLLABLE B020 ZO
-<U00010040>     /xf0/x90/x81/x80 LINEAR B SYLLABLE B025 A2
-<U00010041>     /xf0/x90/x81/x81 LINEAR B SYLLABLE B043 A3
-<U00010042>     /xf0/x90/x81/x82 LINEAR B SYLLABLE B085 AU
-<U00010043>     /xf0/x90/x81/x83 LINEAR B SYLLABLE B071 DWE
-<U00010044>     /xf0/x90/x81/x84 LINEAR B SYLLABLE B090 DWO
-<U00010045>     /xf0/x90/x81/x85 LINEAR B SYLLABLE B048 NWA
-<U00010046>     /xf0/x90/x81/x86 LINEAR B SYLLABLE B029 PU2
-<U00010047>     /xf0/x90/x81/x87 LINEAR B SYLLABLE B062 PTE
-<U00010048>     /xf0/x90/x81/x88 LINEAR B SYLLABLE B076 RA2
-<U00010049>     /xf0/x90/x81/x89 LINEAR B SYLLABLE B033 RA3
-<U0001004A>     /xf0/x90/x81/x8a LINEAR B SYLLABLE B068 RO2
-<U0001004B>     /xf0/x90/x81/x8b LINEAR B SYLLABLE B066 TA2
-<U0001004C>     /xf0/x90/x81/x8c LINEAR B SYLLABLE B087 TWE
-<U0001004D>     /xf0/x90/x81/x8d LINEAR B SYLLABLE B091 TWO
-<U00010050>     /xf0/x90/x81/x90 LINEAR B SYMBOL B018
-<U00010051>     /xf0/x90/x81/x91 LINEAR B SYMBOL B019
-<U00010052>     /xf0/x90/x81/x92 LINEAR B SYMBOL B022
-<U00010053>     /xf0/x90/x81/x93 LINEAR B SYMBOL B034
-<U00010054>     /xf0/x90/x81/x94 LINEAR B SYMBOL B047
-<U00010055>     /xf0/x90/x81/x95 LINEAR B SYMBOL B049
-<U00010056>     /xf0/x90/x81/x96 LINEAR B SYMBOL B056
-<U00010057>     /xf0/x90/x81/x97 LINEAR B SYMBOL B063
-<U00010058>     /xf0/x90/x81/x98 LINEAR B SYMBOL B064
-<U00010059>     /xf0/x90/x81/x99 LINEAR B SYMBOL B079
-<U0001005A>     /xf0/x90/x81/x9a LINEAR B SYMBOL B082
-<U0001005B>     /xf0/x90/x81/x9b LINEAR B SYMBOL B083
-<U0001005C>     /xf0/x90/x81/x9c LINEAR B SYMBOL B086
-<U0001005D>     /xf0/x90/x81/x9d LINEAR B SYMBOL B089
-<U00010080>     /xf0/x90/x82/x80 LINEAR B IDEOGRAM B100 MAN
-<U00010081>     /xf0/x90/x82/x81 LINEAR B IDEOGRAM B102 WOMAN
-<U00010082>     /xf0/x90/x82/x82 LINEAR B IDEOGRAM B104 DEER
-<U00010083>     /xf0/x90/x82/x83 LINEAR B IDEOGRAM B105 EQUID
-<U00010084>     /xf0/x90/x82/x84 LINEAR B IDEOGRAM B105F MARE
-<U00010085>     /xf0/x90/x82/x85 LINEAR B IDEOGRAM B105M STALLION
-<U00010086>     /xf0/x90/x82/x86 LINEAR B IDEOGRAM B106F EWE
-<U00010087>     /xf0/x90/x82/x87 LINEAR B IDEOGRAM B106M RAM
-<U00010088>     /xf0/x90/x82/x88 LINEAR B IDEOGRAM B107F SHE-GOAT
-<U00010089>     /xf0/x90/x82/x89 LINEAR B IDEOGRAM B107M HE-GOAT
-<U0001008A>     /xf0/x90/x82/x8a LINEAR B IDEOGRAM B108F SOW
-<U0001008B>     /xf0/x90/x82/x8b LINEAR B IDEOGRAM B108M BOAR
-<U0001008C>     /xf0/x90/x82/x8c LINEAR B IDEOGRAM B109F COW
-<U0001008D>     /xf0/x90/x82/x8d LINEAR B IDEOGRAM B109M BULL
-<U0001008E>     /xf0/x90/x82/x8e LINEAR B IDEOGRAM B120 WHEAT
-<U0001008F>     /xf0/x90/x82/x8f LINEAR B IDEOGRAM B121 BARLEY
-<U00010090>     /xf0/x90/x82/x90 LINEAR B IDEOGRAM B122 OLIVE
-<U00010091>     /xf0/x90/x82/x91 LINEAR B IDEOGRAM B123 SPICE
-<U00010092>     /xf0/x90/x82/x92 LINEAR B IDEOGRAM B125 CYPERUS
-<U00010093>     /xf0/x90/x82/x93 LINEAR B MONOGRAM B127 KAPO
-<U00010094>     /xf0/x90/x82/x94 LINEAR B MONOGRAM B128 KANAKO
-<U00010095>     /xf0/x90/x82/x95 LINEAR B IDEOGRAM B130 OIL
-<U00010096>     /xf0/x90/x82/x96 LINEAR B IDEOGRAM B131 WINE
-<U00010097>     /xf0/x90/x82/x97 LINEAR B IDEOGRAM B132
-<U00010098>     /xf0/x90/x82/x98 LINEAR B MONOGRAM B133 AREPA
-<U00010099>     /xf0/x90/x82/x99 LINEAR B MONOGRAM B135 MERI
-<U0001009A>     /xf0/x90/x82/x9a LINEAR B IDEOGRAM B140 BRONZE
-<U0001009B>     /xf0/x90/x82/x9b LINEAR B IDEOGRAM B141 GOLD
-<U0001009C>     /xf0/x90/x82/x9c LINEAR B IDEOGRAM B142
-<U0001009D>     /xf0/x90/x82/x9d LINEAR B IDEOGRAM B145 WOOL
-<U0001009E>     /xf0/x90/x82/x9e LINEAR B IDEOGRAM B146
-<U0001009F>     /xf0/x90/x82/x9f LINEAR B IDEOGRAM B150
-<U000100A0>     /xf0/x90/x82/xa0 LINEAR B IDEOGRAM B151 HORN
-<U000100A1>     /xf0/x90/x82/xa1 LINEAR B IDEOGRAM B152
-<U000100A2>     /xf0/x90/x82/xa2 LINEAR B IDEOGRAM B153
-<U000100A3>     /xf0/x90/x82/xa3 LINEAR B IDEOGRAM B154
-<U000100A4>     /xf0/x90/x82/xa4 LINEAR B MONOGRAM B156 TURO2
-<U000100A5>     /xf0/x90/x82/xa5 LINEAR B IDEOGRAM B157
-<U000100A6>     /xf0/x90/x82/xa6 LINEAR B IDEOGRAM B158
-<U000100A7>     /xf0/x90/x82/xa7 LINEAR B IDEOGRAM B159 CLOTH
-<U000100A8>     /xf0/x90/x82/xa8 LINEAR B IDEOGRAM B160
-<U000100A9>     /xf0/x90/x82/xa9 LINEAR B IDEOGRAM B161
-<U000100AA>     /xf0/x90/x82/xaa LINEAR B IDEOGRAM B162 GARMENT
-<U000100AB>     /xf0/x90/x82/xab LINEAR B IDEOGRAM B163 ARMOUR
-<U000100AC>     /xf0/x90/x82/xac LINEAR B IDEOGRAM B164
-<U000100AD>     /xf0/x90/x82/xad LINEAR B IDEOGRAM B165
-<U000100AE>     /xf0/x90/x82/xae LINEAR B IDEOGRAM B166
-<U000100AF>     /xf0/x90/x82/xaf LINEAR B IDEOGRAM B167
-<U000100B0>     /xf0/x90/x82/xb0 LINEAR B IDEOGRAM B168
-<U000100B1>     /xf0/x90/x82/xb1 LINEAR B IDEOGRAM B169
-<U000100B2>     /xf0/x90/x82/xb2 LINEAR B IDEOGRAM B170
-<U000100B3>     /xf0/x90/x82/xb3 LINEAR B IDEOGRAM B171
-<U000100B4>     /xf0/x90/x82/xb4 LINEAR B IDEOGRAM B172
-<U000100B5>     /xf0/x90/x82/xb5 LINEAR B IDEOGRAM B173 MONTH
-<U000100B6>     /xf0/x90/x82/xb6 LINEAR B IDEOGRAM B174
-<U000100B7>     /xf0/x90/x82/xb7 LINEAR B IDEOGRAM B176 TREE
-<U000100B8>     /xf0/x90/x82/xb8 LINEAR B IDEOGRAM B177
-<U000100B9>     /xf0/x90/x82/xb9 LINEAR B IDEOGRAM B178
-<U000100BA>     /xf0/x90/x82/xba LINEAR B IDEOGRAM B179
-<U000100BB>     /xf0/x90/x82/xbb LINEAR B IDEOGRAM B180
-<U000100BC>     /xf0/x90/x82/xbc LINEAR B IDEOGRAM B181
-<U000100BD>     /xf0/x90/x82/xbd LINEAR B IDEOGRAM B182
-<U000100BE>     /xf0/x90/x82/xbe LINEAR B IDEOGRAM B183
-<U000100BF>     /xf0/x90/x82/xbf LINEAR B IDEOGRAM B184
-<U000100C0>     /xf0/x90/x83/x80 LINEAR B IDEOGRAM B185
-<U000100C1>     /xf0/x90/x83/x81 LINEAR B IDEOGRAM B189
-<U000100C2>     /xf0/x90/x83/x82 LINEAR B IDEOGRAM B190
-<U000100C3>     /xf0/x90/x83/x83 LINEAR B IDEOGRAM B191 HELMET
-<U000100C4>     /xf0/x90/x83/x84 LINEAR B IDEOGRAM B220 FOOTSTOOL
-<U000100C5>     /xf0/x90/x83/x85 LINEAR B IDEOGRAM B225 BATHTUB
-<U000100C6>     /xf0/x90/x83/x86 LINEAR B IDEOGRAM B230 SPEAR
-<U000100C7>     /xf0/x90/x83/x87 LINEAR B IDEOGRAM B231 ARROW
-<U000100C8>     /xf0/x90/x83/x88 LINEAR B IDEOGRAM B232
-<U000100C9>     /xf0/x90/x83/x89 LINEAR B IDEOGRAM B233 SWORD
-<U000100CA>     /xf0/x90/x83/x8a LINEAR B IDEOGRAM B234
-<U000100CB>     /xf0/x90/x83/x8b LINEAR B IDEOGRAM B236
-<U000100CC>     /xf0/x90/x83/x8c LINEAR B IDEOGRAM B240 WHEELED CHARIOT
-<U000100CD>     /xf0/x90/x83/x8d LINEAR B IDEOGRAM B241 CHARIOT
-<U000100CE>     /xf0/x90/x83/x8e LINEAR B IDEOGRAM B242 CHARIOT FRAME
-<U000100CF>     /xf0/x90/x83/x8f LINEAR B IDEOGRAM B243 WHEEL
-<U000100D0>     /xf0/x90/x83/x90 LINEAR B IDEOGRAM B245
-<U000100D1>     /xf0/x90/x83/x91 LINEAR B IDEOGRAM B246
-<U000100D2>     /xf0/x90/x83/x92 LINEAR B MONOGRAM B247 DIPTE
-<U000100D3>     /xf0/x90/x83/x93 LINEAR B IDEOGRAM B248
-<U000100D4>     /xf0/x90/x83/x94 LINEAR B IDEOGRAM B249
-<U000100D5>     /xf0/x90/x83/x95 LINEAR B IDEOGRAM B251
-<U000100D6>     /xf0/x90/x83/x96 LINEAR B IDEOGRAM B252
-<U000100D7>     /xf0/x90/x83/x97 LINEAR B IDEOGRAM B253
-<U000100D8>     /xf0/x90/x83/x98 LINEAR B IDEOGRAM B254 DART
-<U000100D9>     /xf0/x90/x83/x99 LINEAR B IDEOGRAM B255
-<U000100DA>     /xf0/x90/x83/x9a LINEAR B IDEOGRAM B256
-<U000100DB>     /xf0/x90/x83/x9b LINEAR B IDEOGRAM B257
-<U000100DC>     /xf0/x90/x83/x9c LINEAR B IDEOGRAM B258
-<U000100DD>     /xf0/x90/x83/x9d LINEAR B IDEOGRAM B259
-<U000100DE>     /xf0/x90/x83/x9e LINEAR B IDEOGRAM VESSEL B155
-<U000100DF>     /xf0/x90/x83/x9f LINEAR B IDEOGRAM VESSEL B200
-<U000100E0>     /xf0/x90/x83/xa0 LINEAR B IDEOGRAM VESSEL B201
-<U000100E1>     /xf0/x90/x83/xa1 LINEAR B IDEOGRAM VESSEL B202
-<U000100E2>     /xf0/x90/x83/xa2 LINEAR B IDEOGRAM VESSEL B203
-<U000100E3>     /xf0/x90/x83/xa3 LINEAR B IDEOGRAM VESSEL B204
-<U000100E4>     /xf0/x90/x83/xa4 LINEAR B IDEOGRAM VESSEL B205
-<U000100E5>     /xf0/x90/x83/xa5 LINEAR B IDEOGRAM VESSEL B206
-<U000100E6>     /xf0/x90/x83/xa6 LINEAR B IDEOGRAM VESSEL B207
-<U000100E7>     /xf0/x90/x83/xa7 LINEAR B IDEOGRAM VESSEL B208
-<U000100E8>     /xf0/x90/x83/xa8 LINEAR B IDEOGRAM VESSEL B209
-<U000100E9>     /xf0/x90/x83/xa9 LINEAR B IDEOGRAM VESSEL B210
-<U000100EA>     /xf0/x90/x83/xaa LINEAR B IDEOGRAM VESSEL B211
-<U000100EB>     /xf0/x90/x83/xab LINEAR B IDEOGRAM VESSEL B212
-<U000100EC>     /xf0/x90/x83/xac LINEAR B IDEOGRAM VESSEL B213
-<U000100ED>     /xf0/x90/x83/xad LINEAR B IDEOGRAM VESSEL B214
-<U000100EE>     /xf0/x90/x83/xae LINEAR B IDEOGRAM VESSEL B215
-<U000100EF>     /xf0/x90/x83/xaf LINEAR B IDEOGRAM VESSEL B216
-<U000100F0>     /xf0/x90/x83/xb0 LINEAR B IDEOGRAM VESSEL B217
-<U000100F1>     /xf0/x90/x83/xb1 LINEAR B IDEOGRAM VESSEL B218
-<U000100F2>     /xf0/x90/x83/xb2 LINEAR B IDEOGRAM VESSEL B219
-<U000100F3>     /xf0/x90/x83/xb3 LINEAR B IDEOGRAM VESSEL B221
-<U000100F4>     /xf0/x90/x83/xb4 LINEAR B IDEOGRAM VESSEL B222
-<U000100F5>     /xf0/x90/x83/xb5 LINEAR B IDEOGRAM VESSEL B226
-<U000100F6>     /xf0/x90/x83/xb6 LINEAR B IDEOGRAM VESSEL B227
-<U000100F7>     /xf0/x90/x83/xb7 LINEAR B IDEOGRAM VESSEL B228
-<U000100F8>     /xf0/x90/x83/xb8 LINEAR B IDEOGRAM VESSEL B229
-<U000100F9>     /xf0/x90/x83/xb9 LINEAR B IDEOGRAM VESSEL B250
-<U000100FA>     /xf0/x90/x83/xba LINEAR B IDEOGRAM VESSEL B305
-<U00010100>     /xf0/x90/x84/x80 AEGEAN WORD SEPARATOR LINE
-<U00010101>     /xf0/x90/x84/x81 AEGEAN WORD SEPARATOR DOT
-<U00010102>     /xf0/x90/x84/x82 AEGEAN CHECK MARK
-<U00010107>     /xf0/x90/x84/x87 AEGEAN NUMBER ONE
-<U00010108>     /xf0/x90/x84/x88 AEGEAN NUMBER TWO
-<U00010109>     /xf0/x90/x84/x89 AEGEAN NUMBER THREE
-<U0001010A>     /xf0/x90/x84/x8a AEGEAN NUMBER FOUR
-<U0001010B>     /xf0/x90/x84/x8b AEGEAN NUMBER FIVE
-<U0001010C>     /xf0/x90/x84/x8c AEGEAN NUMBER SIX
-<U0001010D>     /xf0/x90/x84/x8d AEGEAN NUMBER SEVEN
-<U0001010E>     /xf0/x90/x84/x8e AEGEAN NUMBER EIGHT
-<U0001010F>     /xf0/x90/x84/x8f AEGEAN NUMBER NINE
-<U00010110>     /xf0/x90/x84/x90 AEGEAN NUMBER TEN
-<U00010111>     /xf0/x90/x84/x91 AEGEAN NUMBER TWENTY
-<U00010112>     /xf0/x90/x84/x92 AEGEAN NUMBER THIRTY
-<U00010113>     /xf0/x90/x84/x93 AEGEAN NUMBER FORTY
-<U00010114>     /xf0/x90/x84/x94 AEGEAN NUMBER FIFTY
-<U00010115>     /xf0/x90/x84/x95 AEGEAN NUMBER SIXTY
-<U00010116>     /xf0/x90/x84/x96 AEGEAN NUMBER SEVENTY
-<U00010117>     /xf0/x90/x84/x97 AEGEAN NUMBER EIGHTY
-<U00010118>     /xf0/x90/x84/x98 AEGEAN NUMBER NINETY
-<U00010119>     /xf0/x90/x84/x99 AEGEAN NUMBER ONE HUNDRED
-<U0001011A>     /xf0/x90/x84/x9a AEGEAN NUMBER TWO HUNDRED
-<U0001011B>     /xf0/x90/x84/x9b AEGEAN NUMBER THREE HUNDRED
-<U0001011C>     /xf0/x90/x84/x9c AEGEAN NUMBER FOUR HUNDRED
-<U0001011D>     /xf0/x90/x84/x9d AEGEAN NUMBER FIVE HUNDRED
-<U0001011E>     /xf0/x90/x84/x9e AEGEAN NUMBER SIX HUNDRED
-<U0001011F>     /xf0/x90/x84/x9f AEGEAN NUMBER SEVEN HUNDRED
-<U00010120>     /xf0/x90/x84/xa0 AEGEAN NUMBER EIGHT HUNDRED
-<U00010121>     /xf0/x90/x84/xa1 AEGEAN NUMBER NINE HUNDRED
-<U00010122>     /xf0/x90/x84/xa2 AEGEAN NUMBER ONE THOUSAND
-<U00010123>     /xf0/x90/x84/xa3 AEGEAN NUMBER TWO THOUSAND
-<U00010124>     /xf0/x90/x84/xa4 AEGEAN NUMBER THREE THOUSAND
-<U00010125>     /xf0/x90/x84/xa5 AEGEAN NUMBER FOUR THOUSAND
-<U00010126>     /xf0/x90/x84/xa6 AEGEAN NUMBER FIVE THOUSAND
-<U00010127>     /xf0/x90/x84/xa7 AEGEAN NUMBER SIX THOUSAND
-<U00010128>     /xf0/x90/x84/xa8 AEGEAN NUMBER SEVEN THOUSAND
-<U00010129>     /xf0/x90/x84/xa9 AEGEAN NUMBER EIGHT THOUSAND
-<U0001012A>     /xf0/x90/x84/xaa AEGEAN NUMBER NINE THOUSAND
-<U0001012B>     /xf0/x90/x84/xab AEGEAN NUMBER TEN THOUSAND
-<U0001012C>     /xf0/x90/x84/xac AEGEAN NUMBER TWENTY THOUSAND
-<U0001012D>     /xf0/x90/x84/xad AEGEAN NUMBER THIRTY THOUSAND
-<U0001012E>     /xf0/x90/x84/xae AEGEAN NUMBER FORTY THOUSAND
-<U0001012F>     /xf0/x90/x84/xaf AEGEAN NUMBER FIFTY THOUSAND
-<U00010130>     /xf0/x90/x84/xb0 AEGEAN NUMBER SIXTY THOUSAND
-<U00010131>     /xf0/x90/x84/xb1 AEGEAN NUMBER SEVENTY THOUSAND
-<U00010132>     /xf0/x90/x84/xb2 AEGEAN NUMBER EIGHTY THOUSAND
-<U00010133>     /xf0/x90/x84/xb3 AEGEAN NUMBER NINETY THOUSAND
-<U00010137>     /xf0/x90/x84/xb7 AEGEAN WEIGHT BASE UNIT
-<U00010138>     /xf0/x90/x84/xb8 AEGEAN WEIGHT FIRST SUBUNIT
-<U00010139>     /xf0/x90/x84/xb9 AEGEAN WEIGHT SECOND SUBUNIT
-<U0001013A>     /xf0/x90/x84/xba AEGEAN WEIGHT THIRD SUBUNIT
-<U0001013B>     /xf0/x90/x84/xbb AEGEAN WEIGHT FOURTH SUBUNIT
-<U0001013C>     /xf0/x90/x84/xbc AEGEAN DRY MEASURE FIRST SUBUNIT
-<U0001013D>     /xf0/x90/x84/xbd AEGEAN LIQUID MEASURE FIRST SUBUNIT
-<U0001013E>     /xf0/x90/x84/xbe AEGEAN MEASURE SECOND SUBUNIT
-<U0001013F>     /xf0/x90/x84/xbf AEGEAN MEASURE THIRD SUBUNIT
-<U00010140>     /xf0/x90/x85/x80 GREEK ACROPHONIC ATTIC ONE QUARTER
-<U00010141>     /xf0/x90/x85/x81 GREEK ACROPHONIC ATTIC ONE HALF
-<U00010142>     /xf0/x90/x85/x82 GREEK ACROPHONIC ATTIC ONE DRACHMA
-<U00010143>     /xf0/x90/x85/x83 GREEK ACROPHONIC ATTIC FIVE
-<U00010144>     /xf0/x90/x85/x84 GREEK ACROPHONIC ATTIC FIFTY
-<U00010145>     /xf0/x90/x85/x85 GREEK ACROPHONIC ATTIC FIVE HUNDRED
-<U00010146>     /xf0/x90/x85/x86 GREEK ACROPHONIC ATTIC FIVE THOUSAND
-<U00010147>     /xf0/x90/x85/x87 GREEK ACROPHONIC ATTIC FIFTY THOUSAND
-<U00010148>     /xf0/x90/x85/x88 GREEK ACROPHONIC ATTIC FIVE TALENTS
-<U00010149>     /xf0/x90/x85/x89 GREEK ACROPHONIC ATTIC TEN TALENTS
-<U0001014A>     /xf0/x90/x85/x8a GREEK ACROPHONIC ATTIC FIFTY TALENTS
-<U0001014B>     /xf0/x90/x85/x8b GREEK ACROPHONIC ATTIC ONE HUNDRED TALENTS
-<U0001014C>     /xf0/x90/x85/x8c GREEK ACROPHONIC ATTIC FIVE HUNDRED TALENTS
-<U0001014D>     /xf0/x90/x85/x8d GREEK ACROPHONIC ATTIC ONE THOUSAND TALENTS
-<U0001014E>     /xf0/x90/x85/x8e GREEK ACROPHONIC ATTIC FIVE THOUSAND TALENTS
-<U0001014F>     /xf0/x90/x85/x8f GREEK ACROPHONIC ATTIC FIVE STATERS
-<U00010150>     /xf0/x90/x85/x90 GREEK ACROPHONIC ATTIC TEN STATERS
-<U00010151>     /xf0/x90/x85/x91 GREEK ACROPHONIC ATTIC FIFTY STATERS
-<U00010152>     /xf0/x90/x85/x92 GREEK ACROPHONIC ATTIC ONE HUNDRED STATERS
-<U00010153>     /xf0/x90/x85/x93 GREEK ACROPHONIC ATTIC FIVE HUNDRED STATERS
-<U00010154>     /xf0/x90/x85/x94 GREEK ACROPHONIC ATTIC ONE THOUSAND STATERS
-<U00010155>     /xf0/x90/x85/x95 GREEK ACROPHONIC ATTIC TEN THOUSAND STATERS
-<U00010156>     /xf0/x90/x85/x96 GREEK ACROPHONIC ATTIC FIFTY THOUSAND STATERS
-<U00010157>     /xf0/x90/x85/x97 GREEK ACROPHONIC ATTIC TEN MNAS
-<U00010158>     /xf0/x90/x85/x98 GREEK ACROPHONIC HERAEUM ONE PLETHRON
-<U00010159>     /xf0/x90/x85/x99 GREEK ACROPHONIC THESPIAN ONE
-<U0001015A>     /xf0/x90/x85/x9a GREEK ACROPHONIC HERMIONIAN ONE
-<U0001015B>     /xf0/x90/x85/x9b GREEK ACROPHONIC EPIDAUREAN TWO
-<U0001015C>     /xf0/x90/x85/x9c GREEK ACROPHONIC THESPIAN TWO
-<U0001015D>     /xf0/x90/x85/x9d GREEK ACROPHONIC CYRENAIC TWO DRACHMAS
-<U0001015E>     /xf0/x90/x85/x9e GREEK ACROPHONIC EPIDAUREAN TWO DRACHMAS
-<U0001015F>     /xf0/x90/x85/x9f GREEK ACROPHONIC TROEZENIAN FIVE
-<U00010160>     /xf0/x90/x85/xa0 GREEK ACROPHONIC TROEZENIAN TEN
-<U00010161>     /xf0/x90/x85/xa1 GREEK ACROPHONIC TROEZENIAN TEN ALTERNATE FORM
-<U00010162>     /xf0/x90/x85/xa2 GREEK ACROPHONIC HERMIONIAN TEN
-<U00010163>     /xf0/x90/x85/xa3 GREEK ACROPHONIC MESSENIAN TEN
-<U00010164>     /xf0/x90/x85/xa4 GREEK ACROPHONIC THESPIAN TEN
-<U00010165>     /xf0/x90/x85/xa5 GREEK ACROPHONIC THESPIAN THIRTY
-<U00010166>     /xf0/x90/x85/xa6 GREEK ACROPHONIC TROEZENIAN FIFTY
-<U00010167>     /xf0/x90/x85/xa7 GREEK ACROPHONIC TROEZENIAN FIFTY ALTERNATE FORM
-<U00010168>     /xf0/x90/x85/xa8 GREEK ACROPHONIC HERMIONIAN FIFTY
-<U00010169>     /xf0/x90/x85/xa9 GREEK ACROPHONIC THESPIAN FIFTY
-<U0001016A>     /xf0/x90/x85/xaa GREEK ACROPHONIC THESPIAN ONE HUNDRED
-<U0001016B>     /xf0/x90/x85/xab GREEK ACROPHONIC THESPIAN THREE HUNDRED
-<U0001016C>     /xf0/x90/x85/xac GREEK ACROPHONIC EPIDAUREAN FIVE HUNDRED
-<U0001016D>     /xf0/x90/x85/xad GREEK ACROPHONIC TROEZENIAN FIVE HUNDRED
-<U0001016E>     /xf0/x90/x85/xae GREEK ACROPHONIC THESPIAN FIVE HUNDRED
-<U0001016F>     /xf0/x90/x85/xaf GREEK ACROPHONIC CARYSTIAN FIVE HUNDRED
-<U00010170>     /xf0/x90/x85/xb0 GREEK ACROPHONIC NAXIAN FIVE HUNDRED
-<U00010171>     /xf0/x90/x85/xb1 GREEK ACROPHONIC THESPIAN ONE THOUSAND
-<U00010172>     /xf0/x90/x85/xb2 GREEK ACROPHONIC THESPIAN FIVE THOUSAND
-<U00010173>     /xf0/x90/x85/xb3 GREEK ACROPHONIC DELPHIC FIVE MNAS
-<U00010174>     /xf0/x90/x85/xb4 GREEK ACROPHONIC STRATIAN FIFTY MNAS
-<U00010175>     /xf0/x90/x85/xb5 GREEK ONE HALF SIGN
-<U00010176>     /xf0/x90/x85/xb6 GREEK ONE HALF SIGN ALTERNATE FORM
-<U00010177>     /xf0/x90/x85/xb7 GREEK TWO THIRDS SIGN
-<U00010178>     /xf0/x90/x85/xb8 GREEK THREE QUARTERS SIGN
-<U00010179>     /xf0/x90/x85/xb9 GREEK YEAR SIGN
-<U0001017A>     /xf0/x90/x85/xba GREEK TALENT SIGN
-<U0001017B>     /xf0/x90/x85/xbb GREEK DRACHMA SIGN
-<U0001017C>     /xf0/x90/x85/xbc GREEK OBOL SIGN
-<U0001017D>     /xf0/x90/x85/xbd GREEK TWO OBOLS SIGN
-<U0001017E>     /xf0/x90/x85/xbe GREEK THREE OBOLS SIGN
-<U0001017F>     /xf0/x90/x85/xbf GREEK FOUR OBOLS SIGN
-<U00010180>     /xf0/x90/x86/x80 GREEK FIVE OBOLS SIGN
-<U00010181>     /xf0/x90/x86/x81 GREEK METRETES SIGN
-<U00010182>     /xf0/x90/x86/x82 GREEK KYATHOS BASE SIGN
-<U00010183>     /xf0/x90/x86/x83 GREEK LITRA SIGN
-<U00010184>     /xf0/x90/x86/x84 GREEK OUNKIA SIGN
-<U00010185>     /xf0/x90/x86/x85 GREEK XESTES SIGN
-<U00010186>     /xf0/x90/x86/x86 GREEK ARTABE SIGN
-<U00010187>     /xf0/x90/x86/x87 GREEK AROURA SIGN
-<U00010188>     /xf0/x90/x86/x88 GREEK GRAMMA SIGN
-<U00010189>     /xf0/x90/x86/x89 GREEK TRYBLION BASE SIGN
-<U0001018A>     /xf0/x90/x86/x8a GREEK ZERO SIGN
+<U00010000> /xf0/x90/x80/x80 LINEAR B SYLLABLE B008 A
+<U00010000> /xf0/x90/x80/x80 LINEAR B SYLLABLE B008 A
+<U00010001> /xf0/x90/x80/x81 LINEAR B SYLLABLE B038 E
+<U00010002> /xf0/x90/x80/x82 LINEAR B SYLLABLE B028 I
+<U00010003> /xf0/x90/x80/x83 LINEAR B SYLLABLE B061 O
+<U00010004> /xf0/x90/x80/x84 LINEAR B SYLLABLE B010 U
+<U00010005> /xf0/x90/x80/x85 LINEAR B SYLLABLE B001 DA
+<U00010006> /xf0/x90/x80/x86 LINEAR B SYLLABLE B045 DE
+<U00010007> /xf0/x90/x80/x87 LINEAR B SYLLABLE B007 DI
+<U00010008> /xf0/x90/x80/x88 LINEAR B SYLLABLE B014 DO
+<U00010009> /xf0/x90/x80/x89 LINEAR B SYLLABLE B051 DU
+<U0001000A> /xf0/x90/x80/x8a LINEAR B SYLLABLE B057 JA
+<U0001000B> /xf0/x90/x80/x8b LINEAR B SYLLABLE B046 JE
+<U0001000D> /xf0/x90/x80/x8d LINEAR B SYLLABLE B036 JO
+<U0001000E> /xf0/x90/x80/x8e LINEAR B SYLLABLE B065 JU
+<U0001000F> /xf0/x90/x80/x8f LINEAR B SYLLABLE B077 KA
+<U00010010> /xf0/x90/x80/x90 LINEAR B SYLLABLE B044 KE
+<U00010011> /xf0/x90/x80/x91 LINEAR B SYLLABLE B067 KI
+<U00010012> /xf0/x90/x80/x92 LINEAR B SYLLABLE B070 KO
+<U00010013> /xf0/x90/x80/x93 LINEAR B SYLLABLE B081 KU
+<U00010014> /xf0/x90/x80/x94 LINEAR B SYLLABLE B080 MA
+<U00010015> /xf0/x90/x80/x95 LINEAR B SYLLABLE B013 ME
+<U00010016> /xf0/x90/x80/x96 LINEAR B SYLLABLE B073 MI
+<U00010017> /xf0/x90/x80/x97 LINEAR B SYLLABLE B015 MO
+<U00010018> /xf0/x90/x80/x98 LINEAR B SYLLABLE B023 MU
+<U00010019> /xf0/x90/x80/x99 LINEAR B SYLLABLE B006 NA
+<U0001001A> /xf0/x90/x80/x9a LINEAR B SYLLABLE B024 NE
+<U0001001B> /xf0/x90/x80/x9b LINEAR B SYLLABLE B030 NI
+<U0001001C> /xf0/x90/x80/x9c LINEAR B SYLLABLE B052 NO
+<U0001001D> /xf0/x90/x80/x9d LINEAR B SYLLABLE B055 NU
+<U0001001E> /xf0/x90/x80/x9e LINEAR B SYLLABLE B003 PA
+<U0001001F> /xf0/x90/x80/x9f LINEAR B SYLLABLE B072 PE
+<U00010020> /xf0/x90/x80/xa0 LINEAR B SYLLABLE B039 PI
+<U00010021> /xf0/x90/x80/xa1 LINEAR B SYLLABLE B011 PO
+<U00010022> /xf0/x90/x80/xa2 LINEAR B SYLLABLE B050 PU
+<U00010023> /xf0/x90/x80/xa3 LINEAR B SYLLABLE B016 QA
+<U00010024> /xf0/x90/x80/xa4 LINEAR B SYLLABLE B078 QE
+<U00010025> /xf0/x90/x80/xa5 LINEAR B SYLLABLE B021 QI
+<U00010026> /xf0/x90/x80/xa6 LINEAR B SYLLABLE B032 QO
+<U00010028> /xf0/x90/x80/xa8 LINEAR B SYLLABLE B060 RA
+<U00010029> /xf0/x90/x80/xa9 LINEAR B SYLLABLE B027 RE
+<U0001002A> /xf0/x90/x80/xaa LINEAR B SYLLABLE B053 RI
+<U0001002B> /xf0/x90/x80/xab LINEAR B SYLLABLE B002 RO
+<U0001002C> /xf0/x90/x80/xac LINEAR B SYLLABLE B026 RU
+<U0001002D> /xf0/x90/x80/xad LINEAR B SYLLABLE B031 SA
+<U0001002E> /xf0/x90/x80/xae LINEAR B SYLLABLE B009 SE
+<U0001002F> /xf0/x90/x80/xaf LINEAR B SYLLABLE B041 SI
+<U00010030> /xf0/x90/x80/xb0 LINEAR B SYLLABLE B012 SO
+<U00010031> /xf0/x90/x80/xb1 LINEAR B SYLLABLE B058 SU
+<U00010032> /xf0/x90/x80/xb2 LINEAR B SYLLABLE B059 TA
+<U00010033> /xf0/x90/x80/xb3 LINEAR B SYLLABLE B004 TE
+<U00010034> /xf0/x90/x80/xb4 LINEAR B SYLLABLE B037 TI
+<U00010035> /xf0/x90/x80/xb5 LINEAR B SYLLABLE B005 TO
+<U00010036> /xf0/x90/x80/xb6 LINEAR B SYLLABLE B069 TU
+<U00010037> /xf0/x90/x80/xb7 LINEAR B SYLLABLE B054 WA
+<U00010038> /xf0/x90/x80/xb8 LINEAR B SYLLABLE B075 WE
+<U00010039> /xf0/x90/x80/xb9 LINEAR B SYLLABLE B040 WI
+<U0001003A> /xf0/x90/x80/xba LINEAR B SYLLABLE B042 WO
+<U0001003C> /xf0/x90/x80/xbc LINEAR B SYLLABLE B017 ZA
+<U0001003D> /xf0/x90/x80/xbd LINEAR B SYLLABLE B074 ZE
+<U0001003F> /xf0/x90/x80/xbf LINEAR B SYLLABLE B020 ZO
+<U00010040> /xf0/x90/x81/x80 LINEAR B SYLLABLE B025 A2
+<U00010041> /xf0/x90/x81/x81 LINEAR B SYLLABLE B043 A3
+<U00010042> /xf0/x90/x81/x82 LINEAR B SYLLABLE B085 AU
+<U00010043> /xf0/x90/x81/x83 LINEAR B SYLLABLE B071 DWE
+<U00010044> /xf0/x90/x81/x84 LINEAR B SYLLABLE B090 DWO
+<U00010045> /xf0/x90/x81/x85 LINEAR B SYLLABLE B048 NWA
+<U00010046> /xf0/x90/x81/x86 LINEAR B SYLLABLE B029 PU2
+<U00010047> /xf0/x90/x81/x87 LINEAR B SYLLABLE B062 PTE
+<U00010048> /xf0/x90/x81/x88 LINEAR B SYLLABLE B076 RA2
+<U00010049> /xf0/x90/x81/x89 LINEAR B SYLLABLE B033 RA3
+<U0001004A> /xf0/x90/x81/x8a LINEAR B SYLLABLE B068 RO2
+<U0001004B> /xf0/x90/x81/x8b LINEAR B SYLLABLE B066 TA2
+<U0001004C> /xf0/x90/x81/x8c LINEAR B SYLLABLE B087 TWE
+<U0001004D> /xf0/x90/x81/x8d LINEAR B SYLLABLE B091 TWO
+<U00010050> /xf0/x90/x81/x90 LINEAR B SYMBOL B018
+<U00010051> /xf0/x90/x81/x91 LINEAR B SYMBOL B019
+<U00010052> /xf0/x90/x81/x92 LINEAR B SYMBOL B022
+<U00010053> /xf0/x90/x81/x93 LINEAR B SYMBOL B034
+<U00010054> /xf0/x90/x81/x94 LINEAR B SYMBOL B047
+<U00010055> /xf0/x90/x81/x95 LINEAR B SYMBOL B049
+<U00010056> /xf0/x90/x81/x96 LINEAR B SYMBOL B056
+<U00010057> /xf0/x90/x81/x97 LINEAR B SYMBOL B063
+<U00010058> /xf0/x90/x81/x98 LINEAR B SYMBOL B064
+<U00010059> /xf0/x90/x81/x99 LINEAR B SYMBOL B079
+<U0001005A> /xf0/x90/x81/x9a LINEAR B SYMBOL B082
+<U0001005B> /xf0/x90/x81/x9b LINEAR B SYMBOL B083
+<U0001005C> /xf0/x90/x81/x9c LINEAR B SYMBOL B086
+<U0001005D> /xf0/x90/x81/x9d LINEAR B SYMBOL B089
+<U00010080> /xf0/x90/x82/x80 LINEAR B IDEOGRAM B100 MAN
+<U00010081> /xf0/x90/x82/x81 LINEAR B IDEOGRAM B102 WOMAN
+<U00010082> /xf0/x90/x82/x82 LINEAR B IDEOGRAM B104 DEER
+<U00010083> /xf0/x90/x82/x83 LINEAR B IDEOGRAM B105 EQUID
+<U00010084> /xf0/x90/x82/x84 LINEAR B IDEOGRAM B105F MARE
+<U00010085> /xf0/x90/x82/x85 LINEAR B IDEOGRAM B105M STALLION
+<U00010086> /xf0/x90/x82/x86 LINEAR B IDEOGRAM B106F EWE
+<U00010087> /xf0/x90/x82/x87 LINEAR B IDEOGRAM B106M RAM
+<U00010088> /xf0/x90/x82/x88 LINEAR B IDEOGRAM B107F SHE-GOAT
+<U00010089> /xf0/x90/x82/x89 LINEAR B IDEOGRAM B107M HE-GOAT
+<U0001008A> /xf0/x90/x82/x8a LINEAR B IDEOGRAM B108F SOW
+<U0001008B> /xf0/x90/x82/x8b LINEAR B IDEOGRAM B108M BOAR
+<U0001008C> /xf0/x90/x82/x8c LINEAR B IDEOGRAM B109F COW
+<U0001008D> /xf0/x90/x82/x8d LINEAR B IDEOGRAM B109M BULL
+<U0001008E> /xf0/x90/x82/x8e LINEAR B IDEOGRAM B120 WHEAT
+<U0001008F> /xf0/x90/x82/x8f LINEAR B IDEOGRAM B121 BARLEY
+<U00010090> /xf0/x90/x82/x90 LINEAR B IDEOGRAM B122 OLIVE
+<U00010091> /xf0/x90/x82/x91 LINEAR B IDEOGRAM B123 SPICE
+<U00010092> /xf0/x90/x82/x92 LINEAR B IDEOGRAM B125 CYPERUS
+<U00010093> /xf0/x90/x82/x93 LINEAR B MONOGRAM B127 KAPO
+<U00010094> /xf0/x90/x82/x94 LINEAR B MONOGRAM B128 KANAKO
+<U00010095> /xf0/x90/x82/x95 LINEAR B IDEOGRAM B130 OIL
+<U00010096> /xf0/x90/x82/x96 LINEAR B IDEOGRAM B131 WINE
+<U00010097> /xf0/x90/x82/x97 LINEAR B IDEOGRAM B132
+<U00010098> /xf0/x90/x82/x98 LINEAR B MONOGRAM B133 AREPA
+<U00010099> /xf0/x90/x82/x99 LINEAR B MONOGRAM B135 MERI
+<U0001009A> /xf0/x90/x82/x9a LINEAR B IDEOGRAM B140 BRONZE
+<U0001009B> /xf0/x90/x82/x9b LINEAR B IDEOGRAM B141 GOLD
+<U0001009C> /xf0/x90/x82/x9c LINEAR B IDEOGRAM B142
+<U0001009D> /xf0/x90/x82/x9d LINEAR B IDEOGRAM B145 WOOL
+<U0001009E> /xf0/x90/x82/x9e LINEAR B IDEOGRAM B146
+<U0001009F> /xf0/x90/x82/x9f LINEAR B IDEOGRAM B150
+<U000100A0> /xf0/x90/x82/xa0 LINEAR B IDEOGRAM B151 HORN
+<U000100A1> /xf0/x90/x82/xa1 LINEAR B IDEOGRAM B152
+<U000100A2> /xf0/x90/x82/xa2 LINEAR B IDEOGRAM B153
+<U000100A3> /xf0/x90/x82/xa3 LINEAR B IDEOGRAM B154
+<U000100A4> /xf0/x90/x82/xa4 LINEAR B MONOGRAM B156 TURO2
+<U000100A5> /xf0/x90/x82/xa5 LINEAR B IDEOGRAM B157
+<U000100A6> /xf0/x90/x82/xa6 LINEAR B IDEOGRAM B158
+<U000100A7> /xf0/x90/x82/xa7 LINEAR B IDEOGRAM B159 CLOTH
+<U000100A8> /xf0/x90/x82/xa8 LINEAR B IDEOGRAM B160
+<U000100A9> /xf0/x90/x82/xa9 LINEAR B IDEOGRAM B161
+<U000100AA> /xf0/x90/x82/xaa LINEAR B IDEOGRAM B162 GARMENT
+<U000100AB> /xf0/x90/x82/xab LINEAR B IDEOGRAM B163 ARMOUR
+<U000100AC> /xf0/x90/x82/xac LINEAR B IDEOGRAM B164
+<U000100AD> /xf0/x90/x82/xad LINEAR B IDEOGRAM B165
+<U000100AE> /xf0/x90/x82/xae LINEAR B IDEOGRAM B166
+<U000100AF> /xf0/x90/x82/xaf LINEAR B IDEOGRAM B167
+<U000100B0> /xf0/x90/x82/xb0 LINEAR B IDEOGRAM B168
+<U000100B1> /xf0/x90/x82/xb1 LINEAR B IDEOGRAM B169
+<U000100B2> /xf0/x90/x82/xb2 LINEAR B IDEOGRAM B170
+<U000100B3> /xf0/x90/x82/xb3 LINEAR B IDEOGRAM B171
+<U000100B4> /xf0/x90/x82/xb4 LINEAR B IDEOGRAM B172
+<U000100B5> /xf0/x90/x82/xb5 LINEAR B IDEOGRAM B173 MONTH
+<U000100B6> /xf0/x90/x82/xb6 LINEAR B IDEOGRAM B174
+<U000100B7> /xf0/x90/x82/xb7 LINEAR B IDEOGRAM B176 TREE
+<U000100B8> /xf0/x90/x82/xb8 LINEAR B IDEOGRAM B177
+<U000100B9> /xf0/x90/x82/xb9 LINEAR B IDEOGRAM B178
+<U000100BA> /xf0/x90/x82/xba LINEAR B IDEOGRAM B179
+<U000100BB> /xf0/x90/x82/xbb LINEAR B IDEOGRAM B180
+<U000100BC> /xf0/x90/x82/xbc LINEAR B IDEOGRAM B181
+<U000100BD> /xf0/x90/x82/xbd LINEAR B IDEOGRAM B182
+<U000100BE> /xf0/x90/x82/xbe LINEAR B IDEOGRAM B183
+<U000100BF> /xf0/x90/x82/xbf LINEAR B IDEOGRAM B184
+<U000100C0> /xf0/x90/x83/x80 LINEAR B IDEOGRAM B185
+<U000100C1> /xf0/x90/x83/x81 LINEAR B IDEOGRAM B189
+<U000100C2> /xf0/x90/x83/x82 LINEAR B IDEOGRAM B190
+<U000100C3> /xf0/x90/x83/x83 LINEAR B IDEOGRAM B191 HELMET
+<U000100C4> /xf0/x90/x83/x84 LINEAR B IDEOGRAM B220 FOOTSTOOL
+<U000100C5> /xf0/x90/x83/x85 LINEAR B IDEOGRAM B225 BATHTUB
+<U000100C6> /xf0/x90/x83/x86 LINEAR B IDEOGRAM B230 SPEAR
+<U000100C7> /xf0/x90/x83/x87 LINEAR B IDEOGRAM B231 ARROW
+<U000100C8> /xf0/x90/x83/x88 LINEAR B IDEOGRAM B232
+<U000100C9> /xf0/x90/x83/x89 LINEAR B IDEOGRAM B233 SWORD
+<U000100CA> /xf0/x90/x83/x8a LINEAR B IDEOGRAM B234
+<U000100CB> /xf0/x90/x83/x8b LINEAR B IDEOGRAM B236
+<U000100CC> /xf0/x90/x83/x8c LINEAR B IDEOGRAM B240 WHEELED CHARIOT
+<U000100CD> /xf0/x90/x83/x8d LINEAR B IDEOGRAM B241 CHARIOT
+<U000100CE> /xf0/x90/x83/x8e LINEAR B IDEOGRAM B242 CHARIOT FRAME
+<U000100CF> /xf0/x90/x83/x8f LINEAR B IDEOGRAM B243 WHEEL
+<U000100D0> /xf0/x90/x83/x90 LINEAR B IDEOGRAM B245
+<U000100D1> /xf0/x90/x83/x91 LINEAR B IDEOGRAM B246
+<U000100D2> /xf0/x90/x83/x92 LINEAR B MONOGRAM B247 DIPTE
+<U000100D3> /xf0/x90/x83/x93 LINEAR B IDEOGRAM B248
+<U000100D4> /xf0/x90/x83/x94 LINEAR B IDEOGRAM B249
+<U000100D5> /xf0/x90/x83/x95 LINEAR B IDEOGRAM B251
+<U000100D6> /xf0/x90/x83/x96 LINEAR B IDEOGRAM B252
+<U000100D7> /xf0/x90/x83/x97 LINEAR B IDEOGRAM B253
+<U000100D8> /xf0/x90/x83/x98 LINEAR B IDEOGRAM B254 DART
+<U000100D9> /xf0/x90/x83/x99 LINEAR B IDEOGRAM B255
+<U000100DA> /xf0/x90/x83/x9a LINEAR B IDEOGRAM B256
+<U000100DB> /xf0/x90/x83/x9b LINEAR B IDEOGRAM B257
+<U000100DC> /xf0/x90/x83/x9c LINEAR B IDEOGRAM B258
+<U000100DD> /xf0/x90/x83/x9d LINEAR B IDEOGRAM B259
+<U000100DE> /xf0/x90/x83/x9e LINEAR B IDEOGRAM VESSEL B155
+<U000100DF> /xf0/x90/x83/x9f LINEAR B IDEOGRAM VESSEL B200
+<U000100E0> /xf0/x90/x83/xa0 LINEAR B IDEOGRAM VESSEL B201
+<U000100E1> /xf0/x90/x83/xa1 LINEAR B IDEOGRAM VESSEL B202
+<U000100E2> /xf0/x90/x83/xa2 LINEAR B IDEOGRAM VESSEL B203
+<U000100E3> /xf0/x90/x83/xa3 LINEAR B IDEOGRAM VESSEL B204
+<U000100E4> /xf0/x90/x83/xa4 LINEAR B IDEOGRAM VESSEL B205
+<U000100E5> /xf0/x90/x83/xa5 LINEAR B IDEOGRAM VESSEL B206
+<U000100E6> /xf0/x90/x83/xa6 LINEAR B IDEOGRAM VESSEL B207
+<U000100E7> /xf0/x90/x83/xa7 LINEAR B IDEOGRAM VESSEL B208
+<U000100E8> /xf0/x90/x83/xa8 LINEAR B IDEOGRAM VESSEL B209
+<U000100E9> /xf0/x90/x83/xa9 LINEAR B IDEOGRAM VESSEL B210
+<U000100EA> /xf0/x90/x83/xaa LINEAR B IDEOGRAM VESSEL B211
+<U000100EB> /xf0/x90/x83/xab LINEAR B IDEOGRAM VESSEL B212
+<U000100EC> /xf0/x90/x83/xac LINEAR B IDEOGRAM VESSEL B213
+<U000100ED> /xf0/x90/x83/xad LINEAR B IDEOGRAM VESSEL B214
+<U000100EE> /xf0/x90/x83/xae LINEAR B IDEOGRAM VESSEL B215
+<U000100EF> /xf0/x90/x83/xaf LINEAR B IDEOGRAM VESSEL B216
+<U000100F0> /xf0/x90/x83/xb0 LINEAR B IDEOGRAM VESSEL B217
+<U000100F1> /xf0/x90/x83/xb1 LINEAR B IDEOGRAM VESSEL B218
+<U000100F2> /xf0/x90/x83/xb2 LINEAR B IDEOGRAM VESSEL B219
+<U000100F3> /xf0/x90/x83/xb3 LINEAR B IDEOGRAM VESSEL B221
+<U000100F4> /xf0/x90/x83/xb4 LINEAR B IDEOGRAM VESSEL B222
+<U000100F5> /xf0/x90/x83/xb5 LINEAR B IDEOGRAM VESSEL B226
+<U000100F6> /xf0/x90/x83/xb6 LINEAR B IDEOGRAM VESSEL B227
+<U000100F7> /xf0/x90/x83/xb7 LINEAR B IDEOGRAM VESSEL B228
+<U000100F8> /xf0/x90/x83/xb8 LINEAR B IDEOGRAM VESSEL B229
+<U000100F9> /xf0/x90/x83/xb9 LINEAR B IDEOGRAM VESSEL B250
+<U000100FA> /xf0/x90/x83/xba LINEAR B IDEOGRAM VESSEL B305
+<U00010100> /xf0/x90/x84/x80 AEGEAN WORD SEPARATOR LINE
+<U00010101> /xf0/x90/x84/x81 AEGEAN WORD SEPARATOR DOT
+<U00010102> /xf0/x90/x84/x82 AEGEAN CHECK MARK
+<U00010107> /xf0/x90/x84/x87 AEGEAN NUMBER ONE
+<U00010108> /xf0/x90/x84/x88 AEGEAN NUMBER TWO
+<U00010109> /xf0/x90/x84/x89 AEGEAN NUMBER THREE
+<U0001010A> /xf0/x90/x84/x8a AEGEAN NUMBER FOUR
+<U0001010B> /xf0/x90/x84/x8b AEGEAN NUMBER FIVE
+<U0001010C> /xf0/x90/x84/x8c AEGEAN NUMBER SIX
+<U0001010D> /xf0/x90/x84/x8d AEGEAN NUMBER SEVEN
+<U0001010E> /xf0/x90/x84/x8e AEGEAN NUMBER EIGHT
+<U0001010F> /xf0/x90/x84/x8f AEGEAN NUMBER NINE
+<U00010110> /xf0/x90/x84/x90 AEGEAN NUMBER TEN
+<U00010111> /xf0/x90/x84/x91 AEGEAN NUMBER TWENTY
+<U00010112> /xf0/x90/x84/x92 AEGEAN NUMBER THIRTY
+<U00010113> /xf0/x90/x84/x93 AEGEAN NUMBER FORTY
+<U00010114> /xf0/x90/x84/x94 AEGEAN NUMBER FIFTY
+<U00010115> /xf0/x90/x84/x95 AEGEAN NUMBER SIXTY
+<U00010116> /xf0/x90/x84/x96 AEGEAN NUMBER SEVENTY
+<U00010117> /xf0/x90/x84/x97 AEGEAN NUMBER EIGHTY
+<U00010118> /xf0/x90/x84/x98 AEGEAN NUMBER NINETY
+<U00010119> /xf0/x90/x84/x99 AEGEAN NUMBER ONE HUNDRED
+<U0001011A> /xf0/x90/x84/x9a AEGEAN NUMBER TWO HUNDRED
+<U0001011B> /xf0/x90/x84/x9b AEGEAN NUMBER THREE HUNDRED
+<U0001011C> /xf0/x90/x84/x9c AEGEAN NUMBER FOUR HUNDRED
+<U0001011D> /xf0/x90/x84/x9d AEGEAN NUMBER FIVE HUNDRED
+<U0001011E> /xf0/x90/x84/x9e AEGEAN NUMBER SIX HUNDRED
+<U0001011F> /xf0/x90/x84/x9f AEGEAN NUMBER SEVEN HUNDRED
+<U00010120> /xf0/x90/x84/xa0 AEGEAN NUMBER EIGHT HUNDRED
+<U00010121> /xf0/x90/x84/xa1 AEGEAN NUMBER NINE HUNDRED
+<U00010122> /xf0/x90/x84/xa2 AEGEAN NUMBER ONE THOUSAND
+<U00010123> /xf0/x90/x84/xa3 AEGEAN NUMBER TWO THOUSAND
+<U00010124> /xf0/x90/x84/xa4 AEGEAN NUMBER THREE THOUSAND
+<U00010125> /xf0/x90/x84/xa5 AEGEAN NUMBER FOUR THOUSAND
+<U00010126> /xf0/x90/x84/xa6 AEGEAN NUMBER FIVE THOUSAND
+<U00010127> /xf0/x90/x84/xa7 AEGEAN NUMBER SIX THOUSAND
+<U00010128> /xf0/x90/x84/xa8 AEGEAN NUMBER SEVEN THOUSAND
+<U00010129> /xf0/x90/x84/xa9 AEGEAN NUMBER EIGHT THOUSAND
+<U0001012A> /xf0/x90/x84/xaa AEGEAN NUMBER NINE THOUSAND
+<U0001012B> /xf0/x90/x84/xab AEGEAN NUMBER TEN THOUSAND
+<U0001012C> /xf0/x90/x84/xac AEGEAN NUMBER TWENTY THOUSAND
+<U0001012D> /xf0/x90/x84/xad AEGEAN NUMBER THIRTY THOUSAND
+<U0001012E> /xf0/x90/x84/xae AEGEAN NUMBER FORTY THOUSAND
+<U0001012F> /xf0/x90/x84/xaf AEGEAN NUMBER FIFTY THOUSAND
+<U00010130> /xf0/x90/x84/xb0 AEGEAN NUMBER SIXTY THOUSAND
+<U00010131> /xf0/x90/x84/xb1 AEGEAN NUMBER SEVENTY THOUSAND
+<U00010132> /xf0/x90/x84/xb2 AEGEAN NUMBER EIGHTY THOUSAND
+<U00010133> /xf0/x90/x84/xb3 AEGEAN NUMBER NINETY THOUSAND
+<U00010137> /xf0/x90/x84/xb7 AEGEAN WEIGHT BASE UNIT
+<U00010138> /xf0/x90/x84/xb8 AEGEAN WEIGHT FIRST SUBUNIT
+<U00010139> /xf0/x90/x84/xb9 AEGEAN WEIGHT SECOND SUBUNIT
+<U0001013A> /xf0/x90/x84/xba AEGEAN WEIGHT THIRD SUBUNIT
+<U0001013B> /xf0/x90/x84/xbb AEGEAN WEIGHT FOURTH SUBUNIT
+<U0001013C> /xf0/x90/x84/xbc AEGEAN DRY MEASURE FIRST SUBUNIT
+<U0001013D> /xf0/x90/x84/xbd AEGEAN LIQUID MEASURE FIRST SUBUNIT
+<U0001013E> /xf0/x90/x84/xbe AEGEAN MEASURE SECOND SUBUNIT
+<U0001013F> /xf0/x90/x84/xbf AEGEAN MEASURE THIRD SUBUNIT
+<U00010140> /xf0/x90/x85/x80 GREEK ACROPHONIC ATTIC ONE QUARTER
+<U00010141> /xf0/x90/x85/x81 GREEK ACROPHONIC ATTIC ONE HALF
+<U00010142> /xf0/x90/x85/x82 GREEK ACROPHONIC ATTIC ONE DRACHMA
+<U00010143> /xf0/x90/x85/x83 GREEK ACROPHONIC ATTIC FIVE
+<U00010144> /xf0/x90/x85/x84 GREEK ACROPHONIC ATTIC FIFTY
+<U00010145> /xf0/x90/x85/x85 GREEK ACROPHONIC ATTIC FIVE HUNDRED
+<U00010146> /xf0/x90/x85/x86 GREEK ACROPHONIC ATTIC FIVE THOUSAND
+<U00010147> /xf0/x90/x85/x87 GREEK ACROPHONIC ATTIC FIFTY THOUSAND
+<U00010148> /xf0/x90/x85/x88 GREEK ACROPHONIC ATTIC FIVE TALENTS
+<U00010149> /xf0/x90/x85/x89 GREEK ACROPHONIC ATTIC TEN TALENTS
+<U0001014A> /xf0/x90/x85/x8a GREEK ACROPHONIC ATTIC FIFTY TALENTS
+<U0001014B> /xf0/x90/x85/x8b GREEK ACROPHONIC ATTIC ONE HUNDRED TALENTS
+<U0001014C> /xf0/x90/x85/x8c GREEK ACROPHONIC ATTIC FIVE HUNDRED TALENTS
+<U0001014D> /xf0/x90/x85/x8d GREEK ACROPHONIC ATTIC ONE THOUSAND TALENTS
+<U0001014E> /xf0/x90/x85/x8e GREEK ACROPHONIC ATTIC FIVE THOUSAND TALENTS
+<U0001014F> /xf0/x90/x85/x8f GREEK ACROPHONIC ATTIC FIVE STATERS
+<U00010150> /xf0/x90/x85/x90 GREEK ACROPHONIC ATTIC TEN STATERS
+<U00010151> /xf0/x90/x85/x91 GREEK ACROPHONIC ATTIC FIFTY STATERS
+<U00010152> /xf0/x90/x85/x92 GREEK ACROPHONIC ATTIC ONE HUNDRED STATERS
+<U00010153> /xf0/x90/x85/x93 GREEK ACROPHONIC ATTIC FIVE HUNDRED STATERS
+<U00010154> /xf0/x90/x85/x94 GREEK ACROPHONIC ATTIC ONE THOUSAND STATERS
+<U00010155> /xf0/x90/x85/x95 GREEK ACROPHONIC ATTIC TEN THOUSAND STATERS
+<U00010156> /xf0/x90/x85/x96 GREEK ACROPHONIC ATTIC FIFTY THOUSAND STATERS
+<U00010157> /xf0/x90/x85/x97 GREEK ACROPHONIC ATTIC TEN MNAS
+<U00010158> /xf0/x90/x85/x98 GREEK ACROPHONIC HERAEUM ONE PLETHRON
+<U00010159> /xf0/x90/x85/x99 GREEK ACROPHONIC THESPIAN ONE
+<U0001015A> /xf0/x90/x85/x9a GREEK ACROPHONIC HERMIONIAN ONE
+<U0001015B> /xf0/x90/x85/x9b GREEK ACROPHONIC EPIDAUREAN TWO
+<U0001015C> /xf0/x90/x85/x9c GREEK ACROPHONIC THESPIAN TWO
+<U0001015D> /xf0/x90/x85/x9d GREEK ACROPHONIC CYRENAIC TWO DRACHMAS
+<U0001015E> /xf0/x90/x85/x9e GREEK ACROPHONIC EPIDAUREAN TWO DRACHMAS
+<U0001015F> /xf0/x90/x85/x9f GREEK ACROPHONIC TROEZENIAN FIVE
+<U00010160> /xf0/x90/x85/xa0 GREEK ACROPHONIC TROEZENIAN TEN
+<U00010161> /xf0/x90/x85/xa1 GREEK ACROPHONIC TROEZENIAN TEN ALTERNATE FORM
+<U00010162> /xf0/x90/x85/xa2 GREEK ACROPHONIC HERMIONIAN TEN
+<U00010163> /xf0/x90/x85/xa3 GREEK ACROPHONIC MESSENIAN TEN
+<U00010164> /xf0/x90/x85/xa4 GREEK ACROPHONIC THESPIAN TEN
+<U00010165> /xf0/x90/x85/xa5 GREEK ACROPHONIC THESPIAN THIRTY
+<U00010166> /xf0/x90/x85/xa6 GREEK ACROPHONIC TROEZENIAN FIFTY
+<U00010167> /xf0/x90/x85/xa7 GREEK ACROPHONIC TROEZENIAN FIFTY ALTERNATE FORM
+<U00010168> /xf0/x90/x85/xa8 GREEK ACROPHONIC HERMIONIAN FIFTY
+<U00010169> /xf0/x90/x85/xa9 GREEK ACROPHONIC THESPIAN FIFTY
+<U0001016A> /xf0/x90/x85/xaa GREEK ACROPHONIC THESPIAN ONE HUNDRED
+<U0001016B> /xf0/x90/x85/xab GREEK ACROPHONIC THESPIAN THREE HUNDRED
+<U0001016C> /xf0/x90/x85/xac GREEK ACROPHONIC EPIDAUREAN FIVE HUNDRED
+<U0001016D> /xf0/x90/x85/xad GREEK ACROPHONIC TROEZENIAN FIVE HUNDRED
+<U0001016E> /xf0/x90/x85/xae GREEK ACROPHONIC THESPIAN FIVE HUNDRED
+<U0001016F> /xf0/x90/x85/xaf GREEK ACROPHONIC CARYSTIAN FIVE HUNDRED
+<U00010170> /xf0/x90/x85/xb0 GREEK ACROPHONIC NAXIAN FIVE HUNDRED
+<U00010171> /xf0/x90/x85/xb1 GREEK ACROPHONIC THESPIAN ONE THOUSAND
+<U00010172> /xf0/x90/x85/xb2 GREEK ACROPHONIC THESPIAN FIVE THOUSAND
+<U00010173> /xf0/x90/x85/xb3 GREEK ACROPHONIC DELPHIC FIVE MNAS
+<U00010174> /xf0/x90/x85/xb4 GREEK ACROPHONIC STRATIAN FIFTY MNAS
+<U00010175> /xf0/x90/x85/xb5 GREEK ONE HALF SIGN
+<U00010176> /xf0/x90/x85/xb6 GREEK ONE HALF SIGN ALTERNATE FORM
+<U00010177> /xf0/x90/x85/xb7 GREEK TWO THIRDS SIGN
+<U00010178> /xf0/x90/x85/xb8 GREEK THREE QUARTERS SIGN
+<U00010179> /xf0/x90/x85/xb9 GREEK YEAR SIGN
+<U0001017A> /xf0/x90/x85/xba GREEK TALENT SIGN
+<U0001017B> /xf0/x90/x85/xbb GREEK DRACHMA SIGN
+<U0001017C> /xf0/x90/x85/xbc GREEK OBOL SIGN
+<U0001017D> /xf0/x90/x85/xbd GREEK TWO OBOLS SIGN
+<U0001017E> /xf0/x90/x85/xbe GREEK THREE OBOLS SIGN
+<U0001017F> /xf0/x90/x85/xbf GREEK FOUR OBOLS SIGN
+<U00010180> /xf0/x90/x86/x80 GREEK FIVE OBOLS SIGN
+<U00010181> /xf0/x90/x86/x81 GREEK METRETES SIGN
+<U00010182> /xf0/x90/x86/x82 GREEK KYATHOS BASE SIGN
+<U00010183> /xf0/x90/x86/x83 GREEK LITRA SIGN
+<U00010184> /xf0/x90/x86/x84 GREEK OUNKIA SIGN
+<U00010185> /xf0/x90/x86/x85 GREEK XESTES SIGN
+<U00010186> /xf0/x90/x86/x86 GREEK ARTABE SIGN
+<U00010187> /xf0/x90/x86/x87 GREEK AROURA SIGN
+<U00010188> /xf0/x90/x86/x88 GREEK GRAMMA SIGN
+<U00010189> /xf0/x90/x86/x89 GREEK TRYBLION BASE SIGN
+<U0001018A> /xf0/x90/x86/x8a GREEK ZERO SIGN
+<U00010190> /xf0/x90/x86/x90 ROMAN SEXTANS SIGN
+<U00010191> /xf0/x90/x86/x91 ROMAN UNCIA SIGN
+<U00010192> /xf0/x90/x86/x92 ROMAN SEMUNCIA SIGN
+<U00010193> /xf0/x90/x86/x93 ROMAN SEXTULA SIGN
+<U00010194> /xf0/x90/x86/x94 ROMAN DIMIDIA SEXTULA SIGN
+<U00010195> /xf0/x90/x86/x95 ROMAN SILIQUA SIGN
+<U00010196> /xf0/x90/x86/x96 ROMAN DENARIUS SIGN
+<U00010197> /xf0/x90/x86/x97 ROMAN QUINARIUS SIGN
+<U00010198> /xf0/x90/x86/x98 ROMAN SESTERTIUS SIGN
+<U00010199> /xf0/x90/x86/x99 ROMAN DUPONDIUS SIGN
+<U0001019A> /xf0/x90/x86/x9a ROMAN AS SIGN
+<U0001019B> /xf0/x90/x86/x9b ROMAN CENTURIAL SIGN
+<U000101D0> /xf0/x90/x87/x90 PHAISTOS DISC SIGN PEDESTRIAN
+<U000101D1> /xf0/x90/x87/x91 PHAISTOS DISC SIGN PLUMED HEAD
+<U000101D2> /xf0/x90/x87/x92 PHAISTOS DISC SIGN TATTOOED HEAD
+<U000101D3> /xf0/x90/x87/x93 PHAISTOS DISC SIGN CAPTIVE
+<U000101D4> /xf0/x90/x87/x94 PHAISTOS DISC SIGN CHILD
+<U000101D5> /xf0/x90/x87/x95 PHAISTOS DISC SIGN WOMAN
+<U000101D6> /xf0/x90/x87/x96 PHAISTOS DISC SIGN HELMET
+<U000101D7> /xf0/x90/x87/x97 PHAISTOS DISC SIGN GAUNTLET
+<U000101D8> /xf0/x90/x87/x98 PHAISTOS DISC SIGN TIARA
+<U000101D9> /xf0/x90/x87/x99 PHAISTOS DISC SIGN ARROW
+<U000101DA> /xf0/x90/x87/x9a PHAISTOS DISC SIGN BOW
+<U000101DB> /xf0/x90/x87/x9b PHAISTOS DISC SIGN SHIELD
+<U000101DC> /xf0/x90/x87/x9c PHAISTOS DISC SIGN CLUB
+<U000101DD> /xf0/x90/x87/x9d PHAISTOS DISC SIGN MANACLES
+<U000101DE> /xf0/x90/x87/x9e PHAISTOS DISC SIGN MATTOCK
+<U000101DF> /xf0/x90/x87/x9f PHAISTOS DISC SIGN SAW
+<U000101E0> /xf0/x90/x87/xa0 PHAISTOS DISC SIGN LID
+<U000101E1> /xf0/x90/x87/xa1 PHAISTOS DISC SIGN BOOMERANG
+<U000101E2> /xf0/x90/x87/xa2 PHAISTOS DISC SIGN CARPENTRY PLANE
+<U000101E3> /xf0/x90/x87/xa3 PHAISTOS DISC SIGN DOLIUM
+<U000101E4> /xf0/x90/x87/xa4 PHAISTOS DISC SIGN COMB
+<U000101E5> /xf0/x90/x87/xa5 PHAISTOS DISC SIGN SLING
+<U000101E6> /xf0/x90/x87/xa6 PHAISTOS DISC SIGN COLUMN
+<U000101E7> /xf0/x90/x87/xa7 PHAISTOS DISC SIGN BEEHIVE
+<U000101E8> /xf0/x90/x87/xa8 PHAISTOS DISC SIGN SHIP
+<U000101E9> /xf0/x90/x87/xa9 PHAISTOS DISC SIGN HORN
+<U000101EA> /xf0/x90/x87/xaa PHAISTOS DISC SIGN HIDE
+<U000101EB> /xf0/x90/x87/xab PHAISTOS DISC SIGN BULLS LEG
+<U000101EC> /xf0/x90/x87/xac PHAISTOS DISC SIGN CAT
+<U000101ED> /xf0/x90/x87/xad PHAISTOS DISC SIGN RAM
+<U000101EE> /xf0/x90/x87/xae PHAISTOS DISC SIGN EAGLE
+<U000101EF> /xf0/x90/x87/xaf PHAISTOS DISC SIGN DOVE
+<U000101F0> /xf0/x90/x87/xb0 PHAISTOS DISC SIGN TUNNY
+<U000101F1> /xf0/x90/x87/xb1 PHAISTOS DISC SIGN BEE
+<U000101F2> /xf0/x90/x87/xb2 PHAISTOS DISC SIGN PLANE TREE
+<U000101F3> /xf0/x90/x87/xb3 PHAISTOS DISC SIGN VINE
+<U000101F4> /xf0/x90/x87/xb4 PHAISTOS DISC SIGN PAPYRUS
+<U000101F5> /xf0/x90/x87/xb5 PHAISTOS DISC SIGN ROSETTE
+<U000101F6> /xf0/x90/x87/xb6 PHAISTOS DISC SIGN LILY
+<U000101F7> /xf0/x90/x87/xb7 PHAISTOS DISC SIGN OX BACK
+<U000101F8> /xf0/x90/x87/xb8 PHAISTOS DISC SIGN FLUTE
+<U000101F9> /xf0/x90/x87/xb9 PHAISTOS DISC SIGN GRATER
+<U000101FA> /xf0/x90/x87/xba PHAISTOS DISC SIGN STRAINER
+<U000101FB> /xf0/x90/x87/xbb PHAISTOS DISC SIGN SMALL AXE
+<U000101FC> /xf0/x90/x87/xbc PHAISTOS DISC SIGN WAVY BAND
+<U000101FD> /xf0/x90/x87/xbd PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE
+<U00010280> /xf0/x90/x8a/x80 LYCIAN LETTER A
+<U00010281> /xf0/x90/x8a/x81 LYCIAN LETTER E
+<U00010282> /xf0/x90/x8a/x82 LYCIAN LETTER B
+<U00010283> /xf0/x90/x8a/x83 LYCIAN LETTER BH
+<U00010284> /xf0/x90/x8a/x84 LYCIAN LETTER G
+<U00010285> /xf0/x90/x8a/x85 LYCIAN LETTER D
+<U00010286> /xf0/x90/x8a/x86 LYCIAN LETTER I
+<U00010287> /xf0/x90/x8a/x87 LYCIAN LETTER W
+<U00010288> /xf0/x90/x8a/x88 LYCIAN LETTER Z
+<U00010289> /xf0/x90/x8a/x89 LYCIAN LETTER TH
+<U0001028A> /xf0/x90/x8a/x8a LYCIAN LETTER J
+<U0001028B> /xf0/x90/x8a/x8b LYCIAN LETTER K
+<U0001028C> /xf0/x90/x8a/x8c LYCIAN LETTER Q
+<U0001028D> /xf0/x90/x8a/x8d LYCIAN LETTER L
+<U0001028E> /xf0/x90/x8a/x8e LYCIAN LETTER M
+<U0001028F> /xf0/x90/x8a/x8f LYCIAN LETTER N
+<U00010290> /xf0/x90/x8a/x90 LYCIAN LETTER MM
+<U00010291> /xf0/x90/x8a/x91 LYCIAN LETTER NN
+<U00010292> /xf0/x90/x8a/x92 LYCIAN LETTER U
+<U00010293> /xf0/x90/x8a/x93 LYCIAN LETTER P
+<U00010294> /xf0/x90/x8a/x94 LYCIAN LETTER KK
+<U00010295> /xf0/x90/x8a/x95 LYCIAN LETTER R
+<U00010296> /xf0/x90/x8a/x96 LYCIAN LETTER S
+<U00010297> /xf0/x90/x8a/x97 LYCIAN LETTER T
+<U00010298> /xf0/x90/x8a/x98 LYCIAN LETTER TT
+<U00010299> /xf0/x90/x8a/x99 LYCIAN LETTER AN
+<U0001029A> /xf0/x90/x8a/x9a LYCIAN LETTER EN
+<U0001029B> /xf0/x90/x8a/x9b LYCIAN LETTER H
+<U0001029C> /xf0/x90/x8a/x9c LYCIAN LETTER X
+<U000102A0> /xf0/x90/x8a/xa0 CARIAN LETTER A
+<U000102A1> /xf0/x90/x8a/xa1 CARIAN LETTER P2
+<U000102A2> /xf0/x90/x8a/xa2 CARIAN LETTER D
+<U000102A3> /xf0/x90/x8a/xa3 CARIAN LETTER L
+<U000102A4> /xf0/x90/x8a/xa4 CARIAN LETTER UUU
+<U000102A5> /xf0/x90/x8a/xa5 CARIAN LETTER R
+<U000102A6> /xf0/x90/x8a/xa6 CARIAN LETTER LD
+<U000102A7> /xf0/x90/x8a/xa7 CARIAN LETTER A2
+<U000102A8> /xf0/x90/x8a/xa8 CARIAN LETTER Q
+<U000102A9> /xf0/x90/x8a/xa9 CARIAN LETTER B
+<U000102AA> /xf0/x90/x8a/xaa CARIAN LETTER M
+<U000102AB> /xf0/x90/x8a/xab CARIAN LETTER O
+<U000102AC> /xf0/x90/x8a/xac CARIAN LETTER D2
+<U000102AD> /xf0/x90/x8a/xad CARIAN LETTER T
+<U000102AE> /xf0/x90/x8a/xae CARIAN LETTER SH
+<U000102AF> /xf0/x90/x8a/xaf CARIAN LETTER SH2
+<U000102B0> /xf0/x90/x8a/xb0 CARIAN LETTER S
+<U000102B1> /xf0/x90/x8a/xb1 CARIAN LETTER C-18
+<U000102B2> /xf0/x90/x8a/xb2 CARIAN LETTER U
+<U000102B3> /xf0/x90/x8a/xb3 CARIAN LETTER NN
+<U000102B4> /xf0/x90/x8a/xb4 CARIAN LETTER X
+<U000102B5> /xf0/x90/x8a/xb5 CARIAN LETTER N
+<U000102B6> /xf0/x90/x8a/xb6 CARIAN LETTER TT2
+<U000102B7> /xf0/x90/x8a/xb7 CARIAN LETTER P
+<U000102B8> /xf0/x90/x8a/xb8 CARIAN LETTER SS
+<U000102B9> /xf0/x90/x8a/xb9 CARIAN LETTER I
+<U000102BA> /xf0/x90/x8a/xba CARIAN LETTER E
+<U000102BB> /xf0/x90/x8a/xbb CARIAN LETTER UUUU
+<U000102BC> /xf0/x90/x8a/xbc CARIAN LETTER K
+<U000102BD> /xf0/x90/x8a/xbd CARIAN LETTER K2
+<U000102BE> /xf0/x90/x8a/xbe CARIAN LETTER ND
+<U000102BF> /xf0/x90/x8a/xbf CARIAN LETTER UU
+<U000102C0> /xf0/x90/x8b/x80 CARIAN LETTER G
+<U000102C1> /xf0/x90/x8b/x81 CARIAN LETTER G2
+<U000102C2> /xf0/x90/x8b/x82 CARIAN LETTER ST
+<U000102C3> /xf0/x90/x8b/x83 CARIAN LETTER ST2
+<U000102C4> /xf0/x90/x8b/x84 CARIAN LETTER NG
+<U000102C5> /xf0/x90/x8b/x85 CARIAN LETTER II
+<U000102C6> /xf0/x90/x8b/x86 CARIAN LETTER C-39
+<U000102C7> /xf0/x90/x8b/x87 CARIAN LETTER TT
+<U000102C8> /xf0/x90/x8b/x88 CARIAN LETTER UUU2
+<U000102C9> /xf0/x90/x8b/x89 CARIAN LETTER RR
+<U000102CA> /xf0/x90/x8b/x8a CARIAN LETTER MB
+<U000102CB> /xf0/x90/x8b/x8b CARIAN LETTER MB2
+<U000102CC> /xf0/x90/x8b/x8c CARIAN LETTER MB3
+<U000102CD> /xf0/x90/x8b/x8d CARIAN LETTER MB4
+<U000102CE> /xf0/x90/x8b/x8e CARIAN LETTER LD2
+<U000102CF> /xf0/x90/x8b/x8f CARIAN LETTER E2
+<U000102D0> /xf0/x90/x8b/x90 CARIAN LETTER UUU3
 <U00010300> /xf0/x90/x8c/x80 OLD ITALIC LETTER A
 <U00010301> /xf0/x90/x8c/x81 OLD ITALIC LETTER BE
 <U00010302> /xf0/x90/x8c/x82 OLD ITALIC LETTER KE
@@ -25522,87 +26966,87 @@ CHARMAP
 <U00010348> /xf0/x90/x8d/x88 GOTHIC LETTER HWAIR
 <U00010349> /xf0/x90/x8d/x89 GOTHIC LETTER OTHAL
 <U0001034A> /xf0/x90/x8d/x8a GOTHIC LETTER NINE HUNDRED
-<U00010380>     /xf0/x90/x8e/x80 UGARITIC LETTER ALPA
-<U00010381>     /xf0/x90/x8e/x81 UGARITIC LETTER BETA
-<U00010382>     /xf0/x90/x8e/x82 UGARITIC LETTER GAMLA
-<U00010383>     /xf0/x90/x8e/x83 UGARITIC LETTER KHA
-<U00010384>     /xf0/x90/x8e/x84 UGARITIC LETTER DELTA
-<U00010385>     /xf0/x90/x8e/x85 UGARITIC LETTER HO
-<U00010386>     /xf0/x90/x8e/x86 UGARITIC LETTER WO
-<U00010387>     /xf0/x90/x8e/x87 UGARITIC LETTER ZETA
-<U00010388>     /xf0/x90/x8e/x88 UGARITIC LETTER HOTA
-<U00010389>     /xf0/x90/x8e/x89 UGARITIC LETTER TET
-<U0001038A>     /xf0/x90/x8e/x8a UGARITIC LETTER YOD
-<U0001038B>     /xf0/x90/x8e/x8b UGARITIC LETTER KAF
-<U0001038C>     /xf0/x90/x8e/x8c UGARITIC LETTER SHIN
-<U0001038D>     /xf0/x90/x8e/x8d UGARITIC LETTER LAMDA
-<U0001038E>     /xf0/x90/x8e/x8e UGARITIC LETTER MEM
-<U0001038F>     /xf0/x90/x8e/x8f UGARITIC LETTER DHAL
-<U00010390>     /xf0/x90/x8e/x90 UGARITIC LETTER NUN
-<U00010391>     /xf0/x90/x8e/x91 UGARITIC LETTER ZU
-<U00010392>     /xf0/x90/x8e/x92 UGARITIC LETTER SAMKA
-<U00010393>     /xf0/x90/x8e/x93 UGARITIC LETTER AIN
-<U00010394>     /xf0/x90/x8e/x94 UGARITIC LETTER PU
-<U00010395>     /xf0/x90/x8e/x95 UGARITIC LETTER SADE
-<U00010396>     /xf0/x90/x8e/x96 UGARITIC LETTER QOPA
-<U00010397>     /xf0/x90/x8e/x97 UGARITIC LETTER RASHA
-<U00010398>     /xf0/x90/x8e/x98 UGARITIC LETTER THANNA
-<U00010399>     /xf0/x90/x8e/x99 UGARITIC LETTER GHAIN
-<U0001039A>     /xf0/x90/x8e/x9a UGARITIC LETTER TO
-<U0001039B>     /xf0/x90/x8e/x9b UGARITIC LETTER I
-<U0001039C>     /xf0/x90/x8e/x9c UGARITIC LETTER U
-<U0001039D>     /xf0/x90/x8e/x9d UGARITIC LETTER SSU
-<U0001039F>     /xf0/x90/x8e/x9f UGARITIC WORD DIVIDER
-<U000103A0>     /xf0/x90/x8e/xa0 OLD PERSIAN SIGN A
-<U000103A1>     /xf0/x90/x8e/xa1 OLD PERSIAN SIGN I
-<U000103A2>     /xf0/x90/x8e/xa2 OLD PERSIAN SIGN U
-<U000103A3>     /xf0/x90/x8e/xa3 OLD PERSIAN SIGN KA
-<U000103A4>     /xf0/x90/x8e/xa4 OLD PERSIAN SIGN KU
-<U000103A5>     /xf0/x90/x8e/xa5 OLD PERSIAN SIGN GA
-<U000103A6>     /xf0/x90/x8e/xa6 OLD PERSIAN SIGN GU
-<U000103A7>     /xf0/x90/x8e/xa7 OLD PERSIAN SIGN XA
-<U000103A8>     /xf0/x90/x8e/xa8 OLD PERSIAN SIGN CA
-<U000103A9>     /xf0/x90/x8e/xa9 OLD PERSIAN SIGN JA
-<U000103AA>     /xf0/x90/x8e/xaa OLD PERSIAN SIGN JI
-<U000103AB>     /xf0/x90/x8e/xab OLD PERSIAN SIGN TA
-<U000103AC>     /xf0/x90/x8e/xac OLD PERSIAN SIGN TU
-<U000103AD>     /xf0/x90/x8e/xad OLD PERSIAN SIGN DA
-<U000103AE>     /xf0/x90/x8e/xae OLD PERSIAN SIGN DI
-<U000103AF>     /xf0/x90/x8e/xaf OLD PERSIAN SIGN DU
-<U000103B0>     /xf0/x90/x8e/xb0 OLD PERSIAN SIGN THA
-<U000103B1>     /xf0/x90/x8e/xb1 OLD PERSIAN SIGN PA
-<U000103B2>     /xf0/x90/x8e/xb2 OLD PERSIAN SIGN BA
-<U000103B3>     /xf0/x90/x8e/xb3 OLD PERSIAN SIGN FA
-<U000103B4>     /xf0/x90/x8e/xb4 OLD PERSIAN SIGN NA
-<U000103B5>     /xf0/x90/x8e/xb5 OLD PERSIAN SIGN NU
-<U000103B6>     /xf0/x90/x8e/xb6 OLD PERSIAN SIGN MA
-<U000103B7>     /xf0/x90/x8e/xb7 OLD PERSIAN SIGN MI
-<U000103B8>     /xf0/x90/x8e/xb8 OLD PERSIAN SIGN MU
-<U000103B9>     /xf0/x90/x8e/xb9 OLD PERSIAN SIGN YA
-<U000103BA>     /xf0/x90/x8e/xba OLD PERSIAN SIGN VA
-<U000103BB>     /xf0/x90/x8e/xbb OLD PERSIAN SIGN VI
-<U000103BC>     /xf0/x90/x8e/xbc OLD PERSIAN SIGN RA
-<U000103BD>     /xf0/x90/x8e/xbd OLD PERSIAN SIGN RU
-<U000103BE>     /xf0/x90/x8e/xbe OLD PERSIAN SIGN LA
-<U000103BF>     /xf0/x90/x8e/xbf OLD PERSIAN SIGN SA
-<U000103C0>     /xf0/x90/x8f/x80 OLD PERSIAN SIGN ZA
-<U000103C1>     /xf0/x90/x8f/x81 OLD PERSIAN SIGN SHA
-<U000103C2>     /xf0/x90/x8f/x82 OLD PERSIAN SIGN SSA
-<U000103C3>     /xf0/x90/x8f/x83 OLD PERSIAN SIGN HA
-<U000103C8>     /xf0/x90/x8f/x88 OLD PERSIAN SIGN AURAMAZDAA
-<U000103C9>     /xf0/x90/x8f/x89 OLD PERSIAN SIGN AURAMAZDAA-2
-<U000103CA>     /xf0/x90/x8f/x8A OLD PERSIAN SIGN AURAMAZDAAHA
-<U000103CB>     /xf0/x90/x8f/x8B OLD PERSIAN SIGN XSHAAYATHIYA
-<U000103CC>     /xf0/x90/x8f/x8C OLD PERSIAN SIGN DAHYAAUSH
-<U000103CD>     /xf0/x90/x8f/x8D OLD PERSIAN SIGN DAHYAAUSH-2
-<U000103CE>     /xf0/x90/x8f/x8E OLD PERSIAN SIGN BAGA
-<U000103CF>     /xf0/x90/x8f/x8F OLD PERSIAN SIGN BUUMISH
-<U000103D0>     /xf0/x90/x8f/x90 OLD PERSIAN WORD DIVIDER
-<U000103D1>     /xf0/x90/x8f/x91 OLD PERSIAN NUMBER ONE
-<U000103D2>     /xf0/x90/x8f/x92 OLD PERSIAN NUMBER TWO
-<U000103D3>     /xf0/x90/x8f/x93 OLD PERSIAN NUMBER TEN
-<U000103D4>     /xf0/x90/x8f/x94 OLD PERSIAN NUMBER TWENTY
-<U000103D5>     /xf0/x90/x8f/x95 OLD PERSIAN NUMBER HUNDRED
+<U00010380> /xf0/x90/x8e/x80 UGARITIC LETTER ALPA
+<U00010381> /xf0/x90/x8e/x81 UGARITIC LETTER BETA
+<U00010382> /xf0/x90/x8e/x82 UGARITIC LETTER GAMLA
+<U00010383> /xf0/x90/x8e/x83 UGARITIC LETTER KHA
+<U00010384> /xf0/x90/x8e/x84 UGARITIC LETTER DELTA
+<U00010385> /xf0/x90/x8e/x85 UGARITIC LETTER HO
+<U00010386> /xf0/x90/x8e/x86 UGARITIC LETTER WO
+<U00010387> /xf0/x90/x8e/x87 UGARITIC LETTER ZETA
+<U00010388> /xf0/x90/x8e/x88 UGARITIC LETTER HOTA
+<U00010389> /xf0/x90/x8e/x89 UGARITIC LETTER TET
+<U0001038A> /xf0/x90/x8e/x8a UGARITIC LETTER YOD
+<U0001038B> /xf0/x90/x8e/x8b UGARITIC LETTER KAF
+<U0001038C> /xf0/x90/x8e/x8c UGARITIC LETTER SHIN
+<U0001038D> /xf0/x90/x8e/x8d UGARITIC LETTER LAMDA
+<U0001038E> /xf0/x90/x8e/x8e UGARITIC LETTER MEM
+<U0001038F> /xf0/x90/x8e/x8f UGARITIC LETTER DHAL
+<U00010390> /xf0/x90/x8e/x90 UGARITIC LETTER NUN
+<U00010391> /xf0/x90/x8e/x91 UGARITIC LETTER ZU
+<U00010392> /xf0/x90/x8e/x92 UGARITIC LETTER SAMKA
+<U00010393> /xf0/x90/x8e/x93 UGARITIC LETTER AIN
+<U00010394> /xf0/x90/x8e/x94 UGARITIC LETTER PU
+<U00010395> /xf0/x90/x8e/x95 UGARITIC LETTER SADE
+<U00010396> /xf0/x90/x8e/x96 UGARITIC LETTER QOPA
+<U00010397> /xf0/x90/x8e/x97 UGARITIC LETTER RASHA
+<U00010398> /xf0/x90/x8e/x98 UGARITIC LETTER THANNA
+<U00010399> /xf0/x90/x8e/x99 UGARITIC LETTER GHAIN
+<U0001039A> /xf0/x90/x8e/x9a UGARITIC LETTER TO
+<U0001039B> /xf0/x90/x8e/x9b UGARITIC LETTER I
+<U0001039C> /xf0/x90/x8e/x9c UGARITIC LETTER U
+<U0001039D> /xf0/x90/x8e/x9d UGARITIC LETTER SSU
+<U0001039F> /xf0/x90/x8e/x9f UGARITIC WORD DIVIDER
+<U000103A0> /xf0/x90/x8e/xa0 OLD PERSIAN SIGN A
+<U000103A1> /xf0/x90/x8e/xa1 OLD PERSIAN SIGN I
+<U000103A2> /xf0/x90/x8e/xa2 OLD PERSIAN SIGN U
+<U000103A3> /xf0/x90/x8e/xa3 OLD PERSIAN SIGN KA
+<U000103A4> /xf0/x90/x8e/xa4 OLD PERSIAN SIGN KU
+<U000103A5> /xf0/x90/x8e/xa5 OLD PERSIAN SIGN GA
+<U000103A6> /xf0/x90/x8e/xa6 OLD PERSIAN SIGN GU
+<U000103A7> /xf0/x90/x8e/xa7 OLD PERSIAN SIGN XA
+<U000103A8> /xf0/x90/x8e/xa8 OLD PERSIAN SIGN CA
+<U000103A9> /xf0/x90/x8e/xa9 OLD PERSIAN SIGN JA
+<U000103AA> /xf0/x90/x8e/xaa OLD PERSIAN SIGN JI
+<U000103AB> /xf0/x90/x8e/xab OLD PERSIAN SIGN TA
+<U000103AC> /xf0/x90/x8e/xac OLD PERSIAN SIGN TU
+<U000103AD> /xf0/x90/x8e/xad OLD PERSIAN SIGN DA
+<U000103AE> /xf0/x90/x8e/xae OLD PERSIAN SIGN DI
+<U000103AF> /xf0/x90/x8e/xaf OLD PERSIAN SIGN DU
+<U000103B0> /xf0/x90/x8e/xb0 OLD PERSIAN SIGN THA
+<U000103B1> /xf0/x90/x8e/xb1 OLD PERSIAN SIGN PA
+<U000103B2> /xf0/x90/x8e/xb2 OLD PERSIAN SIGN BA
+<U000103B3> /xf0/x90/x8e/xb3 OLD PERSIAN SIGN FA
+<U000103B4> /xf0/x90/x8e/xb4 OLD PERSIAN SIGN NA
+<U000103B5> /xf0/x90/x8e/xb5 OLD PERSIAN SIGN NU
+<U000103B6> /xf0/x90/x8e/xb6 OLD PERSIAN SIGN MA
+<U000103B7> /xf0/x90/x8e/xb7 OLD PERSIAN SIGN MI
+<U000103B8> /xf0/x90/x8e/xb8 OLD PERSIAN SIGN MU
+<U000103B9> /xf0/x90/x8e/xb9 OLD PERSIAN SIGN YA
+<U000103BA> /xf0/x90/x8e/xba OLD PERSIAN SIGN VA
+<U000103BB> /xf0/x90/x8e/xbb OLD PERSIAN SIGN VI
+<U000103BC> /xf0/x90/x8e/xbc OLD PERSIAN SIGN RA
+<U000103BD> /xf0/x90/x8e/xbd OLD PERSIAN SIGN RU
+<U000103BE> /xf0/x90/x8e/xbe OLD PERSIAN SIGN LA
+<U000103BF> /xf0/x90/x8e/xbf OLD PERSIAN SIGN SA
+<U000103C0> /xf0/x90/x8f/x80 OLD PERSIAN SIGN ZA
+<U000103C1> /xf0/x90/x8f/x81 OLD PERSIAN SIGN SHA
+<U000103C2> /xf0/x90/x8f/x82 OLD PERSIAN SIGN SSA
+<U000103C3> /xf0/x90/x8f/x83 OLD PERSIAN SIGN HA
+<U000103C8> /xf0/x90/x8f/x88 OLD PERSIAN SIGN AURAMAZDAA
+<U000103C9> /xf0/x90/x8f/x89 OLD PERSIAN SIGN AURAMAZDAA-2
+<U000103CA> /xf0/x90/x8f/x8A OLD PERSIAN SIGN AURAMAZDAAHA
+<U000103CB> /xf0/x90/x8f/x8B OLD PERSIAN SIGN XSHAAYATHIYA
+<U000103CC> /xf0/x90/x8f/x8C OLD PERSIAN SIGN DAHYAAUSH
+<U000103CD> /xf0/x90/x8f/x8D OLD PERSIAN SIGN DAHYAAUSH-2
+<U000103CE> /xf0/x90/x8f/x8E OLD PERSIAN SIGN BAGA
+<U000103CF> /xf0/x90/x8f/x8F OLD PERSIAN SIGN BUUMISH
+<U000103D0> /xf0/x90/x8f/x90 OLD PERSIAN WORD DIVIDER
+<U000103D1> /xf0/x90/x8f/x91 OLD PERSIAN NUMBER ONE
+<U000103D2> /xf0/x90/x8f/x92 OLD PERSIAN NUMBER TWO
+<U000103D3> /xf0/x90/x8f/x93 OLD PERSIAN NUMBER TEN
+<U000103D4> /xf0/x90/x8f/x94 OLD PERSIAN NUMBER TWENTY
+<U000103D5> /xf0/x90/x8f/x95 OLD PERSIAN NUMBER HUNDRED
 <U00010400> /xf0/x90/x90/x80 DESERET CAPITAL LETTER LONG I
 <U00010401> /xf0/x90/x90/x81 DESERET CAPITAL LETTER LONG E
 <U00010402> /xf0/x90/x90/x82 DESERET CAPITAL LETTER LONG A
@@ -25641,8 +27085,8 @@ CHARMAP
 <U00010423> /xf0/x90/x90/xa3 DESERET CAPITAL LETTER EM
 <U00010424> /xf0/x90/x90/xa4 DESERET CAPITAL LETTER EN
 <U00010425> /xf0/x90/x90/xa5 DESERET CAPITAL LETTER ENG
-<U00010426>     /xf0/x90/x90/xa6 DESERET CAPITAL LETTER OI
-<U00010427>     /xf0/x90/x90/xa7 DESERET CAPITAL LETTER EW
+<U00010426> /xf0/x90/x90/xa6 DESERET CAPITAL LETTER OI
+<U00010427> /xf0/x90/x90/xa7 DESERET CAPITAL LETTER EW
 <U00010428> /xf0/x90/x90/xa8 DESERET SMALL LETTER LONG I
 <U00010429> /xf0/x90/x90/xa9 DESERET SMALL LETTER LONG E
 <U0001042A> /xf0/x90/x90/xaa DESERET SMALL LETTER LONG A
@@ -25681,1225 +27125,1252 @@ CHARMAP
 <U0001044B> /xf0/x90/x91/x8b DESERET SMALL LETTER EM
 <U0001044C> /xf0/x90/x91/x8c DESERET SMALL LETTER EN
 <U0001044D> /xf0/x90/x91/x8d DESERET SMALL LETTER ENG
-<U0001044E>     /xf0/x90/x91/x8e DESERET SMALL LETTER OI
-<U0001044F>     /xf0/x90/x91/x8f DESERET SMALL LETTER EW
-<U00010450>     /xf0/x90/x91/x90 SHAVIAN LETTER PEEP
-<U00010451>     /xf0/x90/x91/x91 SHAVIAN LETTER TOT
-<U00010452>     /xf0/x90/x91/x92 SHAVIAN LETTER KICK
-<U00010453>     /xf0/x90/x91/x93 SHAVIAN LETTER FEE
-<U00010454>     /xf0/x90/x91/x94 SHAVIAN LETTER THIGH
-<U00010455>     /xf0/x90/x91/x95 SHAVIAN LETTER SO
-<U00010456>     /xf0/x90/x91/x96 SHAVIAN LETTER SURE
-<U00010457>     /xf0/x90/x91/x97 SHAVIAN LETTER CHURCH
-<U00010458>     /xf0/x90/x91/x98 SHAVIAN LETTER YEA
-<U00010459>     /xf0/x90/x91/x99 SHAVIAN LETTER HUNG
-<U0001045A>     /xf0/x90/x91/x9a SHAVIAN LETTER BIB
-<U0001045B>     /xf0/x90/x91/x9b SHAVIAN LETTER DEAD
-<U0001045C>     /xf0/x90/x91/x9c SHAVIAN LETTER GAG
-<U0001045D>     /xf0/x90/x91/x9d SHAVIAN LETTER VOW
-<U0001045E>     /xf0/x90/x91/x9e SHAVIAN LETTER THEY
-<U0001045F>     /xf0/x90/x91/x9f SHAVIAN LETTER ZOO
-<U00010460>     /xf0/x90/x91/xa0 SHAVIAN LETTER MEASURE
-<U00010461>     /xf0/x90/x91/xa1 SHAVIAN LETTER JUDGE
-<U00010462>     /xf0/x90/x91/xa2 SHAVIAN LETTER WOE
-<U00010463>     /xf0/x90/x91/xa3 SHAVIAN LETTER HA-HA
-<U00010464>     /xf0/x90/x91/xa4 SHAVIAN LETTER LOLL
-<U00010465>     /xf0/x90/x91/xa5 SHAVIAN LETTER MIME
-<U00010466>     /xf0/x90/x91/xa6 SHAVIAN LETTER IF
-<U00010467>     /xf0/x90/x91/xa7 SHAVIAN LETTER EGG
-<U00010468>     /xf0/x90/x91/xa8 SHAVIAN LETTER ASH
-<U00010469>     /xf0/x90/x91/xa9 SHAVIAN LETTER ADO
-<U0001046A>     /xf0/x90/x91/xaa SHAVIAN LETTER ON
-<U0001046B>     /xf0/x90/x91/xab SHAVIAN LETTER WOOL
-<U0001046C>     /xf0/x90/x91/xac SHAVIAN LETTER OUT
-<U0001046D>     /xf0/x90/x91/xad SHAVIAN LETTER AH
-<U0001046E>     /xf0/x90/x91/xae SHAVIAN LETTER ROAR
-<U0001046F>     /xf0/x90/x91/xaf SHAVIAN LETTER NUN
-<U00010470>     /xf0/x90/x91/xb0 SHAVIAN LETTER EAT
-<U00010471>     /xf0/x90/x91/xb1 SHAVIAN LETTER AGE
-<U00010472>     /xf0/x90/x91/xb2 SHAVIAN LETTER ICE
-<U00010473>     /xf0/x90/x91/xb3 SHAVIAN LETTER UP
-<U00010474>     /xf0/x90/x91/xb4 SHAVIAN LETTER OAK
-<U00010475>     /xf0/x90/x91/xb5 SHAVIAN LETTER OOZE
-<U00010476>     /xf0/x90/x91/xb6 SHAVIAN LETTER OIL
-<U00010477>     /xf0/x90/x91/xb7 SHAVIAN LETTER AWE
-<U00010478>     /xf0/x90/x91/xb8 SHAVIAN LETTER ARE
-<U00010479>     /xf0/x90/x91/xb9 SHAVIAN LETTER OR
-<U0001047A>     /xf0/x90/x91/xba SHAVIAN LETTER AIR
-<U0001047B>     /xf0/x90/x91/xbb SHAVIAN LETTER ERR
-<U0001047C>     /xf0/x90/x91/xbc SHAVIAN LETTER ARRAY
-<U0001047D>     /xf0/x90/x91/xbd SHAVIAN LETTER EAR
-<U0001047E>     /xf0/x90/x91/xbe SHAVIAN LETTER IAN
-<U0001047F>     /xf0/x90/x91/xbf SHAVIAN LETTER YEW
-<U00010480>     /xf0/x90/x92/x80 OSMANYA LETTER ALEF
-<U00010481>     /xf0/x90/x92/x81 OSMANYA LETTER BA
-<U00010482>     /xf0/x90/x92/x82 OSMANYA LETTER TA
-<U00010483>     /xf0/x90/x92/x83 OSMANYA LETTER JA
-<U00010484>     /xf0/x90/x92/x84 OSMANYA LETTER XA
-<U00010485>     /xf0/x90/x92/x85 OSMANYA LETTER KHA
-<U00010486>     /xf0/x90/x92/x86 OSMANYA LETTER DEEL
-<U00010487>     /xf0/x90/x92/x87 OSMANYA LETTER RA
-<U00010488>     /xf0/x90/x92/x88 OSMANYA LETTER SA
-<U00010489>     /xf0/x90/x92/x89 OSMANYA LETTER SHIIN
-<U0001048A>     /xf0/x90/x92/x8a OSMANYA LETTER DHA
-<U0001048B>     /xf0/x90/x92/x8b OSMANYA LETTER CAYN
-<U0001048C>     /xf0/x90/x92/x8c OSMANYA LETTER GA
-<U0001048D>     /xf0/x90/x92/x8d OSMANYA LETTER FA
-<U0001048E>     /xf0/x90/x92/x8e OSMANYA LETTER QAAF
-<U0001048F>     /xf0/x90/x92/x8f OSMANYA LETTER KAAF
-<U00010490>     /xf0/x90/x92/x90 OSMANYA LETTER LAAN
-<U00010491>     /xf0/x90/x92/x91 OSMANYA LETTER MIIN
-<U00010492>     /xf0/x90/x92/x92 OSMANYA LETTER NUUN
-<U00010493>     /xf0/x90/x92/x93 OSMANYA LETTER WAW
-<U00010494>     /xf0/x90/x92/x94 OSMANYA LETTER HA
-<U00010495>     /xf0/x90/x92/x95 OSMANYA LETTER YA
-<U00010496>     /xf0/x90/x92/x96 OSMANYA LETTER A
-<U00010497>     /xf0/x90/x92/x97 OSMANYA LETTER E
-<U00010498>     /xf0/x90/x92/x98 OSMANYA LETTER I
-<U00010499>     /xf0/x90/x92/x99 OSMANYA LETTER O
-<U0001049A>     /xf0/x90/x92/x9a OSMANYA LETTER U
-<U0001049B>     /xf0/x90/x92/x9b OSMANYA LETTER AA
-<U0001049C>     /xf0/x90/x92/x9c OSMANYA LETTER EE
-<U0001049D>     /xf0/x90/x92/x9d OSMANYA LETTER OO
-<U000104A0>     /xf0/x90/x92/xa0 OSMANYA DIGIT ZERO
-<U000104A1>     /xf0/x90/x92/xa1 OSMANYA DIGIT ONE
-<U000104A2>     /xf0/x90/x92/xa2 OSMANYA DIGIT TWO
-<U000104A3>     /xf0/x90/x92/xa3 OSMANYA DIGIT THREE
-<U000104A4>     /xf0/x90/x92/xa4 OSMANYA DIGIT FOUR
-<U000104A5>     /xf0/x90/x92/xa5 OSMANYA DIGIT FIVE
-<U000104A6>     /xf0/x90/x92/xa6 OSMANYA DIGIT SIX
-<U000104A7>     /xf0/x90/x92/xa7 OSMANYA DIGIT SEVEN
-<U000104A8>     /xf0/x90/x92/xa8 OSMANYA DIGIT EIGHT
-<U000104A9>     /xf0/x90/x92/xa9 OSMANYA DIGIT NINE
-<U00010800>     /xf0/x90/xa0/x80 CYPRIOT SYLLABLE A
-<U00010801>     /xf0/x90/xa0/x81 CYPRIOT SYLLABLE E
-<U00010802>     /xf0/x90/xa0/x82 CYPRIOT SYLLABLE I
-<U00010803>     /xf0/x90/xa0/x83 CYPRIOT SYLLABLE O
-<U00010804>     /xf0/x90/xa0/x84 CYPRIOT SYLLABLE U
-<U00010805>     /xf0/x90/xa0/x85 CYPRIOT SYLLABLE JA
-<U00010808>     /xf0/x90/xa0/x88 CYPRIOT SYLLABLE JO
-<U0001080A>     /xf0/x90/xa0/x8a CYPRIOT SYLLABLE KA
-<U0001080B>     /xf0/x90/xa0/x8b CYPRIOT SYLLABLE KE
-<U0001080C>     /xf0/x90/xa0/x8c CYPRIOT SYLLABLE KI
-<U0001080D>     /xf0/x90/xa0/x8d CYPRIOT SYLLABLE KO
-<U0001080E>     /xf0/x90/xa0/x8e CYPRIOT SYLLABLE KU
-<U0001080F>     /xf0/x90/xa0/x8f CYPRIOT SYLLABLE LA
-<U00010810>     /xf0/x90/xa0/x90 CYPRIOT SYLLABLE LE
-<U00010811>     /xf0/x90/xa0/x91 CYPRIOT SYLLABLE LI
-<U00010812>     /xf0/x90/xa0/x92 CYPRIOT SYLLABLE LO
-<U00010813>     /xf0/x90/xa0/x93 CYPRIOT SYLLABLE LU
-<U00010814>     /xf0/x90/xa0/x94 CYPRIOT SYLLABLE MA
-<U00010815>     /xf0/x90/xa0/x95 CYPRIOT SYLLABLE ME
-<U00010816>     /xf0/x90/xa0/x96 CYPRIOT SYLLABLE MI
-<U00010817>     /xf0/x90/xa0/x97 CYPRIOT SYLLABLE MO
-<U00010818>     /xf0/x90/xa0/x98 CYPRIOT SYLLABLE MU
-<U00010819>     /xf0/x90/xa0/x99 CYPRIOT SYLLABLE NA
-<U0001081A>     /xf0/x90/xa0/x9a CYPRIOT SYLLABLE NE
-<U0001081B>     /xf0/x90/xa0/x9b CYPRIOT SYLLABLE NI
-<U0001081C>     /xf0/x90/xa0/x9c CYPRIOT SYLLABLE NO
-<U0001081D>     /xf0/x90/xa0/x9d CYPRIOT SYLLABLE NU
-<U0001081E>     /xf0/x90/xa0/x9e CYPRIOT SYLLABLE PA
-<U0001081F>     /xf0/x90/xa0/x9f CYPRIOT SYLLABLE PE
-<U00010820>     /xf0/x90/xa0/xa0 CYPRIOT SYLLABLE PI
-<U00010821>     /xf0/x90/xa0/xa1 CYPRIOT SYLLABLE PO
-<U00010822>     /xf0/x90/xa0/xa2 CYPRIOT SYLLABLE PU
-<U00010823>     /xf0/x90/xa0/xa3 CYPRIOT SYLLABLE RA
-<U00010824>     /xf0/x90/xa0/xa4 CYPRIOT SYLLABLE RE
-<U00010825>     /xf0/x90/xa0/xa5 CYPRIOT SYLLABLE RI
-<U00010826>     /xf0/x90/xa0/xa6 CYPRIOT SYLLABLE RO
-<U00010827>     /xf0/x90/xa0/xa7 CYPRIOT SYLLABLE RU
-<U00010828>     /xf0/x90/xa0/xa8 CYPRIOT SYLLABLE SA
-<U00010829>     /xf0/x90/xa0/xa9 CYPRIOT SYLLABLE SE
-<U0001082A>     /xf0/x90/xa0/xaa CYPRIOT SYLLABLE SI
-<U0001082B>     /xf0/x90/xa0/xab CYPRIOT SYLLABLE SO
-<U0001082C>     /xf0/x90/xa0/xac CYPRIOT SYLLABLE SU
-<U0001082D>     /xf0/x90/xa0/xad CYPRIOT SYLLABLE TA
-<U0001082E>     /xf0/x90/xa0/xae CYPRIOT SYLLABLE TE
-<U0001082F>     /xf0/x90/xa0/xaf CYPRIOT SYLLABLE TI
-<U00010830>     /xf0/x90/xa0/xb0 CYPRIOT SYLLABLE TO
-<U00010831>     /xf0/x90/xa0/xb1 CYPRIOT SYLLABLE TU
-<U00010832>     /xf0/x90/xa0/xb2 CYPRIOT SYLLABLE WA
-<U00010833>     /xf0/x90/xa0/xb3 CYPRIOT SYLLABLE WE
-<U00010834>     /xf0/x90/xa0/xb4 CYPRIOT SYLLABLE WI
-<U00010835>     /xf0/x90/xa0/xb5 CYPRIOT SYLLABLE WO
-<U00010837>     /xf0/x90/xa0/xb7 CYPRIOT SYLLABLE XA
-<U00010838>     /xf0/x90/xa0/xb8 CYPRIOT SYLLABLE XE
-<U0001083C>     /xf0/x90/xa0/xbc CYPRIOT SYLLABLE ZA
-<U0001083F>     /xf0/x90/xa0/xbf CYPRIOT SYLLABLE ZO
-<U00010900>     /xf0/x90/xa4/x80 PHOENICIAN LETTER ALF
-<U00010901>     /xf0/x90/xa4/x81 PHOENICIAN LETTER BET
-<U00010902>     /xf0/x90/xa4/x82 PHOENICIAN LETTER GAML
-<U00010903>     /xf0/x90/xa4/x83 PHOENICIAN LETTER DELT
-<U00010904>     /xf0/x90/xa4/x84 PHOENICIAN LETTER HE
-<U00010905>     /xf0/x90/xa4/x85 PHOENICIAN LETTER WAU
-<U00010906>     /xf0/x90/xa4/x86 PHOENICIAN LETTER ZAI
-<U00010907>     /xf0/x90/xa4/x87 PHOENICIAN LETTER HET
-<U00010908>     /xf0/x90/xa4/x88 PHOENICIAN LETTER TET
-<U00010909>     /xf0/x90/xa4/x89 PHOENICIAN LETTER YOD
-<U0001090A>     /xf0/x90/xa4/x8a PHOENICIAN LETTER KAF
-<U0001090B>     /xf0/x90/xa4/x8b PHOENICIAN LETTER LAMD
-<U0001090C>     /xf0/x90/xa4/x8c PHOENICIAN LETTER MEM
-<U0001090D>     /xf0/x90/xa4/x8d PHOENICIAN LETTER NUN
-<U0001090E>     /xf0/x90/xa4/x8e PHOENICIAN LETTER SEMK
-<U0001090F>     /xf0/x90/xa4/x8f PHOENICIAN LETTER AIN
-<U00010910>     /xf0/x90/xa4/x90 PHOENICIAN LETTER PE
-<U00010911>     /xf0/x90/xa4/x91 PHOENICIAN LETTER SADE
-<U00010912>     /xf0/x90/xa4/x92 PHOENICIAN LETTER QOF
-<U00010913>     /xf0/x90/xa4/x93 PHOENICIAN LETTER ROSH
-<U00010914>     /xf0/x90/xa4/x94 PHOENICIAN LETTER SHIN
-<U00010915>     /xf0/x90/xa4/x95 PHOENICIAN LETTER TAU
-<U00010916>     /xf0/x90/xa4/x96 PHOENICIAN NUMBER ONE
-<U00010917>     /xf0/x90/xa4/x97 PHOENICIAN NUMBER TEN
-<U00010918>     /xf0/x90/xa4/x98 PHOENICIAN NUMBER TWENTY
-<U00010919>     /xf0/x90/xa4/x99 PHOENICIAN NUMBER ONE HUNDRED
-<U0001091F>     /xf0/x90/xa4/x9f PHOENICIAN WORD SEPARATOR
-<U00010A00>     /xf0/x90/xa8/x80 KHAROSHTHI LETTER A
-<U00010A01>     /xf0/x90/xa8/x81 KHAROSHTHI VOWEL SIGN I
-<U00010A02>     /xf0/x90/xa8/x82 KHAROSHTHI VOWEL SIGN U
-<U00010A03>     /xf0/x90/xa8/x83 KHAROSHTHI VOWEL SIGN VOCALIC R
-<U00010A05>     /xf0/x90/xa8/x85 KHAROSHTHI VOWEL SIGN E
-<U00010A06>     /xf0/x90/xa8/x86 KHAROSHTHI VOWEL SIGN O
-<U00010A0C>     /xf0/x90/xa8/x8c KHAROSHTHI VOWEL LENGTH MARK
-<U00010A0D>     /xf0/x90/xa8/x8d KHAROSHTHI SIGN DOUBLE RING BELOW
-<U00010A0E>     /xf0/x90/xa8/x8e KHAROSHTHI SIGN ANUSVARA
-<U00010A0F>     /xf0/x90/xa8/x8f KHAROSHTHI SIGN VISARGA
-<U00010A10>     /xf0/x90/xa8/x90 KHAROSHTHI LETTER KA
-<U00010A11>     /xf0/x90/xa8/x91 KHAROSHTHI LETTER KHA
-<U00010A12>     /xf0/x90/xa8/x92 KHAROSHTHI LETTER GA
-<U00010A13>     /xf0/x90/xa8/x93 KHAROSHTHI LETTER GHA
-<U00010A15>     /xf0/x90/xa8/x95 KHAROSHTHI LETTER CA
-<U00010A16>     /xf0/x90/xa8/x96 KHAROSHTHI LETTER CHA
-<U00010A17>     /xf0/x90/xa8/x97 KHAROSHTHI LETTER JA
-<U00010A19>     /xf0/x90/xa8/x99 KHAROSHTHI LETTER NYA
-<U00010A1A>     /xf0/x90/xa8/x9a KHAROSHTHI LETTER TTA
-<U00010A1B>     /xf0/x90/xa8/x9b KHAROSHTHI LETTER TTHA
-<U00010A1C>     /xf0/x90/xa8/x9c KHAROSHTHI LETTER DDA
-<U00010A1D>     /xf0/x90/xa8/x9d KHAROSHTHI LETTER DDHA
-<U00010A1E>     /xf0/x90/xa8/x9e KHAROSHTHI LETTER NNA
-<U00010A1F>     /xf0/x90/xa8/x9f KHAROSHTHI LETTER TA
-<U00010A20>     /xf0/x90/xa8/xa0 KHAROSHTHI LETTER THA
-<U00010A21>     /xf0/x90/xa8/xa1 KHAROSHTHI LETTER DA
-<U00010A22>     /xf0/x90/xa8/xa2 KHAROSHTHI LETTER DHA
-<U00010A23>     /xf0/x90/xa8/xa3 KHAROSHTHI LETTER NA
-<U00010A24>     /xf0/x90/xa8/xa4 KHAROSHTHI LETTER PA
-<U00010A25>     /xf0/x90/xa8/xa5 KHAROSHTHI LETTER PHA
-<U00010A26>     /xf0/x90/xa8/xa6 KHAROSHTHI LETTER BA
-<U00010A27>     /xf0/x90/xa8/xa7 KHAROSHTHI LETTER BHA
-<U00010A28>     /xf0/x90/xa8/xa8 KHAROSHTHI LETTER MA
-<U00010A29>     /xf0/x90/xa8/xa9 KHAROSHTHI LETTER YA
-<U00010A2A>     /xf0/x90/xa8/xaa KHAROSHTHI LETTER RA
-<U00010A2B>     /xf0/x90/xa8/xab KHAROSHTHI LETTER LA
-<U00010A2C>     /xf0/x90/xa8/xac KHAROSHTHI LETTER VA
-<U00010A2D>     /xf0/x90/xa8/xad KHAROSHTHI LETTER SHA
-<U00010A2E>     /xf0/x90/xa8/xae KHAROSHTHI LETTER SSA
-<U00010A2F>     /xf0/x90/xa8/xaf KHAROSHTHI LETTER SA
-<U00010A30>     /xf0/x90/xa8/xb0 KHAROSHTHI LETTER ZA
-<U00010A31>     /xf0/x90/xa8/xb1 KHAROSHTHI LETTER HA
-<U00010A32>     /xf0/x90/xa8/xb2 KHAROSHTHI LETTER KKA
-<U00010A33>     /xf0/x90/xa8/xb3 KHAROSHTHI LETTER TTTHA
-<U00010A38>     /xf0/x90/xa8/xb8 KHAROSHTHI SIGN BAR ABOVE
-<U00010A39>     /xf0/x90/xa8/xb9 KHAROSHTHI SIGN CAUDA
-<U00010A3A>     /xf0/x90/xa8/xba KHAROSHTHI SIGN DOT BELOW
-<U00010A3F>     /xf0/x90/xa8/xbf KHAROSHTHI VIRAMA
-<U00010A40>     /xf0/x90/xa9/x80 KHAROSHTHI DIGIT ONE
-<U00010A41>     /xf0/x90/xa9/x81 KHAROSHTHI DIGIT TWO
-<U00010A42>     /xf0/x90/xa9/x82 KHAROSHTHI DIGIT THREE
-<U00010A43>     /xf0/x90/xa9/x83 KHAROSHTHI DIGIT FOUR
-<U00010A44>     /xf0/x90/xa9/x84 KHAROSHTHI NUMBER TEN
-<U00010A45>     /xf0/x90/xa9/x85 KHAROSHTHI NUMBER TWENTY
-<U00010A46>     /xf0/x90/xa9/x86 KHAROSHTHI NUMBER ONE HUNDRED
-<U00010A47>     /xf0/x90/xa9/x87 KHAROSHTHI NUMBER ONE THOUSAND
-<U00010A50>     /xf0/x90/xa9/x90 KHAROSHTHI PUNCTUATION DOT
-<U00010A51>     /xf0/x90/xa9/x91 KHAROSHTHI PUNCTUATION SMALL CIRCLE
-<U00010A52>     /xf0/x90/xa9/x92 KHAROSHTHI PUNCTUATION CIRCLE
-<U00010A53>     /xf0/x90/xa9/x93 KHAROSHTHI PUNCTUATION CRESCENT BAR
-<U00010A54>     /xf0/x90/xa9/x94 KHAROSHTHI PUNCTUATION MANGALAM
-<U00010A55>     /xf0/x90/xa9/x95 KHAROSHTHI PUNCTUATION LOTUS
-<U00010A56>     /xf0/x90/xa9/x96 KHAROSHTHI PUNCTUATION DANDA
-<U00010A57>     /xf0/x90/xa9/x97 KHAROSHTHI PUNCTUATION DOUBLE DANDA
-<U00010A58>     /xf0/x90/xa9/x98 KHAROSHTHI PUNCTUATION LINES
-<U00012000>     /xf0/x92/x80/x80 CUNEIFORM SIGN A
-<U00012001>     /xf0/x92/x80/x81 CUNEIFORM SIGN A TIMES A
-<U00012002>     /xf0/x92/x80/x82 CUNEIFORM SIGN A TIMES BAD
-<U00012003>     /xf0/x92/x80/x83 CUNEIFORM SIGN A TIMES GAN2 TENU
-<U00012004>     /xf0/x92/x80/x84 CUNEIFORM SIGN A TIMES HA
-<U00012005>     /xf0/x92/x80/x85 CUNEIFORM SIGN A TIMES IGI
-<U00012006>     /xf0/x92/x80/x86 CUNEIFORM SIGN A TIMES LAGAR GUNU
-<U00012007>     /xf0/x92/x80/x87 CUNEIFORM SIGN A TIMES MUSH
-<U00012008>     /xf0/x92/x80/x88 CUNEIFORM SIGN A TIMES SAG
-<U00012009>     /xf0/x92/x80/x89 CUNEIFORM SIGN A2
-<U0001200A>     /xf0/x92/x80/x8a CUNEIFORM SIGN AB
-<U0001200B>     /xf0/x92/x80/x8b CUNEIFORM SIGN AB TIMES ASH2
-<U0001200C>     /xf0/x92/x80/x8c CUNEIFORM SIGN AB TIMES DUN3 GUNU
-<U0001200D>     /xf0/x92/x80/x8d CUNEIFORM SIGN AB TIMES GAL
-<U0001200E>     /xf0/x92/x80/x8e CUNEIFORM SIGN AB TIMES GAN2 TENU
-<U0001200F>     /xf0/x92/x80/x8f CUNEIFORM SIGN AB TIMES HA
-<U00012010>     /xf0/x92/x80/x90 CUNEIFORM SIGN AB TIMES IGI GUNU
-<U00012011>     /xf0/x92/x80/x91 CUNEIFORM SIGN AB TIMES IMIN
-<U00012012>     /xf0/x92/x80/x92 CUNEIFORM SIGN AB TIMES LAGAB
-<U00012013>     /xf0/x92/x80/x93 CUNEIFORM SIGN AB TIMES SHESH
-<U00012014>     /xf0/x92/x80/x94 CUNEIFORM SIGN AB TIMES U PLUS U PLUS U
-<U00012015>     /xf0/x92/x80/x95 CUNEIFORM SIGN AB GUNU
-<U00012016>     /xf0/x92/x80/x96 CUNEIFORM SIGN AB2
-<U00012017>     /xf0/x92/x80/x97 CUNEIFORM SIGN AB2 TIMES BALAG
-<U00012018>     /xf0/x92/x80/x98 CUNEIFORM SIGN AB2 TIMES GAN2 TENU
-<U00012019>     /xf0/x92/x80/x99 CUNEIFORM SIGN AB2 TIMES ME PLUS EN
-<U0001201A>     /xf0/x92/x80/x9a CUNEIFORM SIGN AB2 TIMES SHA3
-<U0001201B>     /xf0/x92/x80/x9b CUNEIFORM SIGN AB2 TIMES TAK4
-<U0001201C>     /xf0/x92/x80/x9c CUNEIFORM SIGN AD
-<U0001201D>     /xf0/x92/x80/x9d CUNEIFORM SIGN AK
-<U0001201E>     /xf0/x92/x80/x9e CUNEIFORM SIGN AK TIMES ERIN2
-<U0001201F>     /xf0/x92/x80/x9f CUNEIFORM SIGN AK TIMES SHITA PLUS GISH
-<U00012020>     /xf0/x92/x80/xa0 CUNEIFORM SIGN AL
-<U00012021>     /xf0/x92/x80/xa1 CUNEIFORM SIGN AL TIMES AL
-<U00012022>     /xf0/x92/x80/xa2 CUNEIFORM SIGN AL TIMES DIM2
-<U00012023>     /xf0/x92/x80/xa3 CUNEIFORM SIGN AL TIMES GISH
-<U00012024>     /xf0/x92/x80/xa4 CUNEIFORM SIGN AL TIMES HA
-<U00012025>     /xf0/x92/x80/xa5 CUNEIFORM SIGN AL TIMES KAD3
-<U00012026>     /xf0/x92/x80/xa6 CUNEIFORM SIGN AL TIMES KI
-<U00012027>     /xf0/x92/x80/xa7 CUNEIFORM SIGN AL TIMES SHE
-<U00012028>     /xf0/x92/x80/xa8 CUNEIFORM SIGN AL TIMES USH
-<U00012029>     /xf0/x92/x80/xa9 CUNEIFORM SIGN ALAN
-<U0001202A>     /xf0/x92/x80/xaa CUNEIFORM SIGN ALEPH
-<U0001202B>     /xf0/x92/x80/xab CUNEIFORM SIGN AMAR
-<U0001202C>     /xf0/x92/x80/xac CUNEIFORM SIGN AMAR TIMES SHE
-<U0001202D>     /xf0/x92/x80/xad CUNEIFORM SIGN AN
-<U0001202E>     /xf0/x92/x80/xae CUNEIFORM SIGN AN OVER AN
-<U0001202F>     /xf0/x92/x80/xaf CUNEIFORM SIGN AN THREE TIMES
-<U00012030>     /xf0/x92/x80/xb0 CUNEIFORM SIGN AN PLUS NAGA OPPOSING AN PLUS NAGA
-<U00012031>     /xf0/x92/x80/xb1 CUNEIFORM SIGN AN PLUS NAGA SQUARED
-<U00012032>     /xf0/x92/x80/xb2 CUNEIFORM SIGN ANSHE
-<U00012033>     /xf0/x92/x80/xb3 CUNEIFORM SIGN APIN
-<U00012034>     /xf0/x92/x80/xb4 CUNEIFORM SIGN ARAD
-<U00012035>     /xf0/x92/x80/xb5 CUNEIFORM SIGN ARAD TIMES KUR
-<U00012036>     /xf0/x92/x80/xb6 CUNEIFORM SIGN ARKAB
-<U00012037>     /xf0/x92/x80/xb7 CUNEIFORM SIGN ASAL2
-<U00012038>     /xf0/x92/x80/xb8 CUNEIFORM SIGN ASH
-<U00012039>     /xf0/x92/x80/xb9 CUNEIFORM SIGN ASH ZIDA TENU
-<U0001203A>     /xf0/x92/x80/xba CUNEIFORM SIGN ASH KABA TENU
-<U0001203B>     /xf0/x92/x80/xbb CUNEIFORM SIGN ASH OVER ASH TUG2 OVER TUG2 TUG2 OVER TUG2 PAP
-<U0001203C>     /xf0/x92/x80/xbc CUNEIFORM SIGN ASH OVER ASH OVER ASH
-<U0001203D>     /xf0/x92/x80/xbd CUNEIFORM SIGN ASH OVER ASH OVER ASH CROSSING ASH OVER ASH OVER ASH
-<U0001203E>     /xf0/x92/x80/xbe CUNEIFORM SIGN ASH2
-<U0001203F>     /xf0/x92/x80/xbf CUNEIFORM SIGN ASHGAB
-<U00012040>     /xf0/x92/x81/x80 CUNEIFORM SIGN BA
-<U00012041>     /xf0/x92/x81/x81 CUNEIFORM SIGN BAD
-<U00012042>     /xf0/x92/x81/x82 CUNEIFORM SIGN BAG3
-<U00012043>     /xf0/x92/x81/x83 CUNEIFORM SIGN BAHAR2
-<U00012044>     /xf0/x92/x81/x84 CUNEIFORM SIGN BAL
-<U00012045>     /xf0/x92/x81/x85 CUNEIFORM SIGN BAL OVER BAL
-<U00012046>     /xf0/x92/x81/x86 CUNEIFORM SIGN BALAG
-<U00012047>     /xf0/x92/x81/x87 CUNEIFORM SIGN BAR
-<U00012048>     /xf0/x92/x81/x88 CUNEIFORM SIGN BARA2
-<U00012049>     /xf0/x92/x81/x89 CUNEIFORM SIGN BI
-<U0001204A>     /xf0/x92/x81/x8a CUNEIFORM SIGN BI TIMES A
-<U0001204B>     /xf0/x92/x81/x8b CUNEIFORM SIGN BI TIMES GAR
-<U0001204C>     /xf0/x92/x81/x8c CUNEIFORM SIGN BI TIMES IGI GUNU
-<U0001204D>     /xf0/x92/x81/x8d CUNEIFORM SIGN BU
-<U0001204E>     /xf0/x92/x81/x8e CUNEIFORM SIGN BU OVER BU AB
-<U0001204F>     /xf0/x92/x81/x8f CUNEIFORM SIGN BU OVER BU UN
-<U00012050>     /xf0/x92/x81/x90 CUNEIFORM SIGN BU CROSSING BU
-<U00012051>     /xf0/x92/x81/x91 CUNEIFORM SIGN BULUG
-<U00012052>     /xf0/x92/x81/x92 CUNEIFORM SIGN BULUG OVER BULUG
-<U00012053>     /xf0/x92/x81/x93 CUNEIFORM SIGN BUR
-<U00012054>     /xf0/x92/x81/x94 CUNEIFORM SIGN BUR2
-<U00012055>     /xf0/x92/x81/x95 CUNEIFORM SIGN DA
-<U00012056>     /xf0/x92/x81/x96 CUNEIFORM SIGN DAG
-<U00012057>     /xf0/x92/x81/x97 CUNEIFORM SIGN DAG KISIM5 TIMES A PLUS MASH
-<U00012058>     /xf0/x92/x81/x98 CUNEIFORM SIGN DAG KISIM5 TIMES AMAR
-<U00012059>     /xf0/x92/x81/x99 CUNEIFORM SIGN DAG KISIM5 TIMES BALAG
-<U0001205A>     /xf0/x92/x81/x9a CUNEIFORM SIGN DAG KISIM5 TIMES BI
-<U0001205B>     /xf0/x92/x81/x9b CUNEIFORM SIGN DAG KISIM5 TIMES GA
-<U0001205C>     /xf0/x92/x81/x9c CUNEIFORM SIGN DAG KISIM5 TIMES GA PLUS MASH
-<U0001205D>     /xf0/x92/x81/x9d CUNEIFORM SIGN DAG KISIM5 TIMES GI
-<U0001205E>     /xf0/x92/x81/x9e CUNEIFORM SIGN DAG KISIM5 TIMES GIR2
-<U0001205F>     /xf0/x92/x81/x9f CUNEIFORM SIGN DAG KISIM5 TIMES GUD
-<U00012060>     /xf0/x92/x81/xa0 CUNEIFORM SIGN DAG KISIM5 TIMES HA
-<U00012061>     /xf0/x92/x81/xa1 CUNEIFORM SIGN DAG KISIM5 TIMES IR
-<U00012062>     /xf0/x92/x81/xa2 CUNEIFORM SIGN DAG KISIM5 TIMES IR PLUS LU
-<U00012063>     /xf0/x92/x81/xa3 CUNEIFORM SIGN DAG KISIM5 TIMES KAK
-<U00012064>     /xf0/x92/x81/xa4 CUNEIFORM SIGN DAG KISIM5 TIMES LA
-<U00012065>     /xf0/x92/x81/xa5 CUNEIFORM SIGN DAG KISIM5 TIMES LU
-<U00012066>     /xf0/x92/x81/xa6 CUNEIFORM SIGN DAG KISIM5 TIMES LU PLUS MASH2
-<U00012067>     /xf0/x92/x81/xa7 CUNEIFORM SIGN DAG KISIM5 TIMES LUM
-<U00012068>     /xf0/x92/x81/xa8 CUNEIFORM SIGN DAG KISIM5 TIMES NE
-<U00012069>     /xf0/x92/x81/xa9 CUNEIFORM SIGN DAG KISIM5 TIMES PAP PLUS PAP
-<U0001206A>     /xf0/x92/x81/xaa CUNEIFORM SIGN DAG KISIM5 TIMES SI
-<U0001206B>     /xf0/x92/x81/xab CUNEIFORM SIGN DAG KISIM5 TIMES TAK4
-<U0001206C>     /xf0/x92/x81/xac CUNEIFORM SIGN DAG KISIM5 TIMES U2 PLUS GIR2
-<U0001206D>     /xf0/x92/x81/xad CUNEIFORM SIGN DAG KISIM5 TIMES USH
-<U0001206E>     /xf0/x92/x81/xae CUNEIFORM SIGN DAM
-<U0001206F>     /xf0/x92/x81/xaf CUNEIFORM SIGN DAR
-<U00012070>     /xf0/x92/x81/xb0 CUNEIFORM SIGN DARA3
-<U00012071>     /xf0/x92/x81/xb1 CUNEIFORM SIGN DARA4
-<U00012072>     /xf0/x92/x81/xb2 CUNEIFORM SIGN DI
-<U00012073>     /xf0/x92/x81/xb3 CUNEIFORM SIGN DIB
-<U00012074>     /xf0/x92/x81/xb4 CUNEIFORM SIGN DIM
-<U00012075>     /xf0/x92/x81/xb5 CUNEIFORM SIGN DIM TIMES SHE
-<U00012076>     /xf0/x92/x81/xb6 CUNEIFORM SIGN DIM2
-<U00012077>     /xf0/x92/x81/xb7 CUNEIFORM SIGN DIN
-<U00012078>     /xf0/x92/x81/xb8 CUNEIFORM SIGN DIN KASKAL U GUNU DISH
-<U00012079>     /xf0/x92/x81/xb9 CUNEIFORM SIGN DISH
-<U0001207A>     /xf0/x92/x81/xba CUNEIFORM SIGN DU
-<U0001207B>     /xf0/x92/x81/xbb CUNEIFORM SIGN DU OVER DU
-<U0001207C>     /xf0/x92/x81/xbc CUNEIFORM SIGN DU GUNU
-<U0001207D>     /xf0/x92/x81/xbd CUNEIFORM SIGN DU SHESHIG
-<U0001207E>     /xf0/x92/x81/xbe CUNEIFORM SIGN DUB
-<U0001207F>     /xf0/x92/x81/xbf CUNEIFORM SIGN DUB TIMES ESH2
-<U00012080>     /xf0/x92/x82/x80 CUNEIFORM SIGN DUB2
-<U00012081>     /xf0/x92/x82/x81 CUNEIFORM SIGN DUG
-<U00012082>     /xf0/x92/x82/x82 CUNEIFORM SIGN DUGUD
-<U00012083>     /xf0/x92/x82/x83 CUNEIFORM SIGN DUH
-<U00012084>     /xf0/x92/x82/x84 CUNEIFORM SIGN DUN
-<U00012085>     /xf0/x92/x82/x85 CUNEIFORM SIGN DUN3
-<U00012086>     /xf0/x92/x82/x86 CUNEIFORM SIGN DUN3 GUNU
-<U00012087>     /xf0/x92/x82/x87 CUNEIFORM SIGN DUN3 GUNU GUNU
-<U00012088>     /xf0/x92/x82/x88 CUNEIFORM SIGN DUN4
-<U00012089>     /xf0/x92/x82/x89 CUNEIFORM SIGN DUR2
-<U0001208A>     /xf0/x92/x82/x8a CUNEIFORM SIGN E
-<U0001208B>     /xf0/x92/x82/x8b CUNEIFORM SIGN E TIMES PAP
-<U0001208C>     /xf0/x92/x82/x8c CUNEIFORM SIGN E OVER E NUN OVER NUN
-<U0001208D>     /xf0/x92/x82/x8d CUNEIFORM SIGN E2
-<U0001208E>     /xf0/x92/x82/x8e CUNEIFORM SIGN E2 TIMES A PLUS HA PLUS DA
-<U0001208F>     /xf0/x92/x82/x8f CUNEIFORM SIGN E2 TIMES GAR
-<U00012090>     /xf0/x92/x82/x90 CUNEIFORM SIGN E2 TIMES MI
-<U00012091>     /xf0/x92/x82/x91 CUNEIFORM SIGN E2 TIMES SAL
-<U00012092>     /xf0/x92/x82/x92 CUNEIFORM SIGN E2 TIMES SHE
-<U00012093>     /xf0/x92/x82/x93 CUNEIFORM SIGN E2 TIMES U
-<U00012094>     /xf0/x92/x82/x94 CUNEIFORM SIGN EDIN
-<U00012095>     /xf0/x92/x82/x95 CUNEIFORM SIGN EGIR
-<U00012096>     /xf0/x92/x82/x96 CUNEIFORM SIGN EL
-<U00012097>     /xf0/x92/x82/x97 CUNEIFORM SIGN EN
-<U00012098>     /xf0/x92/x82/x98 CUNEIFORM SIGN EN TIMES GAN2
-<U00012099>     /xf0/x92/x82/x99 CUNEIFORM SIGN EN TIMES GAN2 TENU
-<U0001209A>     /xf0/x92/x82/x9a CUNEIFORM SIGN EN TIMES ME
-<U0001209B>     /xf0/x92/x82/x9b CUNEIFORM SIGN EN CROSSING EN
-<U0001209C>     /xf0/x92/x82/x9c CUNEIFORM SIGN EN OPPOSING EN
-<U0001209D>     /xf0/x92/x82/x9d CUNEIFORM SIGN EN SQUARED
-<U0001209E>     /xf0/x92/x82/x9e CUNEIFORM SIGN EREN
-<U0001209F>     /xf0/x92/x82/x9f CUNEIFORM SIGN ERIN2
-<U000120A0>     /xf0/x92/x82/xa0 CUNEIFORM SIGN ESH2
-<U000120A1>     /xf0/x92/x82/xa1 CUNEIFORM SIGN EZEN
-<U000120A2>     /xf0/x92/x82/xa2 CUNEIFORM SIGN EZEN TIMES A
-<U000120A3>     /xf0/x92/x82/xa3 CUNEIFORM SIGN EZEN TIMES A PLUS LAL
-<U000120A4>     /xf0/x92/x82/xa4 CUNEIFORM SIGN EZEN TIMES A PLUS LAL TIMES LAL
-<U000120A5>     /xf0/x92/x82/xa5 CUNEIFORM SIGN EZEN TIMES AN
-<U000120A6>     /xf0/x92/x82/xa6 CUNEIFORM SIGN EZEN TIMES BAD
-<U000120A7>     /xf0/x92/x82/xa7 CUNEIFORM SIGN EZEN TIMES DUN3 GUNU
-<U000120A8>     /xf0/x92/x82/xa8 CUNEIFORM SIGN EZEN TIMES DUN3 GUNU GUNU
-<U000120A9>     /xf0/x92/x82/xa9 CUNEIFORM SIGN EZEN TIMES HA
-<U000120AA>     /xf0/x92/x82/xaa CUNEIFORM SIGN EZEN TIMES HA GUNU
-<U000120AB>     /xf0/x92/x82/xab CUNEIFORM SIGN EZEN TIMES IGI GUNU
-<U000120AC>     /xf0/x92/x82/xac CUNEIFORM SIGN EZEN TIMES KASKAL
-<U000120AD>     /xf0/x92/x82/xad CUNEIFORM SIGN EZEN TIMES KASKAL SQUARED
-<U000120AE>     /xf0/x92/x82/xae CUNEIFORM SIGN EZEN TIMES KU3
-<U000120AF>     /xf0/x92/x82/xaf CUNEIFORM SIGN EZEN TIMES LA
-<U000120B0>     /xf0/x92/x82/xb0 CUNEIFORM SIGN EZEN TIMES LAL TIMES LAL
-<U000120B1>     /xf0/x92/x82/xb1 CUNEIFORM SIGN EZEN TIMES LI
-<U000120B2>     /xf0/x92/x82/xb2 CUNEIFORM SIGN EZEN TIMES LU
-<U000120B3>     /xf0/x92/x82/xb3 CUNEIFORM SIGN EZEN TIMES U2
-<U000120B4>     /xf0/x92/x82/xb4 CUNEIFORM SIGN EZEN TIMES UD
-<U000120B5>     /xf0/x92/x82/xb5 CUNEIFORM SIGN GA
-<U000120B6>     /xf0/x92/x82/xb6 CUNEIFORM SIGN GA GUNU
-<U000120B7>     /xf0/x92/x82/xb7 CUNEIFORM SIGN GA2
-<U000120B8>     /xf0/x92/x82/xb8 CUNEIFORM SIGN GA2 TIMES A PLUS DA PLUS HA
-<U000120B9>     /xf0/x92/x82/xb9 CUNEIFORM SIGN GA2 TIMES A PLUS HA
-<U000120BA>     /xf0/x92/x82/xba CUNEIFORM SIGN GA2 TIMES A PLUS IGI
-<U000120BB>     /xf0/x92/x82/xbb CUNEIFORM SIGN GA2 TIMES AB2 TENU PLUS TAB
-<U000120BC>     /xf0/x92/x82/xbc CUNEIFORM SIGN GA2 TIMES AN
-<U000120BD>     /xf0/x92/x82/xbd CUNEIFORM SIGN GA2 TIMES ASH
-<U000120BE>     /xf0/x92/x82/xbe CUNEIFORM SIGN GA2 TIMES ASH2 PLUS GAL
-<U000120BF>     /xf0/x92/x82/xbf CUNEIFORM SIGN GA2 TIMES BAD
-<U000120C0>     /xf0/x92/x83/x80 CUNEIFORM SIGN GA2 TIMES BAR PLUS RA
-<U000120C1>     /xf0/x92/x83/x81 CUNEIFORM SIGN GA2 TIMES BUR
-<U000120C2>     /xf0/x92/x83/x82 CUNEIFORM SIGN GA2 TIMES BUR PLUS RA
-<U000120C3>     /xf0/x92/x83/x83 CUNEIFORM SIGN GA2 TIMES DA
-<U000120C4>     /xf0/x92/x83/x84 CUNEIFORM SIGN GA2 TIMES DI
-<U000120C5>     /xf0/x92/x83/x85 CUNEIFORM SIGN GA2 TIMES DIM TIMES SHE
-<U000120C6>     /xf0/x92/x83/x86 CUNEIFORM SIGN GA2 TIMES DUB
-<U000120C7>     /xf0/x92/x83/x87 CUNEIFORM SIGN GA2 TIMES EL
-<U000120C8>     /xf0/x92/x83/x88 CUNEIFORM SIGN GA2 TIMES EL PLUS LA
-<U000120C9>     /xf0/x92/x83/x89 CUNEIFORM SIGN GA2 TIMES EN
-<U000120CA>     /xf0/x92/x83/x8a CUNEIFORM SIGN GA2 TIMES EN TIMES GAN2 TENU
-<U000120CB>     /xf0/x92/x83/x8b CUNEIFORM SIGN GA2 TIMES GAN2 TENU
-<U000120CC>     /xf0/x92/x83/x8c CUNEIFORM SIGN GA2 TIMES GAR
-<U000120CD>     /xf0/x92/x83/x8d CUNEIFORM SIGN GA2 TIMES GI
-<U000120CE>     /xf0/x92/x83/x8e CUNEIFORM SIGN GA2 TIMES GI4
-<U000120CF>     /xf0/x92/x83/x8f CUNEIFORM SIGN GA2 TIMES GI4 PLUS A
-<U000120D0>     /xf0/x92/x83/x90 CUNEIFORM SIGN GA2 TIMES GIR2 PLUS SU
-<U000120D1>     /xf0/x92/x83/x91 CUNEIFORM SIGN GA2 TIMES HA PLUS LU PLUS ESH2
-<U000120D2>     /xf0/x92/x83/x92 CUNEIFORM SIGN GA2 TIMES HAL
-<U000120D3>     /xf0/x92/x83/x93 CUNEIFORM SIGN GA2 TIMES HAL PLUS LA
-<U000120D4>     /xf0/x92/x83/x94 CUNEIFORM SIGN GA2 TIMES HI PLUS LI
-<U000120D5>     /xf0/x92/x83/x95 CUNEIFORM SIGN GA2 TIMES HUB2
-<U000120D6>     /xf0/x92/x83/x96 CUNEIFORM SIGN GA2 TIMES IGI GUNU
-<U000120D7>     /xf0/x92/x83/x97 CUNEIFORM SIGN GA2 TIMES ISH PLUS HU PLUS ASH
-<U000120D8>     /xf0/x92/x83/x98 CUNEIFORM SIGN GA2 TIMES KAK
-<U000120D9>     /xf0/x92/x83/x99 CUNEIFORM SIGN GA2 TIMES KASKAL
-<U000120DA>     /xf0/x92/x83/x9a CUNEIFORM SIGN GA2 TIMES KID
-<U000120DB>     /xf0/x92/x83/x9b CUNEIFORM SIGN GA2 TIMES KID PLUS LAL
-<U000120DC>     /xf0/x92/x83/x9c CUNEIFORM SIGN GA2 TIMES KU3 PLUS AN
-<U000120DD>     /xf0/x92/x83/x9d CUNEIFORM SIGN GA2 TIMES LA
-<U000120DE>     /xf0/x92/x83/x9e CUNEIFORM SIGN GA2 TIMES ME PLUS EN
-<U000120DF>     /xf0/x92/x83/x9f CUNEIFORM SIGN GA2 TIMES MI
-<U000120E0>     /xf0/x92/x83/xa0 CUNEIFORM SIGN GA2 TIMES NUN
-<U000120E1>     /xf0/x92/x83/xa1 CUNEIFORM SIGN GA2 TIMES NUN OVER NUN
-<U000120E2>     /xf0/x92/x83/xa2 CUNEIFORM SIGN GA2 TIMES PA
-<U000120E3>     /xf0/x92/x83/xa3 CUNEIFORM SIGN GA2 TIMES SAL
-<U000120E4>     /xf0/x92/x83/xa4 CUNEIFORM SIGN GA2 TIMES SAR
-<U000120E5>     /xf0/x92/x83/xa5 CUNEIFORM SIGN GA2 TIMES SHE
-<U000120E6>     /xf0/x92/x83/xa6 CUNEIFORM SIGN GA2 TIMES SHE PLUS TUR
-<U000120E7>     /xf0/x92/x83/xa7 CUNEIFORM SIGN GA2 TIMES SHID
-<U000120E8>     /xf0/x92/x83/xa8 CUNEIFORM SIGN GA2 TIMES SUM
-<U000120E9>     /xf0/x92/x83/xa9 CUNEIFORM SIGN GA2 TIMES TAK4
-<U000120EA>     /xf0/x92/x83/xaa CUNEIFORM SIGN GA2 TIMES U
-<U000120EB>     /xf0/x92/x83/xab CUNEIFORM SIGN GA2 TIMES UD
-<U000120EC>     /xf0/x92/x83/xac CUNEIFORM SIGN GA2 TIMES UD PLUS DU
-<U000120ED>     /xf0/x92/x83/xad CUNEIFORM SIGN GA2 OVER GA2
-<U000120EE>     /xf0/x92/x83/xae CUNEIFORM SIGN GABA
-<U000120EF>     /xf0/x92/x83/xaf CUNEIFORM SIGN GABA CROSSING GABA
-<U000120F0>     /xf0/x92/x83/xb0 CUNEIFORM SIGN GAD
-<U000120F1>     /xf0/x92/x83/xb1 CUNEIFORM SIGN GAD OVER GAD GAR OVER GAR
-<U000120F2>     /xf0/x92/x83/xb2 CUNEIFORM SIGN GAL
-<U000120F3>     /xf0/x92/x83/xb3 CUNEIFORM SIGN GAL GAD OVER GAD GAR OVER GAR
-<U000120F4>     /xf0/x92/x83/xb4 CUNEIFORM SIGN GALAM
-<U000120F5>     /xf0/x92/x83/xb5 CUNEIFORM SIGN GAM
-<U000120F6>     /xf0/x92/x83/xb6 CUNEIFORM SIGN GAN
-<U000120F7>     /xf0/x92/x83/xb7 CUNEIFORM SIGN GAN2
-<U000120F8>     /xf0/x92/x83/xb8 CUNEIFORM SIGN GAN2 TENU
-<U000120F9>     /xf0/x92/x83/xb9 CUNEIFORM SIGN GAN2 OVER GAN2
-<U000120FA>     /xf0/x92/x83/xba CUNEIFORM SIGN GAN2 CROSSING GAN2
-<U000120FB>     /xf0/x92/x83/xbb CUNEIFORM SIGN GAR
-<U000120FC>     /xf0/x92/x83/xbc CUNEIFORM SIGN GAR3
-<U000120FD>     /xf0/x92/x83/xbd CUNEIFORM SIGN GASHAN
-<U000120FE>     /xf0/x92/x83/xbe CUNEIFORM SIGN GESHTIN
-<U000120FF>     /xf0/x92/x83/xbf CUNEIFORM SIGN GESHTIN TIMES KUR
-<U00012100>     /xf0/x92/x84/x80 CUNEIFORM SIGN GI
-<U00012101>     /xf0/x92/x84/x81 CUNEIFORM SIGN GI TIMES E
-<U00012102>     /xf0/x92/x84/x82 CUNEIFORM SIGN GI TIMES U
-<U00012103>     /xf0/x92/x84/x83 CUNEIFORM SIGN GI CROSSING GI
-<U00012104>     /xf0/x92/x84/x84 CUNEIFORM SIGN GI4
-<U00012105>     /xf0/x92/x84/x85 CUNEIFORM SIGN GI4 OVER GI4
-<U00012106>     /xf0/x92/x84/x86 CUNEIFORM SIGN GI4 CROSSING GI4
-<U00012107>     /xf0/x92/x84/x87 CUNEIFORM SIGN GIDIM
-<U00012108>     /xf0/x92/x84/x88 CUNEIFORM SIGN GIR2
-<U00012109>     /xf0/x92/x84/x89 CUNEIFORM SIGN GIR2 GUNU
-<U0001210A>     /xf0/x92/x84/x8a CUNEIFORM SIGN GIR3
-<U0001210B>     /xf0/x92/x84/x8b CUNEIFORM SIGN GIR3 TIMES A PLUS IGI
-<U0001210C>     /xf0/x92/x84/x8c CUNEIFORM SIGN GIR3 TIMES GAN2 TENU
-<U0001210D>     /xf0/x92/x84/x8d CUNEIFORM SIGN GIR3 TIMES IGI
-<U0001210E>     /xf0/x92/x84/x8e CUNEIFORM SIGN GIR3 TIMES LU PLUS IGI
-<U0001210F>     /xf0/x92/x84/x8f CUNEIFORM SIGN GIR3 TIMES PA
-<U00012110>     /xf0/x92/x84/x90 CUNEIFORM SIGN GISAL
-<U00012111>     /xf0/x92/x84/x91 CUNEIFORM SIGN GISH
-<U00012112>     /xf0/x92/x84/x92 CUNEIFORM SIGN GISH CROSSING GISH
-<U00012113>     /xf0/x92/x84/x93 CUNEIFORM SIGN GISH TIMES BAD
-<U00012114>     /xf0/x92/x84/x94 CUNEIFORM SIGN GISH TIMES TAK4
-<U00012115>     /xf0/x92/x84/x95 CUNEIFORM SIGN GISH TENU
-<U00012116>     /xf0/x92/x84/x96 CUNEIFORM SIGN GU
-<U00012117>     /xf0/x92/x84/x97 CUNEIFORM SIGN GU CROSSING GU
-<U00012118>     /xf0/x92/x84/x98 CUNEIFORM SIGN GU2
-<U00012119>     /xf0/x92/x84/x99 CUNEIFORM SIGN GU2 TIMES KAK
-<U0001211A>     /xf0/x92/x84/x9a CUNEIFORM SIGN GU2 TIMES KAK TIMES IGI GUNU
-<U0001211B>     /xf0/x92/x84/x9b CUNEIFORM SIGN GU2 TIMES NUN
-<U0001211C>     /xf0/x92/x84/x9c CUNEIFORM SIGN GU2 TIMES SAL PLUS TUG2
-<U0001211D>     /xf0/x92/x84/x9d CUNEIFORM SIGN GU2 GUNU
-<U0001211E>     /xf0/x92/x84/x9e CUNEIFORM SIGN GUD
-<U0001211F>     /xf0/x92/x84/x9f CUNEIFORM SIGN GUD TIMES A PLUS KUR
-<U00012120>     /xf0/x92/x84/xa0 CUNEIFORM SIGN GUD TIMES KUR
-<U00012121>     /xf0/x92/x84/xa1 CUNEIFORM SIGN GUD OVER GUD LUGAL
-<U00012122>     /xf0/x92/x84/xa2 CUNEIFORM SIGN GUL
-<U00012123>     /xf0/x92/x84/xa3 CUNEIFORM SIGN GUM
-<U00012124>     /xf0/x92/x84/xa4 CUNEIFORM SIGN GUM TIMES SHE
-<U00012125>     /xf0/x92/x84/xa5 CUNEIFORM SIGN GUR
-<U00012126>     /xf0/x92/x84/xa6 CUNEIFORM SIGN GUR7
-<U00012127>     /xf0/x92/x84/xa7 CUNEIFORM SIGN GURUN
-<U00012128>     /xf0/x92/x84/xa8 CUNEIFORM SIGN GURUSH
-<U00012129>     /xf0/x92/x84/xa9 CUNEIFORM SIGN HA
-<U0001212A>     /xf0/x92/x84/xaa CUNEIFORM SIGN HA TENU
-<U0001212B>     /xf0/x92/x84/xab CUNEIFORM SIGN HA GUNU
-<U0001212C>     /xf0/x92/x84/xac CUNEIFORM SIGN HAL
-<U0001212D>     /xf0/x92/x84/xad CUNEIFORM SIGN HI
-<U0001212E>     /xf0/x92/x84/xae CUNEIFORM SIGN HI TIMES ASH
-<U0001212F>     /xf0/x92/x84/xaf CUNEIFORM SIGN HI TIMES ASH2
-<U00012130>     /xf0/x92/x84/xb0 CUNEIFORM SIGN HI TIMES BAD
-<U00012131>     /xf0/x92/x84/xb1 CUNEIFORM SIGN HI TIMES DISH
-<U00012132>     /xf0/x92/x84/xb2 CUNEIFORM SIGN HI TIMES GAD
-<U00012133>     /xf0/x92/x84/xb3 CUNEIFORM SIGN HI TIMES KIN
-<U00012134>     /xf0/x92/x84/xb4 CUNEIFORM SIGN HI TIMES NUN
-<U00012135>     /xf0/x92/x84/xb5 CUNEIFORM SIGN HI TIMES SHE
-<U00012136>     /xf0/x92/x84/xb6 CUNEIFORM SIGN HI TIMES U
-<U00012137>     /xf0/x92/x84/xb7 CUNEIFORM SIGN HU
-<U00012138>     /xf0/x92/x84/xb8 CUNEIFORM SIGN HUB2
-<U00012139>     /xf0/x92/x84/xb9 CUNEIFORM SIGN HUB2 TIMES AN
-<U0001213A>     /xf0/x92/x84/xba CUNEIFORM SIGN HUB2 TIMES HAL
-<U0001213B>     /xf0/x92/x84/xbb CUNEIFORM SIGN HUB2 TIMES KASKAL
-<U0001213C>     /xf0/x92/x84/xbc CUNEIFORM SIGN HUB2 TIMES LISH
-<U0001213D>     /xf0/x92/x84/xbd CUNEIFORM SIGN HUB2 TIMES UD
-<U0001213E>     /xf0/x92/x84/xbe CUNEIFORM SIGN HUL2
-<U0001213F>     /xf0/x92/x84/xbf CUNEIFORM SIGN I
-<U00012140>     /xf0/x92/x85/x80 CUNEIFORM SIGN I A
-<U00012141>     /xf0/x92/x85/x81 CUNEIFORM SIGN IB
-<U00012142>     /xf0/x92/x85/x82 CUNEIFORM SIGN IDIM
-<U00012143>     /xf0/x92/x85/x83 CUNEIFORM SIGN IDIM OVER IDIM BUR
-<U00012144>     /xf0/x92/x85/x84 CUNEIFORM SIGN IDIM OVER IDIM SQUARED
-<U00012145>     /xf0/x92/x85/x85 CUNEIFORM SIGN IG
-<U00012146>     /xf0/x92/x85/x86 CUNEIFORM SIGN IGI
-<U00012147>     /xf0/x92/x85/x87 CUNEIFORM SIGN IGI DIB
-<U00012148>     /xf0/x92/x85/x88 CUNEIFORM SIGN IGI RI
-<U00012149>     /xf0/x92/x85/x89 CUNEIFORM SIGN IGI OVER IGI SHIR OVER SHIR UD OVER UD
-<U0001214A>     /xf0/x92/x85/x8a CUNEIFORM SIGN IGI GUNU
-<U0001214B>     /xf0/x92/x85/x8b CUNEIFORM SIGN IL
-<U0001214C>     /xf0/x92/x85/x8c CUNEIFORM SIGN IL TIMES GAN2 TENU
-<U0001214D>     /xf0/x92/x85/x8d CUNEIFORM SIGN IL2
-<U0001214E>     /xf0/x92/x85/x8e CUNEIFORM SIGN IM
-<U0001214F>     /xf0/x92/x85/x8f CUNEIFORM SIGN IM TIMES TAK4
-<U00012150>     /xf0/x92/x85/x90 CUNEIFORM SIGN IM CROSSING IM
-<U00012151>     /xf0/x92/x85/x91 CUNEIFORM SIGN IM OPPOSING IM
-<U00012152>     /xf0/x92/x85/x92 CUNEIFORM SIGN IM SQUARED
-<U00012153>     /xf0/x92/x85/x93 CUNEIFORM SIGN IMIN
-<U00012154>     /xf0/x92/x85/x94 CUNEIFORM SIGN IN
-<U00012155>     /xf0/x92/x85/x95 CUNEIFORM SIGN IR
-<U00012156>     /xf0/x92/x85/x96 CUNEIFORM SIGN ISH
-<U00012157>     /xf0/x92/x85/x97 CUNEIFORM SIGN KA
-<U00012158>     /xf0/x92/x85/x98 CUNEIFORM SIGN KA TIMES A
-<U00012159>     /xf0/x92/x85/x99 CUNEIFORM SIGN KA TIMES AD
-<U0001215A>     /xf0/x92/x85/x9a CUNEIFORM SIGN KA TIMES AD PLUS KU3
-<U0001215B>     /xf0/x92/x85/x9b CUNEIFORM SIGN KA TIMES ASH2
-<U0001215C>     /xf0/x92/x85/x9c CUNEIFORM SIGN KA TIMES BAD
-<U0001215D>     /xf0/x92/x85/x9d CUNEIFORM SIGN KA TIMES BALAG
-<U0001215E>     /xf0/x92/x85/x9e CUNEIFORM SIGN KA TIMES BAR
-<U0001215F>     /xf0/x92/x85/x9f CUNEIFORM SIGN KA TIMES BI
-<U00012160>     /xf0/x92/x85/xa0 CUNEIFORM SIGN KA TIMES ERIN2
-<U00012161>     /xf0/x92/x85/xa1 CUNEIFORM SIGN KA TIMES ESH2
-<U00012162>     /xf0/x92/x85/xa2 CUNEIFORM SIGN KA TIMES GA
-<U00012163>     /xf0/x92/x85/xa3 CUNEIFORM SIGN KA TIMES GAL
-<U00012164>     /xf0/x92/x85/xa4 CUNEIFORM SIGN KA TIMES GAN2 TENU
-<U00012165>     /xf0/x92/x85/xa5 CUNEIFORM SIGN KA TIMES GAR
-<U00012166>     /xf0/x92/x85/xa6 CUNEIFORM SIGN KA TIMES GAR PLUS SHA3 PLUS A
-<U00012167>     /xf0/x92/x85/xa7 CUNEIFORM SIGN KA TIMES GI
-<U00012168>     /xf0/x92/x85/xa8 CUNEIFORM SIGN KA TIMES GIR2
-<U00012169>     /xf0/x92/x85/xa9 CUNEIFORM SIGN KA TIMES GISH PLUS SAR
-<U0001216A>     /xf0/x92/x85/xaa CUNEIFORM SIGN KA TIMES GISH CROSSING GISH
-<U0001216B>     /xf0/x92/x85/xab CUNEIFORM SIGN KA TIMES GU
-<U0001216C>     /xf0/x92/x85/xac CUNEIFORM SIGN KA TIMES GUR7
-<U0001216D>     /xf0/x92/x85/xad CUNEIFORM SIGN KA TIMES IGI
-<U0001216E>     /xf0/x92/x85/xae CUNEIFORM SIGN KA TIMES IM
-<U0001216F>     /xf0/x92/x85/xaf CUNEIFORM SIGN KA TIMES KAK
-<U00012170>     /xf0/x92/x85/xb0 CUNEIFORM SIGN KA TIMES KI
-<U00012171>     /xf0/x92/x85/xb1 CUNEIFORM SIGN KA TIMES KID
-<U00012172>     /xf0/x92/x85/xb2 CUNEIFORM SIGN KA TIMES LI
-<U00012173>     /xf0/x92/x85/xb3 CUNEIFORM SIGN KA TIMES LU
-<U00012174>     /xf0/x92/x85/xb4 CUNEIFORM SIGN KA TIMES ME
-<U00012175>     /xf0/x92/x85/xb5 CUNEIFORM SIGN KA TIMES ME PLUS DU
-<U00012176>     /xf0/x92/x85/xb6 CUNEIFORM SIGN KA TIMES ME PLUS GI
-<U00012177>     /xf0/x92/x85/xb7 CUNEIFORM SIGN KA TIMES ME PLUS TE
-<U00012178>     /xf0/x92/x85/xb8 CUNEIFORM SIGN KA TIMES MI
-<U00012179>     /xf0/x92/x85/xb9 CUNEIFORM SIGN KA TIMES MI PLUS NUNUZ
-<U0001217A>     /xf0/x92/x85/xba CUNEIFORM SIGN KA TIMES NE
-<U0001217B>     /xf0/x92/x85/xbb CUNEIFORM SIGN KA TIMES NUN
-<U0001217C>     /xf0/x92/x85/xbc CUNEIFORM SIGN KA TIMES PI
-<U0001217D>     /xf0/x92/x85/xbd CUNEIFORM SIGN KA TIMES RU
-<U0001217E>     /xf0/x92/x85/xbe CUNEIFORM SIGN KA TIMES SA
-<U0001217F>     /xf0/x92/x85/xbf CUNEIFORM SIGN KA TIMES SAR
-<U00012180>     /xf0/x92/x86/x80 CUNEIFORM SIGN KA TIMES SHA
-<U00012181>     /xf0/x92/x86/x81 CUNEIFORM SIGN KA TIMES SHE
-<U00012182>     /xf0/x92/x86/x82 CUNEIFORM SIGN KA TIMES SHID
-<U00012183>     /xf0/x92/x86/x83 CUNEIFORM SIGN KA TIMES SHU
-<U00012184>     /xf0/x92/x86/x84 CUNEIFORM SIGN KA TIMES SIG
-<U00012185>     /xf0/x92/x86/x85 CUNEIFORM SIGN KA TIMES SUHUR
-<U00012186>     /xf0/x92/x86/x86 CUNEIFORM SIGN KA TIMES TAR
-<U00012187>     /xf0/x92/x86/x87 CUNEIFORM SIGN KA TIMES U
-<U00012188>     /xf0/x92/x86/x88 CUNEIFORM SIGN KA TIMES U2
-<U00012189>     /xf0/x92/x86/x89 CUNEIFORM SIGN KA TIMES UD
-<U0001218A>     /xf0/x92/x86/x8a CUNEIFORM SIGN KA TIMES UMUM TIMES PA
-<U0001218B>     /xf0/x92/x86/x8b CUNEIFORM SIGN KA TIMES USH
-<U0001218C>     /xf0/x92/x86/x8c CUNEIFORM SIGN KA TIMES ZI
-<U0001218D>     /xf0/x92/x86/x8d CUNEIFORM SIGN KA2
-<U0001218E>     /xf0/x92/x86/x8e CUNEIFORM SIGN KA2 CROSSING KA2
-<U0001218F>     /xf0/x92/x86/x8f CUNEIFORM SIGN KAB
-<U00012190>     /xf0/x92/x86/x90 CUNEIFORM SIGN KAD2
-<U00012191>     /xf0/x92/x86/x91 CUNEIFORM SIGN KAD3
-<U00012192>     /xf0/x92/x86/x92 CUNEIFORM SIGN KAD4
-<U00012193>     /xf0/x92/x86/x93 CUNEIFORM SIGN KAD5
-<U00012194>     /xf0/x92/x86/x94 CUNEIFORM SIGN KAD5 OVER KAD5
-<U00012195>     /xf0/x92/x86/x95 CUNEIFORM SIGN KAK
-<U00012196>     /xf0/x92/x86/x96 CUNEIFORM SIGN KAK TIMES IGI GUNU
-<U00012197>     /xf0/x92/x86/x97 CUNEIFORM SIGN KAL
-<U00012198>     /xf0/x92/x86/x98 CUNEIFORM SIGN KAL TIMES BAD
-<U00012199>     /xf0/x92/x86/x99 CUNEIFORM SIGN KAL CROSSING KAL
-<U0001219A>     /xf0/x92/x86/x9a CUNEIFORM SIGN KAM2
-<U0001219B>     /xf0/x92/x86/x9b CUNEIFORM SIGN KAM4
-<U0001219C>     /xf0/x92/x86/x9c CUNEIFORM SIGN KASKAL
-<U0001219D>     /xf0/x92/x86/x9d CUNEIFORM SIGN KASKAL LAGAB TIMES U OVER LAGAB TIMES U
-<U0001219E>     /xf0/x92/x86/x9e CUNEIFORM SIGN KASKAL OVER KASKAL LAGAB TIMES U OVER LAGAB TIMES U
-<U0001219F>     /xf0/x92/x86/x9f CUNEIFORM SIGN KESH2
-<U000121A0>     /xf0/x92/x86/xa0 CUNEIFORM SIGN KI
-<U000121A1>     /xf0/x92/x86/xa1 CUNEIFORM SIGN KI TIMES BAD
-<U000121A2>     /xf0/x92/x86/xa2 CUNEIFORM SIGN KI TIMES U
-<U000121A3>     /xf0/x92/x86/xa3 CUNEIFORM SIGN KI TIMES UD
-<U000121A4>     /xf0/x92/x86/xa4 CUNEIFORM SIGN KID
-<U000121A5>     /xf0/x92/x86/xa5 CUNEIFORM SIGN KIN
-<U000121A6>     /xf0/x92/x86/xa6 CUNEIFORM SIGN KISAL
-<U000121A7>     /xf0/x92/x86/xa7 CUNEIFORM SIGN KISH
-<U000121A8>     /xf0/x92/x86/xa8 CUNEIFORM SIGN KISIM5
-<U000121A9>     /xf0/x92/x86/xa9 CUNEIFORM SIGN KISIM5 OVER KISIM5
-<U000121AA>     /xf0/x92/x86/xaa CUNEIFORM SIGN KU
-<U000121AB>     /xf0/x92/x86/xab CUNEIFORM SIGN KU OVER HI TIMES ASH2 KU OVER HI TIMES ASH2
-<U000121AC>     /xf0/x92/x86/xac CUNEIFORM SIGN KU3
-<U000121AD>     /xf0/x92/x86/xad CUNEIFORM SIGN KU4
-<U000121AE>     /xf0/x92/x86/xae CUNEIFORM SIGN KU4 VARIANT FORM
-<U000121AF>     /xf0/x92/x86/xaf CUNEIFORM SIGN KU7
-<U000121B0>     /xf0/x92/x86/xb0 CUNEIFORM SIGN KUL
-<U000121B1>     /xf0/x92/x86/xb1 CUNEIFORM SIGN KUL GUNU
-<U000121B2>     /xf0/x92/x86/xb2 CUNEIFORM SIGN KUN
-<U000121B3>     /xf0/x92/x86/xb3 CUNEIFORM SIGN KUR
-<U000121B4>     /xf0/x92/x86/xb4 CUNEIFORM SIGN KUR OPPOSING KUR
-<U000121B5>     /xf0/x92/x86/xb5 CUNEIFORM SIGN KUSHU2
-<U000121B6>     /xf0/x92/x86/xb6 CUNEIFORM SIGN KWU318
-<U000121B7>     /xf0/x92/x86/xb7 CUNEIFORM SIGN LA
-<U000121B8>     /xf0/x92/x86/xb8 CUNEIFORM SIGN LAGAB
-<U000121B9>     /xf0/x92/x86/xb9 CUNEIFORM SIGN LAGAB TIMES A
-<U000121BA>     /xf0/x92/x86/xba CUNEIFORM SIGN LAGAB TIMES A PLUS DA PLUS HA
-<U000121BB>     /xf0/x92/x86/xbb CUNEIFORM SIGN LAGAB TIMES A PLUS GAR
-<U000121BC>     /xf0/x92/x86/xbc CUNEIFORM SIGN LAGAB TIMES A PLUS LAL
-<U000121BD>     /xf0/x92/x86/xbd CUNEIFORM SIGN LAGAB TIMES AL
-<U000121BE>     /xf0/x92/x86/xbe CUNEIFORM SIGN LAGAB TIMES AN
-<U000121BF>     /xf0/x92/x86/xbf CUNEIFORM SIGN LAGAB TIMES ASH ZIDA TENU
-<U000121C0>     /xf0/x92/x87/x80 CUNEIFORM SIGN LAGAB TIMES BAD
-<U000121C1>     /xf0/x92/x87/x81 CUNEIFORM SIGN LAGAB TIMES BI
-<U000121C2>     /xf0/x92/x87/x82 CUNEIFORM SIGN LAGAB TIMES DAR
-<U000121C3>     /xf0/x92/x87/x83 CUNEIFORM SIGN LAGAB TIMES EN
-<U000121C4>     /xf0/x92/x87/x84 CUNEIFORM SIGN LAGAB TIMES GA
-<U000121C5>     /xf0/x92/x87/x85 CUNEIFORM SIGN LAGAB TIMES GAR
-<U000121C6>     /xf0/x92/x87/x86 CUNEIFORM SIGN LAGAB TIMES GUD
-<U000121C7>     /xf0/x92/x87/x87 CUNEIFORM SIGN LAGAB TIMES GUD PLUS GUD
-<U000121C8>     /xf0/x92/x87/x88 CUNEIFORM SIGN LAGAB TIMES HA
-<U000121C9>     /xf0/x92/x87/x89 CUNEIFORM SIGN LAGAB TIMES HAL
-<U000121CA>     /xf0/x92/x87/x8a CUNEIFORM SIGN LAGAB TIMES HI TIMES NUN
-<U000121CB>     /xf0/x92/x87/x8b CUNEIFORM SIGN LAGAB TIMES IGI GUNU
-<U000121CC>     /xf0/x92/x87/x8c CUNEIFORM SIGN LAGAB TIMES IM
-<U000121CD>     /xf0/x92/x87/x8d CUNEIFORM SIGN LAGAB TIMES IM PLUS HA
-<U000121CE>     /xf0/x92/x87/x8e CUNEIFORM SIGN LAGAB TIMES IM PLUS LU
-<U000121CF>     /xf0/x92/x87/x8f CUNEIFORM SIGN LAGAB TIMES KI
-<U000121D0>     /xf0/x92/x87/x90 CUNEIFORM SIGN LAGAB TIMES KIN
-<U000121D1>     /xf0/x92/x87/x91 CUNEIFORM SIGN LAGAB TIMES KU3
-<U000121D2>     /xf0/x92/x87/x92 CUNEIFORM SIGN LAGAB TIMES KUL
-<U000121D3>     /xf0/x92/x87/x93 CUNEIFORM SIGN LAGAB TIMES KUL PLUS HI PLUS A
-<U000121D4>     /xf0/x92/x87/x94 CUNEIFORM SIGN LAGAB TIMES LAGAB
-<U000121D5>     /xf0/x92/x87/x95 CUNEIFORM SIGN LAGAB TIMES LISH
-<U000121D6>     /xf0/x92/x87/x96 CUNEIFORM SIGN LAGAB TIMES LU
-<U000121D7>     /xf0/x92/x87/x97 CUNEIFORM SIGN LAGAB TIMES LUL
-<U000121D8>     /xf0/x92/x87/x98 CUNEIFORM SIGN LAGAB TIMES ME
-<U000121D9>     /xf0/x92/x87/x99 CUNEIFORM SIGN LAGAB TIMES ME PLUS EN
-<U000121DA>     /xf0/x92/x87/x9a CUNEIFORM SIGN LAGAB TIMES MUSH
-<U000121DB>     /xf0/x92/x87/x9b CUNEIFORM SIGN LAGAB TIMES NE
-<U000121DC>     /xf0/x92/x87/x9c CUNEIFORM SIGN LAGAB TIMES SHE PLUS SUM
-<U000121DD>     /xf0/x92/x87/x9d CUNEIFORM SIGN LAGAB TIMES SHITA PLUS GISH PLUS ERIN2
-<U000121DE>     /xf0/x92/x87/x9e CUNEIFORM SIGN LAGAB TIMES SHITA PLUS GISH TENU
-<U000121DF>     /xf0/x92/x87/x9f CUNEIFORM SIGN LAGAB TIMES SHU2
-<U000121E0>     /xf0/x92/x87/xa0 CUNEIFORM SIGN LAGAB TIMES SHU2 PLUS SHU2
-<U000121E1>     /xf0/x92/x87/xa1 CUNEIFORM SIGN LAGAB TIMES SUM
-<U000121E2>     /xf0/x92/x87/xa2 CUNEIFORM SIGN LAGAB TIMES TAG
-<U000121E3>     /xf0/x92/x87/xa3 CUNEIFORM SIGN LAGAB TIMES TAK4
-<U000121E4>     /xf0/x92/x87/xa4 CUNEIFORM SIGN LAGAB TIMES TE PLUS A PLUS SU PLUS NA
-<U000121E5>     /xf0/x92/x87/xa5 CUNEIFORM SIGN LAGAB TIMES U
-<U000121E6>     /xf0/x92/x87/xa6 CUNEIFORM SIGN LAGAB TIMES U PLUS A
-<U000121E7>     /xf0/x92/x87/xa7 CUNEIFORM SIGN LAGAB TIMES U PLUS U PLUS U
-<U000121E8>     /xf0/x92/x87/xa8 CUNEIFORM SIGN LAGAB TIMES U2 PLUS ASH
-<U000121E9>     /xf0/x92/x87/xa9 CUNEIFORM SIGN LAGAB TIMES UD
-<U000121EA>     /xf0/x92/x87/xaa CUNEIFORM SIGN LAGAB TIMES USH
-<U000121EB>     /xf0/x92/x87/xab CUNEIFORM SIGN LAGAB SQUARED
-<U000121EC>     /xf0/x92/x87/xac CUNEIFORM SIGN LAGAR
-<U000121ED>     /xf0/x92/x87/xad CUNEIFORM SIGN LAGAR TIMES SHE
-<U000121EE>     /xf0/x92/x87/xae CUNEIFORM SIGN LAGAR TIMES SHE PLUS SUM
-<U000121EF>     /xf0/x92/x87/xaf CUNEIFORM SIGN LAGAR GUNU
-<U000121F0>     /xf0/x92/x87/xb0 CUNEIFORM SIGN LAGAR GUNU OVER LAGAR GUNU SHE
-<U000121F1>     /xf0/x92/x87/xb1 CUNEIFORM SIGN LAHSHU
-<U000121F2>     /xf0/x92/x87/xb2 CUNEIFORM SIGN LAL
-<U000121F3>     /xf0/x92/x87/xb3 CUNEIFORM SIGN LAL TIMES LAL
-<U000121F4>     /xf0/x92/x87/xb4 CUNEIFORM SIGN LAM
-<U000121F5>     /xf0/x92/x87/xb5 CUNEIFORM SIGN LAM TIMES KUR
-<U000121F6>     /xf0/x92/x87/xb6 CUNEIFORM SIGN LAM TIMES KUR PLUS RU
-<U000121F7>     /xf0/x92/x87/xb7 CUNEIFORM SIGN LI
-<U000121F8>     /xf0/x92/x87/xb8 CUNEIFORM SIGN LIL
-<U000121F9>     /xf0/x92/x87/xb9 CUNEIFORM SIGN LIMMU2
-<U000121FA>     /xf0/x92/x87/xba CUNEIFORM SIGN LISH
-<U000121FB>     /xf0/x92/x87/xbb CUNEIFORM SIGN LU
-<U000121FC>     /xf0/x92/x87/xbc CUNEIFORM SIGN LU TIMES BAD
-<U000121FD>     /xf0/x92/x87/xbd CUNEIFORM SIGN LU2
-<U000121FE>     /xf0/x92/x87/xbe CUNEIFORM SIGN LU2 TIMES AL
-<U000121FF>     /xf0/x92/x87/xbf CUNEIFORM SIGN LU2 TIMES BAD
-<U00012200>     /xf0/x92/x88/x80 CUNEIFORM SIGN LU2 TIMES ESH2
-<U00012201>     /xf0/x92/x88/x81 CUNEIFORM SIGN LU2 TIMES ESH2 TENU
-<U00012202>     /xf0/x92/x88/x82 CUNEIFORM SIGN LU2 TIMES GAN2 TENU
-<U00012203>     /xf0/x92/x88/x83 CUNEIFORM SIGN LU2 TIMES HI TIMES BAD
-<U00012204>     /xf0/x92/x88/x84 CUNEIFORM SIGN LU2 TIMES IM
-<U00012205>     /xf0/x92/x88/x85 CUNEIFORM SIGN LU2 TIMES KAD2
-<U00012206>     /xf0/x92/x88/x86 CUNEIFORM SIGN LU2 TIMES KAD3
-<U00012207>     /xf0/x92/x88/x87 CUNEIFORM SIGN LU2 TIMES KAD3 PLUS ASH
-<U00012208>     /xf0/x92/x88/x88 CUNEIFORM SIGN LU2 TIMES KI
-<U00012209>     /xf0/x92/x88/x89 CUNEIFORM SIGN LU2 TIMES LA PLUS ASH
-<U0001220A>     /xf0/x92/x88/x8a CUNEIFORM SIGN LU2 TIMES LAGAB
-<U0001220B>     /xf0/x92/x88/x8b CUNEIFORM SIGN LU2 TIMES ME PLUS EN
-<U0001220C>     /xf0/x92/x88/x8c CUNEIFORM SIGN LU2 TIMES NE
-<U0001220D>     /xf0/x92/x88/x8d CUNEIFORM SIGN LU2 TIMES NU
-<U0001220E>     /xf0/x92/x88/x8e CUNEIFORM SIGN LU2 TIMES SI PLUS ASH
-<U0001220F>     /xf0/x92/x88/x8f CUNEIFORM SIGN LU2 TIMES SIK2 PLUS BU
-<U00012210>     /xf0/x92/x88/x90 CUNEIFORM SIGN LU2 TIMES TUG2
-<U00012211>     /xf0/x92/x88/x91 CUNEIFORM SIGN LU2 TENU
-<U00012212>     /xf0/x92/x88/x92 CUNEIFORM SIGN LU2 CROSSING LU2
-<U00012213>     /xf0/x92/x88/x93 CUNEIFORM SIGN LU2 OPPOSING LU2
-<U00012214>     /xf0/x92/x88/x94 CUNEIFORM SIGN LU2 SQUARED
-<U00012215>     /xf0/x92/x88/x95 CUNEIFORM SIGN LU2 SHESHIG
-<U00012216>     /xf0/x92/x88/x96 CUNEIFORM SIGN LU3
-<U00012217>     /xf0/x92/x88/x97 CUNEIFORM SIGN LUGAL
-<U00012218>     /xf0/x92/x88/x98 CUNEIFORM SIGN LUGAL OVER LUGAL
-<U00012219>     /xf0/x92/x88/x99 CUNEIFORM SIGN LUGAL OPPOSING LUGAL
-<U0001221A>     /xf0/x92/x88/x9a CUNEIFORM SIGN LUGAL SHESHIG
-<U0001221B>     /xf0/x92/x88/x9b CUNEIFORM SIGN LUH
-<U0001221C>     /xf0/x92/x88/x9c CUNEIFORM SIGN LUL
-<U0001221D>     /xf0/x92/x88/x9d CUNEIFORM SIGN LUM
-<U0001221E>     /xf0/x92/x88/x9e CUNEIFORM SIGN LUM OVER LUM
-<U0001221F>     /xf0/x92/x88/x9f CUNEIFORM SIGN LUM OVER LUM GAR OVER GAR
-<U00012220>     /xf0/x92/x88/xa0 CUNEIFORM SIGN MA
-<U00012221>     /xf0/x92/x88/xa1 CUNEIFORM SIGN MA TIMES TAK4
-<U00012222>     /xf0/x92/x88/xa2 CUNEIFORM SIGN MA GUNU
-<U00012223>     /xf0/x92/x88/xa3 CUNEIFORM SIGN MA2
-<U00012224>     /xf0/x92/x88/xa4 CUNEIFORM SIGN MAH
-<U00012225>     /xf0/x92/x88/xa5 CUNEIFORM SIGN MAR
-<U00012226>     /xf0/x92/x88/xa6 CUNEIFORM SIGN MASH
-<U00012227>     /xf0/x92/x88/xa7 CUNEIFORM SIGN MASH2
-<U00012228>     /xf0/x92/x88/xa8 CUNEIFORM SIGN ME
-<U00012229>     /xf0/x92/x88/xa9 CUNEIFORM SIGN MES
-<U0001222A>     /xf0/x92/x88/xaa CUNEIFORM SIGN MI
-<U0001222B>     /xf0/x92/x88/xab CUNEIFORM SIGN MIN
-<U0001222C>     /xf0/x92/x88/xac CUNEIFORM SIGN MU
-<U0001222D>     /xf0/x92/x88/xad CUNEIFORM SIGN MU OVER MU
-<U0001222E>     /xf0/x92/x88/xae CUNEIFORM SIGN MUG
-<U0001222F>     /xf0/x92/x88/xaf CUNEIFORM SIGN MUG GUNU
-<U00012230>     /xf0/x92/x88/xb0 CUNEIFORM SIGN MUNSUB
-<U00012231>     /xf0/x92/x88/xb1 CUNEIFORM SIGN MURGU2
-<U00012232>     /xf0/x92/x88/xb2 CUNEIFORM SIGN MUSH
-<U00012233>     /xf0/x92/x88/xb3 CUNEIFORM SIGN MUSH TIMES A
-<U00012234>     /xf0/x92/x88/xb4 CUNEIFORM SIGN MUSH TIMES KUR
-<U00012235>     /xf0/x92/x88/xb5 CUNEIFORM SIGN MUSH TIMES ZA
-<U00012236>     /xf0/x92/x88/xb6 CUNEIFORM SIGN MUSH OVER MUSH
-<U00012237>     /xf0/x92/x88/xb7 CUNEIFORM SIGN MUSH OVER MUSH TIMES A PLUS NA
-<U00012238>     /xf0/x92/x88/xb8 CUNEIFORM SIGN MUSH CROSSING MUSH
-<U00012239>     /xf0/x92/x88/xb9 CUNEIFORM SIGN MUSH3
-<U0001223A>     /xf0/x92/x88/xba CUNEIFORM SIGN MUSH3 TIMES A
-<U0001223B>     /xf0/x92/x88/xbb CUNEIFORM SIGN MUSH3 TIMES A PLUS DI
-<U0001223C>     /xf0/x92/x88/xbc CUNEIFORM SIGN MUSH3 TIMES DI
-<U0001223D>     /xf0/x92/x88/xbd CUNEIFORM SIGN MUSH3 GUNU
-<U0001223E>     /xf0/x92/x88/xbe CUNEIFORM SIGN NA
-<U0001223F>     /xf0/x92/x88/xbf CUNEIFORM SIGN NA2
-<U00012240>     /xf0/x92/x89/x80 CUNEIFORM SIGN NAGA
-<U00012241>     /xf0/x92/x89/x81 CUNEIFORM SIGN NAGA INVERTED
-<U00012242>     /xf0/x92/x89/x82 CUNEIFORM SIGN NAGA TIMES SHU TENU
-<U00012243>     /xf0/x92/x89/x83 CUNEIFORM SIGN NAGA OPPOSING NAGA
-<U00012244>     /xf0/x92/x89/x84 CUNEIFORM SIGN NAGAR
-<U00012245>     /xf0/x92/x89/x85 CUNEIFORM SIGN NAM NUTILLU
-<U00012246>     /xf0/x92/x89/x86 CUNEIFORM SIGN NAM
-<U00012247>     /xf0/x92/x89/x87 CUNEIFORM SIGN NAM2
-<U00012248>     /xf0/x92/x89/x88 CUNEIFORM SIGN NE
-<U00012249>     /xf0/x92/x89/x89 CUNEIFORM SIGN NE TIMES A
-<U0001224A>     /xf0/x92/x89/x8a CUNEIFORM SIGN NE TIMES UD
-<U0001224B>     /xf0/x92/x89/x8b CUNEIFORM SIGN NE SHESHIG
-<U0001224C>     /xf0/x92/x89/x8c CUNEIFORM SIGN NI
-<U0001224D>     /xf0/x92/x89/x8d CUNEIFORM SIGN NI TIMES E
-<U0001224E>     /xf0/x92/x89/x8e CUNEIFORM SIGN NI2
-<U0001224F>     /xf0/x92/x89/x8f CUNEIFORM SIGN NIM
-<U00012250>     /xf0/x92/x89/x90 CUNEIFORM SIGN NIM TIMES GAN2 TENU
-<U00012251>     /xf0/x92/x89/x91 CUNEIFORM SIGN NIM TIMES GAR PLUS GAN2 TENU
-<U00012252>     /xf0/x92/x89/x92 CUNEIFORM SIGN NINDA2
-<U00012253>     /xf0/x92/x89/x93 CUNEIFORM SIGN NINDA2 TIMES AN
-<U00012254>     /xf0/x92/x89/x94 CUNEIFORM SIGN NINDA2 TIMES ASH
-<U00012255>     /xf0/x92/x89/x95 CUNEIFORM SIGN NINDA2 TIMES ASH PLUS ASH
-<U00012256>     /xf0/x92/x89/x96 CUNEIFORM SIGN NINDA2 TIMES GUD
-<U00012257>     /xf0/x92/x89/x97 CUNEIFORM SIGN NINDA2 TIMES ME PLUS GAN2 TENU
-<U00012258>     /xf0/x92/x89/x98 CUNEIFORM SIGN NINDA2 TIMES NE
-<U00012259>     /xf0/x92/x89/x99 CUNEIFORM SIGN NINDA2 TIMES NUN
-<U0001225A>     /xf0/x92/x89/x9a CUNEIFORM SIGN NINDA2 TIMES SHE
-<U0001225B>     /xf0/x92/x89/x9b CUNEIFORM SIGN NINDA2 TIMES SHE PLUS A AN
-<U0001225C>     /xf0/x92/x89/x9c CUNEIFORM SIGN NINDA2 TIMES SHE PLUS ASH
-<U0001225D>     /xf0/x92/x89/x9d CUNEIFORM SIGN NINDA2 TIMES SHE PLUS ASH PLUS ASH
-<U0001225E>     /xf0/x92/x89/x9e CUNEIFORM SIGN NINDA2 TIMES U2 PLUS ASH
-<U0001225F>     /xf0/x92/x89/x9f CUNEIFORM SIGN NINDA2 TIMES USH
-<U00012260>     /xf0/x92/x89/xa0 CUNEIFORM SIGN NISAG
-<U00012261>     /xf0/x92/x89/xa1 CUNEIFORM SIGN NU
-<U00012262>     /xf0/x92/x89/xa2 CUNEIFORM SIGN NU11
-<U00012263>     /xf0/x92/x89/xa3 CUNEIFORM SIGN NUN
-<U00012264>     /xf0/x92/x89/xa4 CUNEIFORM SIGN NUN LAGAR TIMES GAR
-<U00012265>     /xf0/x92/x89/xa5 CUNEIFORM SIGN NUN LAGAR TIMES MASH
-<U00012266>     /xf0/x92/x89/xa6 CUNEIFORM SIGN NUN LAGAR TIMES SAL
-<U00012267>     /xf0/x92/x89/xa7 CUNEIFORM SIGN NUN LAGAR TIMES SAL OVER NUN LAGAR TIMES SAL
-<U00012268>     /xf0/x92/x89/xa8 CUNEIFORM SIGN NUN LAGAR TIMES USH
-<U00012269>     /xf0/x92/x89/xa9 CUNEIFORM SIGN NUN TENU
-<U0001226A>     /xf0/x92/x89/xaa CUNEIFORM SIGN NUN OVER NUN
-<U0001226B>     /xf0/x92/x89/xab CUNEIFORM SIGN NUN CROSSING NUN
-<U0001226C>     /xf0/x92/x89/xac CUNEIFORM SIGN NUN CROSSING NUN LAGAR OVER LAGAR
-<U0001226D>     /xf0/x92/x89/xad CUNEIFORM SIGN NUNUZ
-<U0001226E>     /xf0/x92/x89/xae CUNEIFORM SIGN NUNUZ AB2 TIMES ASHGAB
-<U0001226F>     /xf0/x92/x89/xaf CUNEIFORM SIGN NUNUZ AB2 TIMES BI
-<U00012270>     /xf0/x92/x89/xb0 CUNEIFORM SIGN NUNUZ AB2 TIMES DUG
-<U00012271>     /xf0/x92/x89/xb1 CUNEIFORM SIGN NUNUZ AB2 TIMES GUD
-<U00012272>     /xf0/x92/x89/xb2 CUNEIFORM SIGN NUNUZ AB2 TIMES IGI GUNU
-<U00012273>     /xf0/x92/x89/xb3 CUNEIFORM SIGN NUNUZ AB2 TIMES KAD3
-<U00012274>     /xf0/x92/x89/xb4 CUNEIFORM SIGN NUNUZ AB2 TIMES LA
-<U00012275>     /xf0/x92/x89/xb5 CUNEIFORM SIGN NUNUZ AB2 TIMES NE
-<U00012276>     /xf0/x92/x89/xb6 CUNEIFORM SIGN NUNUZ AB2 TIMES SILA3
-<U00012277>     /xf0/x92/x89/xb7 CUNEIFORM SIGN NUNUZ AB2 TIMES U2
-<U00012278>     /xf0/x92/x89/xb8 CUNEIFORM SIGN NUNUZ KISIM5 TIMES BI
-<U00012279>     /xf0/x92/x89/xb9 CUNEIFORM SIGN NUNUZ KISIM5 TIMES BI U
-<U0001227A>     /xf0/x92/x89/xba CUNEIFORM SIGN PA
-<U0001227B>     /xf0/x92/x89/xbb CUNEIFORM SIGN PAD
-<U0001227C>     /xf0/x92/x89/xbc CUNEIFORM SIGN PAN
-<U0001227D>     /xf0/x92/x89/xbd CUNEIFORM SIGN PAP
-<U0001227E>     /xf0/x92/x89/xbe CUNEIFORM SIGN PESH2
-<U0001227F>     /xf0/x92/x89/xbf CUNEIFORM SIGN PI
-<U00012280>     /xf0/x92/x8a/x80 CUNEIFORM SIGN PI TIMES A
-<U00012281>     /xf0/x92/x8a/x81 CUNEIFORM SIGN PI TIMES AB
-<U00012282>     /xf0/x92/x8a/x82 CUNEIFORM SIGN PI TIMES BI
-<U00012283>     /xf0/x92/x8a/x83 CUNEIFORM SIGN PI TIMES BU
-<U00012284>     /xf0/x92/x8a/x84 CUNEIFORM SIGN PI TIMES E
-<U00012285>     /xf0/x92/x8a/x85 CUNEIFORM SIGN PI TIMES I
-<U00012286>     /xf0/x92/x8a/x86 CUNEIFORM SIGN PI TIMES IB
-<U00012287>     /xf0/x92/x8a/x87 CUNEIFORM SIGN PI TIMES U
-<U00012288>     /xf0/x92/x8a/x88 CUNEIFORM SIGN PI TIMES U2
-<U00012289>     /xf0/x92/x8a/x89 CUNEIFORM SIGN PI CROSSING PI
-<U0001228A>     /xf0/x92/x8a/x8a CUNEIFORM SIGN PIRIG
-<U0001228B>     /xf0/x92/x8a/x8b CUNEIFORM SIGN PIRIG TIMES KAL
-<U0001228C>     /xf0/x92/x8a/x8c CUNEIFORM SIGN PIRIG TIMES UD
-<U0001228D>     /xf0/x92/x8a/x8d CUNEIFORM SIGN PIRIG TIMES ZA
-<U0001228E>     /xf0/x92/x8a/x8e CUNEIFORM SIGN PIRIG OPPOSING PIRIG
-<U0001228F>     /xf0/x92/x8a/x8f CUNEIFORM SIGN RA
-<U00012290>     /xf0/x92/x8a/x90 CUNEIFORM SIGN RAB
-<U00012291>     /xf0/x92/x8a/x91 CUNEIFORM SIGN RI
-<U00012292>     /xf0/x92/x8a/x92 CUNEIFORM SIGN RU
-<U00012293>     /xf0/x92/x8a/x93 CUNEIFORM SIGN SA
-<U00012294>     /xf0/x92/x8a/x94 CUNEIFORM SIGN SAG NUTILLU
-<U00012295>     /xf0/x92/x8a/x95 CUNEIFORM SIGN SAG
-<U00012296>     /xf0/x92/x8a/x96 CUNEIFORM SIGN SAG TIMES A
-<U00012297>     /xf0/x92/x8a/x97 CUNEIFORM SIGN SAG TIMES DU
-<U00012298>     /xf0/x92/x8a/x98 CUNEIFORM SIGN SAG TIMES DUB
-<U00012299>     /xf0/x92/x8a/x99 CUNEIFORM SIGN SAG TIMES HA
-<U0001229A>     /xf0/x92/x8a/x9a CUNEIFORM SIGN SAG TIMES KAK
-<U0001229B>     /xf0/x92/x8a/x9b CUNEIFORM SIGN SAG TIMES KUR
-<U0001229C>     /xf0/x92/x8a/x9c CUNEIFORM SIGN SAG TIMES LUM
-<U0001229D>     /xf0/x92/x8a/x9d CUNEIFORM SIGN SAG TIMES MI
-<U0001229E>     /xf0/x92/x8a/x9e CUNEIFORM SIGN SAG TIMES NUN
-<U0001229F>     /xf0/x92/x8a/x9f CUNEIFORM SIGN SAG TIMES SAL
-<U000122A0>     /xf0/x92/x8a/xa0 CUNEIFORM SIGN SAG TIMES SHID
-<U000122A1>     /xf0/x92/x8a/xa1 CUNEIFORM SIGN SAG TIMES TAB
-<U000122A2>     /xf0/x92/x8a/xa2 CUNEIFORM SIGN SAG TIMES U2
-<U000122A3>     /xf0/x92/x8a/xa3 CUNEIFORM SIGN SAG TIMES UB
-<U000122A4>     /xf0/x92/x8a/xa4 CUNEIFORM SIGN SAG TIMES UM
-<U000122A5>     /xf0/x92/x8a/xa5 CUNEIFORM SIGN SAG TIMES UR
-<U000122A6>     /xf0/x92/x8a/xa6 CUNEIFORM SIGN SAG TIMES USH
-<U000122A7>     /xf0/x92/x8a/xa7 CUNEIFORM SIGN SAG OVER SAG
-<U000122A8>     /xf0/x92/x8a/xa8 CUNEIFORM SIGN SAG GUNU
-<U000122A9>     /xf0/x92/x8a/xa9 CUNEIFORM SIGN SAL
-<U000122AA>     /xf0/x92/x8a/xaa CUNEIFORM SIGN SAL LAGAB TIMES ASH2
-<U000122AB>     /xf0/x92/x8a/xab CUNEIFORM SIGN SANGA2
-<U000122AC>     /xf0/x92/x8a/xac CUNEIFORM SIGN SAR
-<U000122AD>     /xf0/x92/x8a/xad CUNEIFORM SIGN SHA
-<U000122AE>     /xf0/x92/x8a/xae CUNEIFORM SIGN SHA3
-<U000122AF>     /xf0/x92/x8a/xaf CUNEIFORM SIGN SHA3 TIMES A
-<U000122B0>     /xf0/x92/x8a/xb0 CUNEIFORM SIGN SHA3 TIMES BAD
-<U000122B1>     /xf0/x92/x8a/xb1 CUNEIFORM SIGN SHA3 TIMES GISH
-<U000122B2>     /xf0/x92/x8a/xb2 CUNEIFORM SIGN SHA3 TIMES NE
-<U000122B3>     /xf0/x92/x8a/xb3 CUNEIFORM SIGN SHA3 TIMES SHU2
-<U000122B4>     /xf0/x92/x8a/xb4 CUNEIFORM SIGN SHA3 TIMES TUR
-<U000122B5>     /xf0/x92/x8a/xb5 CUNEIFORM SIGN SHA3 TIMES U
-<U000122B6>     /xf0/x92/x8a/xb6 CUNEIFORM SIGN SHA3 TIMES U PLUS A
-<U000122B7>     /xf0/x92/x8a/xb7 CUNEIFORM SIGN SHA6
-<U000122B8>     /xf0/x92/x8a/xb8 CUNEIFORM SIGN SHAB6
-<U000122B9>     /xf0/x92/x8a/xb9 CUNEIFORM SIGN SHAR2
-<U000122BA>     /xf0/x92/x8a/xba CUNEIFORM SIGN SHE
-<U000122BB>     /xf0/x92/x8a/xbb CUNEIFORM SIGN SHE HU
-<U000122BC>     /xf0/x92/x8a/xbc CUNEIFORM SIGN SHE OVER SHE GAD OVER GAD GAR OVER GAR
-<U000122BD>     /xf0/x92/x8a/xbd CUNEIFORM SIGN SHE OVER SHE TAB OVER TAB GAR OVER GAR
-<U000122BE>     /xf0/x92/x8a/xbe CUNEIFORM SIGN SHEG9
-<U000122BF>     /xf0/x92/x8a/xbf CUNEIFORM SIGN SHEN
-<U000122C0>     /xf0/x92/x8b/x80 CUNEIFORM SIGN SHESH
-<U000122C1>     /xf0/x92/x8b/x81 CUNEIFORM SIGN SHESH2
-<U000122C2>     /xf0/x92/x8b/x82 CUNEIFORM SIGN SHESHLAM
-<U000122C3>     /xf0/x92/x8b/x83 CUNEIFORM SIGN SHID
-<U000122C4>     /xf0/x92/x8b/x84 CUNEIFORM SIGN SHID TIMES A
-<U000122C5>     /xf0/x92/x8b/x85 CUNEIFORM SIGN SHID TIMES IM
-<U000122C6>     /xf0/x92/x8b/x86 CUNEIFORM SIGN SHIM
-<U000122C7>     /xf0/x92/x8b/x87 CUNEIFORM SIGN SHIM TIMES A
-<U000122C8>     /xf0/x92/x8b/x88 CUNEIFORM SIGN SHIM TIMES BAL
-<U000122C9>     /xf0/x92/x8b/x89 CUNEIFORM SIGN SHIM TIMES BULUG
-<U000122CA>     /xf0/x92/x8b/x8a CUNEIFORM SIGN SHIM TIMES DIN
-<U000122CB>     /xf0/x92/x8b/x8b CUNEIFORM SIGN SHIM TIMES GAR
-<U000122CC>     /xf0/x92/x8b/x8c CUNEIFORM SIGN SHIM TIMES IGI
-<U000122CD>     /xf0/x92/x8b/x8d CUNEIFORM SIGN SHIM TIMES IGI GUNU
-<U000122CE>     /xf0/x92/x8b/x8e CUNEIFORM SIGN SHIM TIMES KUSHU2
-<U000122CF>     /xf0/x92/x8b/x8f CUNEIFORM SIGN SHIM TIMES LUL
-<U000122D0>     /xf0/x92/x8b/x90 CUNEIFORM SIGN SHIM TIMES MUG
-<U000122D1>     /xf0/x92/x8b/x91 CUNEIFORM SIGN SHIM TIMES SAL
-<U000122D2>     /xf0/x92/x8b/x92 CUNEIFORM SIGN SHINIG
-<U000122D3>     /xf0/x92/x8b/x93 CUNEIFORM SIGN SHIR
-<U000122D4>     /xf0/x92/x8b/x94 CUNEIFORM SIGN SHIR TENU
-<U000122D5>     /xf0/x92/x8b/x95 CUNEIFORM SIGN SHIR OVER SHIR BUR OVER BUR
-<U000122D6>     /xf0/x92/x8b/x96 CUNEIFORM SIGN SHITA
-<U000122D7>     /xf0/x92/x8b/x97 CUNEIFORM SIGN SHU
-<U000122D8>     /xf0/x92/x8b/x98 CUNEIFORM SIGN SHU OVER INVERTED SHU
-<U000122D9>     /xf0/x92/x8b/x99 CUNEIFORM SIGN SHU2
-<U000122DA>     /xf0/x92/x8b/x9a CUNEIFORM SIGN SHUBUR
-<U000122DB>     /xf0/x92/x8b/x9b CUNEIFORM SIGN SI
-<U000122DC>     /xf0/x92/x8b/x9c CUNEIFORM SIGN SI GUNU
-<U000122DD>     /xf0/x92/x8b/x9d CUNEIFORM SIGN SIG
-<U000122DE>     /xf0/x92/x8b/x9e CUNEIFORM SIGN SIG4
-<U000122DF>     /xf0/x92/x8b/x9f CUNEIFORM SIGN SIG4 OVER SIG4 SHU2
-<U000122E0>     /xf0/x92/x8b/xa0 CUNEIFORM SIGN SIK2
-<U000122E1>     /xf0/x92/x8b/xa1 CUNEIFORM SIGN SILA3
-<U000122E2>     /xf0/x92/x8b/xa2 CUNEIFORM SIGN SU
-<U000122E3>     /xf0/x92/x8b/xa3 CUNEIFORM SIGN SU OVER SU
-<U000122E4>     /xf0/x92/x8b/xa4 CUNEIFORM SIGN SUD
-<U000122E5>     /xf0/x92/x8b/xa5 CUNEIFORM SIGN SUD2
-<U000122E6>     /xf0/x92/x8b/xa6 CUNEIFORM SIGN SUHUR
-<U000122E7>     /xf0/x92/x8b/xa7 CUNEIFORM SIGN SUM
-<U000122E8>     /xf0/x92/x8b/xa8 CUNEIFORM SIGN SUMASH
-<U000122E9>     /xf0/x92/x8b/xa9 CUNEIFORM SIGN SUR
-<U000122EA>     /xf0/x92/x8b/xaa CUNEIFORM SIGN SUR9
-<U000122EB>     /xf0/x92/x8b/xab CUNEIFORM SIGN TA
-<U000122EC>     /xf0/x92/x8b/xac CUNEIFORM SIGN TA ASTERISK
-<U000122ED>     /xf0/x92/x8b/xad CUNEIFORM SIGN TA TIMES HI
-<U000122EE>     /xf0/x92/x8b/xae CUNEIFORM SIGN TA TIMES MI
-<U000122EF>     /xf0/x92/x8b/xaf CUNEIFORM SIGN TA GUNU
-<U000122F0>     /xf0/x92/x8b/xb0 CUNEIFORM SIGN TAB
-<U000122F1>     /xf0/x92/x8b/xb1 CUNEIFORM SIGN TAB OVER TAB NI OVER NI DISH OVER DISH
-<U000122F2>     /xf0/x92/x8b/xb2 CUNEIFORM SIGN TAB SQUARED
-<U000122F3>     /xf0/x92/x8b/xb3 CUNEIFORM SIGN TAG
-<U000122F4>     /xf0/x92/x8b/xb4 CUNEIFORM SIGN TAG TIMES BI
-<U000122F5>     /xf0/x92/x8b/xb5 CUNEIFORM SIGN TAG TIMES GUD
-<U000122F6>     /xf0/x92/x8b/xb6 CUNEIFORM SIGN TAG TIMES SHE
-<U000122F7>     /xf0/x92/x8b/xb7 CUNEIFORM SIGN TAG TIMES SHU
-<U000122F8>     /xf0/x92/x8b/xb8 CUNEIFORM SIGN TAG TIMES TUG2
-<U000122F9>     /xf0/x92/x8b/xb9 CUNEIFORM SIGN TAG TIMES UD
-<U000122FA>     /xf0/x92/x8b/xba CUNEIFORM SIGN TAK4
-<U000122FB>     /xf0/x92/x8b/xbb CUNEIFORM SIGN TAR
-<U000122FC>     /xf0/x92/x8b/xbc CUNEIFORM SIGN TE
-<U000122FD>     /xf0/x92/x8b/xbd CUNEIFORM SIGN TE GUNU
-<U000122FE>     /xf0/x92/x8b/xbe CUNEIFORM SIGN TI
-<U000122FF>     /xf0/x92/x8b/xbf CUNEIFORM SIGN TI TENU
-<U00012300>     /xf0/x92/x8c/x80 CUNEIFORM SIGN TIL
-<U00012301>     /xf0/x92/x8c/x81 CUNEIFORM SIGN TIR
-<U00012302>     /xf0/x92/x8c/x82 CUNEIFORM SIGN TIR TIMES TAK4
-<U00012303>     /xf0/x92/x8c/x83 CUNEIFORM SIGN TIR OVER TIR
-<U00012304>     /xf0/x92/x8c/x84 CUNEIFORM SIGN TIR OVER TIR GAD OVER GAD GAR OVER GAR
-<U00012305>     /xf0/x92/x8c/x85 CUNEIFORM SIGN TU
-<U00012306>     /xf0/x92/x8c/x86 CUNEIFORM SIGN TUG2
-<U00012307>     /xf0/x92/x8c/x87 CUNEIFORM SIGN TUK
-<U00012308>     /xf0/x92/x8c/x88 CUNEIFORM SIGN TUM
-<U00012309>     /xf0/x92/x8c/x89 CUNEIFORM SIGN TUR
-<U0001230A>     /xf0/x92/x8c/x8a CUNEIFORM SIGN TUR OVER TUR ZA OVER ZA
-<U0001230B>     /xf0/x92/x8c/x8b CUNEIFORM SIGN U
-<U0001230C>     /xf0/x92/x8c/x8c CUNEIFORM SIGN U GUD
-<U0001230D>     /xf0/x92/x8c/x8d CUNEIFORM SIGN U U U
-<U0001230E>     /xf0/x92/x8c/x8e CUNEIFORM SIGN U OVER U PA OVER PA GAR OVER GAR
-<U0001230F>     /xf0/x92/x8c/x8f CUNEIFORM SIGN U OVER U SUR OVER SUR
-<U00012310>     /xf0/x92/x8c/x90 CUNEIFORM SIGN U OVER U U REVERSED OVER U REVERSED
-<U00012311>     /xf0/x92/x8c/x91 CUNEIFORM SIGN U2
-<U00012312>     /xf0/x92/x8c/x92 CUNEIFORM SIGN UB
-<U00012313>     /xf0/x92/x8c/x93 CUNEIFORM SIGN UD
-<U00012314>     /xf0/x92/x8c/x94 CUNEIFORM SIGN UD KUSHU2
-<U00012315>     /xf0/x92/x8c/x95 CUNEIFORM SIGN UD TIMES BAD
-<U00012316>     /xf0/x92/x8c/x96 CUNEIFORM SIGN UD TIMES MI
-<U00012317>     /xf0/x92/x8c/x97 CUNEIFORM SIGN UD TIMES U PLUS U PLUS U
-<U00012318>     /xf0/x92/x8c/x98 CUNEIFORM SIGN UD TIMES U PLUS U PLUS U GUNU
-<U00012319>     /xf0/x92/x8c/x99 CUNEIFORM SIGN UD GUNU
-<U0001231A>     /xf0/x92/x8c/x9a CUNEIFORM SIGN UD SHESHIG
-<U0001231B>     /xf0/x92/x8c/x9b CUNEIFORM SIGN UD SHESHIG TIMES BAD
-<U0001231C>     /xf0/x92/x8c/x9c CUNEIFORM SIGN UDUG
-<U0001231D>     /xf0/x92/x8c/x9d CUNEIFORM SIGN UM
-<U0001231E>     /xf0/x92/x8c/x9e CUNEIFORM SIGN UM TIMES LAGAB
-<U0001231F>     /xf0/x92/x8c/x9f CUNEIFORM SIGN UM TIMES ME PLUS DA
-<U00012320>     /xf0/x92/x8c/xa0 CUNEIFORM SIGN UM TIMES SHA3
-<U00012321>     /xf0/x92/x8c/xa1 CUNEIFORM SIGN UM TIMES U
-<U00012322>     /xf0/x92/x8c/xa2 CUNEIFORM SIGN UMBIN
-<U00012323>     /xf0/x92/x8c/xa3 CUNEIFORM SIGN UMUM
-<U00012324>     /xf0/x92/x8c/xa4 CUNEIFORM SIGN UMUM TIMES KASKAL
-<U00012325>     /xf0/x92/x8c/xa5 CUNEIFORM SIGN UMUM TIMES PA
-<U00012326>     /xf0/x92/x8c/xa6 CUNEIFORM SIGN UN
-<U00012327>     /xf0/x92/x8c/xa7 CUNEIFORM SIGN UN GUNU
-<U00012328>     /xf0/x92/x8c/xa8 CUNEIFORM SIGN UR
-<U00012329>     /xf0/x92/x8c/xa9 CUNEIFORM SIGN UR CROSSING UR
-<U0001232A>     /xf0/x92/x8c/xaa CUNEIFORM SIGN UR SHESHIG
-<U0001232B>     /xf0/x92/x8c/xab CUNEIFORM SIGN UR2
-<U0001232C>     /xf0/x92/x8c/xac CUNEIFORM SIGN UR2 TIMES A PLUS HA
-<U0001232D>     /xf0/x92/x8c/xad CUNEIFORM SIGN UR2 TIMES A PLUS NA
-<U0001232E>     /xf0/x92/x8c/xae CUNEIFORM SIGN UR2 TIMES AL
-<U0001232F>     /xf0/x92/x8c/xaf CUNEIFORM SIGN UR2 TIMES HA
-<U00012330>     /xf0/x92/x8c/xb0 CUNEIFORM SIGN UR2 TIMES NUN
-<U00012331>     /xf0/x92/x8c/xb1 CUNEIFORM SIGN UR2 TIMES U2
-<U00012332>     /xf0/x92/x8c/xb2 CUNEIFORM SIGN UR2 TIMES U2 PLUS ASH
-<U00012333>     /xf0/x92/x8c/xb3 CUNEIFORM SIGN UR2 TIMES U2 PLUS BI
-<U00012334>     /xf0/x92/x8c/xb4 CUNEIFORM SIGN UR4
-<U00012335>     /xf0/x92/x8c/xb5 CUNEIFORM SIGN URI
-<U00012336>     /xf0/x92/x8c/xb6 CUNEIFORM SIGN URI3
-<U00012337>     /xf0/x92/x8c/xb7 CUNEIFORM SIGN URU
-<U00012338>     /xf0/x92/x8c/xb8 CUNEIFORM SIGN URU TIMES A
-<U00012339>     /xf0/x92/x8c/xb9 CUNEIFORM SIGN URU TIMES ASHGAB
-<U0001233A>     /xf0/x92/x8c/xba CUNEIFORM SIGN URU TIMES BAR
-<U0001233B>     /xf0/x92/x8c/xbb CUNEIFORM SIGN URU TIMES DUN
-<U0001233C>     /xf0/x92/x8c/xbc CUNEIFORM SIGN URU TIMES GA
-<U0001233D>     /xf0/x92/x8c/xbd CUNEIFORM SIGN URU TIMES GAL
-<U0001233E>     /xf0/x92/x8c/xbe CUNEIFORM SIGN URU TIMES GAN2 TENU
-<U0001233F>     /xf0/x92/x8c/xbf CUNEIFORM SIGN URU TIMES GAR
-<U00012340>     /xf0/x92/x8d/x80 CUNEIFORM SIGN URU TIMES GU
-<U00012341>     /xf0/x92/x8d/x81 CUNEIFORM SIGN URU TIMES HA
-<U00012342>     /xf0/x92/x8d/x82 CUNEIFORM SIGN URU TIMES IGI
-<U00012343>     /xf0/x92/x8d/x83 CUNEIFORM SIGN URU TIMES IM
-<U00012344>     /xf0/x92/x8d/x84 CUNEIFORM SIGN URU TIMES ISH
-<U00012345>     /xf0/x92/x8d/x85 CUNEIFORM SIGN URU TIMES KI
-<U00012346>     /xf0/x92/x8d/x86 CUNEIFORM SIGN URU TIMES LUM
-<U00012347>     /xf0/x92/x8d/x87 CUNEIFORM SIGN URU TIMES MIN
-<U00012348>     /xf0/x92/x8d/x88 CUNEIFORM SIGN URU TIMES PA
-<U00012349>     /xf0/x92/x8d/x89 CUNEIFORM SIGN URU TIMES SHE
-<U0001234A>     /xf0/x92/x8d/x8a CUNEIFORM SIGN URU TIMES SIG4
-<U0001234B>     /xf0/x92/x8d/x8b CUNEIFORM SIGN URU TIMES TU
-<U0001234C>     /xf0/x92/x8d/x8c CUNEIFORM SIGN URU TIMES U PLUS GUD
-<U0001234D>     /xf0/x92/x8d/x8d CUNEIFORM SIGN URU TIMES UD
-<U0001234E>     /xf0/x92/x8d/x8e CUNEIFORM SIGN URU TIMES URUDA
-<U0001234F>     /xf0/x92/x8d/x8f CUNEIFORM SIGN URUDA
-<U00012350>     /xf0/x92/x8d/x90 CUNEIFORM SIGN URUDA TIMES U
-<U00012351>     /xf0/x92/x8d/x91 CUNEIFORM SIGN USH
-<U00012352>     /xf0/x92/x8d/x92 CUNEIFORM SIGN USH TIMES A
-<U00012353>     /xf0/x92/x8d/x93 CUNEIFORM SIGN USH TIMES KU
-<U00012354>     /xf0/x92/x8d/x94 CUNEIFORM SIGN USH TIMES KUR
-<U00012355>     /xf0/x92/x8d/x95 CUNEIFORM SIGN USH TIMES TAK4
-<U00012356>     /xf0/x92/x8d/x96 CUNEIFORM SIGN USHX
-<U00012357>     /xf0/x92/x8d/x97 CUNEIFORM SIGN USH2
-<U00012358>     /xf0/x92/x8d/x98 CUNEIFORM SIGN USHUMX
-<U00012359>     /xf0/x92/x8d/x99 CUNEIFORM SIGN UTUKI
-<U0001235A>     /xf0/x92/x8d/x9a CUNEIFORM SIGN UZ3
-<U0001235B>     /xf0/x92/x8d/x9b CUNEIFORM SIGN UZ3 TIMES KASKAL
-<U0001235C>     /xf0/x92/x8d/x9c CUNEIFORM SIGN UZU
-<U0001235D>     /xf0/x92/x8d/x9d CUNEIFORM SIGN ZA
-<U0001235E>     /xf0/x92/x8d/x9e CUNEIFORM SIGN ZA TENU
-<U0001235F>     /xf0/x92/x8d/x9f CUNEIFORM SIGN ZA SQUARED TIMES KUR
-<U00012360>     /xf0/x92/x8d/xa0 CUNEIFORM SIGN ZAG
-<U00012361>     /xf0/x92/x8d/xa1 CUNEIFORM SIGN ZAMX
-<U00012362>     /xf0/x92/x8d/xa2 CUNEIFORM SIGN ZE2
-<U00012363>     /xf0/x92/x8d/xa3 CUNEIFORM SIGN ZI
-<U00012364>     /xf0/x92/x8d/xa4 CUNEIFORM SIGN ZI OVER ZI
-<U00012365>     /xf0/x92/x8d/xa5 CUNEIFORM SIGN ZI3
-<U00012366>     /xf0/x92/x8d/xa6 CUNEIFORM SIGN ZIB
-<U00012367>     /xf0/x92/x8d/xa7 CUNEIFORM SIGN ZIB KABA TENU
-<U00012368>     /xf0/x92/x8d/xa8 CUNEIFORM SIGN ZIG
-<U00012369>     /xf0/x92/x8d/xa9 CUNEIFORM SIGN ZIZ2
-<U0001236A>     /xf0/x92/x8d/xaa CUNEIFORM SIGN ZU
-<U0001236B>     /xf0/x92/x8d/xab CUNEIFORM SIGN ZU5
-<U0001236C>     /xf0/x92/x8d/xac CUNEIFORM SIGN ZU5 TIMES A
-<U0001236D>     /xf0/x92/x8d/xad CUNEIFORM SIGN ZUBUR
-<U0001236E>     /xf0/x92/x8d/xae CUNEIFORM SIGN ZUM
-<U00012400>     /xf0/x92/x90/x80 CUNEIFORM NUMERIC SIGN TWO ASH
-<U00012401>     /xf0/x92/x90/x81 CUNEIFORM NUMERIC SIGN THREE ASH
-<U00012402>     /xf0/x92/x90/x82 CUNEIFORM NUMERIC SIGN FOUR ASH
-<U00012403>     /xf0/x92/x90/x83 CUNEIFORM NUMERIC SIGN FIVE ASH
-<U00012404>     /xf0/x92/x90/x84 CUNEIFORM NUMERIC SIGN SIX ASH
-<U00012405>     /xf0/x92/x90/x85 CUNEIFORM NUMERIC SIGN SEVEN ASH
-<U00012406>     /xf0/x92/x90/x86 CUNEIFORM NUMERIC SIGN EIGHT ASH
-<U00012407>     /xf0/x92/x90/x87 CUNEIFORM NUMERIC SIGN NINE ASH
-<U00012408>     /xf0/x92/x90/x88 CUNEIFORM NUMERIC SIGN THREE DISH
-<U00012409>     /xf0/x92/x90/x89 CUNEIFORM NUMERIC SIGN FOUR DISH
-<U0001240A>     /xf0/x92/x90/x8a CUNEIFORM NUMERIC SIGN FIVE DISH
-<U0001240B>     /xf0/x92/x90/x8b CUNEIFORM NUMERIC SIGN SIX DISH
-<U0001240C>     /xf0/x92/x90/x8c CUNEIFORM NUMERIC SIGN SEVEN DISH
-<U0001240D>     /xf0/x92/x90/x8d CUNEIFORM NUMERIC SIGN EIGHT DISH
-<U0001240E>     /xf0/x92/x90/x8e CUNEIFORM NUMERIC SIGN NINE DISH
-<U0001240F>     /xf0/x92/x90/x8f CUNEIFORM NUMERIC SIGN FOUR U
-<U00012410>     /xf0/x92/x90/x90 CUNEIFORM NUMERIC SIGN FIVE U
-<U00012411>     /xf0/x92/x90/x91 CUNEIFORM NUMERIC SIGN SIX U
-<U00012412>     /xf0/x92/x90/x92 CUNEIFORM NUMERIC SIGN SEVEN U
-<U00012413>     /xf0/x92/x90/x93 CUNEIFORM NUMERIC SIGN EIGHT U
-<U00012414>     /xf0/x92/x90/x94 CUNEIFORM NUMERIC SIGN NINE U
-<U00012415>     /xf0/x92/x90/x95 CUNEIFORM NUMERIC SIGN ONE GESH2
-<U00012416>     /xf0/x92/x90/x96 CUNEIFORM NUMERIC SIGN TWO GESH2
-<U00012417>     /xf0/x92/x90/x97 CUNEIFORM NUMERIC SIGN THREE GESH2
-<U00012418>     /xf0/x92/x90/x98 CUNEIFORM NUMERIC SIGN FOUR GESH2
-<U00012419>     /xf0/x92/x90/x99 CUNEIFORM NUMERIC SIGN FIVE GESH2
-<U0001241A>     /xf0/x92/x90/x9a CUNEIFORM NUMERIC SIGN SIX GESH2
-<U0001241B>     /xf0/x92/x90/x9b CUNEIFORM NUMERIC SIGN SEVEN GESH2
-<U0001241C>     /xf0/x92/x90/x9c CUNEIFORM NUMERIC SIGN EIGHT GESH2
-<U0001241D>     /xf0/x92/x90/x9d CUNEIFORM NUMERIC SIGN NINE GESH2
-<U0001241E>     /xf0/x92/x90/x9e CUNEIFORM NUMERIC SIGN ONE GESHU
-<U0001241F>     /xf0/x92/x90/x9f CUNEIFORM NUMERIC SIGN TWO GESHU
-<U00012420>     /xf0/x92/x90/xa0 CUNEIFORM NUMERIC SIGN THREE GESHU
-<U00012421>     /xf0/x92/x90/xa1 CUNEIFORM NUMERIC SIGN FOUR GESHU
-<U00012422>     /xf0/x92/x90/xa2 CUNEIFORM NUMERIC SIGN FIVE GESHU
-<U00012423>     /xf0/x92/x90/xa3 CUNEIFORM NUMERIC SIGN TWO SHAR2
-<U00012424>     /xf0/x92/x90/xa4 CUNEIFORM NUMERIC SIGN THREE SHAR2
-<U00012425>     /xf0/x92/x90/xa5 CUNEIFORM NUMERIC SIGN THREE SHAR2 VARIANT FORM
-<U00012426>     /xf0/x92/x90/xa6 CUNEIFORM NUMERIC SIGN FOUR SHAR2
-<U00012427>     /xf0/x92/x90/xa7 CUNEIFORM NUMERIC SIGN FIVE SHAR2
-<U00012428>     /xf0/x92/x90/xa8 CUNEIFORM NUMERIC SIGN SIX SHAR2
-<U00012429>     /xf0/x92/x90/xa9 CUNEIFORM NUMERIC SIGN SEVEN SHAR2
-<U0001242A>     /xf0/x92/x90/xaa CUNEIFORM NUMERIC SIGN EIGHT SHAR2
-<U0001242B>     /xf0/x92/x90/xab CUNEIFORM NUMERIC SIGN NINE SHAR2
-<U0001242C>     /xf0/x92/x90/xac CUNEIFORM NUMERIC SIGN ONE SHARU
-<U0001242D>     /xf0/x92/x90/xad CUNEIFORM NUMERIC SIGN TWO SHARU
-<U0001242E>     /xf0/x92/x90/xae CUNEIFORM NUMERIC SIGN THREE SHARU
-<U0001242F>     /xf0/x92/x90/xaf CUNEIFORM NUMERIC SIGN THREE SHARU VARIANT FORM
-<U00012430>     /xf0/x92/x90/xb0 CUNEIFORM NUMERIC SIGN FOUR SHARU
-<U00012431>     /xf0/x92/x90/xb1 CUNEIFORM NUMERIC SIGN FIVE SHARU
-<U00012432>     /xf0/x92/x90/xb2 CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS DISH
-<U00012433>     /xf0/x92/x90/xb3 CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS MIN
-<U00012434>     /xf0/x92/x90/xb4 CUNEIFORM NUMERIC SIGN ONE BURU
-<U00012435>     /xf0/x92/x90/xb5 CUNEIFORM NUMERIC SIGN TWO BURU
-<U00012436>     /xf0/x92/x90/xb6 CUNEIFORM NUMERIC SIGN THREE BURU
-<U00012437>     /xf0/x92/x90/xb7 CUNEIFORM NUMERIC SIGN THREE BURU VARIANT FORM
-<U00012438>     /xf0/x92/x90/xb8 CUNEIFORM NUMERIC SIGN FOUR BURU
-<U00012439>     /xf0/x92/x90/xb9 CUNEIFORM NUMERIC SIGN FIVE BURU
-<U0001243A>     /xf0/x92/x90/xba CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH16
-<U0001243B>     /xf0/x92/x90/xbb CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH21
-<U0001243C>     /xf0/x92/x90/xbc CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU
-<U0001243D>     /xf0/x92/x90/xbd CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU4
-<U0001243E>     /xf0/x92/x90/xbe CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU A
-<U0001243F>     /xf0/x92/x90/xbf CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU B
-<U00012440>     /xf0/x92/x91/x80 CUNEIFORM NUMERIC SIGN SIX VARIANT FORM ASH9
-<U00012441>     /xf0/x92/x91/x81 CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN3
-<U00012442>     /xf0/x92/x91/x82 CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN A
-<U00012443>     /xf0/x92/x91/x83 CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN B
-<U00012444>     /xf0/x92/x91/x84 CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU
-<U00012445>     /xf0/x92/x91/x85 CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU3
-<U00012446>     /xf0/x92/x91/x86 CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU
-<U00012447>     /xf0/x92/x91/x87 CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU3
-<U00012448>     /xf0/x92/x91/x88 CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU4
-<U00012449>     /xf0/x92/x91/x89 CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU A
-<U0001244A>     /xf0/x92/x91/x8a CUNEIFORM NUMERIC SIGN TWO ASH TENU
-<U0001244B>     /xf0/x92/x91/x8b CUNEIFORM NUMERIC SIGN THREE ASH TENU
-<U0001244C>     /xf0/x92/x91/x8c CUNEIFORM NUMERIC SIGN FOUR ASH TENU
-<U0001244D>     /xf0/x92/x91/x8d CUNEIFORM NUMERIC SIGN FIVE ASH TENU
-<U0001244E>     /xf0/x92/x91/x8e CUNEIFORM NUMERIC SIGN SIX ASH TENU
-<U0001244F>     /xf0/x92/x91/x8f CUNEIFORM NUMERIC SIGN ONE BAN2
-<U00012450>     /xf0/x92/x91/x90 CUNEIFORM NUMERIC SIGN TWO BAN2
-<U00012451>     /xf0/x92/x91/x91 CUNEIFORM NUMERIC SIGN THREE BAN2
-<U00012452>     /xf0/x92/x91/x92 CUNEIFORM NUMERIC SIGN FOUR BAN2
-<U00012453>     /xf0/x92/x91/x93 CUNEIFORM NUMERIC SIGN FOUR BAN2 VARIANT FORM
-<U00012454>     /xf0/x92/x91/x94 CUNEIFORM NUMERIC SIGN FIVE BAN2
-<U00012455>     /xf0/x92/x91/x95 CUNEIFORM NUMERIC SIGN FIVE BAN2 VARIANT FORM
-<U00012456>     /xf0/x92/x91/x96 CUNEIFORM NUMERIC SIGN NIGIDAMIN
-<U00012457>     /xf0/x92/x91/x97 CUNEIFORM NUMERIC SIGN NIGIDAESH
-<U00012458>     /xf0/x92/x91/x98 CUNEIFORM NUMERIC SIGN ONE ESHE3
-<U00012459>     /xf0/x92/x91/x99 CUNEIFORM NUMERIC SIGN TWO ESHE3
-<U0001245A>     /xf0/x92/x91/x9a CUNEIFORM NUMERIC SIGN ONE THIRD DISH
-<U0001245B>     /xf0/x92/x91/x9b CUNEIFORM NUMERIC SIGN TWO THIRDS DISH
-<U0001245C>     /xf0/x92/x91/x9c CUNEIFORM NUMERIC SIGN FIVE SIXTHS DISH
-<U0001245D>     /xf0/x92/x91/x9d CUNEIFORM NUMERIC SIGN ONE THIRD VARIANT FORM A
-<U0001245E>     /xf0/x92/x91/x9e CUNEIFORM NUMERIC SIGN TWO THIRDS VARIANT FORM A
-<U0001245F>     /xf0/x92/x91/x9f CUNEIFORM NUMERIC SIGN ONE EIGHTH ASH
-<U00012460>     /xf0/x92/x91/xa0 CUNEIFORM NUMERIC SIGN ONE QUARTER ASH
-<U00012461>     /xf0/x92/x91/xa1 CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE SIXTH
-<U00012462>     /xf0/x92/x91/xa2 CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE QUARTER
-<U00012470>     /xf0/x92/x91/xb0 CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER
-<U00012471>     /xf0/x92/x91/xb1 CUNEIFORM PUNCTUATION SIGN VERTICAL COLON
-<U00012472>     /xf0/x92/x91/xb2 CUNEIFORM PUNCTUATION SIGN DIAGONAL COLON
-<U00012473>     /xf0/x92/x91/xb3 CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON
+<U0001044E> /xf0/x90/x91/x8e DESERET SMALL LETTER OI
+<U0001044F> /xf0/x90/x91/x8f DESERET SMALL LETTER EW
+<U00010450> /xf0/x90/x91/x90 SHAVIAN LETTER PEEP
+<U00010451> /xf0/x90/x91/x91 SHAVIAN LETTER TOT
+<U00010452> /xf0/x90/x91/x92 SHAVIAN LETTER KICK
+<U00010453> /xf0/x90/x91/x93 SHAVIAN LETTER FEE
+<U00010454> /xf0/x90/x91/x94 SHAVIAN LETTER THIGH
+<U00010455> /xf0/x90/x91/x95 SHAVIAN LETTER SO
+<U00010456> /xf0/x90/x91/x96 SHAVIAN LETTER SURE
+<U00010457> /xf0/x90/x91/x97 SHAVIAN LETTER CHURCH
+<U00010458> /xf0/x90/x91/x98 SHAVIAN LETTER YEA
+<U00010459> /xf0/x90/x91/x99 SHAVIAN LETTER HUNG
+<U0001045A> /xf0/x90/x91/x9a SHAVIAN LETTER BIB
+<U0001045B> /xf0/x90/x91/x9b SHAVIAN LETTER DEAD
+<U0001045C> /xf0/x90/x91/x9c SHAVIAN LETTER GAG
+<U0001045D> /xf0/x90/x91/x9d SHAVIAN LETTER VOW
+<U0001045E> /xf0/x90/x91/x9e SHAVIAN LETTER THEY
+<U0001045F> /xf0/x90/x91/x9f SHAVIAN LETTER ZOO
+<U00010460> /xf0/x90/x91/xa0 SHAVIAN LETTER MEASURE
+<U00010461> /xf0/x90/x91/xa1 SHAVIAN LETTER JUDGE
+<U00010462> /xf0/x90/x91/xa2 SHAVIAN LETTER WOE
+<U00010463> /xf0/x90/x91/xa3 SHAVIAN LETTER HA-HA
+<U00010464> /xf0/x90/x91/xa4 SHAVIAN LETTER LOLL
+<U00010465> /xf0/x90/x91/xa5 SHAVIAN LETTER MIME
+<U00010466> /xf0/x90/x91/xa6 SHAVIAN LETTER IF
+<U00010467> /xf0/x90/x91/xa7 SHAVIAN LETTER EGG
+<U00010468> /xf0/x90/x91/xa8 SHAVIAN LETTER ASH
+<U00010469> /xf0/x90/x91/xa9 SHAVIAN LETTER ADO
+<U0001046A> /xf0/x90/x91/xaa SHAVIAN LETTER ON
+<U0001046B> /xf0/x90/x91/xab SHAVIAN LETTER WOOL
+<U0001046C> /xf0/x90/x91/xac SHAVIAN LETTER OUT
+<U0001046D> /xf0/x90/x91/xad SHAVIAN LETTER AH
+<U0001046E> /xf0/x90/x91/xae SHAVIAN LETTER ROAR
+<U0001046F> /xf0/x90/x91/xaf SHAVIAN LETTER NUN
+<U00010470> /xf0/x90/x91/xb0 SHAVIAN LETTER EAT
+<U00010471> /xf0/x90/x91/xb1 SHAVIAN LETTER AGE
+<U00010472> /xf0/x90/x91/xb2 SHAVIAN LETTER ICE
+<U00010473> /xf0/x90/x91/xb3 SHAVIAN LETTER UP
+<U00010474> /xf0/x90/x91/xb4 SHAVIAN LETTER OAK
+<U00010475> /xf0/x90/x91/xb5 SHAVIAN LETTER OOZE
+<U00010476> /xf0/x90/x91/xb6 SHAVIAN LETTER OIL
+<U00010477> /xf0/x90/x91/xb7 SHAVIAN LETTER AWE
+<U00010478> /xf0/x90/x91/xb8 SHAVIAN LETTER ARE
+<U00010479> /xf0/x90/x91/xb9 SHAVIAN LETTER OR
+<U0001047A> /xf0/x90/x91/xba SHAVIAN LETTER AIR
+<U0001047B> /xf0/x90/x91/xbb SHAVIAN LETTER ERR
+<U0001047C> /xf0/x90/x91/xbc SHAVIAN LETTER ARRAY
+<U0001047D> /xf0/x90/x91/xbd SHAVIAN LETTER EAR
+<U0001047E> /xf0/x90/x91/xbe SHAVIAN LETTER IAN
+<U0001047F> /xf0/x90/x91/xbf SHAVIAN LETTER YEW
+<U00010480> /xf0/x90/x92/x80 OSMANYA LETTER ALEF
+<U00010481> /xf0/x90/x92/x81 OSMANYA LETTER BA
+<U00010482> /xf0/x90/x92/x82 OSMANYA LETTER TA
+<U00010483> /xf0/x90/x92/x83 OSMANYA LETTER JA
+<U00010484> /xf0/x90/x92/x84 OSMANYA LETTER XA
+<U00010485> /xf0/x90/x92/x85 OSMANYA LETTER KHA
+<U00010486> /xf0/x90/x92/x86 OSMANYA LETTER DEEL
+<U00010487> /xf0/x90/x92/x87 OSMANYA LETTER RA
+<U00010488> /xf0/x90/x92/x88 OSMANYA LETTER SA
+<U00010489> /xf0/x90/x92/x89 OSMANYA LETTER SHIIN
+<U0001048A> /xf0/x90/x92/x8a OSMANYA LETTER DHA
+<U0001048B> /xf0/x90/x92/x8b OSMANYA LETTER CAYN
+<U0001048C> /xf0/x90/x92/x8c OSMANYA LETTER GA
+<U0001048D> /xf0/x90/x92/x8d OSMANYA LETTER FA
+<U0001048E> /xf0/x90/x92/x8e OSMANYA LETTER QAAF
+<U0001048F> /xf0/x90/x92/x8f OSMANYA LETTER KAAF
+<U00010490> /xf0/x90/x92/x90 OSMANYA LETTER LAAN
+<U00010491> /xf0/x90/x92/x91 OSMANYA LETTER MIIN
+<U00010492> /xf0/x90/x92/x92 OSMANYA LETTER NUUN
+<U00010493> /xf0/x90/x92/x93 OSMANYA LETTER WAW
+<U00010494> /xf0/x90/x92/x94 OSMANYA LETTER HA
+<U00010495> /xf0/x90/x92/x95 OSMANYA LETTER YA
+<U00010496> /xf0/x90/x92/x96 OSMANYA LETTER A
+<U00010497> /xf0/x90/x92/x97 OSMANYA LETTER E
+<U00010498> /xf0/x90/x92/x98 OSMANYA LETTER I
+<U00010499> /xf0/x90/x92/x99 OSMANYA LETTER O
+<U0001049A> /xf0/x90/x92/x9a OSMANYA LETTER U
+<U0001049B> /xf0/x90/x92/x9b OSMANYA LETTER AA
+<U0001049C> /xf0/x90/x92/x9c OSMANYA LETTER EE
+<U0001049D> /xf0/x90/x92/x9d OSMANYA LETTER OO
+<U000104A0> /xf0/x90/x92/xa0 OSMANYA DIGIT ZERO
+<U000104A1> /xf0/x90/x92/xa1 OSMANYA DIGIT ONE
+<U000104A2> /xf0/x90/x92/xa2 OSMANYA DIGIT TWO
+<U000104A3> /xf0/x90/x92/xa3 OSMANYA DIGIT THREE
+<U000104A4> /xf0/x90/x92/xa4 OSMANYA DIGIT FOUR
+<U000104A5> /xf0/x90/x92/xa5 OSMANYA DIGIT FIVE
+<U000104A6> /xf0/x90/x92/xa6 OSMANYA DIGIT SIX
+<U000104A7> /xf0/x90/x92/xa7 OSMANYA DIGIT SEVEN
+<U000104A8> /xf0/x90/x92/xa8 OSMANYA DIGIT EIGHT
+<U000104A9> /xf0/x90/x92/xa9 OSMANYA DIGIT NINE
+<U00010800> /xf0/x90/xa0/x80 CYPRIOT SYLLABLE A
+<U00010801> /xf0/x90/xa0/x81 CYPRIOT SYLLABLE E
+<U00010802> /xf0/x90/xa0/x82 CYPRIOT SYLLABLE I
+<U00010803> /xf0/x90/xa0/x83 CYPRIOT SYLLABLE O
+<U00010804> /xf0/x90/xa0/x84 CYPRIOT SYLLABLE U
+<U00010805> /xf0/x90/xa0/x85 CYPRIOT SYLLABLE JA
+<U00010808> /xf0/x90/xa0/x88 CYPRIOT SYLLABLE JO
+<U0001080A> /xf0/x90/xa0/x8a CYPRIOT SYLLABLE KA
+<U0001080B> /xf0/x90/xa0/x8b CYPRIOT SYLLABLE KE
+<U0001080C> /xf0/x90/xa0/x8c CYPRIOT SYLLABLE KI
+<U0001080D> /xf0/x90/xa0/x8d CYPRIOT SYLLABLE KO
+<U0001080E> /xf0/x90/xa0/x8e CYPRIOT SYLLABLE KU
+<U0001080F> /xf0/x90/xa0/x8f CYPRIOT SYLLABLE LA
+<U00010810> /xf0/x90/xa0/x90 CYPRIOT SYLLABLE LE
+<U00010811> /xf0/x90/xa0/x91 CYPRIOT SYLLABLE LI
+<U00010812> /xf0/x90/xa0/x92 CYPRIOT SYLLABLE LO
+<U00010813> /xf0/x90/xa0/x93 CYPRIOT SYLLABLE LU
+<U00010814> /xf0/x90/xa0/x94 CYPRIOT SYLLABLE MA
+<U00010815> /xf0/x90/xa0/x95 CYPRIOT SYLLABLE ME
+<U00010816> /xf0/x90/xa0/x96 CYPRIOT SYLLABLE MI
+<U00010817> /xf0/x90/xa0/x97 CYPRIOT SYLLABLE MO
+<U00010818> /xf0/x90/xa0/x98 CYPRIOT SYLLABLE MU
+<U00010819> /xf0/x90/xa0/x99 CYPRIOT SYLLABLE NA
+<U0001081A> /xf0/x90/xa0/x9a CYPRIOT SYLLABLE NE
+<U0001081B> /xf0/x90/xa0/x9b CYPRIOT SYLLABLE NI
+<U0001081C> /xf0/x90/xa0/x9c CYPRIOT SYLLABLE NO
+<U0001081D> /xf0/x90/xa0/x9d CYPRIOT SYLLABLE NU
+<U0001081E> /xf0/x90/xa0/x9e CYPRIOT SYLLABLE PA
+<U0001081F> /xf0/x90/xa0/x9f CYPRIOT SYLLABLE PE
+<U00010820> /xf0/x90/xa0/xa0 CYPRIOT SYLLABLE PI
+<U00010821> /xf0/x90/xa0/xa1 CYPRIOT SYLLABLE PO
+<U00010822> /xf0/x90/xa0/xa2 CYPRIOT SYLLABLE PU
+<U00010823> /xf0/x90/xa0/xa3 CYPRIOT SYLLABLE RA
+<U00010824> /xf0/x90/xa0/xa4 CYPRIOT SYLLABLE RE
+<U00010825> /xf0/x90/xa0/xa5 CYPRIOT SYLLABLE RI
+<U00010826> /xf0/x90/xa0/xa6 CYPRIOT SYLLABLE RO
+<U00010827> /xf0/x90/xa0/xa7 CYPRIOT SYLLABLE RU
+<U00010828> /xf0/x90/xa0/xa8 CYPRIOT SYLLABLE SA
+<U00010829> /xf0/x90/xa0/xa9 CYPRIOT SYLLABLE SE
+<U0001082A> /xf0/x90/xa0/xaa CYPRIOT SYLLABLE SI
+<U0001082B> /xf0/x90/xa0/xab CYPRIOT SYLLABLE SO
+<U0001082C> /xf0/x90/xa0/xac CYPRIOT SYLLABLE SU
+<U0001082D> /xf0/x90/xa0/xad CYPRIOT SYLLABLE TA
+<U0001082E> /xf0/x90/xa0/xae CYPRIOT SYLLABLE TE
+<U0001082F> /xf0/x90/xa0/xaf CYPRIOT SYLLABLE TI
+<U00010830> /xf0/x90/xa0/xb0 CYPRIOT SYLLABLE TO
+<U00010831> /xf0/x90/xa0/xb1 CYPRIOT SYLLABLE TU
+<U00010832> /xf0/x90/xa0/xb2 CYPRIOT SYLLABLE WA
+<U00010833> /xf0/x90/xa0/xb3 CYPRIOT SYLLABLE WE
+<U00010834> /xf0/x90/xa0/xb4 CYPRIOT SYLLABLE WI
+<U00010835> /xf0/x90/xa0/xb5 CYPRIOT SYLLABLE WO
+<U00010837> /xf0/x90/xa0/xb7 CYPRIOT SYLLABLE XA
+<U00010838> /xf0/x90/xa0/xb8 CYPRIOT SYLLABLE XE
+<U0001083C> /xf0/x90/xa0/xbc CYPRIOT SYLLABLE ZA
+<U0001083F> /xf0/x90/xa0/xbf CYPRIOT SYLLABLE ZO
+<U00010900> /xf0/x90/xa4/x80 PHOENICIAN LETTER ALF
+<U00010901> /xf0/x90/xa4/x81 PHOENICIAN LETTER BET
+<U00010902> /xf0/x90/xa4/x82 PHOENICIAN LETTER GAML
+<U00010903> /xf0/x90/xa4/x83 PHOENICIAN LETTER DELT
+<U00010904> /xf0/x90/xa4/x84 PHOENICIAN LETTER HE
+<U00010905> /xf0/x90/xa4/x85 PHOENICIAN LETTER WAU
+<U00010906> /xf0/x90/xa4/x86 PHOENICIAN LETTER ZAI
+<U00010907> /xf0/x90/xa4/x87 PHOENICIAN LETTER HET
+<U00010908> /xf0/x90/xa4/x88 PHOENICIAN LETTER TET
+<U00010909> /xf0/x90/xa4/x89 PHOENICIAN LETTER YOD
+<U0001090A> /xf0/x90/xa4/x8a PHOENICIAN LETTER KAF
+<U0001090B> /xf0/x90/xa4/x8b PHOENICIAN LETTER LAMD
+<U0001090C> /xf0/x90/xa4/x8c PHOENICIAN LETTER MEM
+<U0001090D> /xf0/x90/xa4/x8d PHOENICIAN LETTER NUN
+<U0001090E> /xf0/x90/xa4/x8e PHOENICIAN LETTER SEMK
+<U0001090F> /xf0/x90/xa4/x8f PHOENICIAN LETTER AIN
+<U00010910> /xf0/x90/xa4/x90 PHOENICIAN LETTER PE
+<U00010911> /xf0/x90/xa4/x91 PHOENICIAN LETTER SADE
+<U00010912> /xf0/x90/xa4/x92 PHOENICIAN LETTER QOF
+<U00010913> /xf0/x90/xa4/x93 PHOENICIAN LETTER ROSH
+<U00010914> /xf0/x90/xa4/x94 PHOENICIAN LETTER SHIN
+<U00010915> /xf0/x90/xa4/x95 PHOENICIAN LETTER TAU
+<U00010916> /xf0/x90/xa4/x96 PHOENICIAN NUMBER ONE
+<U00010917> /xf0/x90/xa4/x97 PHOENICIAN NUMBER TEN
+<U00010918> /xf0/x90/xa4/x98 PHOENICIAN NUMBER TWENTY
+<U00010919> /xf0/x90/xa4/x99 PHOENICIAN NUMBER ONE HUNDRED
+<U0001091F> /xf0/x90/xa4/x9f PHOENICIAN WORD SEPARATOR
+<U00010920> /xf0/x90/xa4/xa0 LYDIAN LETTER A
+<U00010921> /xf0/x90/xa4/xa1 LYDIAN LETTER B
+<U00010922> /xf0/x90/xa4/xa2 LYDIAN LETTER G
+<U00010923> /xf0/x90/xa4/xa3 LYDIAN LETTER D
+<U00010924> /xf0/x90/xa4/xa4 LYDIAN LETTER E
+<U00010925> /xf0/x90/xa4/xa5 LYDIAN LETTER V
+<U00010926> /xf0/x90/xa4/xa6 LYDIAN LETTER I
+<U00010927> /xf0/x90/xa4/xa7 LYDIAN LETTER Y
+<U00010928> /xf0/x90/xa4/xa8 LYDIAN LETTER K
+<U00010929> /xf0/x90/xa4/xa9 LYDIAN LETTER L
+<U0001092A> /xf0/x90/xa4/xaa LYDIAN LETTER M
+<U0001092B> /xf0/x90/xa4/xab LYDIAN LETTER N
+<U0001092C> /xf0/x90/xa4/xac LYDIAN LETTER O
+<U0001092D> /xf0/x90/xa4/xad LYDIAN LETTER R
+<U0001092E> /xf0/x90/xa4/xae LYDIAN LETTER SS
+<U0001092F> /xf0/x90/xa4/xaf LYDIAN LETTER T
+<U00010930> /xf0/x90/xa4/xb0 LYDIAN LETTER U
+<U00010931> /xf0/x90/xa4/xb1 LYDIAN LETTER F
+<U00010932> /xf0/x90/xa4/xb2 LYDIAN LETTER Q
+<U00010933> /xf0/x90/xa4/xb3 LYDIAN LETTER S
+<U00010934> /xf0/x90/xa4/xb4 LYDIAN LETTER TT
+<U00010935> /xf0/x90/xa4/xb5 LYDIAN LETTER AN
+<U00010936> /xf0/x90/xa4/xb6 LYDIAN LETTER EN
+<U00010937> /xf0/x90/xa4/xb7 LYDIAN LETTER LY
+<U00010938> /xf0/x90/xa4/xb8 LYDIAN LETTER NN
+<U00010939> /xf0/x90/xa4/xb9 LYDIAN LETTER C
+<U0001093F> /xf0/x90/xa4/xbf LYDIAN TRIANGULAR MARK
+<U00010A00> /xf0/x90/xa8/x80 KHAROSHTHI LETTER A
+<U00010A01> /xf0/x90/xa8/x81 KHAROSHTHI VOWEL SIGN I
+<U00010A02> /xf0/x90/xa8/x82 KHAROSHTHI VOWEL SIGN U
+<U00010A03> /xf0/x90/xa8/x83 KHAROSHTHI VOWEL SIGN VOCALIC R
+<U00010A05> /xf0/x90/xa8/x85 KHAROSHTHI VOWEL SIGN E
+<U00010A06> /xf0/x90/xa8/x86 KHAROSHTHI VOWEL SIGN O
+<U00010A0C> /xf0/x90/xa8/x8c KHAROSHTHI VOWEL LENGTH MARK
+<U00010A0D> /xf0/x90/xa8/x8d KHAROSHTHI SIGN DOUBLE RING BELOW
+<U00010A0E> /xf0/x90/xa8/x8e KHAROSHTHI SIGN ANUSVARA
+<U00010A0F> /xf0/x90/xa8/x8f KHAROSHTHI SIGN VISARGA
+<U00010A10> /xf0/x90/xa8/x90 KHAROSHTHI LETTER KA
+<U00010A11> /xf0/x90/xa8/x91 KHAROSHTHI LETTER KHA
+<U00010A12> /xf0/x90/xa8/x92 KHAROSHTHI LETTER GA
+<U00010A13> /xf0/x90/xa8/x93 KHAROSHTHI LETTER GHA
+<U00010A15> /xf0/x90/xa8/x95 KHAROSHTHI LETTER CA
+<U00010A16> /xf0/x90/xa8/x96 KHAROSHTHI LETTER CHA
+<U00010A17> /xf0/x90/xa8/x97 KHAROSHTHI LETTER JA
+<U00010A19> /xf0/x90/xa8/x99 KHAROSHTHI LETTER NYA
+<U00010A1A> /xf0/x90/xa8/x9a KHAROSHTHI LETTER TTA
+<U00010A1B> /xf0/x90/xa8/x9b KHAROSHTHI LETTER TTHA
+<U00010A1C> /xf0/x90/xa8/x9c KHAROSHTHI LETTER DDA
+<U00010A1D> /xf0/x90/xa8/x9d KHAROSHTHI LETTER DDHA
+<U00010A1E> /xf0/x90/xa8/x9e KHAROSHTHI LETTER NNA
+<U00010A1F> /xf0/x90/xa8/x9f KHAROSHTHI LETTER TA
+<U00010A20> /xf0/x90/xa8/xa0 KHAROSHTHI LETTER THA
+<U00010A21> /xf0/x90/xa8/xa1 KHAROSHTHI LETTER DA
+<U00010A22> /xf0/x90/xa8/xa2 KHAROSHTHI LETTER DHA
+<U00010A23> /xf0/x90/xa8/xa3 KHAROSHTHI LETTER NA
+<U00010A24> /xf0/x90/xa8/xa4 KHAROSHTHI LETTER PA
+<U00010A25> /xf0/x90/xa8/xa5 KHAROSHTHI LETTER PHA
+<U00010A26> /xf0/x90/xa8/xa6 KHAROSHTHI LETTER BA
+<U00010A27> /xf0/x90/xa8/xa7 KHAROSHTHI LETTER BHA
+<U00010A28> /xf0/x90/xa8/xa8 KHAROSHTHI LETTER MA
+<U00010A29> /xf0/x90/xa8/xa9 KHAROSHTHI LETTER YA
+<U00010A2A> /xf0/x90/xa8/xaa KHAROSHTHI LETTER RA
+<U00010A2B> /xf0/x90/xa8/xab KHAROSHTHI LETTER LA
+<U00010A2C> /xf0/x90/xa8/xac KHAROSHTHI LETTER VA
+<U00010A2D> /xf0/x90/xa8/xad KHAROSHTHI LETTER SHA
+<U00010A2E> /xf0/x90/xa8/xae KHAROSHTHI LETTER SSA
+<U00010A2F> /xf0/x90/xa8/xaf KHAROSHTHI LETTER SA
+<U00010A30> /xf0/x90/xa8/xb0 KHAROSHTHI LETTER ZA
+<U00010A31> /xf0/x90/xa8/xb1 KHAROSHTHI LETTER HA
+<U00010A32> /xf0/x90/xa8/xb2 KHAROSHTHI LETTER KKA
+<U00010A33> /xf0/x90/xa8/xb3 KHAROSHTHI LETTER TTTHA
+<U00010A38> /xf0/x90/xa8/xb8 KHAROSHTHI SIGN BAR ABOVE
+<U00010A39> /xf0/x90/xa8/xb9 KHAROSHTHI SIGN CAUDA
+<U00010A3A> /xf0/x90/xa8/xba KHAROSHTHI SIGN DOT BELOW
+<U00010A3F> /xf0/x90/xa8/xbf KHAROSHTHI VIRAMA
+<U00010A40> /xf0/x90/xa9/x80 KHAROSHTHI DIGIT ONE
+<U00010A41> /xf0/x90/xa9/x81 KHAROSHTHI DIGIT TWO
+<U00010A42> /xf0/x90/xa9/x82 KHAROSHTHI DIGIT THREE
+<U00010A43> /xf0/x90/xa9/x83 KHAROSHTHI DIGIT FOUR
+<U00010A44> /xf0/x90/xa9/x84 KHAROSHTHI NUMBER TEN
+<U00010A45> /xf0/x90/xa9/x85 KHAROSHTHI NUMBER TWENTY
+<U00010A46> /xf0/x90/xa9/x86 KHAROSHTHI NUMBER ONE HUNDRED
+<U00010A47> /xf0/x90/xa9/x87 KHAROSHTHI NUMBER ONE THOUSAND
+<U00010A50> /xf0/x90/xa9/x90 KHAROSHTHI PUNCTUATION DOT
+<U00010A51> /xf0/x90/xa9/x91 KHAROSHTHI PUNCTUATION SMALL CIRCLE
+<U00010A52> /xf0/x90/xa9/x92 KHAROSHTHI PUNCTUATION CIRCLE
+<U00010A53> /xf0/x90/xa9/x93 KHAROSHTHI PUNCTUATION CRESCENT BAR
+<U00010A54> /xf0/x90/xa9/x94 KHAROSHTHI PUNCTUATION MANGALAM
+<U00010A55> /xf0/x90/xa9/x95 KHAROSHTHI PUNCTUATION LOTUS
+<U00010A56> /xf0/x90/xa9/x96 KHAROSHTHI PUNCTUATION DANDA
+<U00010A57> /xf0/x90/xa9/x97 KHAROSHTHI PUNCTUATION DOUBLE DANDA
+<U00010A58> /xf0/x90/xa9/x98 KHAROSHTHI PUNCTUATION LINES
+<U00012000> /xf0/x92/x80/x80 CUNEIFORM SIGN A
+<U00012001> /xf0/x92/x80/x81 CUNEIFORM SIGN A TIMES A
+<U00012002> /xf0/x92/x80/x82 CUNEIFORM SIGN A TIMES BAD
+<U00012003> /xf0/x92/x80/x83 CUNEIFORM SIGN A TIMES GAN2 TENU
+<U00012004> /xf0/x92/x80/x84 CUNEIFORM SIGN A TIMES HA
+<U00012005> /xf0/x92/x80/x85 CUNEIFORM SIGN A TIMES IGI
+<U00012006> /xf0/x92/x80/x86 CUNEIFORM SIGN A TIMES LAGAR GUNU
+<U00012007> /xf0/x92/x80/x87 CUNEIFORM SIGN A TIMES MUSH
+<U00012008> /xf0/x92/x80/x88 CUNEIFORM SIGN A TIMES SAG
+<U00012009> /xf0/x92/x80/x89 CUNEIFORM SIGN A2
+<U0001200A> /xf0/x92/x80/x8a CUNEIFORM SIGN AB
+<U0001200B> /xf0/x92/x80/x8b CUNEIFORM SIGN AB TIMES ASH2
+<U0001200C> /xf0/x92/x80/x8c CUNEIFORM SIGN AB TIMES DUN3 GUNU
+<U0001200D> /xf0/x92/x80/x8d CUNEIFORM SIGN AB TIMES GAL
+<U0001200E> /xf0/x92/x80/x8e CUNEIFORM SIGN AB TIMES GAN2 TENU
+<U0001200F> /xf0/x92/x80/x8f CUNEIFORM SIGN AB TIMES HA
+<U00012010> /xf0/x92/x80/x90 CUNEIFORM SIGN AB TIMES IGI GUNU
+<U00012011> /xf0/x92/x80/x91 CUNEIFORM SIGN AB TIMES IMIN
+<U00012012> /xf0/x92/x80/x92 CUNEIFORM SIGN AB TIMES LAGAB
+<U00012013> /xf0/x92/x80/x93 CUNEIFORM SIGN AB TIMES SHESH
+<U00012014> /xf0/x92/x80/x94 CUNEIFORM SIGN AB TIMES U PLUS U PLUS U
+<U00012015> /xf0/x92/x80/x95 CUNEIFORM SIGN AB GUNU
+<U00012016> /xf0/x92/x80/x96 CUNEIFORM SIGN AB2
+<U00012017> /xf0/x92/x80/x97 CUNEIFORM SIGN AB2 TIMES BALAG
+<U00012018> /xf0/x92/x80/x98 CUNEIFORM SIGN AB2 TIMES GAN2 TENU
+<U00012019> /xf0/x92/x80/x99 CUNEIFORM SIGN AB2 TIMES ME PLUS EN
+<U0001201A> /xf0/x92/x80/x9a CUNEIFORM SIGN AB2 TIMES SHA3
+<U0001201B> /xf0/x92/x80/x9b CUNEIFORM SIGN AB2 TIMES TAK4
+<U0001201C> /xf0/x92/x80/x9c CUNEIFORM SIGN AD
+<U0001201D> /xf0/x92/x80/x9d CUNEIFORM SIGN AK
+<U0001201E> /xf0/x92/x80/x9e CUNEIFORM SIGN AK TIMES ERIN2
+<U0001201F> /xf0/x92/x80/x9f CUNEIFORM SIGN AK TIMES SHITA PLUS GISH
+<U00012020> /xf0/x92/x80/xa0 CUNEIFORM SIGN AL
+<U00012021> /xf0/x92/x80/xa1 CUNEIFORM SIGN AL TIMES AL
+<U00012022> /xf0/x92/x80/xa2 CUNEIFORM SIGN AL TIMES DIM2
+<U00012023> /xf0/x92/x80/xa3 CUNEIFORM SIGN AL TIMES GISH
+<U00012024> /xf0/x92/x80/xa4 CUNEIFORM SIGN AL TIMES HA
+<U00012025> /xf0/x92/x80/xa5 CUNEIFORM SIGN AL TIMES KAD3
+<U00012026> /xf0/x92/x80/xa6 CUNEIFORM SIGN AL TIMES KI
+<U00012027> /xf0/x92/x80/xa7 CUNEIFORM SIGN AL TIMES SHE
+<U00012028> /xf0/x92/x80/xa8 CUNEIFORM SIGN AL TIMES USH
+<U00012029> /xf0/x92/x80/xa9 CUNEIFORM SIGN ALAN
+<U0001202A> /xf0/x92/x80/xaa CUNEIFORM SIGN ALEPH
+<U0001202B> /xf0/x92/x80/xab CUNEIFORM SIGN AMAR
+<U0001202C> /xf0/x92/x80/xac CUNEIFORM SIGN AMAR TIMES SHE
+<U0001202D> /xf0/x92/x80/xad CUNEIFORM SIGN AN
+<U0001202E> /xf0/x92/x80/xae CUNEIFORM SIGN AN OVER AN
+<U0001202F> /xf0/x92/x80/xaf CUNEIFORM SIGN AN THREE TIMES
+<U00012030> /xf0/x92/x80/xb0 CUNEIFORM SIGN AN PLUS NAGA OPPOSING AN PLUS NAGA
+<U00012031> /xf0/x92/x80/xb1 CUNEIFORM SIGN AN PLUS NAGA SQUARED
+<U00012032> /xf0/x92/x80/xb2 CUNEIFORM SIGN ANSHE
+<U00012033> /xf0/x92/x80/xb3 CUNEIFORM SIGN APIN
+<U00012034> /xf0/x92/x80/xb4 CUNEIFORM SIGN ARAD
+<U00012035> /xf0/x92/x80/xb5 CUNEIFORM SIGN ARAD TIMES KUR
+<U00012036> /xf0/x92/x80/xb6 CUNEIFORM SIGN ARKAB
+<U00012037> /xf0/x92/x80/xb7 CUNEIFORM SIGN ASAL2
+<U00012038> /xf0/x92/x80/xb8 CUNEIFORM SIGN ASH
+<U00012039> /xf0/x92/x80/xb9 CUNEIFORM SIGN ASH ZIDA TENU
+<U0001203A> /xf0/x92/x80/xba CUNEIFORM SIGN ASH KABA TENU
+<U0001203B> /xf0/x92/x80/xbb CUNEIFORM SIGN ASH OVER ASH TUG2 OVER TUG2 TUG2 OVER TUG2 PAP
+<U0001203C> /xf0/x92/x80/xbc CUNEIFORM SIGN ASH OVER ASH OVER ASH
+<U0001203D> /xf0/x92/x80/xbd CUNEIFORM SIGN ASH OVER ASH OVER ASH CROSSING ASH OVER ASH OVER ASH
+<U0001203E> /xf0/x92/x80/xbe CUNEIFORM SIGN ASH2
+<U0001203F> /xf0/x92/x80/xbf CUNEIFORM SIGN ASHGAB
+<U00012040> /xf0/x92/x81/x80 CUNEIFORM SIGN BA
+<U00012041> /xf0/x92/x81/x81 CUNEIFORM SIGN BAD
+<U00012042> /xf0/x92/x81/x82 CUNEIFORM SIGN BAG3
+<U00012043> /xf0/x92/x81/x83 CUNEIFORM SIGN BAHAR2
+<U00012044> /xf0/x92/x81/x84 CUNEIFORM SIGN BAL
+<U00012045> /xf0/x92/x81/x85 CUNEIFORM SIGN BAL OVER BAL
+<U00012046> /xf0/x92/x81/x86 CUNEIFORM SIGN BALAG
+<U00012047> /xf0/x92/x81/x87 CUNEIFORM SIGN BAR
+<U00012048> /xf0/x92/x81/x88 CUNEIFORM SIGN BARA2
+<U00012049> /xf0/x92/x81/x89 CUNEIFORM SIGN BI
+<U0001204A> /xf0/x92/x81/x8a CUNEIFORM SIGN BI TIMES A
+<U0001204B> /xf0/x92/x81/x8b CUNEIFORM SIGN BI TIMES GAR
+<U0001204C> /xf0/x92/x81/x8c CUNEIFORM SIGN BI TIMES IGI GUNU
+<U0001204D> /xf0/x92/x81/x8d CUNEIFORM SIGN BU
+<U0001204E> /xf0/x92/x81/x8e CUNEIFORM SIGN BU OVER BU AB
+<U0001204F> /xf0/x92/x81/x8f CUNEIFORM SIGN BU OVER BU UN
+<U00012050> /xf0/x92/x81/x90 CUNEIFORM SIGN BU CROSSING BU
+<U00012051> /xf0/x92/x81/x91 CUNEIFORM SIGN BULUG
+<U00012052> /xf0/x92/x81/x92 CUNEIFORM SIGN BULUG OVER BULUG
+<U00012053> /xf0/x92/x81/x93 CUNEIFORM SIGN BUR
+<U00012054> /xf0/x92/x81/x94 CUNEIFORM SIGN BUR2
+<U00012055> /xf0/x92/x81/x95 CUNEIFORM SIGN DA
+<U00012056> /xf0/x92/x81/x96 CUNEIFORM SIGN DAG
+<U00012057> /xf0/x92/x81/x97 CUNEIFORM SIGN DAG KISIM5 TIMES A PLUS MASH
+<U00012058> /xf0/x92/x81/x98 CUNEIFORM SIGN DAG KISIM5 TIMES AMAR
+<U00012059> /xf0/x92/x81/x99 CUNEIFORM SIGN DAG KISIM5 TIMES BALAG
+<U0001205A> /xf0/x92/x81/x9a CUNEIFORM SIGN DAG KISIM5 TIMES BI
+<U0001205B> /xf0/x92/x81/x9b CUNEIFORM SIGN DAG KISIM5 TIMES GA
+<U0001205C> /xf0/x92/x81/x9c CUNEIFORM SIGN DAG KISIM5 TIMES GA PLUS MASH
+<U0001205D> /xf0/x92/x81/x9d CUNEIFORM SIGN DAG KISIM5 TIMES GI
+<U0001205E> /xf0/x92/x81/x9e CUNEIFORM SIGN DAG KISIM5 TIMES GIR2
+<U0001205F> /xf0/x92/x81/x9f CUNEIFORM SIGN DAG KISIM5 TIMES GUD
+<U00012060> /xf0/x92/x81/xa0 CUNEIFORM SIGN DAG KISIM5 TIMES HA
+<U00012061> /xf0/x92/x81/xa1 CUNEIFORM SIGN DAG KISIM5 TIMES IR
+<U00012062> /xf0/x92/x81/xa2 CUNEIFORM SIGN DAG KISIM5 TIMES IR PLUS LU
+<U00012063> /xf0/x92/x81/xa3 CUNEIFORM SIGN DAG KISIM5 TIMES KAK
+<U00012064> /xf0/x92/x81/xa4 CUNEIFORM SIGN DAG KISIM5 TIMES LA
+<U00012065> /xf0/x92/x81/xa5 CUNEIFORM SIGN DAG KISIM5 TIMES LU
+<U00012066> /xf0/x92/x81/xa6 CUNEIFORM SIGN DAG KISIM5 TIMES LU PLUS MASH2
+<U00012067> /xf0/x92/x81/xa7 CUNEIFORM SIGN DAG KISIM5 TIMES LUM
+<U00012068> /xf0/x92/x81/xa8 CUNEIFORM SIGN DAG KISIM5 TIMES NE
+<U00012069> /xf0/x92/x81/xa9 CUNEIFORM SIGN DAG KISIM5 TIMES PAP PLUS PAP
+<U0001206A> /xf0/x92/x81/xaa CUNEIFORM SIGN DAG KISIM5 TIMES SI
+<U0001206B> /xf0/x92/x81/xab CUNEIFORM SIGN DAG KISIM5 TIMES TAK4
+<U0001206C> /xf0/x92/x81/xac CUNEIFORM SIGN DAG KISIM5 TIMES U2 PLUS GIR2
+<U0001206D> /xf0/x92/x81/xad CUNEIFORM SIGN DAG KISIM5 TIMES USH
+<U0001206E> /xf0/x92/x81/xae CUNEIFORM SIGN DAM
+<U0001206F> /xf0/x92/x81/xaf CUNEIFORM SIGN DAR
+<U00012070> /xf0/x92/x81/xb0 CUNEIFORM SIGN DARA3
+<U00012071> /xf0/x92/x81/xb1 CUNEIFORM SIGN DARA4
+<U00012072> /xf0/x92/x81/xb2 CUNEIFORM SIGN DI
+<U00012073> /xf0/x92/x81/xb3 CUNEIFORM SIGN DIB
+<U00012074> /xf0/x92/x81/xb4 CUNEIFORM SIGN DIM
+<U00012075> /xf0/x92/x81/xb5 CUNEIFORM SIGN DIM TIMES SHE
+<U00012076> /xf0/x92/x81/xb6 CUNEIFORM SIGN DIM2
+<U00012077> /xf0/x92/x81/xb7 CUNEIFORM SIGN DIN
+<U00012078> /xf0/x92/x81/xb8 CUNEIFORM SIGN DIN KASKAL U GUNU DISH
+<U00012079> /xf0/x92/x81/xb9 CUNEIFORM SIGN DISH
+<U0001207A> /xf0/x92/x81/xba CUNEIFORM SIGN DU
+<U0001207B> /xf0/x92/x81/xbb CUNEIFORM SIGN DU OVER DU
+<U0001207C> /xf0/x92/x81/xbc CUNEIFORM SIGN DU GUNU
+<U0001207D> /xf0/x92/x81/xbd CUNEIFORM SIGN DU SHESHIG
+<U0001207E> /xf0/x92/x81/xbe CUNEIFORM SIGN DUB
+<U0001207F> /xf0/x92/x81/xbf CUNEIFORM SIGN DUB TIMES ESH2
+<U00012080> /xf0/x92/x82/x80 CUNEIFORM SIGN DUB2
+<U00012081> /xf0/x92/x82/x81 CUNEIFORM SIGN DUG
+<U00012082> /xf0/x92/x82/x82 CUNEIFORM SIGN DUGUD
+<U00012083> /xf0/x92/x82/x83 CUNEIFORM SIGN DUH
+<U00012084> /xf0/x92/x82/x84 CUNEIFORM SIGN DUN
+<U00012085> /xf0/x92/x82/x85 CUNEIFORM SIGN DUN3
+<U00012086> /xf0/x92/x82/x86 CUNEIFORM SIGN DUN3 GUNU
+<U00012087> /xf0/x92/x82/x87 CUNEIFORM SIGN DUN3 GUNU GUNU
+<U00012088> /xf0/x92/x82/x88 CUNEIFORM SIGN DUN4
+<U00012089> /xf0/x92/x82/x89 CUNEIFORM SIGN DUR2
+<U0001208A> /xf0/x92/x82/x8a CUNEIFORM SIGN E
+<U0001208B> /xf0/x92/x82/x8b CUNEIFORM SIGN E TIMES PAP
+<U0001208C> /xf0/x92/x82/x8c CUNEIFORM SIGN E OVER E NUN OVER NUN
+<U0001208D> /xf0/x92/x82/x8d CUNEIFORM SIGN E2
+<U0001208E> /xf0/x92/x82/x8e CUNEIFORM SIGN E2 TIMES A PLUS HA PLUS DA
+<U0001208F> /xf0/x92/x82/x8f CUNEIFORM SIGN E2 TIMES GAR
+<U00012090> /xf0/x92/x82/x90 CUNEIFORM SIGN E2 TIMES MI
+<U00012091> /xf0/x92/x82/x91 CUNEIFORM SIGN E2 TIMES SAL
+<U00012092> /xf0/x92/x82/x92 CUNEIFORM SIGN E2 TIMES SHE
+<U00012093> /xf0/x92/x82/x93 CUNEIFORM SIGN E2 TIMES U
+<U00012094> /xf0/x92/x82/x94 CUNEIFORM SIGN EDIN
+<U00012095> /xf0/x92/x82/x95 CUNEIFORM SIGN EGIR
+<U00012096> /xf0/x92/x82/x96 CUNEIFORM SIGN EL
+<U00012097> /xf0/x92/x82/x97 CUNEIFORM SIGN EN
+<U00012098> /xf0/x92/x82/x98 CUNEIFORM SIGN EN TIMES GAN2
+<U00012099> /xf0/x92/x82/x99 CUNEIFORM SIGN EN TIMES GAN2 TENU
+<U0001209A> /xf0/x92/x82/x9a CUNEIFORM SIGN EN TIMES ME
+<U0001209B> /xf0/x92/x82/x9b CUNEIFORM SIGN EN CROSSING EN
+<U0001209C> /xf0/x92/x82/x9c CUNEIFORM SIGN EN OPPOSING EN
+<U0001209D> /xf0/x92/x82/x9d CUNEIFORM SIGN EN SQUARED
+<U0001209E> /xf0/x92/x82/x9e CUNEIFORM SIGN EREN
+<U0001209F> /xf0/x92/x82/x9f CUNEIFORM SIGN ERIN2
+<U000120A0> /xf0/x92/x82/xa0 CUNEIFORM SIGN ESH2
+<U000120A1> /xf0/x92/x82/xa1 CUNEIFORM SIGN EZEN
+<U000120A2> /xf0/x92/x82/xa2 CUNEIFORM SIGN EZEN TIMES A
+<U000120A3> /xf0/x92/x82/xa3 CUNEIFORM SIGN EZEN TIMES A PLUS LAL
+<U000120A4> /xf0/x92/x82/xa4 CUNEIFORM SIGN EZEN TIMES A PLUS LAL TIMES LAL
+<U000120A5> /xf0/x92/x82/xa5 CUNEIFORM SIGN EZEN TIMES AN
+<U000120A6> /xf0/x92/x82/xa6 CUNEIFORM SIGN EZEN TIMES BAD
+<U000120A7> /xf0/x92/x82/xa7 CUNEIFORM SIGN EZEN TIMES DUN3 GUNU
+<U000120A8> /xf0/x92/x82/xa8 CUNEIFORM SIGN EZEN TIMES DUN3 GUNU GUNU
+<U000120A9> /xf0/x92/x82/xa9 CUNEIFORM SIGN EZEN TIMES HA
+<U000120AA> /xf0/x92/x82/xaa CUNEIFORM SIGN EZEN TIMES HA GUNU
+<U000120AB> /xf0/x92/x82/xab CUNEIFORM SIGN EZEN TIMES IGI GUNU
+<U000120AC> /xf0/x92/x82/xac CUNEIFORM SIGN EZEN TIMES KASKAL
+<U000120AD> /xf0/x92/x82/xad CUNEIFORM SIGN EZEN TIMES KASKAL SQUARED
+<U000120AE> /xf0/x92/x82/xae CUNEIFORM SIGN EZEN TIMES KU3
+<U000120AF> /xf0/x92/x82/xaf CUNEIFORM SIGN EZEN TIMES LA
+<U000120B0> /xf0/x92/x82/xb0 CUNEIFORM SIGN EZEN TIMES LAL TIMES LAL
+<U000120B1> /xf0/x92/x82/xb1 CUNEIFORM SIGN EZEN TIMES LI
+<U000120B2> /xf0/x92/x82/xb2 CUNEIFORM SIGN EZEN TIMES LU
+<U000120B3> /xf0/x92/x82/xb3 CUNEIFORM SIGN EZEN TIMES U2
+<U000120B4> /xf0/x92/x82/xb4 CUNEIFORM SIGN EZEN TIMES UD
+<U000120B5> /xf0/x92/x82/xb5 CUNEIFORM SIGN GA
+<U000120B6> /xf0/x92/x82/xb6 CUNEIFORM SIGN GA GUNU
+<U000120B7> /xf0/x92/x82/xb7 CUNEIFORM SIGN GA2
+<U000120B8> /xf0/x92/x82/xb8 CUNEIFORM SIGN GA2 TIMES A PLUS DA PLUS HA
+<U000120B9> /xf0/x92/x82/xb9 CUNEIFORM SIGN GA2 TIMES A PLUS HA
+<U000120BA> /xf0/x92/x82/xba CUNEIFORM SIGN GA2 TIMES A PLUS IGI
+<U000120BB> /xf0/x92/x82/xbb CUNEIFORM SIGN GA2 TIMES AB2 TENU PLUS TAB
+<U000120BC> /xf0/x92/x82/xbc CUNEIFORM SIGN GA2 TIMES AN
+<U000120BD> /xf0/x92/x82/xbd CUNEIFORM SIGN GA2 TIMES ASH
+<U000120BE> /xf0/x92/x82/xbe CUNEIFORM SIGN GA2 TIMES ASH2 PLUS GAL
+<U000120BF> /xf0/x92/x82/xbf CUNEIFORM SIGN GA2 TIMES BAD
+<U000120C0> /xf0/x92/x83/x80 CUNEIFORM SIGN GA2 TIMES BAR PLUS RA
+<U000120C1> /xf0/x92/x83/x81 CUNEIFORM SIGN GA2 TIMES BUR
+<U000120C2> /xf0/x92/x83/x82 CUNEIFORM SIGN GA2 TIMES BUR PLUS RA
+<U000120C3> /xf0/x92/x83/x83 CUNEIFORM SIGN GA2 TIMES DA
+<U000120C4> /xf0/x92/x83/x84 CUNEIFORM SIGN GA2 TIMES DI
+<U000120C5> /xf0/x92/x83/x85 CUNEIFORM SIGN GA2 TIMES DIM TIMES SHE
+<U000120C6> /xf0/x92/x83/x86 CUNEIFORM SIGN GA2 TIMES DUB
+<U000120C7> /xf0/x92/x83/x87 CUNEIFORM SIGN GA2 TIMES EL
+<U000120C8> /xf0/x92/x83/x88 CUNEIFORM SIGN GA2 TIMES EL PLUS LA
+<U000120C9> /xf0/x92/x83/x89 CUNEIFORM SIGN GA2 TIMES EN
+<U000120CA> /xf0/x92/x83/x8a CUNEIFORM SIGN GA2 TIMES EN TIMES GAN2 TENU
+<U000120CB> /xf0/x92/x83/x8b CUNEIFORM SIGN GA2 TIMES GAN2 TENU
+<U000120CC> /xf0/x92/x83/x8c CUNEIFORM SIGN GA2 TIMES GAR
+<U000120CD> /xf0/x92/x83/x8d CUNEIFORM SIGN GA2 TIMES GI
+<U000120CE> /xf0/x92/x83/x8e CUNEIFORM SIGN GA2 TIMES GI4
+<U000120CF> /xf0/x92/x83/x8f CUNEIFORM SIGN GA2 TIMES GI4 PLUS A
+<U000120D0> /xf0/x92/x83/x90 CUNEIFORM SIGN GA2 TIMES GIR2 PLUS SU
+<U000120D1> /xf0/x92/x83/x91 CUNEIFORM SIGN GA2 TIMES HA PLUS LU PLUS ESH2
+<U000120D2> /xf0/x92/x83/x92 CUNEIFORM SIGN GA2 TIMES HAL
+<U000120D3> /xf0/x92/x83/x93 CUNEIFORM SIGN GA2 TIMES HAL PLUS LA
+<U000120D4> /xf0/x92/x83/x94 CUNEIFORM SIGN GA2 TIMES HI PLUS LI
+<U000120D5> /xf0/x92/x83/x95 CUNEIFORM SIGN GA2 TIMES HUB2
+<U000120D6> /xf0/x92/x83/x96 CUNEIFORM SIGN GA2 TIMES IGI GUNU
+<U000120D7> /xf0/x92/x83/x97 CUNEIFORM SIGN GA2 TIMES ISH PLUS HU PLUS ASH
+<U000120D8> /xf0/x92/x83/x98 CUNEIFORM SIGN GA2 TIMES KAK
+<U000120D9> /xf0/x92/x83/x99 CUNEIFORM SIGN GA2 TIMES KASKAL
+<U000120DA> /xf0/x92/x83/x9a CUNEIFORM SIGN GA2 TIMES KID
+<U000120DB> /xf0/x92/x83/x9b CUNEIFORM SIGN GA2 TIMES KID PLUS LAL
+<U000120DC> /xf0/x92/x83/x9c CUNEIFORM SIGN GA2 TIMES KU3 PLUS AN
+<U000120DD> /xf0/x92/x83/x9d CUNEIFORM SIGN GA2 TIMES LA
+<U000120DE> /xf0/x92/x83/x9e CUNEIFORM SIGN GA2 TIMES ME PLUS EN
+<U000120DF> /xf0/x92/x83/x9f CUNEIFORM SIGN GA2 TIMES MI
+<U000120E0> /xf0/x92/x83/xa0 CUNEIFORM SIGN GA2 TIMES NUN
+<U000120E1> /xf0/x92/x83/xa1 CUNEIFORM SIGN GA2 TIMES NUN OVER NUN
+<U000120E2> /xf0/x92/x83/xa2 CUNEIFORM SIGN GA2 TIMES PA
+<U000120E3> /xf0/x92/x83/xa3 CUNEIFORM SIGN GA2 TIMES SAL
+<U000120E4> /xf0/x92/x83/xa4 CUNEIFORM SIGN GA2 TIMES SAR
+<U000120E5> /xf0/x92/x83/xa5 CUNEIFORM SIGN GA2 TIMES SHE
+<U000120E6> /xf0/x92/x83/xa6 CUNEIFORM SIGN GA2 TIMES SHE PLUS TUR
+<U000120E7> /xf0/x92/x83/xa7 CUNEIFORM SIGN GA2 TIMES SHID
+<U000120E8> /xf0/x92/x83/xa8 CUNEIFORM SIGN GA2 TIMES SUM
+<U000120E9> /xf0/x92/x83/xa9 CUNEIFORM SIGN GA2 TIMES TAK4
+<U000120EA> /xf0/x92/x83/xaa CUNEIFORM SIGN GA2 TIMES U
+<U000120EB> /xf0/x92/x83/xab CUNEIFORM SIGN GA2 TIMES UD
+<U000120EC> /xf0/x92/x83/xac CUNEIFORM SIGN GA2 TIMES UD PLUS DU
+<U000120ED> /xf0/x92/x83/xad CUNEIFORM SIGN GA2 OVER GA2
+<U000120EE> /xf0/x92/x83/xae CUNEIFORM SIGN GABA
+<U000120EF> /xf0/x92/x83/xaf CUNEIFORM SIGN GABA CROSSING GABA
+<U000120F0> /xf0/x92/x83/xb0 CUNEIFORM SIGN GAD
+<U000120F1> /xf0/x92/x83/xb1 CUNEIFORM SIGN GAD OVER GAD GAR OVER GAR
+<U000120F2> /xf0/x92/x83/xb2 CUNEIFORM SIGN GAL
+<U000120F3> /xf0/x92/x83/xb3 CUNEIFORM SIGN GAL GAD OVER GAD GAR OVER GAR
+<U000120F4> /xf0/x92/x83/xb4 CUNEIFORM SIGN GALAM
+<U000120F5> /xf0/x92/x83/xb5 CUNEIFORM SIGN GAM
+<U000120F6> /xf0/x92/x83/xb6 CUNEIFORM SIGN GAN
+<U000120F7> /xf0/x92/x83/xb7 CUNEIFORM SIGN GAN2
+<U000120F8> /xf0/x92/x83/xb8 CUNEIFORM SIGN GAN2 TENU
+<U000120F9> /xf0/x92/x83/xb9 CUNEIFORM SIGN GAN2 OVER GAN2
+<U000120FA> /xf0/x92/x83/xba CUNEIFORM SIGN GAN2 CROSSING GAN2
+<U000120FB> /xf0/x92/x83/xbb CUNEIFORM SIGN GAR
+<U000120FC> /xf0/x92/x83/xbc CUNEIFORM SIGN GAR3
+<U000120FD> /xf0/x92/x83/xbd CUNEIFORM SIGN GASHAN
+<U000120FE> /xf0/x92/x83/xbe CUNEIFORM SIGN GESHTIN
+<U000120FF> /xf0/x92/x83/xbf CUNEIFORM SIGN GESHTIN TIMES KUR
+<U00012100> /xf0/x92/x84/x80 CUNEIFORM SIGN GI
+<U00012101> /xf0/x92/x84/x81 CUNEIFORM SIGN GI TIMES E
+<U00012102> /xf0/x92/x84/x82 CUNEIFORM SIGN GI TIMES U
+<U00012103> /xf0/x92/x84/x83 CUNEIFORM SIGN GI CROSSING GI
+<U00012104> /xf0/x92/x84/x84 CUNEIFORM SIGN GI4
+<U00012105> /xf0/x92/x84/x85 CUNEIFORM SIGN GI4 OVER GI4
+<U00012106> /xf0/x92/x84/x86 CUNEIFORM SIGN GI4 CROSSING GI4
+<U00012107> /xf0/x92/x84/x87 CUNEIFORM SIGN GIDIM
+<U00012108> /xf0/x92/x84/x88 CUNEIFORM SIGN GIR2
+<U00012109> /xf0/x92/x84/x89 CUNEIFORM SIGN GIR2 GUNU
+<U0001210A> /xf0/x92/x84/x8a CUNEIFORM SIGN GIR3
+<U0001210B> /xf0/x92/x84/x8b CUNEIFORM SIGN GIR3 TIMES A PLUS IGI
+<U0001210C> /xf0/x92/x84/x8c CUNEIFORM SIGN GIR3 TIMES GAN2 TENU
+<U0001210D> /xf0/x92/x84/x8d CUNEIFORM SIGN GIR3 TIMES IGI
+<U0001210E> /xf0/x92/x84/x8e CUNEIFORM SIGN GIR3 TIMES LU PLUS IGI
+<U0001210F> /xf0/x92/x84/x8f CUNEIFORM SIGN GIR3 TIMES PA
+<U00012110> /xf0/x92/x84/x90 CUNEIFORM SIGN GISAL
+<U00012111> /xf0/x92/x84/x91 CUNEIFORM SIGN GISH
+<U00012112> /xf0/x92/x84/x92 CUNEIFORM SIGN GISH CROSSING GISH
+<U00012113> /xf0/x92/x84/x93 CUNEIFORM SIGN GISH TIMES BAD
+<U00012114> /xf0/x92/x84/x94 CUNEIFORM SIGN GISH TIMES TAK4
+<U00012115> /xf0/x92/x84/x95 CUNEIFORM SIGN GISH TENU
+<U00012116> /xf0/x92/x84/x96 CUNEIFORM SIGN GU
+<U00012117> /xf0/x92/x84/x97 CUNEIFORM SIGN GU CROSSING GU
+<U00012118> /xf0/x92/x84/x98 CUNEIFORM SIGN GU2
+<U00012119> /xf0/x92/x84/x99 CUNEIFORM SIGN GU2 TIMES KAK
+<U0001211A> /xf0/x92/x84/x9a CUNEIFORM SIGN GU2 TIMES KAK TIMES IGI GUNU
+<U0001211B> /xf0/x92/x84/x9b CUNEIFORM SIGN GU2 TIMES NUN
+<U0001211C> /xf0/x92/x84/x9c CUNEIFORM SIGN GU2 TIMES SAL PLUS TUG2
+<U0001211D> /xf0/x92/x84/x9d CUNEIFORM SIGN GU2 GUNU
+<U0001211E> /xf0/x92/x84/x9e CUNEIFORM SIGN GUD
+<U0001211F> /xf0/x92/x84/x9f CUNEIFORM SIGN GUD TIMES A PLUS KUR
+<U00012120> /xf0/x92/x84/xa0 CUNEIFORM SIGN GUD TIMES KUR
+<U00012121> /xf0/x92/x84/xa1 CUNEIFORM SIGN GUD OVER GUD LUGAL
+<U00012122> /xf0/x92/x84/xa2 CUNEIFORM SIGN GUL
+<U00012123> /xf0/x92/x84/xa3 CUNEIFORM SIGN GUM
+<U00012124> /xf0/x92/x84/xa4 CUNEIFORM SIGN GUM TIMES SHE
+<U00012125> /xf0/x92/x84/xa5 CUNEIFORM SIGN GUR
+<U00012126> /xf0/x92/x84/xa6 CUNEIFORM SIGN GUR7
+<U00012127> /xf0/x92/x84/xa7 CUNEIFORM SIGN GURUN
+<U00012128> /xf0/x92/x84/xa8 CUNEIFORM SIGN GURUSH
+<U00012129> /xf0/x92/x84/xa9 CUNEIFORM SIGN HA
+<U0001212A> /xf0/x92/x84/xaa CUNEIFORM SIGN HA TENU
+<U0001212B> /xf0/x92/x84/xab CUNEIFORM SIGN HA GUNU
+<U0001212C> /xf0/x92/x84/xac CUNEIFORM SIGN HAL
+<U0001212D> /xf0/x92/x84/xad CUNEIFORM SIGN HI
+<U0001212E> /xf0/x92/x84/xae CUNEIFORM SIGN HI TIMES ASH
+<U0001212F> /xf0/x92/x84/xaf CUNEIFORM SIGN HI TIMES ASH2
+<U00012130> /xf0/x92/x84/xb0 CUNEIFORM SIGN HI TIMES BAD
+<U00012131> /xf0/x92/x84/xb1 CUNEIFORM SIGN HI TIMES DISH
+<U00012132> /xf0/x92/x84/xb2 CUNEIFORM SIGN HI TIMES GAD
+<U00012133> /xf0/x92/x84/xb3 CUNEIFORM SIGN HI TIMES KIN
+<U00012134> /xf0/x92/x84/xb4 CUNEIFORM SIGN HI TIMES NUN
+<U00012135> /xf0/x92/x84/xb5 CUNEIFORM SIGN HI TIMES SHE
+<U00012136> /xf0/x92/x84/xb6 CUNEIFORM SIGN HI TIMES U
+<U00012137> /xf0/x92/x84/xb7 CUNEIFORM SIGN HU
+<U00012138> /xf0/x92/x84/xb8 CUNEIFORM SIGN HUB2
+<U00012139> /xf0/x92/x84/xb9 CUNEIFORM SIGN HUB2 TIMES AN
+<U0001213A> /xf0/x92/x84/xba CUNEIFORM SIGN HUB2 TIMES HAL
+<U0001213B> /xf0/x92/x84/xbb CUNEIFORM SIGN HUB2 TIMES KASKAL
+<U0001213C> /xf0/x92/x84/xbc CUNEIFORM SIGN HUB2 TIMES LISH
+<U0001213D> /xf0/x92/x84/xbd CUNEIFORM SIGN HUB2 TIMES UD
+<U0001213E> /xf0/x92/x84/xbe CUNEIFORM SIGN HUL2
+<U0001213F> /xf0/x92/x84/xbf CUNEIFORM SIGN I
+<U00012140> /xf0/x92/x85/x80 CUNEIFORM SIGN I A
+<U00012141> /xf0/x92/x85/x81 CUNEIFORM SIGN IB
+<U00012142> /xf0/x92/x85/x82 CUNEIFORM SIGN IDIM
+<U00012143> /xf0/x92/x85/x83 CUNEIFORM SIGN IDIM OVER IDIM BUR
+<U00012144> /xf0/x92/x85/x84 CUNEIFORM SIGN IDIM OVER IDIM SQUARED
+<U00012145> /xf0/x92/x85/x85 CUNEIFORM SIGN IG
+<U00012146> /xf0/x92/x85/x86 CUNEIFORM SIGN IGI
+<U00012147> /xf0/x92/x85/x87 CUNEIFORM SIGN IGI DIB
+<U00012148> /xf0/x92/x85/x88 CUNEIFORM SIGN IGI RI
+<U00012149> /xf0/x92/x85/x89 CUNEIFORM SIGN IGI OVER IGI SHIR OVER SHIR UD OVER UD
+<U0001214A> /xf0/x92/x85/x8a CUNEIFORM SIGN IGI GUNU
+<U0001214B> /xf0/x92/x85/x8b CUNEIFORM SIGN IL
+<U0001214C> /xf0/x92/x85/x8c CUNEIFORM SIGN IL TIMES GAN2 TENU
+<U0001214D> /xf0/x92/x85/x8d CUNEIFORM SIGN IL2
+<U0001214E> /xf0/x92/x85/x8e CUNEIFORM SIGN IM
+<U0001214F> /xf0/x92/x85/x8f CUNEIFORM SIGN IM TIMES TAK4
+<U00012150> /xf0/x92/x85/x90 CUNEIFORM SIGN IM CROSSING IM
+<U00012151> /xf0/x92/x85/x91 CUNEIFORM SIGN IM OPPOSING IM
+<U00012152> /xf0/x92/x85/x92 CUNEIFORM SIGN IM SQUARED
+<U00012153> /xf0/x92/x85/x93 CUNEIFORM SIGN IMIN
+<U00012154> /xf0/x92/x85/x94 CUNEIFORM SIGN IN
+<U00012155> /xf0/x92/x85/x95 CUNEIFORM SIGN IR
+<U00012156> /xf0/x92/x85/x96 CUNEIFORM SIGN ISH
+<U00012157> /xf0/x92/x85/x97 CUNEIFORM SIGN KA
+<U00012158> /xf0/x92/x85/x98 CUNEIFORM SIGN KA TIMES A
+<U00012159> /xf0/x92/x85/x99 CUNEIFORM SIGN KA TIMES AD
+<U0001215A> /xf0/x92/x85/x9a CUNEIFORM SIGN KA TIMES AD PLUS KU3
+<U0001215B> /xf0/x92/x85/x9b CUNEIFORM SIGN KA TIMES ASH2
+<U0001215C> /xf0/x92/x85/x9c CUNEIFORM SIGN KA TIMES BAD
+<U0001215D> /xf0/x92/x85/x9d CUNEIFORM SIGN KA TIMES BALAG
+<U0001215E> /xf0/x92/x85/x9e CUNEIFORM SIGN KA TIMES BAR
+<U0001215F> /xf0/x92/x85/x9f CUNEIFORM SIGN KA TIMES BI
+<U00012160> /xf0/x92/x85/xa0 CUNEIFORM SIGN KA TIMES ERIN2
+<U00012161> /xf0/x92/x85/xa1 CUNEIFORM SIGN KA TIMES ESH2
+<U00012162> /xf0/x92/x85/xa2 CUNEIFORM SIGN KA TIMES GA
+<U00012163> /xf0/x92/x85/xa3 CUNEIFORM SIGN KA TIMES GAL
+<U00012164> /xf0/x92/x85/xa4 CUNEIFORM SIGN KA TIMES GAN2 TENU
+<U00012165> /xf0/x92/x85/xa5 CUNEIFORM SIGN KA TIMES GAR
+<U00012166> /xf0/x92/x85/xa6 CUNEIFORM SIGN KA TIMES GAR PLUS SHA3 PLUS A
+<U00012167> /xf0/x92/x85/xa7 CUNEIFORM SIGN KA TIMES GI
+<U00012168> /xf0/x92/x85/xa8 CUNEIFORM SIGN KA TIMES GIR2
+<U00012169> /xf0/x92/x85/xa9 CUNEIFORM SIGN KA TIMES GISH PLUS SAR
+<U0001216A> /xf0/x92/x85/xaa CUNEIFORM SIGN KA TIMES GISH CROSSING GISH
+<U0001216B> /xf0/x92/x85/xab CUNEIFORM SIGN KA TIMES GU
+<U0001216C> /xf0/x92/x85/xac CUNEIFORM SIGN KA TIMES GUR7
+<U0001216D> /xf0/x92/x85/xad CUNEIFORM SIGN KA TIMES IGI
+<U0001216E> /xf0/x92/x85/xae CUNEIFORM SIGN KA TIMES IM
+<U0001216F> /xf0/x92/x85/xaf CUNEIFORM SIGN KA TIMES KAK
+<U00012170> /xf0/x92/x85/xb0 CUNEIFORM SIGN KA TIMES KI
+<U00012171> /xf0/x92/x85/xb1 CUNEIFORM SIGN KA TIMES KID
+<U00012172> /xf0/x92/x85/xb2 CUNEIFORM SIGN KA TIMES LI
+<U00012173> /xf0/x92/x85/xb3 CUNEIFORM SIGN KA TIMES LU
+<U00012174> /xf0/x92/x85/xb4 CUNEIFORM SIGN KA TIMES ME
+<U00012175> /xf0/x92/x85/xb5 CUNEIFORM SIGN KA TIMES ME PLUS DU
+<U00012176> /xf0/x92/x85/xb6 CUNEIFORM SIGN KA TIMES ME PLUS GI
+<U00012177> /xf0/x92/x85/xb7 CUNEIFORM SIGN KA TIMES ME PLUS TE
+<U00012178> /xf0/x92/x85/xb8 CUNEIFORM SIGN KA TIMES MI
+<U00012179> /xf0/x92/x85/xb9 CUNEIFORM SIGN KA TIMES MI PLUS NUNUZ
+<U0001217A> /xf0/x92/x85/xba CUNEIFORM SIGN KA TIMES NE
+<U0001217B> /xf0/x92/x85/xbb CUNEIFORM SIGN KA TIMES NUN
+<U0001217C> /xf0/x92/x85/xbc CUNEIFORM SIGN KA TIMES PI
+<U0001217D> /xf0/x92/x85/xbd CUNEIFORM SIGN KA TIMES RU
+<U0001217E> /xf0/x92/x85/xbe CUNEIFORM SIGN KA TIMES SA
+<U0001217F> /xf0/x92/x85/xbf CUNEIFORM SIGN KA TIMES SAR
+<U00012180> /xf0/x92/x86/x80 CUNEIFORM SIGN KA TIMES SHA
+<U00012181> /xf0/x92/x86/x81 CUNEIFORM SIGN KA TIMES SHE
+<U00012182> /xf0/x92/x86/x82 CUNEIFORM SIGN KA TIMES SHID
+<U00012183> /xf0/x92/x86/x83 CUNEIFORM SIGN KA TIMES SHU
+<U00012184> /xf0/x92/x86/x84 CUNEIFORM SIGN KA TIMES SIG
+<U00012185> /xf0/x92/x86/x85 CUNEIFORM SIGN KA TIMES SUHUR
+<U00012186> /xf0/x92/x86/x86 CUNEIFORM SIGN KA TIMES TAR
+<U00012187> /xf0/x92/x86/x87 CUNEIFORM SIGN KA TIMES U
+<U00012188> /xf0/x92/x86/x88 CUNEIFORM SIGN KA TIMES U2
+<U00012189> /xf0/x92/x86/x89 CUNEIFORM SIGN KA TIMES UD
+<U0001218A> /xf0/x92/x86/x8a CUNEIFORM SIGN KA TIMES UMUM TIMES PA
+<U0001218B> /xf0/x92/x86/x8b CUNEIFORM SIGN KA TIMES USH
+<U0001218C> /xf0/x92/x86/x8c CUNEIFORM SIGN KA TIMES ZI
+<U0001218D> /xf0/x92/x86/x8d CUNEIFORM SIGN KA2
+<U0001218E> /xf0/x92/x86/x8e CUNEIFORM SIGN KA2 CROSSING KA2
+<U0001218F> /xf0/x92/x86/x8f CUNEIFORM SIGN KAB
+<U00012190> /xf0/x92/x86/x90 CUNEIFORM SIGN KAD2
+<U00012191> /xf0/x92/x86/x91 CUNEIFORM SIGN KAD3
+<U00012192> /xf0/x92/x86/x92 CUNEIFORM SIGN KAD4
+<U00012193> /xf0/x92/x86/x93 CUNEIFORM SIGN KAD5
+<U00012194> /xf0/x92/x86/x94 CUNEIFORM SIGN KAD5 OVER KAD5
+<U00012195> /xf0/x92/x86/x95 CUNEIFORM SIGN KAK
+<U00012196> /xf0/x92/x86/x96 CUNEIFORM SIGN KAK TIMES IGI GUNU
+<U00012197> /xf0/x92/x86/x97 CUNEIFORM SIGN KAL
+<U00012198> /xf0/x92/x86/x98 CUNEIFORM SIGN KAL TIMES BAD
+<U00012199> /xf0/x92/x86/x99 CUNEIFORM SIGN KAL CROSSING KAL
+<U0001219A> /xf0/x92/x86/x9a CUNEIFORM SIGN KAM2
+<U0001219B> /xf0/x92/x86/x9b CUNEIFORM SIGN KAM4
+<U0001219C> /xf0/x92/x86/x9c CUNEIFORM SIGN KASKAL
+<U0001219D> /xf0/x92/x86/x9d CUNEIFORM SIGN KASKAL LAGAB TIMES U OVER LAGAB TIMES U
+<U0001219E> /xf0/x92/x86/x9e CUNEIFORM SIGN KASKAL OVER KASKAL LAGAB TIMES U OVER LAGAB TIMES U
+<U0001219F> /xf0/x92/x86/x9f CUNEIFORM SIGN KESH2
+<U000121A0> /xf0/x92/x86/xa0 CUNEIFORM SIGN KI
+<U000121A1> /xf0/x92/x86/xa1 CUNEIFORM SIGN KI TIMES BAD
+<U000121A2> /xf0/x92/x86/xa2 CUNEIFORM SIGN KI TIMES U
+<U000121A3> /xf0/x92/x86/xa3 CUNEIFORM SIGN KI TIMES UD
+<U000121A4> /xf0/x92/x86/xa4 CUNEIFORM SIGN KID
+<U000121A5> /xf0/x92/x86/xa5 CUNEIFORM SIGN KIN
+<U000121A6> /xf0/x92/x86/xa6 CUNEIFORM SIGN KISAL
+<U000121A7> /xf0/x92/x86/xa7 CUNEIFORM SIGN KISH
+<U000121A8> /xf0/x92/x86/xa8 CUNEIFORM SIGN KISIM5
+<U000121A9> /xf0/x92/x86/xa9 CUNEIFORM SIGN KISIM5 OVER KISIM5
+<U000121AA> /xf0/x92/x86/xaa CUNEIFORM SIGN KU
+<U000121AB> /xf0/x92/x86/xab CUNEIFORM SIGN KU OVER HI TIMES ASH2 KU OVER HI TIMES ASH2
+<U000121AC> /xf0/x92/x86/xac CUNEIFORM SIGN KU3
+<U000121AD> /xf0/x92/x86/xad CUNEIFORM SIGN KU4
+<U000121AE> /xf0/x92/x86/xae CUNEIFORM SIGN KU4 VARIANT FORM
+<U000121AF> /xf0/x92/x86/xaf CUNEIFORM SIGN KU7
+<U000121B0> /xf0/x92/x86/xb0 CUNEIFORM SIGN KUL
+<U000121B1> /xf0/x92/x86/xb1 CUNEIFORM SIGN KUL GUNU
+<U000121B2> /xf0/x92/x86/xb2 CUNEIFORM SIGN KUN
+<U000121B3> /xf0/x92/x86/xb3 CUNEIFORM SIGN KUR
+<U000121B4> /xf0/x92/x86/xb4 CUNEIFORM SIGN KUR OPPOSING KUR
+<U000121B5> /xf0/x92/x86/xb5 CUNEIFORM SIGN KUSHU2
+<U000121B6> /xf0/x92/x86/xb6 CUNEIFORM SIGN KWU318
+<U000121B7> /xf0/x92/x86/xb7 CUNEIFORM SIGN LA
+<U000121B8> /xf0/x92/x86/xb8 CUNEIFORM SIGN LAGAB
+<U000121B9> /xf0/x92/x86/xb9 CUNEIFORM SIGN LAGAB TIMES A
+<U000121BA> /xf0/x92/x86/xba CUNEIFORM SIGN LAGAB TIMES A PLUS DA PLUS HA
+<U000121BB> /xf0/x92/x86/xbb CUNEIFORM SIGN LAGAB TIMES A PLUS GAR
+<U000121BC> /xf0/x92/x86/xbc CUNEIFORM SIGN LAGAB TIMES A PLUS LAL
+<U000121BD> /xf0/x92/x86/xbd CUNEIFORM SIGN LAGAB TIMES AL
+<U000121BE> /xf0/x92/x86/xbe CUNEIFORM SIGN LAGAB TIMES AN
+<U000121BF> /xf0/x92/x86/xbf CUNEIFORM SIGN LAGAB TIMES ASH ZIDA TENU
+<U000121C0> /xf0/x92/x87/x80 CUNEIFORM SIGN LAGAB TIMES BAD
+<U000121C1> /xf0/x92/x87/x81 CUNEIFORM SIGN LAGAB TIMES BI
+<U000121C2> /xf0/x92/x87/x82 CUNEIFORM SIGN LAGAB TIMES DAR
+<U000121C3> /xf0/x92/x87/x83 CUNEIFORM SIGN LAGAB TIMES EN
+<U000121C4> /xf0/x92/x87/x84 CUNEIFORM SIGN LAGAB TIMES GA
+<U000121C5> /xf0/x92/x87/x85 CUNEIFORM SIGN LAGAB TIMES GAR
+<U000121C6> /xf0/x92/x87/x86 CUNEIFORM SIGN LAGAB TIMES GUD
+<U000121C7> /xf0/x92/x87/x87 CUNEIFORM SIGN LAGAB TIMES GUD PLUS GUD
+<U000121C8> /xf0/x92/x87/x88 CUNEIFORM SIGN LAGAB TIMES HA
+<U000121C9> /xf0/x92/x87/x89 CUNEIFORM SIGN LAGAB TIMES HAL
+<U000121CA> /xf0/x92/x87/x8a CUNEIFORM SIGN LAGAB TIMES HI TIMES NUN
+<U000121CB> /xf0/x92/x87/x8b CUNEIFORM SIGN LAGAB TIMES IGI GUNU
+<U000121CC> /xf0/x92/x87/x8c CUNEIFORM SIGN LAGAB TIMES IM
+<U000121CD> /xf0/x92/x87/x8d CUNEIFORM SIGN LAGAB TIMES IM PLUS HA
+<U000121CE> /xf0/x92/x87/x8e CUNEIFORM SIGN LAGAB TIMES IM PLUS LU
+<U000121CF> /xf0/x92/x87/x8f CUNEIFORM SIGN LAGAB TIMES KI
+<U000121D0> /xf0/x92/x87/x90 CUNEIFORM SIGN LAGAB TIMES KIN
+<U000121D1> /xf0/x92/x87/x91 CUNEIFORM SIGN LAGAB TIMES KU3
+<U000121D2> /xf0/x92/x87/x92 CUNEIFORM SIGN LAGAB TIMES KUL
+<U000121D3> /xf0/x92/x87/x93 CUNEIFORM SIGN LAGAB TIMES KUL PLUS HI PLUS A
+<U000121D4> /xf0/x92/x87/x94 CUNEIFORM SIGN LAGAB TIMES LAGAB
+<U000121D5> /xf0/x92/x87/x95 CUNEIFORM SIGN LAGAB TIMES LISH
+<U000121D6> /xf0/x92/x87/x96 CUNEIFORM SIGN LAGAB TIMES LU
+<U000121D7> /xf0/x92/x87/x97 CUNEIFORM SIGN LAGAB TIMES LUL
+<U000121D8> /xf0/x92/x87/x98 CUNEIFORM SIGN LAGAB TIMES ME
+<U000121D9> /xf0/x92/x87/x99 CUNEIFORM SIGN LAGAB TIMES ME PLUS EN
+<U000121DA> /xf0/x92/x87/x9a CUNEIFORM SIGN LAGAB TIMES MUSH
+<U000121DB> /xf0/x92/x87/x9b CUNEIFORM SIGN LAGAB TIMES NE
+<U000121DC> /xf0/x92/x87/x9c CUNEIFORM SIGN LAGAB TIMES SHE PLUS SUM
+<U000121DD> /xf0/x92/x87/x9d CUNEIFORM SIGN LAGAB TIMES SHITA PLUS GISH PLUS ERIN2
+<U000121DE> /xf0/x92/x87/x9e CUNEIFORM SIGN LAGAB TIMES SHITA PLUS GISH TENU
+<U000121DF> /xf0/x92/x87/x9f CUNEIFORM SIGN LAGAB TIMES SHU2
+<U000121E0> /xf0/x92/x87/xa0 CUNEIFORM SIGN LAGAB TIMES SHU2 PLUS SHU2
+<U000121E1> /xf0/x92/x87/xa1 CUNEIFORM SIGN LAGAB TIMES SUM
+<U000121E2> /xf0/x92/x87/xa2 CUNEIFORM SIGN LAGAB TIMES TAG
+<U000121E3> /xf0/x92/x87/xa3 CUNEIFORM SIGN LAGAB TIMES TAK4
+<U000121E4> /xf0/x92/x87/xa4 CUNEIFORM SIGN LAGAB TIMES TE PLUS A PLUS SU PLUS NA
+<U000121E5> /xf0/x92/x87/xa5 CUNEIFORM SIGN LAGAB TIMES U
+<U000121E6> /xf0/x92/x87/xa6 CUNEIFORM SIGN LAGAB TIMES U PLUS A
+<U000121E7> /xf0/x92/x87/xa7 CUNEIFORM SIGN LAGAB TIMES U PLUS U PLUS U
+<U000121E8> /xf0/x92/x87/xa8 CUNEIFORM SIGN LAGAB TIMES U2 PLUS ASH
+<U000121E9> /xf0/x92/x87/xa9 CUNEIFORM SIGN LAGAB TIMES UD
+<U000121EA> /xf0/x92/x87/xaa CUNEIFORM SIGN LAGAB TIMES USH
+<U000121EB> /xf0/x92/x87/xab CUNEIFORM SIGN LAGAB SQUARED
+<U000121EC> /xf0/x92/x87/xac CUNEIFORM SIGN LAGAR
+<U000121ED> /xf0/x92/x87/xad CUNEIFORM SIGN LAGAR TIMES SHE
+<U000121EE> /xf0/x92/x87/xae CUNEIFORM SIGN LAGAR TIMES SHE PLUS SUM
+<U000121EF> /xf0/x92/x87/xaf CUNEIFORM SIGN LAGAR GUNU
+<U000121F0> /xf0/x92/x87/xb0 CUNEIFORM SIGN LAGAR GUNU OVER LAGAR GUNU SHE
+<U000121F1> /xf0/x92/x87/xb1 CUNEIFORM SIGN LAHSHU
+<U000121F2> /xf0/x92/x87/xb2 CUNEIFORM SIGN LAL
+<U000121F3> /xf0/x92/x87/xb3 CUNEIFORM SIGN LAL TIMES LAL
+<U000121F4> /xf0/x92/x87/xb4 CUNEIFORM SIGN LAM
+<U000121F5> /xf0/x92/x87/xb5 CUNEIFORM SIGN LAM TIMES KUR
+<U000121F6> /xf0/x92/x87/xb6 CUNEIFORM SIGN LAM TIMES KUR PLUS RU
+<U000121F7> /xf0/x92/x87/xb7 CUNEIFORM SIGN LI
+<U000121F8> /xf0/x92/x87/xb8 CUNEIFORM SIGN LIL
+<U000121F9> /xf0/x92/x87/xb9 CUNEIFORM SIGN LIMMU2
+<U000121FA> /xf0/x92/x87/xba CUNEIFORM SIGN LISH
+<U000121FB> /xf0/x92/x87/xbb CUNEIFORM SIGN LU
+<U000121FC> /xf0/x92/x87/xbc CUNEIFORM SIGN LU TIMES BAD
+<U000121FD> /xf0/x92/x87/xbd CUNEIFORM SIGN LU2
+<U000121FE> /xf0/x92/x87/xbe CUNEIFORM SIGN LU2 TIMES AL
+<U000121FF> /xf0/x92/x87/xbf CUNEIFORM SIGN LU2 TIMES BAD
+<U00012200> /xf0/x92/x88/x80 CUNEIFORM SIGN LU2 TIMES ESH2
+<U00012201> /xf0/x92/x88/x81 CUNEIFORM SIGN LU2 TIMES ESH2 TENU
+<U00012202> /xf0/x92/x88/x82 CUNEIFORM SIGN LU2 TIMES GAN2 TENU
+<U00012203> /xf0/x92/x88/x83 CUNEIFORM SIGN LU2 TIMES HI TIMES BAD
+<U00012204> /xf0/x92/x88/x84 CUNEIFORM SIGN LU2 TIMES IM
+<U00012205> /xf0/x92/x88/x85 CUNEIFORM SIGN LU2 TIMES KAD2
+<U00012206> /xf0/x92/x88/x86 CUNEIFORM SIGN LU2 TIMES KAD3
+<U00012207> /xf0/x92/x88/x87 CUNEIFORM SIGN LU2 TIMES KAD3 PLUS ASH
+<U00012208> /xf0/x92/x88/x88 CUNEIFORM SIGN LU2 TIMES KI
+<U00012209> /xf0/x92/x88/x89 CUNEIFORM SIGN LU2 TIMES LA PLUS ASH
+<U0001220A> /xf0/x92/x88/x8a CUNEIFORM SIGN LU2 TIMES LAGAB
+<U0001220B> /xf0/x92/x88/x8b CUNEIFORM SIGN LU2 TIMES ME PLUS EN
+<U0001220C> /xf0/x92/x88/x8c CUNEIFORM SIGN LU2 TIMES NE
+<U0001220D> /xf0/x92/x88/x8d CUNEIFORM SIGN LU2 TIMES NU
+<U0001220E> /xf0/x92/x88/x8e CUNEIFORM SIGN LU2 TIMES SI PLUS ASH
+<U0001220F> /xf0/x92/x88/x8f CUNEIFORM SIGN LU2 TIMES SIK2 PLUS BU
+<U00012210> /xf0/x92/x88/x90 CUNEIFORM SIGN LU2 TIMES TUG2
+<U00012211> /xf0/x92/x88/x91 CUNEIFORM SIGN LU2 TENU
+<U00012212> /xf0/x92/x88/x92 CUNEIFORM SIGN LU2 CROSSING LU2
+<U00012213> /xf0/x92/x88/x93 CUNEIFORM SIGN LU2 OPPOSING LU2
+<U00012214> /xf0/x92/x88/x94 CUNEIFORM SIGN LU2 SQUARED
+<U00012215> /xf0/x92/x88/x95 CUNEIFORM SIGN LU2 SHESHIG
+<U00012216> /xf0/x92/x88/x96 CUNEIFORM SIGN LU3
+<U00012217> /xf0/x92/x88/x97 CUNEIFORM SIGN LUGAL
+<U00012218> /xf0/x92/x88/x98 CUNEIFORM SIGN LUGAL OVER LUGAL
+<U00012219> /xf0/x92/x88/x99 CUNEIFORM SIGN LUGAL OPPOSING LUGAL
+<U0001221A> /xf0/x92/x88/x9a CUNEIFORM SIGN LUGAL SHESHIG
+<U0001221B> /xf0/x92/x88/x9b CUNEIFORM SIGN LUH
+<U0001221C> /xf0/x92/x88/x9c CUNEIFORM SIGN LUL
+<U0001221D> /xf0/x92/x88/x9d CUNEIFORM SIGN LUM
+<U0001221E> /xf0/x92/x88/x9e CUNEIFORM SIGN LUM OVER LUM
+<U0001221F> /xf0/x92/x88/x9f CUNEIFORM SIGN LUM OVER LUM GAR OVER GAR
+<U00012220> /xf0/x92/x88/xa0 CUNEIFORM SIGN MA
+<U00012221> /xf0/x92/x88/xa1 CUNEIFORM SIGN MA TIMES TAK4
+<U00012222> /xf0/x92/x88/xa2 CUNEIFORM SIGN MA GUNU
+<U00012223> /xf0/x92/x88/xa3 CUNEIFORM SIGN MA2
+<U00012224> /xf0/x92/x88/xa4 CUNEIFORM SIGN MAH
+<U00012225> /xf0/x92/x88/xa5 CUNEIFORM SIGN MAR
+<U00012226> /xf0/x92/x88/xa6 CUNEIFORM SIGN MASH
+<U00012227> /xf0/x92/x88/xa7 CUNEIFORM SIGN MASH2
+<U00012228> /xf0/x92/x88/xa8 CUNEIFORM SIGN ME
+<U00012229> /xf0/x92/x88/xa9 CUNEIFORM SIGN MES
+<U0001222A> /xf0/x92/x88/xaa CUNEIFORM SIGN MI
+<U0001222B> /xf0/x92/x88/xab CUNEIFORM SIGN MIN
+<U0001222C> /xf0/x92/x88/xac CUNEIFORM SIGN MU
+<U0001222D> /xf0/x92/x88/xad CUNEIFORM SIGN MU OVER MU
+<U0001222E> /xf0/x92/x88/xae CUNEIFORM SIGN MUG
+<U0001222F> /xf0/x92/x88/xaf CUNEIFORM SIGN MUG GUNU
+<U00012230> /xf0/x92/x88/xb0 CUNEIFORM SIGN MUNSUB
+<U00012231> /xf0/x92/x88/xb1 CUNEIFORM SIGN MURGU2
+<U00012232> /xf0/x92/x88/xb2 CUNEIFORM SIGN MUSH
+<U00012233> /xf0/x92/x88/xb3 CUNEIFORM SIGN MUSH TIMES A
+<U00012234> /xf0/x92/x88/xb4 CUNEIFORM SIGN MUSH TIMES KUR
+<U00012235> /xf0/x92/x88/xb5 CUNEIFORM SIGN MUSH TIMES ZA
+<U00012236> /xf0/x92/x88/xb6 CUNEIFORM SIGN MUSH OVER MUSH
+<U00012237> /xf0/x92/x88/xb7 CUNEIFORM SIGN MUSH OVER MUSH TIMES A PLUS NA
+<U00012238> /xf0/x92/x88/xb8 CUNEIFORM SIGN MUSH CROSSING MUSH
+<U00012239> /xf0/x92/x88/xb9 CUNEIFORM SIGN MUSH3
+<U0001223A> /xf0/x92/x88/xba CUNEIFORM SIGN MUSH3 TIMES A
+<U0001223B> /xf0/x92/x88/xbb CUNEIFORM SIGN MUSH3 TIMES A PLUS DI
+<U0001223C> /xf0/x92/x88/xbc CUNEIFORM SIGN MUSH3 TIMES DI
+<U0001223D> /xf0/x92/x88/xbd CUNEIFORM SIGN MUSH3 GUNU
+<U0001223E> /xf0/x92/x88/xbe CUNEIFORM SIGN NA
+<U0001223F> /xf0/x92/x88/xbf CUNEIFORM SIGN NA2
+<U00012240> /xf0/x92/x89/x80 CUNEIFORM SIGN NAGA
+<U00012241> /xf0/x92/x89/x81 CUNEIFORM SIGN NAGA INVERTED
+<U00012242> /xf0/x92/x89/x82 CUNEIFORM SIGN NAGA TIMES SHU TENU
+<U00012243> /xf0/x92/x89/x83 CUNEIFORM SIGN NAGA OPPOSING NAGA
+<U00012244> /xf0/x92/x89/x84 CUNEIFORM SIGN NAGAR
+<U00012245> /xf0/x92/x89/x85 CUNEIFORM SIGN NAM NUTILLU
+<U00012246> /xf0/x92/x89/x86 CUNEIFORM SIGN NAM
+<U00012247> /xf0/x92/x89/x87 CUNEIFORM SIGN NAM2
+<U00012248> /xf0/x92/x89/x88 CUNEIFORM SIGN NE
+<U00012249> /xf0/x92/x89/x89 CUNEIFORM SIGN NE TIMES A
+<U0001224A> /xf0/x92/x89/x8a CUNEIFORM SIGN NE TIMES UD
+<U0001224B> /xf0/x92/x89/x8b CUNEIFORM SIGN NE SHESHIG
+<U0001224C> /xf0/x92/x89/x8c CUNEIFORM SIGN NI
+<U0001224D> /xf0/x92/x89/x8d CUNEIFORM SIGN NI TIMES E
+<U0001224E> /xf0/x92/x89/x8e CUNEIFORM SIGN NI2
+<U0001224F> /xf0/x92/x89/x8f CUNEIFORM SIGN NIM
+<U00012250> /xf0/x92/x89/x90 CUNEIFORM SIGN NIM TIMES GAN2 TENU
+<U00012251> /xf0/x92/x89/x91 CUNEIFORM SIGN NIM TIMES GAR PLUS GAN2 TENU
+<U00012252> /xf0/x92/x89/x92 CUNEIFORM SIGN NINDA2
+<U00012253> /xf0/x92/x89/x93 CUNEIFORM SIGN NINDA2 TIMES AN
+<U00012254> /xf0/x92/x89/x94 CUNEIFORM SIGN NINDA2 TIMES ASH
+<U00012255> /xf0/x92/x89/x95 CUNEIFORM SIGN NINDA2 TIMES ASH PLUS ASH
+<U00012256> /xf0/x92/x89/x96 CUNEIFORM SIGN NINDA2 TIMES GUD
+<U00012257> /xf0/x92/x89/x97 CUNEIFORM SIGN NINDA2 TIMES ME PLUS GAN2 TENU
+<U00012258> /xf0/x92/x89/x98 CUNEIFORM SIGN NINDA2 TIMES NE
+<U00012259> /xf0/x92/x89/x99 CUNEIFORM SIGN NINDA2 TIMES NUN
+<U0001225A> /xf0/x92/x89/x9a CUNEIFORM SIGN NINDA2 TIMES SHE
+<U0001225B> /xf0/x92/x89/x9b CUNEIFORM SIGN NINDA2 TIMES SHE PLUS A AN
+<U0001225C> /xf0/x92/x89/x9c CUNEIFORM SIGN NINDA2 TIMES SHE PLUS ASH
+<U0001225D> /xf0/x92/x89/x9d CUNEIFORM SIGN NINDA2 TIMES SHE PLUS ASH PLUS ASH
+<U0001225E> /xf0/x92/x89/x9e CUNEIFORM SIGN NINDA2 TIMES U2 PLUS ASH
+<U0001225F> /xf0/x92/x89/x9f CUNEIFORM SIGN NINDA2 TIMES USH
+<U00012260> /xf0/x92/x89/xa0 CUNEIFORM SIGN NISAG
+<U00012261> /xf0/x92/x89/xa1 CUNEIFORM SIGN NU
+<U00012262> /xf0/x92/x89/xa2 CUNEIFORM SIGN NU11
+<U00012263> /xf0/x92/x89/xa3 CUNEIFORM SIGN NUN
+<U00012264> /xf0/x92/x89/xa4 CUNEIFORM SIGN NUN LAGAR TIMES GAR
+<U00012265> /xf0/x92/x89/xa5 CUNEIFORM SIGN NUN LAGAR TIMES MASH
+<U00012266> /xf0/x92/x89/xa6 CUNEIFORM SIGN NUN LAGAR TIMES SAL
+<U00012267> /xf0/x92/x89/xa7 CUNEIFORM SIGN NUN LAGAR TIMES SAL OVER NUN LAGAR TIMES SAL
+<U00012268> /xf0/x92/x89/xa8 CUNEIFORM SIGN NUN LAGAR TIMES USH
+<U00012269> /xf0/x92/x89/xa9 CUNEIFORM SIGN NUN TENU
+<U0001226A> /xf0/x92/x89/xaa CUNEIFORM SIGN NUN OVER NUN
+<U0001226B> /xf0/x92/x89/xab CUNEIFORM SIGN NUN CROSSING NUN
+<U0001226C> /xf0/x92/x89/xac CUNEIFORM SIGN NUN CROSSING NUN LAGAR OVER LAGAR
+<U0001226D> /xf0/x92/x89/xad CUNEIFORM SIGN NUNUZ
+<U0001226E> /xf0/x92/x89/xae CUNEIFORM SIGN NUNUZ AB2 TIMES ASHGAB
+<U0001226F> /xf0/x92/x89/xaf CUNEIFORM SIGN NUNUZ AB2 TIMES BI
+<U00012270> /xf0/x92/x89/xb0 CUNEIFORM SIGN NUNUZ AB2 TIMES DUG
+<U00012271> /xf0/x92/x89/xb1 CUNEIFORM SIGN NUNUZ AB2 TIMES GUD
+<U00012272> /xf0/x92/x89/xb2 CUNEIFORM SIGN NUNUZ AB2 TIMES IGI GUNU
+<U00012273> /xf0/x92/x89/xb3 CUNEIFORM SIGN NUNUZ AB2 TIMES KAD3
+<U00012274> /xf0/x92/x89/xb4 CUNEIFORM SIGN NUNUZ AB2 TIMES LA
+<U00012275> /xf0/x92/x89/xb5 CUNEIFORM SIGN NUNUZ AB2 TIMES NE
+<U00012276> /xf0/x92/x89/xb6 CUNEIFORM SIGN NUNUZ AB2 TIMES SILA3
+<U00012277> /xf0/x92/x89/xb7 CUNEIFORM SIGN NUNUZ AB2 TIMES U2
+<U00012278> /xf0/x92/x89/xb8 CUNEIFORM SIGN NUNUZ KISIM5 TIMES BI
+<U00012279> /xf0/x92/x89/xb9 CUNEIFORM SIGN NUNUZ KISIM5 TIMES BI U
+<U0001227A> /xf0/x92/x89/xba CUNEIFORM SIGN PA
+<U0001227B> /xf0/x92/x89/xbb CUNEIFORM SIGN PAD
+<U0001227C> /xf0/x92/x89/xbc CUNEIFORM SIGN PAN
+<U0001227D> /xf0/x92/x89/xbd CUNEIFORM SIGN PAP
+<U0001227E> /xf0/x92/x89/xbe CUNEIFORM SIGN PESH2
+<U0001227F> /xf0/x92/x89/xbf CUNEIFORM SIGN PI
+<U00012280> /xf0/x92/x8a/x80 CUNEIFORM SIGN PI TIMES A
+<U00012281> /xf0/x92/x8a/x81 CUNEIFORM SIGN PI TIMES AB
+<U00012282> /xf0/x92/x8a/x82 CUNEIFORM SIGN PI TIMES BI
+<U00012283> /xf0/x92/x8a/x83 CUNEIFORM SIGN PI TIMES BU
+<U00012284> /xf0/x92/x8a/x84 CUNEIFORM SIGN PI TIMES E
+<U00012285> /xf0/x92/x8a/x85 CUNEIFORM SIGN PI TIMES I
+<U00012286> /xf0/x92/x8a/x86 CUNEIFORM SIGN PI TIMES IB
+<U00012287> /xf0/x92/x8a/x87 CUNEIFORM SIGN PI TIMES U
+<U00012288> /xf0/x92/x8a/x88 CUNEIFORM SIGN PI TIMES U2
+<U00012289> /xf0/x92/x8a/x89 CUNEIFORM SIGN PI CROSSING PI
+<U0001228A> /xf0/x92/x8a/x8a CUNEIFORM SIGN PIRIG
+<U0001228B> /xf0/x92/x8a/x8b CUNEIFORM SIGN PIRIG TIMES KAL
+<U0001228C> /xf0/x92/x8a/x8c CUNEIFORM SIGN PIRIG TIMES UD
+<U0001228D> /xf0/x92/x8a/x8d CUNEIFORM SIGN PIRIG TIMES ZA
+<U0001228E> /xf0/x92/x8a/x8e CUNEIFORM SIGN PIRIG OPPOSING PIRIG
+<U0001228F> /xf0/x92/x8a/x8f CUNEIFORM SIGN RA
+<U00012290> /xf0/x92/x8a/x90 CUNEIFORM SIGN RAB
+<U00012291> /xf0/x92/x8a/x91 CUNEIFORM SIGN RI
+<U00012292> /xf0/x92/x8a/x92 CUNEIFORM SIGN RU
+<U00012293> /xf0/x92/x8a/x93 CUNEIFORM SIGN SA
+<U00012294> /xf0/x92/x8a/x94 CUNEIFORM SIGN SAG NUTILLU
+<U00012295> /xf0/x92/x8a/x95 CUNEIFORM SIGN SAG
+<U00012296> /xf0/x92/x8a/x96 CUNEIFORM SIGN SAG TIMES A
+<U00012297> /xf0/x92/x8a/x97 CUNEIFORM SIGN SAG TIMES DU
+<U00012298> /xf0/x92/x8a/x98 CUNEIFORM SIGN SAG TIMES DUB
+<U00012299> /xf0/x92/x8a/x99 CUNEIFORM SIGN SAG TIMES HA
+<U0001229A> /xf0/x92/x8a/x9a CUNEIFORM SIGN SAG TIMES KAK
+<U0001229B> /xf0/x92/x8a/x9b CUNEIFORM SIGN SAG TIMES KUR
+<U0001229C> /xf0/x92/x8a/x9c CUNEIFORM SIGN SAG TIMES LUM
+<U0001229D> /xf0/x92/x8a/x9d CUNEIFORM SIGN SAG TIMES MI
+<U0001229E> /xf0/x92/x8a/x9e CUNEIFORM SIGN SAG TIMES NUN
+<U0001229F> /xf0/x92/x8a/x9f CUNEIFORM SIGN SAG TIMES SAL
+<U000122A0> /xf0/x92/x8a/xa0 CUNEIFORM SIGN SAG TIMES SHID
+<U000122A1> /xf0/x92/x8a/xa1 CUNEIFORM SIGN SAG TIMES TAB
+<U000122A2> /xf0/x92/x8a/xa2 CUNEIFORM SIGN SAG TIMES U2
+<U000122A3> /xf0/x92/x8a/xa3 CUNEIFORM SIGN SAG TIMES UB
+<U000122A4> /xf0/x92/x8a/xa4 CUNEIFORM SIGN SAG TIMES UM
+<U000122A5> /xf0/x92/x8a/xa5 CUNEIFORM SIGN SAG TIMES UR
+<U000122A6> /xf0/x92/x8a/xa6 CUNEIFORM SIGN SAG TIMES USH
+<U000122A7> /xf0/x92/x8a/xa7 CUNEIFORM SIGN SAG OVER SAG
+<U000122A8> /xf0/x92/x8a/xa8 CUNEIFORM SIGN SAG GUNU
+<U000122A9> /xf0/x92/x8a/xa9 CUNEIFORM SIGN SAL
+<U000122AA> /xf0/x92/x8a/xaa CUNEIFORM SIGN SAL LAGAB TIMES ASH2
+<U000122AB> /xf0/x92/x8a/xab CUNEIFORM SIGN SANGA2
+<U000122AC> /xf0/x92/x8a/xac CUNEIFORM SIGN SAR
+<U000122AD> /xf0/x92/x8a/xad CUNEIFORM SIGN SHA
+<U000122AE> /xf0/x92/x8a/xae CUNEIFORM SIGN SHA3
+<U000122AF> /xf0/x92/x8a/xaf CUNEIFORM SIGN SHA3 TIMES A
+<U000122B0> /xf0/x92/x8a/xb0 CUNEIFORM SIGN SHA3 TIMES BAD
+<U000122B1> /xf0/x92/x8a/xb1 CUNEIFORM SIGN SHA3 TIMES GISH
+<U000122B2> /xf0/x92/x8a/xb2 CUNEIFORM SIGN SHA3 TIMES NE
+<U000122B3> /xf0/x92/x8a/xb3 CUNEIFORM SIGN SHA3 TIMES SHU2
+<U000122B4> /xf0/x92/x8a/xb4 CUNEIFORM SIGN SHA3 TIMES TUR
+<U000122B5> /xf0/x92/x8a/xb5 CUNEIFORM SIGN SHA3 TIMES U
+<U000122B6> /xf0/x92/x8a/xb6 CUNEIFORM SIGN SHA3 TIMES U PLUS A
+<U000122B7> /xf0/x92/x8a/xb7 CUNEIFORM SIGN SHA6
+<U000122B8> /xf0/x92/x8a/xb8 CUNEIFORM SIGN SHAB6
+<U000122B9> /xf0/x92/x8a/xb9 CUNEIFORM SIGN SHAR2
+<U000122BA> /xf0/x92/x8a/xba CUNEIFORM SIGN SHE
+<U000122BB> /xf0/x92/x8a/xbb CUNEIFORM SIGN SHE HU
+<U000122BC> /xf0/x92/x8a/xbc CUNEIFORM SIGN SHE OVER SHE GAD OVER GAD GAR OVER GAR
+<U000122BD> /xf0/x92/x8a/xbd CUNEIFORM SIGN SHE OVER SHE TAB OVER TAB GAR OVER GAR
+<U000122BE> /xf0/x92/x8a/xbe CUNEIFORM SIGN SHEG9
+<U000122BF> /xf0/x92/x8a/xbf CUNEIFORM SIGN SHEN
+<U000122C0> /xf0/x92/x8b/x80 CUNEIFORM SIGN SHESH
+<U000122C1> /xf0/x92/x8b/x81 CUNEIFORM SIGN SHESH2
+<U000122C2> /xf0/x92/x8b/x82 CUNEIFORM SIGN SHESHLAM
+<U000122C3> /xf0/x92/x8b/x83 CUNEIFORM SIGN SHID
+<U000122C4> /xf0/x92/x8b/x84 CUNEIFORM SIGN SHID TIMES A
+<U000122C5> /xf0/x92/x8b/x85 CUNEIFORM SIGN SHID TIMES IM
+<U000122C6> /xf0/x92/x8b/x86 CUNEIFORM SIGN SHIM
+<U000122C7> /xf0/x92/x8b/x87 CUNEIFORM SIGN SHIM TIMES A
+<U000122C8> /xf0/x92/x8b/x88 CUNEIFORM SIGN SHIM TIMES BAL
+<U000122C9> /xf0/x92/x8b/x89 CUNEIFORM SIGN SHIM TIMES BULUG
+<U000122CA> /xf0/x92/x8b/x8a CUNEIFORM SIGN SHIM TIMES DIN
+<U000122CB> /xf0/x92/x8b/x8b CUNEIFORM SIGN SHIM TIMES GAR
+<U000122CC> /xf0/x92/x8b/x8c CUNEIFORM SIGN SHIM TIMES IGI
+<U000122CD> /xf0/x92/x8b/x8d CUNEIFORM SIGN SHIM TIMES IGI GUNU
+<U000122CE> /xf0/x92/x8b/x8e CUNEIFORM SIGN SHIM TIMES KUSHU2
+<U000122CF> /xf0/x92/x8b/x8f CUNEIFORM SIGN SHIM TIMES LUL
+<U000122D0> /xf0/x92/x8b/x90 CUNEIFORM SIGN SHIM TIMES MUG
+<U000122D1> /xf0/x92/x8b/x91 CUNEIFORM SIGN SHIM TIMES SAL
+<U000122D2> /xf0/x92/x8b/x92 CUNEIFORM SIGN SHINIG
+<U000122D3> /xf0/x92/x8b/x93 CUNEIFORM SIGN SHIR
+<U000122D4> /xf0/x92/x8b/x94 CUNEIFORM SIGN SHIR TENU
+<U000122D5> /xf0/x92/x8b/x95 CUNEIFORM SIGN SHIR OVER SHIR BUR OVER BUR
+<U000122D6> /xf0/x92/x8b/x96 CUNEIFORM SIGN SHITA
+<U000122D7> /xf0/x92/x8b/x97 CUNEIFORM SIGN SHU
+<U000122D8> /xf0/x92/x8b/x98 CUNEIFORM SIGN SHU OVER INVERTED SHU
+<U000122D9> /xf0/x92/x8b/x99 CUNEIFORM SIGN SHU2
+<U000122DA> /xf0/x92/x8b/x9a CUNEIFORM SIGN SHUBUR
+<U000122DB> /xf0/x92/x8b/x9b CUNEIFORM SIGN SI
+<U000122DC> /xf0/x92/x8b/x9c CUNEIFORM SIGN SI GUNU
+<U000122DD> /xf0/x92/x8b/x9d CUNEIFORM SIGN SIG
+<U000122DE> /xf0/x92/x8b/x9e CUNEIFORM SIGN SIG4
+<U000122DF> /xf0/x92/x8b/x9f CUNEIFORM SIGN SIG4 OVER SIG4 SHU2
+<U000122E0> /xf0/x92/x8b/xa0 CUNEIFORM SIGN SIK2
+<U000122E1> /xf0/x92/x8b/xa1 CUNEIFORM SIGN SILA3
+<U000122E2> /xf0/x92/x8b/xa2 CUNEIFORM SIGN SU
+<U000122E3> /xf0/x92/x8b/xa3 CUNEIFORM SIGN SU OVER SU
+<U000122E4> /xf0/x92/x8b/xa4 CUNEIFORM SIGN SUD
+<U000122E5> /xf0/x92/x8b/xa5 CUNEIFORM SIGN SUD2
+<U000122E6> /xf0/x92/x8b/xa6 CUNEIFORM SIGN SUHUR
+<U000122E7> /xf0/x92/x8b/xa7 CUNEIFORM SIGN SUM
+<U000122E8> /xf0/x92/x8b/xa8 CUNEIFORM SIGN SUMASH
+<U000122E9> /xf0/x92/x8b/xa9 CUNEIFORM SIGN SUR
+<U000122EA> /xf0/x92/x8b/xaa CUNEIFORM SIGN SUR9
+<U000122EB> /xf0/x92/x8b/xab CUNEIFORM SIGN TA
+<U000122EC> /xf0/x92/x8b/xac CUNEIFORM SIGN TA ASTERISK
+<U000122ED> /xf0/x92/x8b/xad CUNEIFORM SIGN TA TIMES HI
+<U000122EE> /xf0/x92/x8b/xae CUNEIFORM SIGN TA TIMES MI
+<U000122EF> /xf0/x92/x8b/xaf CUNEIFORM SIGN TA GUNU
+<U000122F0> /xf0/x92/x8b/xb0 CUNEIFORM SIGN TAB
+<U000122F1> /xf0/x92/x8b/xb1 CUNEIFORM SIGN TAB OVER TAB NI OVER NI DISH OVER DISH
+<U000122F2> /xf0/x92/x8b/xb2 CUNEIFORM SIGN TAB SQUARED
+<U000122F3> /xf0/x92/x8b/xb3 CUNEIFORM SIGN TAG
+<U000122F4> /xf0/x92/x8b/xb4 CUNEIFORM SIGN TAG TIMES BI
+<U000122F5> /xf0/x92/x8b/xb5 CUNEIFORM SIGN TAG TIMES GUD
+<U000122F6> /xf0/x92/x8b/xb6 CUNEIFORM SIGN TAG TIMES SHE
+<U000122F7> /xf0/x92/x8b/xb7 CUNEIFORM SIGN TAG TIMES SHU
+<U000122F8> /xf0/x92/x8b/xb8 CUNEIFORM SIGN TAG TIMES TUG2
+<U000122F9> /xf0/x92/x8b/xb9 CUNEIFORM SIGN TAG TIMES UD
+<U000122FA> /xf0/x92/x8b/xba CUNEIFORM SIGN TAK4
+<U000122FB> /xf0/x92/x8b/xbb CUNEIFORM SIGN TAR
+<U000122FC> /xf0/x92/x8b/xbc CUNEIFORM SIGN TE
+<U000122FD> /xf0/x92/x8b/xbd CUNEIFORM SIGN TE GUNU
+<U000122FE> /xf0/x92/x8b/xbe CUNEIFORM SIGN TI
+<U000122FF> /xf0/x92/x8b/xbf CUNEIFORM SIGN TI TENU
+<U00012300> /xf0/x92/x8c/x80 CUNEIFORM SIGN TIL
+<U00012301> /xf0/x92/x8c/x81 CUNEIFORM SIGN TIR
+<U00012302> /xf0/x92/x8c/x82 CUNEIFORM SIGN TIR TIMES TAK4
+<U00012303> /xf0/x92/x8c/x83 CUNEIFORM SIGN TIR OVER TIR
+<U00012304> /xf0/x92/x8c/x84 CUNEIFORM SIGN TIR OVER TIR GAD OVER GAD GAR OVER GAR
+<U00012305> /xf0/x92/x8c/x85 CUNEIFORM SIGN TU
+<U00012306> /xf0/x92/x8c/x86 CUNEIFORM SIGN TUG2
+<U00012307> /xf0/x92/x8c/x87 CUNEIFORM SIGN TUK
+<U00012308> /xf0/x92/x8c/x88 CUNEIFORM SIGN TUM
+<U00012309> /xf0/x92/x8c/x89 CUNEIFORM SIGN TUR
+<U0001230A> /xf0/x92/x8c/x8a CUNEIFORM SIGN TUR OVER TUR ZA OVER ZA
+<U0001230B> /xf0/x92/x8c/x8b CUNEIFORM SIGN U
+<U0001230C> /xf0/x92/x8c/x8c CUNEIFORM SIGN U GUD
+<U0001230D> /xf0/x92/x8c/x8d CUNEIFORM SIGN U U U
+<U0001230E> /xf0/x92/x8c/x8e CUNEIFORM SIGN U OVER U PA OVER PA GAR OVER GAR
+<U0001230F> /xf0/x92/x8c/x8f CUNEIFORM SIGN U OVER U SUR OVER SUR
+<U00012310> /xf0/x92/x8c/x90 CUNEIFORM SIGN U OVER U U REVERSED OVER U REVERSED
+<U00012311> /xf0/x92/x8c/x91 CUNEIFORM SIGN U2
+<U00012312> /xf0/x92/x8c/x92 CUNEIFORM SIGN UB
+<U00012313> /xf0/x92/x8c/x93 CUNEIFORM SIGN UD
+<U00012314> /xf0/x92/x8c/x94 CUNEIFORM SIGN UD KUSHU2
+<U00012315> /xf0/x92/x8c/x95 CUNEIFORM SIGN UD TIMES BAD
+<U00012316> /xf0/x92/x8c/x96 CUNEIFORM SIGN UD TIMES MI
+<U00012317> /xf0/x92/x8c/x97 CUNEIFORM SIGN UD TIMES U PLUS U PLUS U
+<U00012318> /xf0/x92/x8c/x98 CUNEIFORM SIGN UD TIMES U PLUS U PLUS U GUNU
+<U00012319> /xf0/x92/x8c/x99 CUNEIFORM SIGN UD GUNU
+<U0001231A> /xf0/x92/x8c/x9a CUNEIFORM SIGN UD SHESHIG
+<U0001231B> /xf0/x92/x8c/x9b CUNEIFORM SIGN UD SHESHIG TIMES BAD
+<U0001231C> /xf0/x92/x8c/x9c CUNEIFORM SIGN UDUG
+<U0001231D> /xf0/x92/x8c/x9d CUNEIFORM SIGN UM
+<U0001231E> /xf0/x92/x8c/x9e CUNEIFORM SIGN UM TIMES LAGAB
+<U0001231F> /xf0/x92/x8c/x9f CUNEIFORM SIGN UM TIMES ME PLUS DA
+<U00012320> /xf0/x92/x8c/xa0 CUNEIFORM SIGN UM TIMES SHA3
+<U00012321> /xf0/x92/x8c/xa1 CUNEIFORM SIGN UM TIMES U
+<U00012322> /xf0/x92/x8c/xa2 CUNEIFORM SIGN UMBIN
+<U00012323> /xf0/x92/x8c/xa3 CUNEIFORM SIGN UMUM
+<U00012324> /xf0/x92/x8c/xa4 CUNEIFORM SIGN UMUM TIMES KASKAL
+<U00012325> /xf0/x92/x8c/xa5 CUNEIFORM SIGN UMUM TIMES PA
+<U00012326> /xf0/x92/x8c/xa6 CUNEIFORM SIGN UN
+<U00012327> /xf0/x92/x8c/xa7 CUNEIFORM SIGN UN GUNU
+<U00012328> /xf0/x92/x8c/xa8 CUNEIFORM SIGN UR
+<U00012329> /xf0/x92/x8c/xa9 CUNEIFORM SIGN UR CROSSING UR
+<U0001232A> /xf0/x92/x8c/xaa CUNEIFORM SIGN UR SHESHIG
+<U0001232B> /xf0/x92/x8c/xab CUNEIFORM SIGN UR2
+<U0001232C> /xf0/x92/x8c/xac CUNEIFORM SIGN UR2 TIMES A PLUS HA
+<U0001232D> /xf0/x92/x8c/xad CUNEIFORM SIGN UR2 TIMES A PLUS NA
+<U0001232E> /xf0/x92/x8c/xae CUNEIFORM SIGN UR2 TIMES AL
+<U0001232F> /xf0/x92/x8c/xaf CUNEIFORM SIGN UR2 TIMES HA
+<U00012330> /xf0/x92/x8c/xb0 CUNEIFORM SIGN UR2 TIMES NUN
+<U00012331> /xf0/x92/x8c/xb1 CUNEIFORM SIGN UR2 TIMES U2
+<U00012332> /xf0/x92/x8c/xb2 CUNEIFORM SIGN UR2 TIMES U2 PLUS ASH
+<U00012333> /xf0/x92/x8c/xb3 CUNEIFORM SIGN UR2 TIMES U2 PLUS BI
+<U00012334> /xf0/x92/x8c/xb4 CUNEIFORM SIGN UR4
+<U00012335> /xf0/x92/x8c/xb5 CUNEIFORM SIGN URI
+<U00012336> /xf0/x92/x8c/xb6 CUNEIFORM SIGN URI3
+<U00012337> /xf0/x92/x8c/xb7 CUNEIFORM SIGN URU
+<U00012338> /xf0/x92/x8c/xb8 CUNEIFORM SIGN URU TIMES A
+<U00012339> /xf0/x92/x8c/xb9 CUNEIFORM SIGN URU TIMES ASHGAB
+<U0001233A> /xf0/x92/x8c/xba CUNEIFORM SIGN URU TIMES BAR
+<U0001233B> /xf0/x92/x8c/xbb CUNEIFORM SIGN URU TIMES DUN
+<U0001233C> /xf0/x92/x8c/xbc CUNEIFORM SIGN URU TIMES GA
+<U0001233D> /xf0/x92/x8c/xbd CUNEIFORM SIGN URU TIMES GAL
+<U0001233E> /xf0/x92/x8c/xbe CUNEIFORM SIGN URU TIMES GAN2 TENU
+<U0001233F> /xf0/x92/x8c/xbf CUNEIFORM SIGN URU TIMES GAR
+<U00012340> /xf0/x92/x8d/x80 CUNEIFORM SIGN URU TIMES GU
+<U00012341> /xf0/x92/x8d/x81 CUNEIFORM SIGN URU TIMES HA
+<U00012342> /xf0/x92/x8d/x82 CUNEIFORM SIGN URU TIMES IGI
+<U00012343> /xf0/x92/x8d/x83 CUNEIFORM SIGN URU TIMES IM
+<U00012344> /xf0/x92/x8d/x84 CUNEIFORM SIGN URU TIMES ISH
+<U00012345> /xf0/x92/x8d/x85 CUNEIFORM SIGN URU TIMES KI
+<U00012346> /xf0/x92/x8d/x86 CUNEIFORM SIGN URU TIMES LUM
+<U00012347> /xf0/x92/x8d/x87 CUNEIFORM SIGN URU TIMES MIN
+<U00012348> /xf0/x92/x8d/x88 CUNEIFORM SIGN URU TIMES PA
+<U00012349> /xf0/x92/x8d/x89 CUNEIFORM SIGN URU TIMES SHE
+<U0001234A> /xf0/x92/x8d/x8a CUNEIFORM SIGN URU TIMES SIG4
+<U0001234B> /xf0/x92/x8d/x8b CUNEIFORM SIGN URU TIMES TU
+<U0001234C> /xf0/x92/x8d/x8c CUNEIFORM SIGN URU TIMES U PLUS GUD
+<U0001234D> /xf0/x92/x8d/x8d CUNEIFORM SIGN URU TIMES UD
+<U0001234E> /xf0/x92/x8d/x8e CUNEIFORM SIGN URU TIMES URUDA
+<U0001234F> /xf0/x92/x8d/x8f CUNEIFORM SIGN URUDA
+<U00012350> /xf0/x92/x8d/x90 CUNEIFORM SIGN URUDA TIMES U
+<U00012351> /xf0/x92/x8d/x91 CUNEIFORM SIGN USH
+<U00012352> /xf0/x92/x8d/x92 CUNEIFORM SIGN USH TIMES A
+<U00012353> /xf0/x92/x8d/x93 CUNEIFORM SIGN USH TIMES KU
+<U00012354> /xf0/x92/x8d/x94 CUNEIFORM SIGN USH TIMES KUR
+<U00012355> /xf0/x92/x8d/x95 CUNEIFORM SIGN USH TIMES TAK4
+<U00012356> /xf0/x92/x8d/x96 CUNEIFORM SIGN USHX
+<U00012357> /xf0/x92/x8d/x97 CUNEIFORM SIGN USH2
+<U00012358> /xf0/x92/x8d/x98 CUNEIFORM SIGN USHUMX
+<U00012359> /xf0/x92/x8d/x99 CUNEIFORM SIGN UTUKI
+<U0001235A> /xf0/x92/x8d/x9a CUNEIFORM SIGN UZ3
+<U0001235B> /xf0/x92/x8d/x9b CUNEIFORM SIGN UZ3 TIMES KASKAL
+<U0001235C> /xf0/x92/x8d/x9c CUNEIFORM SIGN UZU
+<U0001235D> /xf0/x92/x8d/x9d CUNEIFORM SIGN ZA
+<U0001235E> /xf0/x92/x8d/x9e CUNEIFORM SIGN ZA TENU
+<U0001235F> /xf0/x92/x8d/x9f CUNEIFORM SIGN ZA SQUARED TIMES KUR
+<U00012360> /xf0/x92/x8d/xa0 CUNEIFORM SIGN ZAG
+<U00012361> /xf0/x92/x8d/xa1 CUNEIFORM SIGN ZAMX
+<U00012362> /xf0/x92/x8d/xa2 CUNEIFORM SIGN ZE2
+<U00012363> /xf0/x92/x8d/xa3 CUNEIFORM SIGN ZI
+<U00012364> /xf0/x92/x8d/xa4 CUNEIFORM SIGN ZI OVER ZI
+<U00012365> /xf0/x92/x8d/xa5 CUNEIFORM SIGN ZI3
+<U00012366> /xf0/x92/x8d/xa6 CUNEIFORM SIGN ZIB
+<U00012367> /xf0/x92/x8d/xa7 CUNEIFORM SIGN ZIB KABA TENU
+<U00012368> /xf0/x92/x8d/xa8 CUNEIFORM SIGN ZIG
+<U00012369> /xf0/x92/x8d/xa9 CUNEIFORM SIGN ZIZ2
+<U0001236A> /xf0/x92/x8d/xaa CUNEIFORM SIGN ZU
+<U0001236B> /xf0/x92/x8d/xab CUNEIFORM SIGN ZU5
+<U0001236C> /xf0/x92/x8d/xac CUNEIFORM SIGN ZU5 TIMES A
+<U0001236D> /xf0/x92/x8d/xad CUNEIFORM SIGN ZUBUR
+<U0001236E> /xf0/x92/x8d/xae CUNEIFORM SIGN ZUM
+<U00012400> /xf0/x92/x90/x80 CUNEIFORM NUMERIC SIGN TWO ASH
+<U00012401> /xf0/x92/x90/x81 CUNEIFORM NUMERIC SIGN THREE ASH
+<U00012402> /xf0/x92/x90/x82 CUNEIFORM NUMERIC SIGN FOUR ASH
+<U00012403> /xf0/x92/x90/x83 CUNEIFORM NUMERIC SIGN FIVE ASH
+<U00012404> /xf0/x92/x90/x84 CUNEIFORM NUMERIC SIGN SIX ASH
+<U00012405> /xf0/x92/x90/x85 CUNEIFORM NUMERIC SIGN SEVEN ASH
+<U00012406> /xf0/x92/x90/x86 CUNEIFORM NUMERIC SIGN EIGHT ASH
+<U00012407> /xf0/x92/x90/x87 CUNEIFORM NUMERIC SIGN NINE ASH
+<U00012408> /xf0/x92/x90/x88 CUNEIFORM NUMERIC SIGN THREE DISH
+<U00012409> /xf0/x92/x90/x89 CUNEIFORM NUMERIC SIGN FOUR DISH
+<U0001240A> /xf0/x92/x90/x8a CUNEIFORM NUMERIC SIGN FIVE DISH
+<U0001240B> /xf0/x92/x90/x8b CUNEIFORM NUMERIC SIGN SIX DISH
+<U0001240C> /xf0/x92/x90/x8c CUNEIFORM NUMERIC SIGN SEVEN DISH
+<U0001240D> /xf0/x92/x90/x8d CUNEIFORM NUMERIC SIGN EIGHT DISH
+<U0001240E> /xf0/x92/x90/x8e CUNEIFORM NUMERIC SIGN NINE DISH
+<U0001240F> /xf0/x92/x90/x8f CUNEIFORM NUMERIC SIGN FOUR U
+<U00012410> /xf0/x92/x90/x90 CUNEIFORM NUMERIC SIGN FIVE U
+<U00012411> /xf0/x92/x90/x91 CUNEIFORM NUMERIC SIGN SIX U
+<U00012412> /xf0/x92/x90/x92 CUNEIFORM NUMERIC SIGN SEVEN U
+<U00012413> /xf0/x92/x90/x93 CUNEIFORM NUMERIC SIGN EIGHT U
+<U00012414> /xf0/x92/x90/x94 CUNEIFORM NUMERIC SIGN NINE U
+<U00012415> /xf0/x92/x90/x95 CUNEIFORM NUMERIC SIGN ONE GESH2
+<U00012416> /xf0/x92/x90/x96 CUNEIFORM NUMERIC SIGN TWO GESH2
+<U00012417> /xf0/x92/x90/x97 CUNEIFORM NUMERIC SIGN THREE GESH2
+<U00012418> /xf0/x92/x90/x98 CUNEIFORM NUMERIC SIGN FOUR GESH2
+<U00012419> /xf0/x92/x90/x99 CUNEIFORM NUMERIC SIGN FIVE GESH2
+<U0001241A> /xf0/x92/x90/x9a CUNEIFORM NUMERIC SIGN SIX GESH2
+<U0001241B> /xf0/x92/x90/x9b CUNEIFORM NUMERIC SIGN SEVEN GESH2
+<U0001241C> /xf0/x92/x90/x9c CUNEIFORM NUMERIC SIGN EIGHT GESH2
+<U0001241D> /xf0/x92/x90/x9d CUNEIFORM NUMERIC SIGN NINE GESH2
+<U0001241E> /xf0/x92/x90/x9e CUNEIFORM NUMERIC SIGN ONE GESHU
+<U0001241F> /xf0/x92/x90/x9f CUNEIFORM NUMERIC SIGN TWO GESHU
+<U00012420> /xf0/x92/x90/xa0 CUNEIFORM NUMERIC SIGN THREE GESHU
+<U00012421> /xf0/x92/x90/xa1 CUNEIFORM NUMERIC SIGN FOUR GESHU
+<U00012422> /xf0/x92/x90/xa2 CUNEIFORM NUMERIC SIGN FIVE GESHU
+<U00012423> /xf0/x92/x90/xa3 CUNEIFORM NUMERIC SIGN TWO SHAR2
+<U00012424> /xf0/x92/x90/xa4 CUNEIFORM NUMERIC SIGN THREE SHAR2
+<U00012425> /xf0/x92/x90/xa5 CUNEIFORM NUMERIC SIGN THREE SHAR2 VARIANT FORM
+<U00012426> /xf0/x92/x90/xa6 CUNEIFORM NUMERIC SIGN FOUR SHAR2
+<U00012427> /xf0/x92/x90/xa7 CUNEIFORM NUMERIC SIGN FIVE SHAR2
+<U00012428> /xf0/x92/x90/xa8 CUNEIFORM NUMERIC SIGN SIX SHAR2
+<U00012429> /xf0/x92/x90/xa9 CUNEIFORM NUMERIC SIGN SEVEN SHAR2
+<U0001242A> /xf0/x92/x90/xaa CUNEIFORM NUMERIC SIGN EIGHT SHAR2
+<U0001242B> /xf0/x92/x90/xab CUNEIFORM NUMERIC SIGN NINE SHAR2
+<U0001242C> /xf0/x92/x90/xac CUNEIFORM NUMERIC SIGN ONE SHARU
+<U0001242D> /xf0/x92/x90/xad CUNEIFORM NUMERIC SIGN TWO SHARU
+<U0001242E> /xf0/x92/x90/xae CUNEIFORM NUMERIC SIGN THREE SHARU
+<U0001242F> /xf0/x92/x90/xaf CUNEIFORM NUMERIC SIGN THREE SHARU VARIANT FORM
+<U00012430> /xf0/x92/x90/xb0 CUNEIFORM NUMERIC SIGN FOUR SHARU
+<U00012431> /xf0/x92/x90/xb1 CUNEIFORM NUMERIC SIGN FIVE SHARU
+<U00012432> /xf0/x92/x90/xb2 CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS DISH
+<U00012433> /xf0/x92/x90/xb3 CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS MIN
+<U00012434> /xf0/x92/x90/xb4 CUNEIFORM NUMERIC SIGN ONE BURU
+<U00012435> /xf0/x92/x90/xb5 CUNEIFORM NUMERIC SIGN TWO BURU
+<U00012436> /xf0/x92/x90/xb6 CUNEIFORM NUMERIC SIGN THREE BURU
+<U00012437> /xf0/x92/x90/xb7 CUNEIFORM NUMERIC SIGN THREE BURU VARIANT FORM
+<U00012438> /xf0/x92/x90/xb8 CUNEIFORM NUMERIC SIGN FOUR BURU
+<U00012439> /xf0/x92/x90/xb9 CUNEIFORM NUMERIC SIGN FIVE BURU
+<U0001243A> /xf0/x92/x90/xba CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH16
+<U0001243B> /xf0/x92/x90/xbb CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH21
+<U0001243C> /xf0/x92/x90/xbc CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU
+<U0001243D> /xf0/x92/x90/xbd CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU4
+<U0001243E> /xf0/x92/x90/xbe CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU A
+<U0001243F> /xf0/x92/x90/xbf CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU B
+<U00012440> /xf0/x92/x91/x80 CUNEIFORM NUMERIC SIGN SIX VARIANT FORM ASH9
+<U00012441> /xf0/x92/x91/x81 CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN3
+<U00012442> /xf0/x92/x91/x82 CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN A
+<U00012443> /xf0/x92/x91/x83 CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN B
+<U00012444> /xf0/x92/x91/x84 CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU
+<U00012445> /xf0/x92/x91/x85 CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU3
+<U00012446> /xf0/x92/x91/x86 CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU
+<U00012447> /xf0/x92/x91/x87 CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU3
+<U00012448> /xf0/x92/x91/x88 CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU4
+<U00012449> /xf0/x92/x91/x89 CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU A
+<U0001244A> /xf0/x92/x91/x8a CUNEIFORM NUMERIC SIGN TWO ASH TENU
+<U0001244B> /xf0/x92/x91/x8b CUNEIFORM NUMERIC SIGN THREE ASH TENU
+<U0001244C> /xf0/x92/x91/x8c CUNEIFORM NUMERIC SIGN FOUR ASH TENU
+<U0001244D> /xf0/x92/x91/x8d CUNEIFORM NUMERIC SIGN FIVE ASH TENU
+<U0001244E> /xf0/x92/x91/x8e CUNEIFORM NUMERIC SIGN SIX ASH TENU
+<U0001244F> /xf0/x92/x91/x8f CUNEIFORM NUMERIC SIGN ONE BAN2
+<U00012450> /xf0/x92/x91/x90 CUNEIFORM NUMERIC SIGN TWO BAN2
+<U00012451> /xf0/x92/x91/x91 CUNEIFORM NUMERIC SIGN THREE BAN2
+<U00012452> /xf0/x92/x91/x92 CUNEIFORM NUMERIC SIGN FOUR BAN2
+<U00012453> /xf0/x92/x91/x93 CUNEIFORM NUMERIC SIGN FOUR BAN2 VARIANT FORM
+<U00012454> /xf0/x92/x91/x94 CUNEIFORM NUMERIC SIGN FIVE BAN2
+<U00012455> /xf0/x92/x91/x95 CUNEIFORM NUMERIC SIGN FIVE BAN2 VARIANT FORM
+<U00012456> /xf0/x92/x91/x96 CUNEIFORM NUMERIC SIGN NIGIDAMIN
+<U00012457> /xf0/x92/x91/x97 CUNEIFORM NUMERIC SIGN NIGIDAESH
+<U00012458> /xf0/x92/x91/x98 CUNEIFORM NUMERIC SIGN ONE ESHE3
+<U00012459> /xf0/x92/x91/x99 CUNEIFORM NUMERIC SIGN TWO ESHE3
+<U0001245A> /xf0/x92/x91/x9a CUNEIFORM NUMERIC SIGN ONE THIRD DISH
+<U0001245B> /xf0/x92/x91/x9b CUNEIFORM NUMERIC SIGN TWO THIRDS DISH
+<U0001245C> /xf0/x92/x91/x9c CUNEIFORM NUMERIC SIGN FIVE SIXTHS DISH
+<U0001245D> /xf0/x92/x91/x9d CUNEIFORM NUMERIC SIGN ONE THIRD VARIANT FORM A
+<U0001245E> /xf0/x92/x91/x9e CUNEIFORM NUMERIC SIGN TWO THIRDS VARIANT FORM A
+<U0001245F> /xf0/x92/x91/x9f CUNEIFORM NUMERIC SIGN ONE EIGHTH ASH
+<U00012460> /xf0/x92/x91/xa0 CUNEIFORM NUMERIC SIGN ONE QUARTER ASH
+<U00012461> /xf0/x92/x91/xa1 CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE SIXTH
+<U00012462> /xf0/x92/x91/xa2 CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE QUARTER
+<U00012470> /xf0/x92/x91/xb0 CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER
+<U00012471> /xf0/x92/x91/xb1 CUNEIFORM PUNCTUATION SIGN VERTICAL COLON
+<U00012472> /xf0/x92/x91/xb2 CUNEIFORM PUNCTUATION SIGN DIAGONAL COLON
+<U00012473> /xf0/x92/x91/xb3 CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON
 <U0001D000> /xf0/x9d/x80/x80 BYZANTINE MUSICAL SYMBOL PSILI
 <U0001D001> /xf0/x9d/x80/x81 BYZANTINE MUSICAL SYMBOL DASEIA
 <U0001D002> /xf0/x9d/x80/x82 BYZANTINE MUSICAL SYMBOL PERISPOMENI
@@ -27185,6 +28656,7 @@ CHARMAP
 <U0001D124> /xf0/x9d/x84/xa4 MUSICAL SYMBOL F CLEF OTTAVA BASSA
 <U0001D125> /xf0/x9d/x84/xa5 MUSICAL SYMBOL DRUM CLEF-1
 <U0001D126> /xf0/x9d/x84/xa6 MUSICAL SYMBOL DRUM CLEF-2
+<U0001D129> /xf0/x9d/x84/xa9 MUSICAL SYMBOL MULTIPLE MEASURE REST
 <U0001D12A> /xf0/x9d/x84/xaa MUSICAL SYMBOL DOUBLE SHARP
 <U0001D12B> /xf0/x9d/x84/xab MUSICAL SYMBOL DOUBLE FLAT
 <U0001D12C> /xf0/x9d/x84/xac MUSICAL SYMBOL FLAT UP
@@ -27365,181 +28837,181 @@ CHARMAP
 <U0001D1DB> /xf0/x9d/x87/x9b MUSICAL SYMBOL SCANDICUS FLEXUS
 <U0001D1DC> /xf0/x9d/x87/x9c MUSICAL SYMBOL TORCULUS RESUPINUS
 <U0001D1DD> /xf0/x9d/x87/x9d MUSICAL SYMBOL PES SUBPUNCTIS
-<U0001D200>     /xf0/x9d/x88/x80 GREEK VOCAL NOTATION SYMBOL-1
-<U0001D201>     /xf0/x9d/x88/x81 GREEK VOCAL NOTATION SYMBOL-2
-<U0001D202>     /xf0/x9d/x88/x82 GREEK VOCAL NOTATION SYMBOL-3
-<U0001D203>     /xf0/x9d/x88/x83 GREEK VOCAL NOTATION SYMBOL-4
-<U0001D204>     /xf0/x9d/x88/x84 GREEK VOCAL NOTATION SYMBOL-5
-<U0001D205>     /xf0/x9d/x88/x85 GREEK VOCAL NOTATION SYMBOL-6
-<U0001D206>     /xf0/x9d/x88/x86 GREEK VOCAL NOTATION SYMBOL-7
-<U0001D207>     /xf0/x9d/x88/x87 GREEK VOCAL NOTATION SYMBOL-8
-<U0001D208>     /xf0/x9d/x88/x88 GREEK VOCAL NOTATION SYMBOL-9
-<U0001D209>     /xf0/x9d/x88/x89 GREEK VOCAL NOTATION SYMBOL-10
-<U0001D20A>     /xf0/x9d/x88/x8a GREEK VOCAL NOTATION SYMBOL-11
-<U0001D20B>     /xf0/x9d/x88/x8b GREEK VOCAL NOTATION SYMBOL-12
-<U0001D20C>     /xf0/x9d/x88/x8c GREEK VOCAL NOTATION SYMBOL-13
-<U0001D20D>     /xf0/x9d/x88/x8d GREEK VOCAL NOTATION SYMBOL-14
-<U0001D20E>     /xf0/x9d/x88/x8e GREEK VOCAL NOTATION SYMBOL-15
-<U0001D20F>     /xf0/x9d/x88/x8f GREEK VOCAL NOTATION SYMBOL-16
-<U0001D210>     /xf0/x9d/x88/x90 GREEK VOCAL NOTATION SYMBOL-17
-<U0001D211>     /xf0/x9d/x88/x91 GREEK VOCAL NOTATION SYMBOL-18
-<U0001D212>     /xf0/x9d/x88/x92 GREEK VOCAL NOTATION SYMBOL-19
-<U0001D213>     /xf0/x9d/x88/x93 GREEK VOCAL NOTATION SYMBOL-20
-<U0001D214>     /xf0/x9d/x88/x94 GREEK VOCAL NOTATION SYMBOL-21
-<U0001D215>     /xf0/x9d/x88/x95 GREEK VOCAL NOTATION SYMBOL-22
-<U0001D216>     /xf0/x9d/x88/x96 GREEK VOCAL NOTATION SYMBOL-23
-<U0001D217>     /xf0/x9d/x88/x97 GREEK VOCAL NOTATION SYMBOL-24
-<U0001D218>     /xf0/x9d/x88/x98 GREEK VOCAL NOTATION SYMBOL-50
-<U0001D219>     /xf0/x9d/x88/x99 GREEK VOCAL NOTATION SYMBOL-51
-<U0001D21A>     /xf0/x9d/x88/x9a GREEK VOCAL NOTATION SYMBOL-52
-<U0001D21B>     /xf0/x9d/x88/x9b GREEK VOCAL NOTATION SYMBOL-53
-<U0001D21C>     /xf0/x9d/x88/x9c GREEK VOCAL NOTATION SYMBOL-54
-<U0001D21D>     /xf0/x9d/x88/x9d GREEK INSTRUMENTAL NOTATION SYMBOL-1
-<U0001D21E>     /xf0/x9d/x88/x9e GREEK INSTRUMENTAL NOTATION SYMBOL-2
-<U0001D21F>     /xf0/x9d/x88/x9f GREEK INSTRUMENTAL NOTATION SYMBOL-4
-<U0001D220>     /xf0/x9d/x88/xa0 GREEK INSTRUMENTAL NOTATION SYMBOL-5
-<U0001D221>     /xf0/x9d/x88/xa1 GREEK INSTRUMENTAL NOTATION SYMBOL-7
-<U0001D222>     /xf0/x9d/x88/xa2 GREEK INSTRUMENTAL NOTATION SYMBOL-8
-<U0001D223>     /xf0/x9d/x88/xa3 GREEK INSTRUMENTAL NOTATION SYMBOL-11
-<U0001D224>     /xf0/x9d/x88/xa4 GREEK INSTRUMENTAL NOTATION SYMBOL-12
-<U0001D225>     /xf0/x9d/x88/xa5 GREEK INSTRUMENTAL NOTATION SYMBOL-13
-<U0001D226>     /xf0/x9d/x88/xa6 GREEK INSTRUMENTAL NOTATION SYMBOL-14
-<U0001D227>     /xf0/x9d/x88/xa7 GREEK INSTRUMENTAL NOTATION SYMBOL-17
-<U0001D228>     /xf0/x9d/x88/xa8 GREEK INSTRUMENTAL NOTATION SYMBOL-18
-<U0001D229>     /xf0/x9d/x88/xa9 GREEK INSTRUMENTAL NOTATION SYMBOL-19
-<U0001D22A>     /xf0/x9d/x88/xaa GREEK INSTRUMENTAL NOTATION SYMBOL-23
-<U0001D22B>     /xf0/x9d/x88/xab GREEK INSTRUMENTAL NOTATION SYMBOL-24
-<U0001D22C>     /xf0/x9d/x88/xac GREEK INSTRUMENTAL NOTATION SYMBOL-25
-<U0001D22D>     /xf0/x9d/x88/xad GREEK INSTRUMENTAL NOTATION SYMBOL-26
-<U0001D22E>     /xf0/x9d/x88/xae GREEK INSTRUMENTAL NOTATION SYMBOL-27
-<U0001D22F>     /xf0/x9d/x88/xaf GREEK INSTRUMENTAL NOTATION SYMBOL-29
-<U0001D230>     /xf0/x9d/x88/xb0 GREEK INSTRUMENTAL NOTATION SYMBOL-30
-<U0001D231>     /xf0/x9d/x88/xb1 GREEK INSTRUMENTAL NOTATION SYMBOL-32
-<U0001D232>     /xf0/x9d/x88/xb2 GREEK INSTRUMENTAL NOTATION SYMBOL-36
-<U0001D233>     /xf0/x9d/x88/xb3 GREEK INSTRUMENTAL NOTATION SYMBOL-37
-<U0001D234>     /xf0/x9d/x88/xb4 GREEK INSTRUMENTAL NOTATION SYMBOL-38
-<U0001D235>     /xf0/x9d/x88/xb5 GREEK INSTRUMENTAL NOTATION SYMBOL-39
-<U0001D236>     /xf0/x9d/x88/xb6 GREEK INSTRUMENTAL NOTATION SYMBOL-40
-<U0001D237>     /xf0/x9d/x88/xb7 GREEK INSTRUMENTAL NOTATION SYMBOL-42
-<U0001D238>     /xf0/x9d/x88/xb8 GREEK INSTRUMENTAL NOTATION SYMBOL-43
-<U0001D239>     /xf0/x9d/x88/xb9 GREEK INSTRUMENTAL NOTATION SYMBOL-45
-<U0001D23A>     /xf0/x9d/x88/xba GREEK INSTRUMENTAL NOTATION SYMBOL-47
-<U0001D23B>     /xf0/x9d/x88/xbb GREEK INSTRUMENTAL NOTATION SYMBOL-48
-<U0001D23C>     /xf0/x9d/x88/xbc GREEK INSTRUMENTAL NOTATION SYMBOL-49
-<U0001D23D>     /xf0/x9d/x88/xbd GREEK INSTRUMENTAL NOTATION SYMBOL-50
-<U0001D23E>     /xf0/x9d/x88/xbe GREEK INSTRUMENTAL NOTATION SYMBOL-51
-<U0001D23F>     /xf0/x9d/x88/xbf GREEK INSTRUMENTAL NOTATION SYMBOL-52
-<U0001D240>     /xf0/x9d/x89/x80 GREEK INSTRUMENTAL NOTATION SYMBOL-53
-<U0001D241>     /xf0/x9d/x89/x81 GREEK INSTRUMENTAL NOTATION SYMBOL-54
-<U0001D242>     /xf0/x9d/x89/x82 COMBINING GREEK MUSICAL TRISEME
-<U0001D243>     /xf0/x9d/x89/x83 COMBINING GREEK MUSICAL TETRASEME
-<U0001D244>     /xf0/x9d/x89/x84 COMBINING GREEK MUSICAL PENTASEME
-<U0001D245>     /xf0/x9d/x89/x85 GREEK MUSICAL LEIMMA
-<U0001D300>     /xf0/x9d/x8c/x80 MONOGRAM FOR EARTH
-<U0001D301>     /xf0/x9d/x8c/x81 DIGRAM FOR HEAVENLY EARTH
-<U0001D302>     /xf0/x9d/x8c/x82 DIGRAM FOR HUMAN EARTH
-<U0001D303>     /xf0/x9d/x8c/x83 DIGRAM FOR EARTHLY HEAVEN
-<U0001D304>     /xf0/x9d/x8c/x84 DIGRAM FOR EARTHLY HUMAN
-<U0001D305>     /xf0/x9d/x8c/x85 DIGRAM FOR EARTH
-<U0001D306>     /xf0/x9d/x8c/x86 TETRAGRAM FOR CENTRE
-<U0001D307>     /xf0/x9d/x8c/x87 TETRAGRAM FOR FULL CIRCLE
-<U0001D308>     /xf0/x9d/x8c/x88 TETRAGRAM FOR MIRED
-<U0001D309>     /xf0/x9d/x8c/x89 TETRAGRAM FOR BARRIER
-<U0001D30A>     /xf0/x9d/x8c/x8a TETRAGRAM FOR KEEPING SMALL
-<U0001D30B>     /xf0/x9d/x8c/x8b TETRAGRAM FOR CONTRARIETY
-<U0001D30C>     /xf0/x9d/x8c/x8c TETRAGRAM FOR ASCENT
-<U0001D30D>     /xf0/x9d/x8c/x8d TETRAGRAM FOR OPPOSITION
-<U0001D30E>     /xf0/x9d/x8c/x8e TETRAGRAM FOR BRANCHING OUT
-<U0001D30F>     /xf0/x9d/x8c/x8f TETRAGRAM FOR DEFECTIVENESS OR DISTORTION
-<U0001D310>     /xf0/x9d/x8c/x90 TETRAGRAM FOR DIVERGENCE
-<U0001D311>     /xf0/x9d/x8c/x91 TETRAGRAM FOR YOUTHFULNESS
-<U0001D312>     /xf0/x9d/x8c/x92 TETRAGRAM FOR INCREASE
-<U0001D313>     /xf0/x9d/x8c/x93 TETRAGRAM FOR PENETRATION
-<U0001D314>     /xf0/x9d/x8c/x94 TETRAGRAM FOR REACH
-<U0001D315>     /xf0/x9d/x8c/x95 TETRAGRAM FOR CONTACT
-<U0001D316>     /xf0/x9d/x8c/x96 TETRAGRAM FOR HOLDING BACK
-<U0001D317>     /xf0/x9d/x8c/x97 TETRAGRAM FOR WAITING
-<U0001D318>     /xf0/x9d/x8c/x98 TETRAGRAM FOR FOLLOWING
-<U0001D319>     /xf0/x9d/x8c/x99 TETRAGRAM FOR ADVANCE
-<U0001D31A>     /xf0/x9d/x8c/x9a TETRAGRAM FOR RELEASE
-<U0001D31B>     /xf0/x9d/x8c/x9b TETRAGRAM FOR RESISTANCE
-<U0001D31C>     /xf0/x9d/x8c/x9c TETRAGRAM FOR EASE
-<U0001D31D>     /xf0/x9d/x8c/x9d TETRAGRAM FOR JOY
-<U0001D31E>     /xf0/x9d/x8c/x9e TETRAGRAM FOR CONTENTION
-<U0001D31F>     /xf0/x9d/x8c/x9f TETRAGRAM FOR ENDEAVOUR
-<U0001D320>     /xf0/x9d/x8c/xa0 TETRAGRAM FOR DUTIES
-<U0001D321>     /xf0/x9d/x8c/xa1 TETRAGRAM FOR CHANGE
-<U0001D322>     /xf0/x9d/x8c/xa2 TETRAGRAM FOR DECISIVENESS
-<U0001D323>     /xf0/x9d/x8c/xa3 TETRAGRAM FOR BOLD RESOLUTION
-<U0001D324>     /xf0/x9d/x8c/xa4 TETRAGRAM FOR PACKING
-<U0001D325>     /xf0/x9d/x8c/xa5 TETRAGRAM FOR LEGION
-<U0001D326>     /xf0/x9d/x8c/xa6 TETRAGRAM FOR CLOSENESS
-<U0001D327>     /xf0/x9d/x8c/xa7 TETRAGRAM FOR KINSHIP
-<U0001D328>     /xf0/x9d/x8c/xa8 TETRAGRAM FOR GATHERING
-<U0001D329>     /xf0/x9d/x8c/xa9 TETRAGRAM FOR STRENGTH
-<U0001D32A>     /xf0/x9d/x8c/xaa TETRAGRAM FOR PURITY
-<U0001D32B>     /xf0/x9d/x8c/xab TETRAGRAM FOR FULLNESS
-<U0001D32C>     /xf0/x9d/x8c/xac TETRAGRAM FOR RESIDENCE
-<U0001D32D>     /xf0/x9d/x8c/xad TETRAGRAM FOR LAW OR MODEL
-<U0001D32E>     /xf0/x9d/x8c/xae TETRAGRAM FOR RESPONSE
-<U0001D32F>     /xf0/x9d/x8c/xaf TETRAGRAM FOR GOING TO MEET
-<U0001D330>     /xf0/x9d/x8c/xb0 TETRAGRAM FOR ENCOUNTERS
-<U0001D331>     /xf0/x9d/x8c/xb1 TETRAGRAM FOR STOVE
-<U0001D332>     /xf0/x9d/x8c/xb2 TETRAGRAM FOR GREATNESS
-<U0001D333>     /xf0/x9d/x8c/xb3 TETRAGRAM FOR ENLARGEMENT
-<U0001D334>     /xf0/x9d/x8c/xb4 TETRAGRAM FOR PATTERN
-<U0001D335>     /xf0/x9d/x8c/xb5 TETRAGRAM FOR RITUAL
-<U0001D336>     /xf0/x9d/x8c/xb6 TETRAGRAM FOR FLIGHT
-<U0001D337>     /xf0/x9d/x8c/xb7 TETRAGRAM FOR VASTNESS OR WASTING
-<U0001D338>     /xf0/x9d/x8c/xb8 TETRAGRAM FOR CONSTANCY
-<U0001D339>     /xf0/x9d/x8c/xb9 TETRAGRAM FOR MEASURE
-<U0001D33A>     /xf0/x9d/x8c/xba TETRAGRAM FOR ETERNITY
-<U0001D33B>     /xf0/x9d/x8c/xbb TETRAGRAM FOR UNITY
-<U0001D33C>     /xf0/x9d/x8c/xbc TETRAGRAM FOR DIMINISHMENT
-<U0001D33D>     /xf0/x9d/x8c/xbd TETRAGRAM FOR CLOSED MOUTH
-<U0001D33E>     /xf0/x9d/x8c/xbe TETRAGRAM FOR GUARDEDNESS
-<U0001D33F>     /xf0/x9d/x8c/xbf TETRAGRAM FOR GATHERING IN
-<U0001D340>     /xf0/x9d/x8d/x80 TETRAGRAM FOR MASSING
-<U0001D341>     /xf0/x9d/x8d/x81 TETRAGRAM FOR ACCUMULATION
-<U0001D342>     /xf0/x9d/x8d/x82 TETRAGRAM FOR EMBELLISHMENT
-<U0001D343>     /xf0/x9d/x8d/x83 TETRAGRAM FOR DOUBT
-<U0001D344>     /xf0/x9d/x8d/x84 TETRAGRAM FOR WATCH
-<U0001D345>     /xf0/x9d/x8d/x85 TETRAGRAM FOR SINKING
-<U0001D346>     /xf0/x9d/x8d/x86 TETRAGRAM FOR INNER
-<U0001D347>     /xf0/x9d/x8d/x87 TETRAGRAM FOR DEPARTURE
-<U0001D348>     /xf0/x9d/x8d/x88 TETRAGRAM FOR DARKENING
-<U0001D349>     /xf0/x9d/x8d/x89 TETRAGRAM FOR DIMMING
-<U0001D34A>     /xf0/x9d/x8d/x8a TETRAGRAM FOR EXHAUSTION
-<U0001D34B>     /xf0/x9d/x8d/x8b TETRAGRAM FOR SEVERANCE
-<U0001D34C>     /xf0/x9d/x8d/x8c TETRAGRAM FOR STOPPAGE
-<U0001D34D>     /xf0/x9d/x8d/x8d TETRAGRAM FOR HARDNESS
-<U0001D34E>     /xf0/x9d/x8d/x8e TETRAGRAM FOR COMPLETION
-<U0001D34F>     /xf0/x9d/x8d/x8f TETRAGRAM FOR CLOSURE
-<U0001D350>     /xf0/x9d/x8d/x90 TETRAGRAM FOR FAILURE
-<U0001D351>     /xf0/x9d/x8d/x91 TETRAGRAM FOR AGGRAVATION
-<U0001D352>     /xf0/x9d/x8d/x92 TETRAGRAM FOR COMPLIANCE
-<U0001D353>     /xf0/x9d/x8d/x93 TETRAGRAM FOR ON THE VERGE
-<U0001D354>     /xf0/x9d/x8d/x94 TETRAGRAM FOR DIFFICULTIES
-<U0001D355>     /xf0/x9d/x8d/x95 TETRAGRAM FOR LABOURING
-<U0001D356>     /xf0/x9d/x8d/x96 TETRAGRAM FOR FOSTERING
-<U0001D360>     /xf0/x9d/x8d/xa0 COUNTING ROD UNIT DIGIT ONE
-<U0001D361>     /xf0/x9d/x8d/xa1 COUNTING ROD UNIT DIGIT TWO
-<U0001D362>     /xf0/x9d/x8d/xa2 COUNTING ROD UNIT DIGIT THREE
-<U0001D363>     /xf0/x9d/x8d/xa3 COUNTING ROD UNIT DIGIT FOUR
-<U0001D364>     /xf0/x9d/x8d/xa4 COUNTING ROD UNIT DIGIT FIVE
-<U0001D365>     /xf0/x9d/x8d/xa5 COUNTING ROD UNIT DIGIT SIX
-<U0001D366>     /xf0/x9d/x8d/xa6 COUNTING ROD UNIT DIGIT SEVEN
-<U0001D367>     /xf0/x9d/x8d/xa7 COUNTING ROD UNIT DIGIT EIGHT
-<U0001D368>     /xf0/x9d/x8d/xa8 COUNTING ROD UNIT DIGIT NINE
-<U0001D369>     /xf0/x9d/x8d/xa9 COUNTING ROD TENS DIGIT ONE
-<U0001D36A>     /xf0/x9d/x8d/xaa COUNTING ROD TENS DIGIT TWO
-<U0001D36B>     /xf0/x9d/x8d/xab COUNTING ROD TENS DIGIT THREE
-<U0001D36C>     /xf0/x9d/x8d/xac COUNTING ROD TENS DIGIT FOUR
-<U0001D36D>     /xf0/x9d/x8d/xad COUNTING ROD TENS DIGIT FIVE
-<U0001D36E>     /xf0/x9d/x8d/xae COUNTING ROD TENS DIGIT SIX
-<U0001D36F>     /xf0/x9d/x8d/xaf COUNTING ROD TENS DIGIT SEVEN
-<U0001D370>     /xf0/x9d/x8d/xb0 COUNTING ROD TENS DIGIT EIGHT
-<U0001D371>     /xf0/x9d/x8d/xb1 COUNTING ROD TENS DIGIT NINE
+<U0001D200> /xf0/x9d/x88/x80 GREEK VOCAL NOTATION SYMBOL-1
+<U0001D201> /xf0/x9d/x88/x81 GREEK VOCAL NOTATION SYMBOL-2
+<U0001D202> /xf0/x9d/x88/x82 GREEK VOCAL NOTATION SYMBOL-3
+<U0001D203> /xf0/x9d/x88/x83 GREEK VOCAL NOTATION SYMBOL-4
+<U0001D204> /xf0/x9d/x88/x84 GREEK VOCAL NOTATION SYMBOL-5
+<U0001D205> /xf0/x9d/x88/x85 GREEK VOCAL NOTATION SYMBOL-6
+<U0001D206> /xf0/x9d/x88/x86 GREEK VOCAL NOTATION SYMBOL-7
+<U0001D207> /xf0/x9d/x88/x87 GREEK VOCAL NOTATION SYMBOL-8
+<U0001D208> /xf0/x9d/x88/x88 GREEK VOCAL NOTATION SYMBOL-9
+<U0001D209> /xf0/x9d/x88/x89 GREEK VOCAL NOTATION SYMBOL-10
+<U0001D20A> /xf0/x9d/x88/x8a GREEK VOCAL NOTATION SYMBOL-11
+<U0001D20B> /xf0/x9d/x88/x8b GREEK VOCAL NOTATION SYMBOL-12
+<U0001D20C> /xf0/x9d/x88/x8c GREEK VOCAL NOTATION SYMBOL-13
+<U0001D20D> /xf0/x9d/x88/x8d GREEK VOCAL NOTATION SYMBOL-14
+<U0001D20E> /xf0/x9d/x88/x8e GREEK VOCAL NOTATION SYMBOL-15
+<U0001D20F> /xf0/x9d/x88/x8f GREEK VOCAL NOTATION SYMBOL-16
+<U0001D210> /xf0/x9d/x88/x90 GREEK VOCAL NOTATION SYMBOL-17
+<U0001D211> /xf0/x9d/x88/x91 GREEK VOCAL NOTATION SYMBOL-18
+<U0001D212> /xf0/x9d/x88/x92 GREEK VOCAL NOTATION SYMBOL-19
+<U0001D213> /xf0/x9d/x88/x93 GREEK VOCAL NOTATION SYMBOL-20
+<U0001D214> /xf0/x9d/x88/x94 GREEK VOCAL NOTATION SYMBOL-21
+<U0001D215> /xf0/x9d/x88/x95 GREEK VOCAL NOTATION SYMBOL-22
+<U0001D216> /xf0/x9d/x88/x96 GREEK VOCAL NOTATION SYMBOL-23
+<U0001D217> /xf0/x9d/x88/x97 GREEK VOCAL NOTATION SYMBOL-24
+<U0001D218> /xf0/x9d/x88/x98 GREEK VOCAL NOTATION SYMBOL-50
+<U0001D219> /xf0/x9d/x88/x99 GREEK VOCAL NOTATION SYMBOL-51
+<U0001D21A> /xf0/x9d/x88/x9a GREEK VOCAL NOTATION SYMBOL-52
+<U0001D21B> /xf0/x9d/x88/x9b GREEK VOCAL NOTATION SYMBOL-53
+<U0001D21C> /xf0/x9d/x88/x9c GREEK VOCAL NOTATION SYMBOL-54
+<U0001D21D> /xf0/x9d/x88/x9d GREEK INSTRUMENTAL NOTATION SYMBOL-1
+<U0001D21E> /xf0/x9d/x88/x9e GREEK INSTRUMENTAL NOTATION SYMBOL-2
+<U0001D21F> /xf0/x9d/x88/x9f GREEK INSTRUMENTAL NOTATION SYMBOL-4
+<U0001D220> /xf0/x9d/x88/xa0 GREEK INSTRUMENTAL NOTATION SYMBOL-5
+<U0001D221> /xf0/x9d/x88/xa1 GREEK INSTRUMENTAL NOTATION SYMBOL-7
+<U0001D222> /xf0/x9d/x88/xa2 GREEK INSTRUMENTAL NOTATION SYMBOL-8
+<U0001D223> /xf0/x9d/x88/xa3 GREEK INSTRUMENTAL NOTATION SYMBOL-11
+<U0001D224> /xf0/x9d/x88/xa4 GREEK INSTRUMENTAL NOTATION SYMBOL-12
+<U0001D225> /xf0/x9d/x88/xa5 GREEK INSTRUMENTAL NOTATION SYMBOL-13
+<U0001D226> /xf0/x9d/x88/xa6 GREEK INSTRUMENTAL NOTATION SYMBOL-14
+<U0001D227> /xf0/x9d/x88/xa7 GREEK INSTRUMENTAL NOTATION SYMBOL-17
+<U0001D228> /xf0/x9d/x88/xa8 GREEK INSTRUMENTAL NOTATION SYMBOL-18
+<U0001D229> /xf0/x9d/x88/xa9 GREEK INSTRUMENTAL NOTATION SYMBOL-19
+<U0001D22A> /xf0/x9d/x88/xaa GREEK INSTRUMENTAL NOTATION SYMBOL-23
+<U0001D22B> /xf0/x9d/x88/xab GREEK INSTRUMENTAL NOTATION SYMBOL-24
+<U0001D22C> /xf0/x9d/x88/xac GREEK INSTRUMENTAL NOTATION SYMBOL-25
+<U0001D22D> /xf0/x9d/x88/xad GREEK INSTRUMENTAL NOTATION SYMBOL-26
+<U0001D22E> /xf0/x9d/x88/xae GREEK INSTRUMENTAL NOTATION SYMBOL-27
+<U0001D22F> /xf0/x9d/x88/xaf GREEK INSTRUMENTAL NOTATION SYMBOL-29
+<U0001D230> /xf0/x9d/x88/xb0 GREEK INSTRUMENTAL NOTATION SYMBOL-30
+<U0001D231> /xf0/x9d/x88/xb1 GREEK INSTRUMENTAL NOTATION SYMBOL-32
+<U0001D232> /xf0/x9d/x88/xb2 GREEK INSTRUMENTAL NOTATION SYMBOL-36
+<U0001D233> /xf0/x9d/x88/xb3 GREEK INSTRUMENTAL NOTATION SYMBOL-37
+<U0001D234> /xf0/x9d/x88/xb4 GREEK INSTRUMENTAL NOTATION SYMBOL-38
+<U0001D235> /xf0/x9d/x88/xb5 GREEK INSTRUMENTAL NOTATION SYMBOL-39
+<U0001D236> /xf0/x9d/x88/xb6 GREEK INSTRUMENTAL NOTATION SYMBOL-40
+<U0001D237> /xf0/x9d/x88/xb7 GREEK INSTRUMENTAL NOTATION SYMBOL-42
+<U0001D238> /xf0/x9d/x88/xb8 GREEK INSTRUMENTAL NOTATION SYMBOL-43
+<U0001D239> /xf0/x9d/x88/xb9 GREEK INSTRUMENTAL NOTATION SYMBOL-45
+<U0001D23A> /xf0/x9d/x88/xba GREEK INSTRUMENTAL NOTATION SYMBOL-47
+<U0001D23B> /xf0/x9d/x88/xbb GREEK INSTRUMENTAL NOTATION SYMBOL-48
+<U0001D23C> /xf0/x9d/x88/xbc GREEK INSTRUMENTAL NOTATION SYMBOL-49
+<U0001D23D> /xf0/x9d/x88/xbd GREEK INSTRUMENTAL NOTATION SYMBOL-50
+<U0001D23E> /xf0/x9d/x88/xbe GREEK INSTRUMENTAL NOTATION SYMBOL-51
+<U0001D23F> /xf0/x9d/x88/xbf GREEK INSTRUMENTAL NOTATION SYMBOL-52
+<U0001D240> /xf0/x9d/x89/x80 GREEK INSTRUMENTAL NOTATION SYMBOL-53
+<U0001D241> /xf0/x9d/x89/x81 GREEK INSTRUMENTAL NOTATION SYMBOL-54
+<U0001D242> /xf0/x9d/x89/x82 COMBINING GREEK MUSICAL TRISEME
+<U0001D243> /xf0/x9d/x89/x83 COMBINING GREEK MUSICAL TETRASEME
+<U0001D244> /xf0/x9d/x89/x84 COMBINING GREEK MUSICAL PENTASEME
+<U0001D245> /xf0/x9d/x89/x85 GREEK MUSICAL LEIMMA
+<U0001D300> /xf0/x9d/x8c/x80 MONOGRAM FOR EARTH
+<U0001D301> /xf0/x9d/x8c/x81 DIGRAM FOR HEAVENLY EARTH
+<U0001D302> /xf0/x9d/x8c/x82 DIGRAM FOR HUMAN EARTH
+<U0001D303> /xf0/x9d/x8c/x83 DIGRAM FOR EARTHLY HEAVEN
+<U0001D304> /xf0/x9d/x8c/x84 DIGRAM FOR EARTHLY HUMAN
+<U0001D305> /xf0/x9d/x8c/x85 DIGRAM FOR EARTH
+<U0001D306> /xf0/x9d/x8c/x86 TETRAGRAM FOR CENTRE
+<U0001D307> /xf0/x9d/x8c/x87 TETRAGRAM FOR FULL CIRCLE
+<U0001D308> /xf0/x9d/x8c/x88 TETRAGRAM FOR MIRED
+<U0001D309> /xf0/x9d/x8c/x89 TETRAGRAM FOR BARRIER
+<U0001D30A> /xf0/x9d/x8c/x8a TETRAGRAM FOR KEEPING SMALL
+<U0001D30B> /xf0/x9d/x8c/x8b TETRAGRAM FOR CONTRARIETY
+<U0001D30C> /xf0/x9d/x8c/x8c TETRAGRAM FOR ASCENT
+<U0001D30D> /xf0/x9d/x8c/x8d TETRAGRAM FOR OPPOSITION
+<U0001D30E> /xf0/x9d/x8c/x8e TETRAGRAM FOR BRANCHING OUT
+<U0001D30F> /xf0/x9d/x8c/x8f TETRAGRAM FOR DEFECTIVENESS OR DISTORTION
+<U0001D310> /xf0/x9d/x8c/x90 TETRAGRAM FOR DIVERGENCE
+<U0001D311> /xf0/x9d/x8c/x91 TETRAGRAM FOR YOUTHFULNESS
+<U0001D312> /xf0/x9d/x8c/x92 TETRAGRAM FOR INCREASE
+<U0001D313> /xf0/x9d/x8c/x93 TETRAGRAM FOR PENETRATION
+<U0001D314> /xf0/x9d/x8c/x94 TETRAGRAM FOR REACH
+<U0001D315> /xf0/x9d/x8c/x95 TETRAGRAM FOR CONTACT
+<U0001D316> /xf0/x9d/x8c/x96 TETRAGRAM FOR HOLDING BACK
+<U0001D317> /xf0/x9d/x8c/x97 TETRAGRAM FOR WAITING
+<U0001D318> /xf0/x9d/x8c/x98 TETRAGRAM FOR FOLLOWING
+<U0001D319> /xf0/x9d/x8c/x99 TETRAGRAM FOR ADVANCE
+<U0001D31A> /xf0/x9d/x8c/x9a TETRAGRAM FOR RELEASE
+<U0001D31B> /xf0/x9d/x8c/x9b TETRAGRAM FOR RESISTANCE
+<U0001D31C> /xf0/x9d/x8c/x9c TETRAGRAM FOR EASE
+<U0001D31D> /xf0/x9d/x8c/x9d TETRAGRAM FOR JOY
+<U0001D31E> /xf0/x9d/x8c/x9e TETRAGRAM FOR CONTENTION
+<U0001D31F> /xf0/x9d/x8c/x9f TETRAGRAM FOR ENDEAVOUR
+<U0001D320> /xf0/x9d/x8c/xa0 TETRAGRAM FOR DUTIES
+<U0001D321> /xf0/x9d/x8c/xa1 TETRAGRAM FOR CHANGE
+<U0001D322> /xf0/x9d/x8c/xa2 TETRAGRAM FOR DECISIVENESS
+<U0001D323> /xf0/x9d/x8c/xa3 TETRAGRAM FOR BOLD RESOLUTION
+<U0001D324> /xf0/x9d/x8c/xa4 TETRAGRAM FOR PACKING
+<U0001D325> /xf0/x9d/x8c/xa5 TETRAGRAM FOR LEGION
+<U0001D326> /xf0/x9d/x8c/xa6 TETRAGRAM FOR CLOSENESS
+<U0001D327> /xf0/x9d/x8c/xa7 TETRAGRAM FOR KINSHIP
+<U0001D328> /xf0/x9d/x8c/xa8 TETRAGRAM FOR GATHERING
+<U0001D329> /xf0/x9d/x8c/xa9 TETRAGRAM FOR STRENGTH
+<U0001D32A> /xf0/x9d/x8c/xaa TETRAGRAM FOR PURITY
+<U0001D32B> /xf0/x9d/x8c/xab TETRAGRAM FOR FULLNESS
+<U0001D32C> /xf0/x9d/x8c/xac TETRAGRAM FOR RESIDENCE
+<U0001D32D> /xf0/x9d/x8c/xad TETRAGRAM FOR LAW OR MODEL
+<U0001D32E> /xf0/x9d/x8c/xae TETRAGRAM FOR RESPONSE
+<U0001D32F> /xf0/x9d/x8c/xaf TETRAGRAM FOR GOING TO MEET
+<U0001D330> /xf0/x9d/x8c/xb0 TETRAGRAM FOR ENCOUNTERS
+<U0001D331> /xf0/x9d/x8c/xb1 TETRAGRAM FOR STOVE
+<U0001D332> /xf0/x9d/x8c/xb2 TETRAGRAM FOR GREATNESS
+<U0001D333> /xf0/x9d/x8c/xb3 TETRAGRAM FOR ENLARGEMENT
+<U0001D334> /xf0/x9d/x8c/xb4 TETRAGRAM FOR PATTERN
+<U0001D335> /xf0/x9d/x8c/xb5 TETRAGRAM FOR RITUAL
+<U0001D336> /xf0/x9d/x8c/xb6 TETRAGRAM FOR FLIGHT
+<U0001D337> /xf0/x9d/x8c/xb7 TETRAGRAM FOR VASTNESS OR WASTING
+<U0001D338> /xf0/x9d/x8c/xb8 TETRAGRAM FOR CONSTANCY
+<U0001D339> /xf0/x9d/x8c/xb9 TETRAGRAM FOR MEASURE
+<U0001D33A> /xf0/x9d/x8c/xba TETRAGRAM FOR ETERNITY
+<U0001D33B> /xf0/x9d/x8c/xbb TETRAGRAM FOR UNITY
+<U0001D33C> /xf0/x9d/x8c/xbc TETRAGRAM FOR DIMINISHMENT
+<U0001D33D> /xf0/x9d/x8c/xbd TETRAGRAM FOR CLOSED MOUTH
+<U0001D33E> /xf0/x9d/x8c/xbe TETRAGRAM FOR GUARDEDNESS
+<U0001D33F> /xf0/x9d/x8c/xbf TETRAGRAM FOR GATHERING IN
+<U0001D340> /xf0/x9d/x8d/x80 TETRAGRAM FOR MASSING
+<U0001D341> /xf0/x9d/x8d/x81 TETRAGRAM FOR ACCUMULATION
+<U0001D342> /xf0/x9d/x8d/x82 TETRAGRAM FOR EMBELLISHMENT
+<U0001D343> /xf0/x9d/x8d/x83 TETRAGRAM FOR DOUBT
+<U0001D344> /xf0/x9d/x8d/x84 TETRAGRAM FOR WATCH
+<U0001D345> /xf0/x9d/x8d/x85 TETRAGRAM FOR SINKING
+<U0001D346> /xf0/x9d/x8d/x86 TETRAGRAM FOR INNER
+<U0001D347> /xf0/x9d/x8d/x87 TETRAGRAM FOR DEPARTURE
+<U0001D348> /xf0/x9d/x8d/x88 TETRAGRAM FOR DARKENING
+<U0001D349> /xf0/x9d/x8d/x89 TETRAGRAM FOR DIMMING
+<U0001D34A> /xf0/x9d/x8d/x8a TETRAGRAM FOR EXHAUSTION
+<U0001D34B> /xf0/x9d/x8d/x8b TETRAGRAM FOR SEVERANCE
+<U0001D34C> /xf0/x9d/x8d/x8c TETRAGRAM FOR STOPPAGE
+<U0001D34D> /xf0/x9d/x8d/x8d TETRAGRAM FOR HARDNESS
+<U0001D34E> /xf0/x9d/x8d/x8e TETRAGRAM FOR COMPLETION
+<U0001D34F> /xf0/x9d/x8d/x8f TETRAGRAM FOR CLOSURE
+<U0001D350> /xf0/x9d/x8d/x90 TETRAGRAM FOR FAILURE
+<U0001D351> /xf0/x9d/x8d/x91 TETRAGRAM FOR AGGRAVATION
+<U0001D352> /xf0/x9d/x8d/x92 TETRAGRAM FOR COMPLIANCE
+<U0001D353> /xf0/x9d/x8d/x93 TETRAGRAM FOR ON THE VERGE
+<U0001D354> /xf0/x9d/x8d/x94 TETRAGRAM FOR DIFFICULTIES
+<U0001D355> /xf0/x9d/x8d/x95 TETRAGRAM FOR LABOURING
+<U0001D356> /xf0/x9d/x8d/x96 TETRAGRAM FOR FOSTERING
+<U0001D360> /xf0/x9d/x8d/xa0 COUNTING ROD UNIT DIGIT ONE
+<U0001D361> /xf0/x9d/x8d/xa1 COUNTING ROD UNIT DIGIT TWO
+<U0001D362> /xf0/x9d/x8d/xa2 COUNTING ROD UNIT DIGIT THREE
+<U0001D363> /xf0/x9d/x8d/xa3 COUNTING ROD UNIT DIGIT FOUR
+<U0001D364> /xf0/x9d/x8d/xa4 COUNTING ROD UNIT DIGIT FIVE
+<U0001D365> /xf0/x9d/x8d/xa5 COUNTING ROD UNIT DIGIT SIX
+<U0001D366> /xf0/x9d/x8d/xa6 COUNTING ROD UNIT DIGIT SEVEN
+<U0001D367> /xf0/x9d/x8d/xa7 COUNTING ROD UNIT DIGIT EIGHT
+<U0001D368> /xf0/x9d/x8d/xa8 COUNTING ROD UNIT DIGIT NINE
+<U0001D369> /xf0/x9d/x8d/xa9 COUNTING ROD TENS DIGIT ONE
+<U0001D36A> /xf0/x9d/x8d/xaa COUNTING ROD TENS DIGIT TWO
+<U0001D36B> /xf0/x9d/x8d/xab COUNTING ROD TENS DIGIT THREE
+<U0001D36C> /xf0/x9d/x8d/xac COUNTING ROD TENS DIGIT FOUR
+<U0001D36D> /xf0/x9d/x8d/xad COUNTING ROD TENS DIGIT FIVE
+<U0001D36E> /xf0/x9d/x8d/xae COUNTING ROD TENS DIGIT SIX
+<U0001D36F> /xf0/x9d/x8d/xaf COUNTING ROD TENS DIGIT SEVEN
+<U0001D370> /xf0/x9d/x8d/xb0 COUNTING ROD TENS DIGIT EIGHT
+<U0001D371> /xf0/x9d/x8d/xb1 COUNTING ROD TENS DIGIT NINE
 <U0001D400> /xf0/x9d/x90/x80 MATHEMATICAL BOLD CAPITAL A
 <U0001D401> /xf0/x9d/x90/x81 MATHEMATICAL BOLD CAPITAL B
 <U0001D402> /xf0/x9d/x90/x82 MATHEMATICAL BOLD CAPITAL C
@@ -27722,7 +29194,7 @@ CHARMAP
 <U0001D4BE> /xf0/x9d/x92/xbe MATHEMATICAL SCRIPT SMALL I
 <U0001D4BF> /xf0/x9d/x92/xbf MATHEMATICAL SCRIPT SMALL J
 <U0001D4C0> /xf0/x9d/x93/x80 MATHEMATICAL SCRIPT SMALL K
-<U0001D4C1>     /xf0/x9d/x93/x81 MATHEMATICAL SCRIPT SMALL L
+<U0001D4C1> /xf0/x9d/x93/x81 MATHEMATICAL SCRIPT SMALL L
 <U0001D4C2> /xf0/x9d/x93/x82 MATHEMATICAL SCRIPT SMALL M
 <U0001D4C3> /xf0/x9d/x93/x83 MATHEMATICAL SCRIPT SMALL N
 <U0001D4C5> /xf0/x9d/x93/x85 MATHEMATICAL SCRIPT SMALL P
@@ -28192,8 +29664,8 @@ CHARMAP
 <U0001D6A1> /xf0/x9d/x9a/xa1 MATHEMATICAL MONOSPACE SMALL X
 <U0001D6A2> /xf0/x9d/x9a/xa2 MATHEMATICAL MONOSPACE SMALL Y
 <U0001D6A3> /xf0/x9d/x9a/xa3 MATHEMATICAL MONOSPACE SMALL Z
-<U0001D6A4>     /xf0/x9d/x9a/xa4 MATHEMATICAL ITALIC SMALL DOTLESS I
-<U0001D6A5>     /xf0/x9d/x9a/xa5 MATHEMATICAL ITALIC SMALL DOTLESS J
+<U0001D6A4> /xf0/x9d/x9a/xa4 MATHEMATICAL ITALIC SMALL DOTLESS I
+<U0001D6A5> /xf0/x9d/x9a/xa5 MATHEMATICAL ITALIC SMALL DOTLESS J
 <U0001D6A8> /xf0/x9d/x9a/xa8 MATHEMATICAL BOLD CAPITAL ALPHA
 <U0001D6A9> /xf0/x9d/x9a/xa9 MATHEMATICAL BOLD CAPITAL BETA
 <U0001D6AA> /xf0/x9d/x9a/xaa MATHEMATICAL BOLD CAPITAL GAMMA
@@ -28484,8 +29956,8 @@ CHARMAP
 <U0001D7C7> /xf0/x9d/x9f/x87 MATHEMATICAL SANS-SERIF BOLD ITALIC PHI SYMBOL
 <U0001D7C8> /xf0/x9d/x9f/x88 MATHEMATICAL SANS-SERIF BOLD ITALIC RHO SYMBOL
 <U0001D7C9> /xf0/x9d/x9f/x89 MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL
-<U0001D7CA>     /xf0/x9d/x9f/x8a MATHEMATICAL BOLD CAPITAL DIGAMMA
-<U0001D7CB>     /xf0/x9d/x9f/x8b MATHEMATICAL BOLD SMALL DIGAMMA
+<U0001D7CA> /xf0/x9d/x9f/x8a MATHEMATICAL BOLD CAPITAL DIGAMMA
+<U0001D7CB> /xf0/x9d/x9f/x8b MATHEMATICAL BOLD SMALL DIGAMMA
 <U0001D7CE> /xf0/x9d/x9f/x8e MATHEMATICAL BOLD DIGIT ZERO
 <U0001D7CF> /xf0/x9d/x9f/x8f MATHEMATICAL BOLD DIGIT ONE
 <U0001D7D0> /xf0/x9d/x9f/x90 MATHEMATICAL BOLD DIGIT TWO
@@ -28536,6 +30008,150 @@ CHARMAP
 <U0001D7FD> /xf0/x9d/x9f/xbd MATHEMATICAL MONOSPACE DIGIT SEVEN
 <U0001D7FE> /xf0/x9d/x9f/xbe MATHEMATICAL MONOSPACE DIGIT EIGHT
 <U0001D7FF> /xf0/x9d/x9f/xbf MATHEMATICAL MONOSPACE DIGIT NINE
+<U0001F000> /xf0/x9f/x80/x80 MAHJONG TILE EAST WIND
+<U0001F001> /xf0/x9f/x80/x81 MAHJONG TILE SOUTH WIND
+<U0001F002> /xf0/x9f/x80/x82 MAHJONG TILE WEST WIND
+<U0001F003> /xf0/x9f/x80/x83 MAHJONG TILE NORTH WIND
+<U0001F004> /xf0/x9f/x80/x84 MAHJONG TILE RED DRAGON
+<U0001F005> /xf0/x9f/x80/x85 MAHJONG TILE GREEN DRAGON
+<U0001F006> /xf0/x9f/x80/x86 MAHJONG TILE WHITE DRAGON
+<U0001F007> /xf0/x9f/x80/x87 MAHJONG TILE ONE OF CHARACTERS
+<U0001F008> /xf0/x9f/x80/x88 MAHJONG TILE TWO OF CHARACTERS
+<U0001F009> /xf0/x9f/x80/x89 MAHJONG TILE THREE OF CHARACTERS
+<U0001F00A> /xf0/x9f/x80/x8a MAHJONG TILE FOUR OF CHARACTERS
+<U0001F00B> /xf0/x9f/x80/x8b MAHJONG TILE FIVE OF CHARACTERS
+<U0001F00C> /xf0/x9f/x80/x8c MAHJONG TILE SIX OF CHARACTERS
+<U0001F00D> /xf0/x9f/x80/x8d MAHJONG TILE SEVEN OF CHARACTERS
+<U0001F00E> /xf0/x9f/x80/x8e MAHJONG TILE EIGHT OF CHARACTERS
+<U0001F00F> /xf0/x9f/x80/x8f MAHJONG TILE NINE OF CHARACTERS
+<U0001F010> /xf0/x9f/x80/x90 MAHJONG TILE ONE OF BAMBOOS
+<U0001F011> /xf0/x9f/x80/x91 MAHJONG TILE TWO OF BAMBOOS
+<U0001F012> /xf0/x9f/x80/x92 MAHJONG TILE THREE OF BAMBOOS
+<U0001F013> /xf0/x9f/x80/x93 MAHJONG TILE FOUR OF BAMBOOS
+<U0001F014> /xf0/x9f/x80/x94 MAHJONG TILE FIVE OF BAMBOOS
+<U0001F015> /xf0/x9f/x80/x95 MAHJONG TILE SIX OF BAMBOOS
+<U0001F016> /xf0/x9f/x80/x96 MAHJONG TILE SEVEN OF BAMBOOS
+<U0001F017> /xf0/x9f/x80/x97 MAHJONG TILE EIGHT OF BAMBOOS
+<U0001F018> /xf0/x9f/x80/x98 MAHJONG TILE NINE OF BAMBOOS
+<U0001F019> /xf0/x9f/x80/x99 MAHJONG TILE ONE OF CIRCLES
+<U0001F01A> /xf0/x9f/x80/x9a MAHJONG TILE TWO OF CIRCLES
+<U0001F01B> /xf0/x9f/x80/x9b MAHJONG TILE THREE OF CIRCLES
+<U0001F01C> /xf0/x9f/x80/x9c MAHJONG TILE FOUR OF CIRCLES
+<U0001F01D> /xf0/x9f/x80/x9d MAHJONG TILE FIVE OF CIRCLES
+<U0001F01E> /xf0/x9f/x80/x9e MAHJONG TILE SIX OF CIRCLES
+<U0001F01F> /xf0/x9f/x80/x9f MAHJONG TILE SEVEN OF CIRCLES
+<U0001F020> /xf0/x9f/x80/xa0 MAHJONG TILE EIGHT OF CIRCLES
+<U0001F021> /xf0/x9f/x80/xa1 MAHJONG TILE NINE OF CIRCLES
+<U0001F022> /xf0/x9f/x80/xa2 MAHJONG TILE PLUM
+<U0001F023> /xf0/x9f/x80/xa3 MAHJONG TILE ORCHID
+<U0001F024> /xf0/x9f/x80/xa4 MAHJONG TILE BAMBOO
+<U0001F025> /xf0/x9f/x80/xa5 MAHJONG TILE CHRYSANTHEMUM
+<U0001F026> /xf0/x9f/x80/xa6 MAHJONG TILE SPRING
+<U0001F027> /xf0/x9f/x80/xa7 MAHJONG TILE SUMMER
+<U0001F028> /xf0/x9f/x80/xa8 MAHJONG TILE AUTUMN
+<U0001F029> /xf0/x9f/x80/xa9 MAHJONG TILE WINTER
+<U0001F02A> /xf0/x9f/x80/xaa MAHJONG TILE JOKER
+<U0001F02B> /xf0/x9f/x80/xab MAHJONG TILE BACK
+<U0001F030> /xf0/x9f/x80/xb0 DOMINO TILE HORIZONTAL BACK
+<U0001F031> /xf0/x9f/x80/xb1 DOMINO TILE HORIZONTAL-00-00
+<U0001F032> /xf0/x9f/x80/xb2 DOMINO TILE HORIZONTAL-00-01
+<U0001F033> /xf0/x9f/x80/xb3 DOMINO TILE HORIZONTAL-00-02
+<U0001F034> /xf0/x9f/x80/xb4 DOMINO TILE HORIZONTAL-00-03
+<U0001F035> /xf0/x9f/x80/xb5 DOMINO TILE HORIZONTAL-00-04
+<U0001F036> /xf0/x9f/x80/xb6 DOMINO TILE HORIZONTAL-00-05
+<U0001F037> /xf0/x9f/x80/xb7 DOMINO TILE HORIZONTAL-00-06
+<U0001F038> /xf0/x9f/x80/xb8 DOMINO TILE HORIZONTAL-01-00
+<U0001F039> /xf0/x9f/x80/xb9 DOMINO TILE HORIZONTAL-01-01
+<U0001F03A> /xf0/x9f/x80/xba DOMINO TILE HORIZONTAL-01-02
+<U0001F03B> /xf0/x9f/x80/xbb DOMINO TILE HORIZONTAL-01-03
+<U0001F03C> /xf0/x9f/x80/xbc DOMINO TILE HORIZONTAL-01-04
+<U0001F03D> /xf0/x9f/x80/xbd DOMINO TILE HORIZONTAL-01-05
+<U0001F03E> /xf0/x9f/x80/xbe DOMINO TILE HORIZONTAL-01-06
+<U0001F03F> /xf0/x9f/x80/xbf DOMINO TILE HORIZONTAL-02-00
+<U0001F040> /xf0/x9f/x81/x80 DOMINO TILE HORIZONTAL-02-01
+<U0001F041> /xf0/x9f/x81/x81 DOMINO TILE HORIZONTAL-02-02
+<U0001F042> /xf0/x9f/x81/x82 DOMINO TILE HORIZONTAL-02-03
+<U0001F043> /xf0/x9f/x81/x83 DOMINO TILE HORIZONTAL-02-04
+<U0001F044> /xf0/x9f/x81/x84 DOMINO TILE HORIZONTAL-02-05
+<U0001F045> /xf0/x9f/x81/x85 DOMINO TILE HORIZONTAL-02-06
+<U0001F046> /xf0/x9f/x81/x86 DOMINO TILE HORIZONTAL-03-00
+<U0001F047> /xf0/x9f/x81/x87 DOMINO TILE HORIZONTAL-03-01
+<U0001F048> /xf0/x9f/x81/x88 DOMINO TILE HORIZONTAL-03-02
+<U0001F049> /xf0/x9f/x81/x89 DOMINO TILE HORIZONTAL-03-03
+<U0001F04A> /xf0/x9f/x81/x8a DOMINO TILE HORIZONTAL-03-04
+<U0001F04B> /xf0/x9f/x81/x8b DOMINO TILE HORIZONTAL-03-05
+<U0001F04C> /xf0/x9f/x81/x8c DOMINO TILE HORIZONTAL-03-06
+<U0001F04D> /xf0/x9f/x81/x8d DOMINO TILE HORIZONTAL-04-00
+<U0001F04E> /xf0/x9f/x81/x8e DOMINO TILE HORIZONTAL-04-01
+<U0001F04F> /xf0/x9f/x81/x8f DOMINO TILE HORIZONTAL-04-02
+<U0001F050> /xf0/x9f/x81/x90 DOMINO TILE HORIZONTAL-04-03
+<U0001F051> /xf0/x9f/x81/x91 DOMINO TILE HORIZONTAL-04-04
+<U0001F052> /xf0/x9f/x81/x92 DOMINO TILE HORIZONTAL-04-05
+<U0001F053> /xf0/x9f/x81/x93 DOMINO TILE HORIZONTAL-04-06
+<U0001F054> /xf0/x9f/x81/x94 DOMINO TILE HORIZONTAL-05-00
+<U0001F055> /xf0/x9f/x81/x95 DOMINO TILE HORIZONTAL-05-01
+<U0001F056> /xf0/x9f/x81/x96 DOMINO TILE HORIZONTAL-05-02
+<U0001F057> /xf0/x9f/x81/x97 DOMINO TILE HORIZONTAL-05-03
+<U0001F058> /xf0/x9f/x81/x98 DOMINO TILE HORIZONTAL-05-04
+<U0001F059> /xf0/x9f/x81/x99 DOMINO TILE HORIZONTAL-05-05
+<U0001F05A> /xf0/x9f/x81/x9a DOMINO TILE HORIZONTAL-05-06
+<U0001F05B> /xf0/x9f/x81/x9b DOMINO TILE HORIZONTAL-06-00
+<U0001F05C> /xf0/x9f/x81/x9c DOMINO TILE HORIZONTAL-06-01
+<U0001F05D> /xf0/x9f/x81/x9d DOMINO TILE HORIZONTAL-06-02
+<U0001F05E> /xf0/x9f/x81/x9e DOMINO TILE HORIZONTAL-06-03
+<U0001F05F> /xf0/x9f/x81/x9f DOMINO TILE HORIZONTAL-06-04
+<U0001F060> /xf0/x9f/x81/xa0 DOMINO TILE HORIZONTAL-06-05
+<U0001F061> /xf0/x9f/x81/xa1 DOMINO TILE HORIZONTAL-06-06
+<U0001F062> /xf0/x9f/x81/xa2 DOMINO TILE VERTICAL BACK
+<U0001F063> /xf0/x9f/x81/xa3 DOMINO TILE VERTICAL-00-00
+<U0001F064> /xf0/x9f/x81/xa4 DOMINO TILE VERTICAL-00-01
+<U0001F065> /xf0/x9f/x81/xa5 DOMINO TILE VERTICAL-00-02
+<U0001F066> /xf0/x9f/x81/xa6 DOMINO TILE VERTICAL-00-03
+<U0001F067> /xf0/x9f/x81/xa7 DOMINO TILE VERTICAL-00-04
+<U0001F068> /xf0/x9f/x81/xa8 DOMINO TILE VERTICAL-00-05
+<U0001F069> /xf0/x9f/x81/xa9 DOMINO TILE VERTICAL-00-06
+<U0001F06A> /xf0/x9f/x81/xaa DOMINO TILE VERTICAL-01-00
+<U0001F06B> /xf0/x9f/x81/xab DOMINO TILE VERTICAL-01-01
+<U0001F06C> /xf0/x9f/x81/xac DOMINO TILE VERTICAL-01-02
+<U0001F06D> /xf0/x9f/x81/xad DOMINO TILE VERTICAL-01-03
+<U0001F06E> /xf0/x9f/x81/xae DOMINO TILE VERTICAL-01-04
+<U0001F06F> /xf0/x9f/x81/xaf DOMINO TILE VERTICAL-01-05
+<U0001F070> /xf0/x9f/x81/xb0 DOMINO TILE VERTICAL-01-06
+<U0001F071> /xf0/x9f/x81/xb1 DOMINO TILE VERTICAL-02-00
+<U0001F072> /xf0/x9f/x81/xb2 DOMINO TILE VERTICAL-02-01
+<U0001F073> /xf0/x9f/x81/xb3 DOMINO TILE VERTICAL-02-02
+<U0001F074> /xf0/x9f/x81/xb4 DOMINO TILE VERTICAL-02-03
+<U0001F075> /xf0/x9f/x81/xb5 DOMINO TILE VERTICAL-02-04
+<U0001F076> /xf0/x9f/x81/xb6 DOMINO TILE VERTICAL-02-05
+<U0001F077> /xf0/x9f/x81/xb7 DOMINO TILE VERTICAL-02-06
+<U0001F078> /xf0/x9f/x81/xb8 DOMINO TILE VERTICAL-03-00
+<U0001F079> /xf0/x9f/x81/xb9 DOMINO TILE VERTICAL-03-01
+<U0001F07A> /xf0/x9f/x81/xba DOMINO TILE VERTICAL-03-02
+<U0001F07B> /xf0/x9f/x81/xbb DOMINO TILE VERTICAL-03-03
+<U0001F07C> /xf0/x9f/x81/xbc DOMINO TILE VERTICAL-03-04
+<U0001F07D> /xf0/x9f/x81/xbd DOMINO TILE VERTICAL-03-05
+<U0001F07E> /xf0/x9f/x81/xbe DOMINO TILE VERTICAL-03-06
+<U0001F07F> /xf0/x9f/x81/xbf DOMINO TILE VERTICAL-04-00
+<U0001F080> /xf0/x9f/x82/x80 DOMINO TILE VERTICAL-04-01
+<U0001F081> /xf0/x9f/x82/x81 DOMINO TILE VERTICAL-04-02
+<U0001F082> /xf0/x9f/x82/x82 DOMINO TILE VERTICAL-04-03
+<U0001F083> /xf0/x9f/x82/x83 DOMINO TILE VERTICAL-04-04
+<U0001F084> /xf0/x9f/x82/x84 DOMINO TILE VERTICAL-04-05
+<U0001F085> /xf0/x9f/x82/x85 DOMINO TILE VERTICAL-04-06
+<U0001F086> /xf0/x9f/x82/x86 DOMINO TILE VERTICAL-05-00
+<U0001F087> /xf0/x9f/x82/x87 DOMINO TILE VERTICAL-05-01
+<U0001F088> /xf0/x9f/x82/x88 DOMINO TILE VERTICAL-05-02
+<U0001F089> /xf0/x9f/x82/x89 DOMINO TILE VERTICAL-05-03
+<U0001F08A> /xf0/x9f/x82/x8a DOMINO TILE VERTICAL-05-04
+<U0001F08B> /xf0/x9f/x82/x8b DOMINO TILE VERTICAL-05-05
+<U0001F08C> /xf0/x9f/x82/x8c DOMINO TILE VERTICAL-05-06
+<U0001F08D> /xf0/x9f/x82/x8d DOMINO TILE VERTICAL-06-00
+<U0001F08E> /xf0/x9f/x82/x8e DOMINO TILE VERTICAL-06-01
+<U0001F08F> /xf0/x9f/x82/x8f DOMINO TILE VERTICAL-06-02
+<U0001F090> /xf0/x9f/x82/x90 DOMINO TILE VERTICAL-06-03
+<U0001F091> /xf0/x9f/x82/x91 DOMINO TILE VERTICAL-06-04
+<U0001F092> /xf0/x9f/x82/x92 DOMINO TILE VERTICAL-06-05
+<U0001F093> /xf0/x9f/x82/x93 DOMINO TILE VERTICAL-06-06
 <U00020000>..<U0002003F> /xf0/xa0/x80/x80 <CJK>
 <U00020040>..<U0002007F> /xf0/xa0/x81/x80 <CJK>
 <U00020080>..<U000200BF> /xf0/xa0/x82/x80 <CJK>
@@ -29843,246 +31459,246 @@ CHARMAP
 <U000E007D> /xf3/xa0/x81/xbd TAG RIGHT CURLY BRACKET
 <U000E007E> /xf3/xa0/x81/xbe TAG TILDE
 <U000E007F> /xf3/xa0/x81/xbf CANCEL TAG
-<U000E0100>     /xf3/xa0/x84/x80 VARIATION SELECTOR-17
-<U000E0101>     /xf3/xa0/x84/x81 VARIATION SELECTOR-18
-<U000E0102>     /xf3/xa0/x84/x82 VARIATION SELECTOR-19
-<U000E0103>     /xf3/xa0/x84/x83 VARIATION SELECTOR-20
-<U000E0104>     /xf3/xa0/x84/x84 VARIATION SELECTOR-21
-<U000E0105>     /xf3/xa0/x84/x85 VARIATION SELECTOR-22
-<U000E0106>     /xf3/xa0/x84/x86 VARIATION SELECTOR-23
-<U000E0107>     /xf3/xa0/x84/x87 VARIATION SELECTOR-24
-<U000E0108>     /xf3/xa0/x84/x88 VARIATION SELECTOR-25
-<U000E0109>     /xf3/xa0/x84/x89 VARIATION SELECTOR-26
-<U000E010A>     /xf3/xa0/x84/x8a VARIATION SELECTOR-27
-<U000E010B>     /xf3/xa0/x84/x8b VARIATION SELECTOR-28
-<U000E010C>     /xf3/xa0/x84/x8c VARIATION SELECTOR-29
-<U000E010D>     /xf3/xa0/x84/x8d VARIATION SELECTOR-30
-<U000E010E>     /xf3/xa0/x84/x8e VARIATION SELECTOR-31
-<U000E010F>     /xf3/xa0/x84/x8f VARIATION SELECTOR-32
-<U000E0110>     /xf3/xa0/x84/x90 VARIATION SELECTOR-33
-<U000E0111>     /xf3/xa0/x84/x91 VARIATION SELECTOR-34
-<U000E0112>     /xf3/xa0/x84/x92 VARIATION SELECTOR-35
-<U000E0113>     /xf3/xa0/x84/x93 VARIATION SELECTOR-36
-<U000E0114>     /xf3/xa0/x84/x94 VARIATION SELECTOR-37
-<U000E0115>     /xf3/xa0/x84/x95 VARIATION SELECTOR-38
-<U000E0116>     /xf3/xa0/x84/x96 VARIATION SELECTOR-39
-<U000E0117>     /xf3/xa0/x84/x97 VARIATION SELECTOR-40
-<U000E0118>     /xf3/xa0/x84/x98 VARIATION SELECTOR-41
-<U000E0119>     /xf3/xa0/x84/x99 VARIATION SELECTOR-42
-<U000E011A>     /xf3/xa0/x84/x9a VARIATION SELECTOR-43
-<U000E011B>     /xf3/xa0/x84/x9b VARIATION SELECTOR-44
-<U000E011C>     /xf3/xa0/x84/x9c VARIATION SELECTOR-45
-<U000E011D>     /xf3/xa0/x84/x9d VARIATION SELECTOR-46
-<U000E011E>     /xf3/xa0/x84/x9e VARIATION SELECTOR-47
-<U000E011F>     /xf3/xa0/x84/x9f VARIATION SELECTOR-48
-<U000E0120>     /xf3/xa0/x84/xa0 VARIATION SELECTOR-49
-<U000E0121>     /xf3/xa0/x84/xa1 VARIATION SELECTOR-50
-<U000E0122>     /xf3/xa0/x84/xa2 VARIATION SELECTOR-51
-<U000E0123>     /xf3/xa0/x84/xa3 VARIATION SELECTOR-52
-<U000E0124>     /xf3/xa0/x84/xa4 VARIATION SELECTOR-53
-<U000E0125>     /xf3/xa0/x84/xa5 VARIATION SELECTOR-54
-<U000E0126>     /xf3/xa0/x84/xa6 VARIATION SELECTOR-55
-<U000E0127>     /xf3/xa0/x84/xa7 VARIATION SELECTOR-56
-<U000E0128>     /xf3/xa0/x84/xa8 VARIATION SELECTOR-57
-<U000E0129>     /xf3/xa0/x84/xa9 VARIATION SELECTOR-58
-<U000E012A>     /xf3/xa0/x84/xaa VARIATION SELECTOR-59
-<U000E012B>     /xf3/xa0/x84/xab VARIATION SELECTOR-60
-<U000E012C>     /xf3/xa0/x84/xac VARIATION SELECTOR-61
-<U000E012D>     /xf3/xa0/x84/xad VARIATION SELECTOR-62
-<U000E012E>     /xf3/xa0/x84/xae VARIATION SELECTOR-63
-<U000E012F>     /xf3/xa0/x84/xaf VARIATION SELECTOR-64
-<U000E0130>     /xf3/xa0/x84/xb0 VARIATION SELECTOR-65
-<U000E0131>     /xf3/xa0/x84/xb1 VARIATION SELECTOR-66
-<U000E0132>     /xf3/xa0/x84/xb2 VARIATION SELECTOR-67
-<U000E0133>     /xf3/xa0/x84/xb3 VARIATION SELECTOR-68
-<U000E0134>     /xf3/xa0/x84/xb4 VARIATION SELECTOR-69
-<U000E0135>     /xf3/xa0/x84/xb5 VARIATION SELECTOR-70
-<U000E0136>     /xf3/xa0/x84/xb6 VARIATION SELECTOR-71
-<U000E0137>     /xf3/xa0/x84/xb7 VARIATION SELECTOR-72
-<U000E0138>     /xf3/xa0/x84/xb8 VARIATION SELECTOR-73
-<U000E0139>     /xf3/xa0/x84/xb9 VARIATION SELECTOR-74
-<U000E013A>     /xf3/xa0/x84/xba VARIATION SELECTOR-75
-<U000E013B>     /xf3/xa0/x84/xbb VARIATION SELECTOR-76
-<U000E013C>     /xf3/xa0/x84/xbc VARIATION SELECTOR-77
-<U000E013D>     /xf3/xa0/x84/xbd VARIATION SELECTOR-78
-<U000E013E>     /xf3/xa0/x84/xbe VARIATION SELECTOR-79
-<U000E013F>     /xf3/xa0/x84/xbf VARIATION SELECTOR-80
-<U000E0140>     /xf3/xa0/x85/x80 VARIATION SELECTOR-81
-<U000E0141>     /xf3/xa0/x85/x81 VARIATION SELECTOR-82
-<U000E0142>     /xf3/xa0/x85/x82 VARIATION SELECTOR-83
-<U000E0143>     /xf3/xa0/x85/x83 VARIATION SELECTOR-84
-<U000E0144>     /xf3/xa0/x85/x84 VARIATION SELECTOR-85
-<U000E0145>     /xf3/xa0/x85/x85 VARIATION SELECTOR-86
-<U000E0146>     /xf3/xa0/x85/x86 VARIATION SELECTOR-87
-<U000E0147>     /xf3/xa0/x85/x87 VARIATION SELECTOR-88
-<U000E0148>     /xf3/xa0/x85/x88 VARIATION SELECTOR-89
-<U000E0149>     /xf3/xa0/x85/x89 VARIATION SELECTOR-90
-<U000E014A>     /xf3/xa0/x85/x8a VARIATION SELECTOR-91
-<U000E014B>     /xf3/xa0/x85/x8b VARIATION SELECTOR-92
-<U000E014C>     /xf3/xa0/x85/x8c VARIATION SELECTOR-93
-<U000E014D>     /xf3/xa0/x85/x8d VARIATION SELECTOR-94
-<U000E014E>     /xf3/xa0/x85/x8e VARIATION SELECTOR-95
-<U000E014F>     /xf3/xa0/x85/x8f VARIATION SELECTOR-96
-<U000E0150>     /xf3/xa0/x85/x90 VARIATION SELECTOR-97
-<U000E0151>     /xf3/xa0/x85/x91 VARIATION SELECTOR-98
-<U000E0152>     /xf3/xa0/x85/x92 VARIATION SELECTOR-99
-<U000E0153>     /xf3/xa0/x85/x93 VARIATION SELECTOR-100
-<U000E0154>     /xf3/xa0/x85/x94 VARIATION SELECTOR-101
-<U000E0155>     /xf3/xa0/x85/x95 VARIATION SELECTOR-102
-<U000E0156>     /xf3/xa0/x85/x96 VARIATION SELECTOR-103
-<U000E0157>     /xf3/xa0/x85/x97 VARIATION SELECTOR-104
-<U000E0158>     /xf3/xa0/x85/x98 VARIATION SELECTOR-105
-<U000E0159>     /xf3/xa0/x85/x99 VARIATION SELECTOR-106
-<U000E015A>     /xf3/xa0/x85/x9a VARIATION SELECTOR-107
-<U000E015B>     /xf3/xa0/x85/x9b VARIATION SELECTOR-108
-<U000E015C>     /xf3/xa0/x85/x9c VARIATION SELECTOR-109
-<U000E015D>     /xf3/xa0/x85/x9d VARIATION SELECTOR-110
-<U000E015E>     /xf3/xa0/x85/x9e VARIATION SELECTOR-111
-<U000E015F>     /xf3/xa0/x85/x9f VARIATION SELECTOR-112
-<U000E0160>     /xf3/xa0/x85/xa0 VARIATION SELECTOR-113
-<U000E0161>     /xf3/xa0/x85/xa1 VARIATION SELECTOR-114
-<U000E0162>     /xf3/xa0/x85/xa2 VARIATION SELECTOR-115
-<U000E0163>     /xf3/xa0/x85/xa3 VARIATION SELECTOR-116
-<U000E0164>     /xf3/xa0/x85/xa4 VARIATION SELECTOR-117
-<U000E0165>     /xf3/xa0/x85/xa5 VARIATION SELECTOR-118
-<U000E0166>     /xf3/xa0/x85/xa6 VARIATION SELECTOR-119
-<U000E0167>     /xf3/xa0/x85/xa7 VARIATION SELECTOR-120
-<U000E0168>     /xf3/xa0/x85/xa8 VARIATION SELECTOR-121
-<U000E0169>     /xf3/xa0/x85/xa9 VARIATION SELECTOR-122
-<U000E016A>     /xf3/xa0/x85/xaa VARIATION SELECTOR-123
-<U000E016B>     /xf3/xa0/x85/xab VARIATION SELECTOR-124
-<U000E016C>     /xf3/xa0/x85/xac VARIATION SELECTOR-125
-<U000E016D>     /xf3/xa0/x85/xad VARIATION SELECTOR-126
-<U000E016E>     /xf3/xa0/x85/xae VARIATION SELECTOR-127
-<U000E016F>     /xf3/xa0/x85/xaf VARIATION SELECTOR-128
-<U000E0170>     /xf3/xa0/x85/xb0 VARIATION SELECTOR-129
-<U000E0171>     /xf3/xa0/x85/xb1 VARIATION SELECTOR-130
-<U000E0172>     /xf3/xa0/x85/xb2 VARIATION SELECTOR-131
-<U000E0173>     /xf3/xa0/x85/xb3 VARIATION SELECTOR-132
-<U000E0174>     /xf3/xa0/x85/xb4 VARIATION SELECTOR-133
-<U000E0175>     /xf3/xa0/x85/xb5 VARIATION SELECTOR-134
-<U000E0176>     /xf3/xa0/x85/xb6 VARIATION SELECTOR-135
-<U000E0177>     /xf3/xa0/x85/xb7 VARIATION SELECTOR-136
-<U000E0178>     /xf3/xa0/x85/xb8 VARIATION SELECTOR-137
-<U000E0179>     /xf3/xa0/x85/xb9 VARIATION SELECTOR-138
-<U000E017A>     /xf3/xa0/x85/xba VARIATION SELECTOR-139
-<U000E017B>     /xf3/xa0/x85/xbb VARIATION SELECTOR-140
-<U000E017C>     /xf3/xa0/x85/xbc VARIATION SELECTOR-141
-<U000E017D>     /xf3/xa0/x85/xbd VARIATION SELECTOR-142
-<U000E017E>     /xf3/xa0/x85/xbe VARIATION SELECTOR-143
-<U000E017F>     /xf3/xa0/x85/xbf VARIATION SELECTOR-144
-<U000E0180>     /xf3/xa0/x86/x80 VARIATION SELECTOR-145
-<U000E0181>     /xf3/xa0/x86/x81 VARIATION SELECTOR-146
-<U000E0182>     /xf3/xa0/x86/x82 VARIATION SELECTOR-147
-<U000E0183>     /xf3/xa0/x86/x83 VARIATION SELECTOR-148
-<U000E0184>     /xf3/xa0/x86/x84 VARIATION SELECTOR-149
-<U000E0185>     /xf3/xa0/x86/x85 VARIATION SELECTOR-150
-<U000E0186>     /xf3/xa0/x86/x86 VARIATION SELECTOR-151
-<U000E0187>     /xf3/xa0/x86/x87 VARIATION SELECTOR-152
-<U000E0188>     /xf3/xa0/x86/x88 VARIATION SELECTOR-153
-<U000E0189>     /xf3/xa0/x86/x89 VARIATION SELECTOR-154
-<U000E018A>     /xf3/xa0/x86/x8a VARIATION SELECTOR-155
-<U000E018B>     /xf3/xa0/x86/x8b VARIATION SELECTOR-156
-<U000E018C>     /xf3/xa0/x86/x8c VARIATION SELECTOR-157
-<U000E018D>     /xf3/xa0/x86/x8d VARIATION SELECTOR-158
-<U000E018E>     /xf3/xa0/x86/x8e VARIATION SELECTOR-159
-<U000E018F>     /xf3/xa0/x86/x8f VARIATION SELECTOR-160
-<U000E0190>     /xf3/xa0/x86/x90 VARIATION SELECTOR-161
-<U000E0191>     /xf3/xa0/x86/x91 VARIATION SELECTOR-162
-<U000E0192>     /xf3/xa0/x86/x92 VARIATION SELECTOR-163
-<U000E0193>     /xf3/xa0/x86/x93 VARIATION SELECTOR-164
-<U000E0194>     /xf3/xa0/x86/x94 VARIATION SELECTOR-165
-<U000E0195>     /xf3/xa0/x86/x95 VARIATION SELECTOR-166
-<U000E0196>     /xf3/xa0/x86/x96 VARIATION SELECTOR-167
-<U000E0197>     /xf3/xa0/x86/x97 VARIATION SELECTOR-168
-<U000E0198>     /xf3/xa0/x86/x98 VARIATION SELECTOR-169
-<U000E0199>     /xf3/xa0/x86/x99 VARIATION SELECTOR-170
-<U000E019A>     /xf3/xa0/x86/x9a VARIATION SELECTOR-171
-<U000E019B>     /xf3/xa0/x86/x9b VARIATION SELECTOR-172
-<U000E019C>     /xf3/xa0/x86/x9c VARIATION SELECTOR-173
-<U000E019D>     /xf3/xa0/x86/x9d VARIATION SELECTOR-174
-<U000E019E>     /xf3/xa0/x86/x9e VARIATION SELECTOR-175
-<U000E019F>     /xf3/xa0/x86/x9f VARIATION SELECTOR-176
-<U000E01A0>     /xf3/xa0/x86/xa0 VARIATION SELECTOR-177
-<U000E01A1>     /xf3/xa0/x86/xa1 VARIATION SELECTOR-178
-<U000E01A2>     /xf3/xa0/x86/xa2 VARIATION SELECTOR-179
-<U000E01A3>     /xf3/xa0/x86/xa3 VARIATION SELECTOR-180
-<U000E01A4>     /xf3/xa0/x86/xa4 VARIATION SELECTOR-181
-<U000E01A5>     /xf3/xa0/x86/xa5 VARIATION SELECTOR-182
-<U000E01A6>     /xf3/xa0/x86/xa6 VARIATION SELECTOR-183
-<U000E01A7>     /xf3/xa0/x86/xa7 VARIATION SELECTOR-184
-<U000E01A8>     /xf3/xa0/x86/xa8 VARIATION SELECTOR-185
-<U000E01A9>     /xf3/xa0/x86/xa9 VARIATION SELECTOR-186
-<U000E01AA>     /xf3/xa0/x86/xaa VARIATION SELECTOR-187
-<U000E01AB>     /xf3/xa0/x86/xab VARIATION SELECTOR-188
-<U000E01AC>     /xf3/xa0/x86/xac VARIATION SELECTOR-189
-<U000E01AD>     /xf3/xa0/x86/xad VARIATION SELECTOR-190
-<U000E01AE>     /xf3/xa0/x86/xae VARIATION SELECTOR-191
-<U000E01AF>     /xf3/xa0/x86/xaf VARIATION SELECTOR-192
-<U000E01B0>     /xf3/xa0/x86/xb0 VARIATION SELECTOR-193
-<U000E01B1>     /xf3/xa0/x86/xb1 VARIATION SELECTOR-194
-<U000E01B2>     /xf3/xa0/x86/xb2 VARIATION SELECTOR-195
-<U000E01B3>     /xf3/xa0/x86/xb3 VARIATION SELECTOR-196
-<U000E01B4>     /xf3/xa0/x86/xb4 VARIATION SELECTOR-197
-<U000E01B5>     /xf3/xa0/x86/xb5 VARIATION SELECTOR-198
-<U000E01B6>     /xf3/xa0/x86/xb6 VARIATION SELECTOR-199
-<U000E01B7>     /xf3/xa0/x86/xb7 VARIATION SELECTOR-200
-<U000E01B8>     /xf3/xa0/x86/xb8 VARIATION SELECTOR-201
-<U000E01B9>     /xf3/xa0/x86/xb9 VARIATION SELECTOR-202
-<U000E01BA>     /xf3/xa0/x86/xba VARIATION SELECTOR-203
-<U000E01BB>     /xf3/xa0/x86/xbb VARIATION SELECTOR-204
-<U000E01BC>     /xf3/xa0/x86/xbc VARIATION SELECTOR-205
-<U000E01BD>     /xf3/xa0/x86/xbd VARIATION SELECTOR-206
-<U000E01BE>     /xf3/xa0/x86/xbe VARIATION SELECTOR-207
-<U000E01BF>     /xf3/xa0/x86/xbf VARIATION SELECTOR-208
-<U000E01C0>     /xf3/xa0/x87/x80 VARIATION SELECTOR-209
-<U000E01C1>     /xf3/xa0/x87/x81 VARIATION SELECTOR-210
-<U000E01C2>     /xf3/xa0/x87/x82 VARIATION SELECTOR-211
-<U000E01C3>     /xf3/xa0/x87/x83 VARIATION SELECTOR-212
-<U000E01C4>     /xf3/xa0/x87/x84 VARIATION SELECTOR-213
-<U000E01C5>     /xf3/xa0/x87/x85 VARIATION SELECTOR-214
-<U000E01C6>     /xf3/xa0/x87/x86 VARIATION SELECTOR-215
-<U000E01C7>     /xf3/xa0/x87/x87 VARIATION SELECTOR-216
-<U000E01C8>     /xf3/xa0/x87/x88 VARIATION SELECTOR-217
-<U000E01C9>     /xf3/xa0/x87/x89 VARIATION SELECTOR-218
-<U000E01CA>     /xf3/xa0/x87/x8a VARIATION SELECTOR-219
-<U000E01CB>     /xf3/xa0/x87/x8b VARIATION SELECTOR-220
-<U000E01CC>     /xf3/xa0/x87/x8c VARIATION SELECTOR-221
-<U000E01CD>     /xf3/xa0/x87/x8d VARIATION SELECTOR-222
-<U000E01CE>     /xf3/xa0/x87/x8e VARIATION SELECTOR-223
-<U000E01CF>     /xf3/xa0/x87/x8f VARIATION SELECTOR-224
-<U000E01D0>     /xf3/xa0/x87/x90 VARIATION SELECTOR-225
-<U000E01D1>     /xf3/xa0/x87/x91 VARIATION SELECTOR-226
-<U000E01D2>     /xf3/xa0/x87/x92 VARIATION SELECTOR-227
-<U000E01D3>     /xf3/xa0/x87/x93 VARIATION SELECTOR-228
-<U000E01D4>     /xf3/xa0/x87/x94 VARIATION SELECTOR-229
-<U000E01D5>     /xf3/xa0/x87/x95 VARIATION SELECTOR-230
-<U000E01D6>     /xf3/xa0/x87/x96 VARIATION SELECTOR-231
-<U000E01D7>     /xf3/xa0/x87/x97 VARIATION SELECTOR-232
-<U000E01D8>     /xf3/xa0/x87/x98 VARIATION SELECTOR-233
-<U000E01D9>     /xf3/xa0/x87/x99 VARIATION SELECTOR-234
-<U000E01DA>     /xf3/xa0/x87/x9a VARIATION SELECTOR-235
-<U000E01DB>     /xf3/xa0/x87/x9b VARIATION SELECTOR-236
-<U000E01DC>     /xf3/xa0/x87/x9c VARIATION SELECTOR-237
-<U000E01DD>     /xf3/xa0/x87/x9d VARIATION SELECTOR-238
-<U000E01DE>     /xf3/xa0/x87/x9e VARIATION SELECTOR-239
-<U000E01DF>     /xf3/xa0/x87/x9f VARIATION SELECTOR-240
-<U000E01E0>     /xf3/xa0/x87/xa0 VARIATION SELECTOR-241
-<U000E01E1>     /xf3/xa0/x87/xa1 VARIATION SELECTOR-242
-<U000E01E2>     /xf3/xa0/x87/xa2 VARIATION SELECTOR-243
-<U000E01E3>     /xf3/xa0/x87/xa3 VARIATION SELECTOR-244
-<U000E01E4>     /xf3/xa0/x87/xa4 VARIATION SELECTOR-245
-<U000E01E5>     /xf3/xa0/x87/xa5 VARIATION SELECTOR-246
-<U000E01E6>     /xf3/xa0/x87/xa6 VARIATION SELECTOR-247
-<U000E01E7>     /xf3/xa0/x87/xa7 VARIATION SELECTOR-248
-<U000E01E8>     /xf3/xa0/x87/xa8 VARIATION SELECTOR-249
-<U000E01E9>     /xf3/xa0/x87/xa9 VARIATION SELECTOR-250
-<U000E01EA>     /xf3/xa0/x87/xaa VARIATION SELECTOR-251
-<U000E01EB>     /xf3/xa0/x87/xab VARIATION SELECTOR-252
-<U000E01EC>     /xf3/xa0/x87/xac VARIATION SELECTOR-253
-<U000E01ED>     /xf3/xa0/x87/xad VARIATION SELECTOR-254
-<U000E01EE>     /xf3/xa0/x87/xae VARIATION SELECTOR-255
-<U000E01EF>     /xf3/xa0/x87/xaf VARIATION SELECTOR-256
+<U000E0100> /xf3/xa0/x84/x80 VARIATION SELECTOR-17
+<U000E0101> /xf3/xa0/x84/x81 VARIATION SELECTOR-18
+<U000E0102> /xf3/xa0/x84/x82 VARIATION SELECTOR-19
+<U000E0103> /xf3/xa0/x84/x83 VARIATION SELECTOR-20
+<U000E0104> /xf3/xa0/x84/x84 VARIATION SELECTOR-21
+<U000E0105> /xf3/xa0/x84/x85 VARIATION SELECTOR-22
+<U000E0106> /xf3/xa0/x84/x86 VARIATION SELECTOR-23
+<U000E0107> /xf3/xa0/x84/x87 VARIATION SELECTOR-24
+<U000E0108> /xf3/xa0/x84/x88 VARIATION SELECTOR-25
+<U000E0109> /xf3/xa0/x84/x89 VARIATION SELECTOR-26
+<U000E010A> /xf3/xa0/x84/x8a VARIATION SELECTOR-27
+<U000E010B> /xf3/xa0/x84/x8b VARIATION SELECTOR-28
+<U000E010C> /xf3/xa0/x84/x8c VARIATION SELECTOR-29
+<U000E010D> /xf3/xa0/x84/x8d VARIATION SELECTOR-30
+<U000E010E> /xf3/xa0/x84/x8e VARIATION SELECTOR-31
+<U000E010F> /xf3/xa0/x84/x8f VARIATION SELECTOR-32
+<U000E0110> /xf3/xa0/x84/x90 VARIATION SELECTOR-33
+<U000E0111> /xf3/xa0/x84/x91 VARIATION SELECTOR-34
+<U000E0112> /xf3/xa0/x84/x92 VARIATION SELECTOR-35
+<U000E0113> /xf3/xa0/x84/x93 VARIATION SELECTOR-36
+<U000E0114> /xf3/xa0/x84/x94 VARIATION SELECTOR-37
+<U000E0115> /xf3/xa0/x84/x95 VARIATION SELECTOR-38
+<U000E0116> /xf3/xa0/x84/x96 VARIATION SELECTOR-39
+<U000E0117> /xf3/xa0/x84/x97 VARIATION SELECTOR-40
+<U000E0118> /xf3/xa0/x84/x98 VARIATION SELECTOR-41
+<U000E0119> /xf3/xa0/x84/x99 VARIATION SELECTOR-42
+<U000E011A> /xf3/xa0/x84/x9a VARIATION SELECTOR-43
+<U000E011B> /xf3/xa0/x84/x9b VARIATION SELECTOR-44
+<U000E011C> /xf3/xa0/x84/x9c VARIATION SELECTOR-45
+<U000E011D> /xf3/xa0/x84/x9d VARIATION SELECTOR-46
+<U000E011E> /xf3/xa0/x84/x9e VARIATION SELECTOR-47
+<U000E011F> /xf3/xa0/x84/x9f VARIATION SELECTOR-48
+<U000E0120> /xf3/xa0/x84/xa0 VARIATION SELECTOR-49
+<U000E0121> /xf3/xa0/x84/xa1 VARIATION SELECTOR-50
+<U000E0122> /xf3/xa0/x84/xa2 VARIATION SELECTOR-51
+<U000E0123> /xf3/xa0/x84/xa3 VARIATION SELECTOR-52
+<U000E0124> /xf3/xa0/x84/xa4 VARIATION SELECTOR-53
+<U000E0125> /xf3/xa0/x84/xa5 VARIATION SELECTOR-54
+<U000E0126> /xf3/xa0/x84/xa6 VARIATION SELECTOR-55
+<U000E0127> /xf3/xa0/x84/xa7 VARIATION SELECTOR-56
+<U000E0128> /xf3/xa0/x84/xa8 VARIATION SELECTOR-57
+<U000E0129> /xf3/xa0/x84/xa9 VARIATION SELECTOR-58
+<U000E012A> /xf3/xa0/x84/xaa VARIATION SELECTOR-59
+<U000E012B> /xf3/xa0/x84/xab VARIATION SELECTOR-60
+<U000E012C> /xf3/xa0/x84/xac VARIATION SELECTOR-61
+<U000E012D> /xf3/xa0/x84/xad VARIATION SELECTOR-62
+<U000E012E> /xf3/xa0/x84/xae VARIATION SELECTOR-63
+<U000E012F> /xf3/xa0/x84/xaf VARIATION SELECTOR-64
+<U000E0130> /xf3/xa0/x84/xb0 VARIATION SELECTOR-65
+<U000E0131> /xf3/xa0/x84/xb1 VARIATION SELECTOR-66
+<U000E0132> /xf3/xa0/x84/xb2 VARIATION SELECTOR-67
+<U000E0133> /xf3/xa0/x84/xb3 VARIATION SELECTOR-68
+<U000E0134> /xf3/xa0/x84/xb4 VARIATION SELECTOR-69
+<U000E0135> /xf3/xa0/x84/xb5 VARIATION SELECTOR-70
+<U000E0136> /xf3/xa0/x84/xb6 VARIATION SELECTOR-71
+<U000E0137> /xf3/xa0/x84/xb7 VARIATION SELECTOR-72
+<U000E0138> /xf3/xa0/x84/xb8 VARIATION SELECTOR-73
+<U000E0139> /xf3/xa0/x84/xb9 VARIATION SELECTOR-74
+<U000E013A> /xf3/xa0/x84/xba VARIATION SELECTOR-75
+<U000E013B> /xf3/xa0/x84/xbb VARIATION SELECTOR-76
+<U000E013C> /xf3/xa0/x84/xbc VARIATION SELECTOR-77
+<U000E013D> /xf3/xa0/x84/xbd VARIATION SELECTOR-78
+<U000E013E> /xf3/xa0/x84/xbe VARIATION SELECTOR-79
+<U000E013F> /xf3/xa0/x84/xbf VARIATION SELECTOR-80
+<U000E0140> /xf3/xa0/x85/x80 VARIATION SELECTOR-81
+<U000E0141> /xf3/xa0/x85/x81 VARIATION SELECTOR-82
+<U000E0142> /xf3/xa0/x85/x82 VARIATION SELECTOR-83
+<U000E0143> /xf3/xa0/x85/x83 VARIATION SELECTOR-84
+<U000E0144> /xf3/xa0/x85/x84 VARIATION SELECTOR-85
+<U000E0145> /xf3/xa0/x85/x85 VARIATION SELECTOR-86
+<U000E0146> /xf3/xa0/x85/x86 VARIATION SELECTOR-87
+<U000E0147> /xf3/xa0/x85/x87 VARIATION SELECTOR-88
+<U000E0148> /xf3/xa0/x85/x88 VARIATION SELECTOR-89
+<U000E0149> /xf3/xa0/x85/x89 VARIATION SELECTOR-90
+<U000E014A> /xf3/xa0/x85/x8a VARIATION SELECTOR-91
+<U000E014B> /xf3/xa0/x85/x8b VARIATION SELECTOR-92
+<U000E014C> /xf3/xa0/x85/x8c VARIATION SELECTOR-93
+<U000E014D> /xf3/xa0/x85/x8d VARIATION SELECTOR-94
+<U000E014E> /xf3/xa0/x85/x8e VARIATION SELECTOR-95
+<U000E014F> /xf3/xa0/x85/x8f VARIATION SELECTOR-96
+<U000E0150> /xf3/xa0/x85/x90 VARIATION SELECTOR-97
+<U000E0151> /xf3/xa0/x85/x91 VARIATION SELECTOR-98
+<U000E0152> /xf3/xa0/x85/x92 VARIATION SELECTOR-99
+<U000E0153> /xf3/xa0/x85/x93 VARIATION SELECTOR-100
+<U000E0154> /xf3/xa0/x85/x94 VARIATION SELECTOR-101
+<U000E0155> /xf3/xa0/x85/x95 VARIATION SELECTOR-102
+<U000E0156> /xf3/xa0/x85/x96 VARIATION SELECTOR-103
+<U000E0157> /xf3/xa0/x85/x97 VARIATION SELECTOR-104
+<U000E0158> /xf3/xa0/x85/x98 VARIATION SELECTOR-105
+<U000E0159> /xf3/xa0/x85/x99 VARIATION SELECTOR-106
+<U000E015A> /xf3/xa0/x85/x9a VARIATION SELECTOR-107
+<U000E015B> /xf3/xa0/x85/x9b VARIATION SELECTOR-108
+<U000E015C> /xf3/xa0/x85/x9c VARIATION SELECTOR-109
+<U000E015D> /xf3/xa0/x85/x9d VARIATION SELECTOR-110
+<U000E015E> /xf3/xa0/x85/x9e VARIATION SELECTOR-111
+<U000E015F> /xf3/xa0/x85/x9f VARIATION SELECTOR-112
+<U000E0160> /xf3/xa0/x85/xa0 VARIATION SELECTOR-113
+<U000E0161> /xf3/xa0/x85/xa1 VARIATION SELECTOR-114
+<U000E0162> /xf3/xa0/x85/xa2 VARIATION SELECTOR-115
+<U000E0163> /xf3/xa0/x85/xa3 VARIATION SELECTOR-116
+<U000E0164> /xf3/xa0/x85/xa4 VARIATION SELECTOR-117
+<U000E0165> /xf3/xa0/x85/xa5 VARIATION SELECTOR-118
+<U000E0166> /xf3/xa0/x85/xa6 VARIATION SELECTOR-119
+<U000E0167> /xf3/xa0/x85/xa7 VARIATION SELECTOR-120
+<U000E0168> /xf3/xa0/x85/xa8 VARIATION SELECTOR-121
+<U000E0169> /xf3/xa0/x85/xa9 VARIATION SELECTOR-122
+<U000E016A> /xf3/xa0/x85/xaa VARIATION SELECTOR-123
+<U000E016B> /xf3/xa0/x85/xab VARIATION SELECTOR-124
+<U000E016C> /xf3/xa0/x85/xac VARIATION SELECTOR-125
+<U000E016D> /xf3/xa0/x85/xad VARIATION SELECTOR-126
+<U000E016E> /xf3/xa0/x85/xae VARIATION SELECTOR-127
+<U000E016F> /xf3/xa0/x85/xaf VARIATION SELECTOR-128
+<U000E0170> /xf3/xa0/x85/xb0 VARIATION SELECTOR-129
+<U000E0171> /xf3/xa0/x85/xb1 VARIATION SELECTOR-130
+<U000E0172> /xf3/xa0/x85/xb2 VARIATION SELECTOR-131
+<U000E0173> /xf3/xa0/x85/xb3 VARIATION SELECTOR-132
+<U000E0174> /xf3/xa0/x85/xb4 VARIATION SELECTOR-133
+<U000E0175> /xf3/xa0/x85/xb5 VARIATION SELECTOR-134
+<U000E0176> /xf3/xa0/x85/xb6 VARIATION SELECTOR-135
+<U000E0177> /xf3/xa0/x85/xb7 VARIATION SELECTOR-136
+<U000E0178> /xf3/xa0/x85/xb8 VARIATION SELECTOR-137
+<U000E0179> /xf3/xa0/x85/xb9 VARIATION SELECTOR-138
+<U000E017A> /xf3/xa0/x85/xba VARIATION SELECTOR-139
+<U000E017B> /xf3/xa0/x85/xbb VARIATION SELECTOR-140
+<U000E017C> /xf3/xa0/x85/xbc VARIATION SELECTOR-141
+<U000E017D> /xf3/xa0/x85/xbd VARIATION SELECTOR-142
+<U000E017E> /xf3/xa0/x85/xbe VARIATION SELECTOR-143
+<U000E017F> /xf3/xa0/x85/xbf VARIATION SELECTOR-144
+<U000E0180> /xf3/xa0/x86/x80 VARIATION SELECTOR-145
+<U000E0181> /xf3/xa0/x86/x81 VARIATION SELECTOR-146
+<U000E0182> /xf3/xa0/x86/x82 VARIATION SELECTOR-147
+<U000E0183> /xf3/xa0/x86/x83 VARIATION SELECTOR-148
+<U000E0184> /xf3/xa0/x86/x84 VARIATION SELECTOR-149
+<U000E0185> /xf3/xa0/x86/x85 VARIATION SELECTOR-150
+<U000E0186> /xf3/xa0/x86/x86 VARIATION SELECTOR-151
+<U000E0187> /xf3/xa0/x86/x87 VARIATION SELECTOR-152
+<U000E0188> /xf3/xa0/x86/x88 VARIATION SELECTOR-153
+<U000E0189> /xf3/xa0/x86/x89 VARIATION SELECTOR-154
+<U000E018A> /xf3/xa0/x86/x8a VARIATION SELECTOR-155
+<U000E018B> /xf3/xa0/x86/x8b VARIATION SELECTOR-156
+<U000E018C> /xf3/xa0/x86/x8c VARIATION SELECTOR-157
+<U000E018D> /xf3/xa0/x86/x8d VARIATION SELECTOR-158
+<U000E018E> /xf3/xa0/x86/x8e VARIATION SELECTOR-159
+<U000E018F> /xf3/xa0/x86/x8f VARIATION SELECTOR-160
+<U000E0190> /xf3/xa0/x86/x90 VARIATION SELECTOR-161
+<U000E0191> /xf3/xa0/x86/x91 VARIATION SELECTOR-162
+<U000E0192> /xf3/xa0/x86/x92 VARIATION SELECTOR-163
+<U000E0193> /xf3/xa0/x86/x93 VARIATION SELECTOR-164
+<U000E0194> /xf3/xa0/x86/x94 VARIATION SELECTOR-165
+<U000E0195> /xf3/xa0/x86/x95 VARIATION SELECTOR-166
+<U000E0196> /xf3/xa0/x86/x96 VARIATION SELECTOR-167
+<U000E0197> /xf3/xa0/x86/x97 VARIATION SELECTOR-168
+<U000E0198> /xf3/xa0/x86/x98 VARIATION SELECTOR-169
+<U000E0199> /xf3/xa0/x86/x99 VARIATION SELECTOR-170
+<U000E019A> /xf3/xa0/x86/x9a VARIATION SELECTOR-171
+<U000E019B> /xf3/xa0/x86/x9b VARIATION SELECTOR-172
+<U000E019C> /xf3/xa0/x86/x9c VARIATION SELECTOR-173
+<U000E019D> /xf3/xa0/x86/x9d VARIATION SELECTOR-174
+<U000E019E> /xf3/xa0/x86/x9e VARIATION SELECTOR-175
+<U000E019F> /xf3/xa0/x86/x9f VARIATION SELECTOR-176
+<U000E01A0> /xf3/xa0/x86/xa0 VARIATION SELECTOR-177
+<U000E01A1> /xf3/xa0/x86/xa1 VARIATION SELECTOR-178
+<U000E01A2> /xf3/xa0/x86/xa2 VARIATION SELECTOR-179
+<U000E01A3> /xf3/xa0/x86/xa3 VARIATION SELECTOR-180
+<U000E01A4> /xf3/xa0/x86/xa4 VARIATION SELECTOR-181
+<U000E01A5> /xf3/xa0/x86/xa5 VARIATION SELECTOR-182
+<U000E01A6> /xf3/xa0/x86/xa6 VARIATION SELECTOR-183
+<U000E01A7> /xf3/xa0/x86/xa7 VARIATION SELECTOR-184
+<U000E01A8> /xf3/xa0/x86/xa8 VARIATION SELECTOR-185
+<U000E01A9> /xf3/xa0/x86/xa9 VARIATION SELECTOR-186
+<U000E01AA> /xf3/xa0/x86/xaa VARIATION SELECTOR-187
+<U000E01AB> /xf3/xa0/x86/xab VARIATION SELECTOR-188
+<U000E01AC> /xf3/xa0/x86/xac VARIATION SELECTOR-189
+<U000E01AD> /xf3/xa0/x86/xad VARIATION SELECTOR-190
+<U000E01AE> /xf3/xa0/x86/xae VARIATION SELECTOR-191
+<U000E01AF> /xf3/xa0/x86/xaf VARIATION SELECTOR-192
+<U000E01B0> /xf3/xa0/x86/xb0 VARIATION SELECTOR-193
+<U000E01B1> /xf3/xa0/x86/xb1 VARIATION SELECTOR-194
+<U000E01B2> /xf3/xa0/x86/xb2 VARIATION SELECTOR-195
+<U000E01B3> /xf3/xa0/x86/xb3 VARIATION SELECTOR-196
+<U000E01B4> /xf3/xa0/x86/xb4 VARIATION SELECTOR-197
+<U000E01B5> /xf3/xa0/x86/xb5 VARIATION SELECTOR-198
+<U000E01B6> /xf3/xa0/x86/xb6 VARIATION SELECTOR-199
+<U000E01B7> /xf3/xa0/x86/xb7 VARIATION SELECTOR-200
+<U000E01B8> /xf3/xa0/x86/xb8 VARIATION SELECTOR-201
+<U000E01B9> /xf3/xa0/x86/xb9 VARIATION SELECTOR-202
+<U000E01BA> /xf3/xa0/x86/xba VARIATION SELECTOR-203
+<U000E01BB> /xf3/xa0/x86/xbb VARIATION SELECTOR-204
+<U000E01BC> /xf3/xa0/x86/xbc VARIATION SELECTOR-205
+<U000E01BD> /xf3/xa0/x86/xbd VARIATION SELECTOR-206
+<U000E01BE> /xf3/xa0/x86/xbe VARIATION SELECTOR-207
+<U000E01BF> /xf3/xa0/x86/xbf VARIATION SELECTOR-208
+<U000E01C0> /xf3/xa0/x87/x80 VARIATION SELECTOR-209
+<U000E01C1> /xf3/xa0/x87/x81 VARIATION SELECTOR-210
+<U000E01C2> /xf3/xa0/x87/x82 VARIATION SELECTOR-211
+<U000E01C3> /xf3/xa0/x87/x83 VARIATION SELECTOR-212
+<U000E01C4> /xf3/xa0/x87/x84 VARIATION SELECTOR-213
+<U000E01C5> /xf3/xa0/x87/x85 VARIATION SELECTOR-214
+<U000E01C6> /xf3/xa0/x87/x86 VARIATION SELECTOR-215
+<U000E01C7> /xf3/xa0/x87/x87 VARIATION SELECTOR-216
+<U000E01C8> /xf3/xa0/x87/x88 VARIATION SELECTOR-217
+<U000E01C9> /xf3/xa0/x87/x89 VARIATION SELECTOR-218
+<U000E01CA> /xf3/xa0/x87/x8a VARIATION SELECTOR-219
+<U000E01CB> /xf3/xa0/x87/x8b VARIATION SELECTOR-220
+<U000E01CC> /xf3/xa0/x87/x8c VARIATION SELECTOR-221
+<U000E01CD> /xf3/xa0/x87/x8d VARIATION SELECTOR-222
+<U000E01CE> /xf3/xa0/x87/x8e VARIATION SELECTOR-223
+<U000E01CF> /xf3/xa0/x87/x8f VARIATION SELECTOR-224
+<U000E01D0> /xf3/xa0/x87/x90 VARIATION SELECTOR-225
+<U000E01D1> /xf3/xa0/x87/x91 VARIATION SELECTOR-226
+<U000E01D2> /xf3/xa0/x87/x92 VARIATION SELECTOR-227
+<U000E01D3> /xf3/xa0/x87/x93 VARIATION SELECTOR-228
+<U000E01D4> /xf3/xa0/x87/x94 VARIATION SELECTOR-229
+<U000E01D5> /xf3/xa0/x87/x95 VARIATION SELECTOR-230
+<U000E01D6> /xf3/xa0/x87/x96 VARIATION SELECTOR-231
+<U000E01D7> /xf3/xa0/x87/x97 VARIATION SELECTOR-232
+<U000E01D8> /xf3/xa0/x87/x98 VARIATION SELECTOR-233
+<U000E01D9> /xf3/xa0/x87/x99 VARIATION SELECTOR-234
+<U000E01DA> /xf3/xa0/x87/x9a VARIATION SELECTOR-235
+<U000E01DB> /xf3/xa0/x87/x9b VARIATION SELECTOR-236
+<U000E01DC> /xf3/xa0/x87/x9c VARIATION SELECTOR-237
+<U000E01DD> /xf3/xa0/x87/x9d VARIATION SELECTOR-238
+<U000E01DE> /xf3/xa0/x87/x9e VARIATION SELECTOR-239
+<U000E01DF> /xf3/xa0/x87/x9f VARIATION SELECTOR-240
+<U000E01E0> /xf3/xa0/x87/xa0 VARIATION SELECTOR-241
+<U000E01E1> /xf3/xa0/x87/xa1 VARIATION SELECTOR-242
+<U000E01E2> /xf3/xa0/x87/xa2 VARIATION SELECTOR-243
+<U000E01E3> /xf3/xa0/x87/xa3 VARIATION SELECTOR-244
+<U000E01E4> /xf3/xa0/x87/xa4 VARIATION SELECTOR-245
+<U000E01E5> /xf3/xa0/x87/xa5 VARIATION SELECTOR-246
+<U000E01E6> /xf3/xa0/x87/xa6 VARIATION SELECTOR-247
+<U000E01E7> /xf3/xa0/x87/xa7 VARIATION SELECTOR-248
+<U000E01E8> /xf3/xa0/x87/xa8 VARIATION SELECTOR-249
+<U000E01E9> /xf3/xa0/x87/xa9 VARIATION SELECTOR-250
+<U000E01EA> /xf3/xa0/x87/xaa VARIATION SELECTOR-251
+<U000E01EB> /xf3/xa0/x87/xab VARIATION SELECTOR-252
+<U000E01EC> /xf3/xa0/x87/xac VARIATION SELECTOR-253
+<U000E01ED> /xf3/xa0/x87/xad VARIATION SELECTOR-254
+<U000E01EE> /xf3/xa0/x87/xae VARIATION SELECTOR-255
+<U000E01EF> /xf3/xa0/x87/xaf VARIATION SELECTOR-256
 <U000F0000>..<U000F003F> /xf3/xb0/x80/x80 <Private Use>
 <U000F0040>..<U000F007F> /xf3/xb0/x81/x80 <Private Use>
 <U000F0080>..<U000F00BF> /xf3/xb0/x82/x80 <Private Use>
diff --git a/localedata/locales/as_IN b/localedata/locales/as_IN
index c61ba30460..41917f06dc 100644
--- a/localedata/locales/as_IN
+++ b/localedata/locales/as_IN
@@ -2,13 +2,12 @@ comment_char %
 escape_char /
 
 % Assamese locale for India.
-% Contributed by Masahide Washizawa <washi at jp ibm com>
 
 %%%%%%%%%%%%%
 LC_IDENTIFICATION
 title       "Assamese language locale for India"
-source      "IBM AP Linux Technology Center, Yamato Software Laboratory"
-address     "1623-14, Shimotsuruma, Yamato-shi, Kanagawa-ken, 242-8502, Japan"
+source      "Amitakhya Phukan, Red Hat"
+address     ""
 contact     ""
 email       "bug-glibc@gnu.org"
 tel         ""
@@ -678,7 +677,7 @@ d_fmt    "<U0025><U0065><U002D><U0025><U006D><U002D><U0025><U0059>"
 t_fmt    "<U0025><U0049><U002E><U0025><U004D><U002E><U0025><U0053><U0020><U0025><U0070>"
 % d_t_fmt"%e %B, %Y %I.%M.%S %p %Z"
 d_t_fmt  "<U0025><U0065><U0020><U0025><U0042><U002C><U0020><U0025><U0059><U0020><U0025><U0049><U002E><U0025><U004D><U002E><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
-am_pm    "<U09AA><U09C2><U09F0><U09CD><U09AC><U09CD><U09AC><U09BE><U09B9><U09CD><U09A8>";"<U0985><U09AA><U09F0><U09BE><U09B9><U09CD><U09A8>"  
+am_pm    "<U09AA><U09C2><U09F0><U09CD><U09AC><U09CD><U09AC><U09BE><U09B9><U09CD><U09A8>";"<U0985><U09AA><U09F0><U09BE><U09B9><U09CD><U09A8>"
 % t_fmt_ampm  "%I.%M.%S %p"
 t_fmt_ampm  "<U0025><U0049><U002E><U0025><U004D><U002E><U0025><U0053><U0020><U0025><U0070>"
 END LC_TIME
diff --git a/localedata/locales/bo_CN b/localedata/locales/bo_CN
new file mode 100644
index 0000000000..8440506f21
--- /dev/null
+++ b/localedata/locales/bo_CN
@@ -0,0 +1,170 @@
+comment_char %
+escape_char  /
+
+% Tibetan language locale for P.R. of China
+%
+% Based on dz_BT by Pema Geyleg
+
+LC_IDENTIFICATION
+title      "Tibetan language locale for P.R. of China"
+source     ""
+address    ""
+contact    ""
+email      "bug-glibc@gnu.org"
+tel        ""
+fax        ""
+language   "Tibetan"
+territory  "P.R. of China"
+revision   "0.1"
+date       "2007-11-06"
+%
+category  "bo_CN:2007";LC_IDENTIFICATION
+category  "bo_CN:2007";LC_CTYPE
+category  "bo_CN:2007";LC_COLLATE
+category  "bo_CN:2007";LC_NUMERIC
+category  "bo_CN:2007";LC_MONETARY
+category  "bo_CN:2007";LC_MESSAGES
+category  "bo_CN:2007";LC_PAPER
+category  "bo_CN:2007";LC_NAME
+category  "bo_CN:2007";LC_ADDRESS
+category  "bo_CN:2007";LC_TELEPHONE
+
+END LC_IDENTIFICATION
+
+LC_CTYPE
+copy "i18n"
+
+translit_start
+include "translit_combining";""
+translit_end
+END LC_CTYPE
+
+LC_COLLATE
+copy "dz_BT"
+END LC_COLLATE
+
+LC_MONETARY
+copy "zh_CN"
+END LC_MONETARY
+
+LC_NUMERIC
+copy "zh_CN"
+END LC_NUMERIC
+
+LC_TIME
+abday   "<U0F49><U0F72><U0F0B>";/
+        "<U0F5F><U0FB3><U0F0B>";/
+        "<U0F58><U0F72><U0F62><U0F0B>";/
+        "<U0F63><U0FB7><U0F42><U0F0B>";/
+        "<U0F54><U0F74><U0F62><U0F0B>";/
+        "<U0F66><U0F44><U0F66><U0F0B>";/
+        "<U0F66><U0FA4><U0F7A><U0F53><U0F0B>"
+
+day     "<U0F42><U0F5F><U0F60><U0F0B><U0F49><U0F72><U0F0B><U0F58><U0F0B>";/
+        "<U0F42><U0F5F><U0F60><U0F0B><U0F5F><U0FB3><U0F0B><U0F56><U0F0B>";/
+        "<U0F42><U0F5F><U0F60><U0F0B><U0F58><U0F72><U0F42><U0F0B><U0F51><U0F58><U0F62><U0F0B>";/
+        "<U0F42><U0F5F><U0F60><U0F0B><U0F63><U0FB7><U0F42><U0F0B><U0F55><U0F0B>";/
+        "<U0F42><U0F5F><U0F60><U0F0B><U0F54><U0F74><U0F62><U0F0B><U0F56><U0F74><U0F0B>";/
+        "<U0F42><U0F5F><U0F60><U0F0B><U0F54><U0F0B><U0F66><U0F44><U0F66><U0F0B>";/
+        "<U0F42><U0F5F><U0F60><U0F0B><U0F66><U0FA4><U0F7A><U0F53><U0F0B><U0F55><U0F0B>"
+
+abmon   "<U0F5F><U0FB3><U0F0B><U0F21>";/
+	"<U0F5F><U0FB3><U0F0B><U0F22>";/
+	"<U0F5F><U0FB3><U0F0B><U0F23>";/
+	"<U0F5F><U0FB3><U0F0B><U0F24>";/
+	"<U0F5F><U0FB3><U0F0B><U0F25>";/
+	"<U0F5F><U0FB3><U0F0B><U0F26>";/
+	"<U0F5F><U0FB3><U0F0B><U0F27>";/
+	"<U0F5F><U0FB3><U0F0B><U0F28>";/
+	"<U0F5F><U0FB3><U0F0B><U0F29>";/
+	"<U0F5F><U0FB3><U0F0B><U0F21><U0F20>";/
+	"<U0F5F><U0FB3><U0F0B><U0F21><U0F21>";/
+	"<U0F5F><U0FB3><U0F0B><U0F21><U0F22>"
+
+mon      "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F51><U0F44><U0F0B><U0F54><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F42><U0F49><U0F72><U0F66><U0F0B><U0F54><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F42><U0F66><U0F74><U0F58><U0F0B><U0F54><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F5E><U0F72><U0F0B><U0F54><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F63><U0F94><U0F0B><U0F55><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F51><U0FB2><U0F74><U0F42><U0F0B><U0F54><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F51><U0F74><U0F53><U0F54><U0F0B>";/
+    "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F62><U0F92><U0FB1><U0F51><U0F0B><U0F54><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F51><U0F42><U0F74><U0F0B><U0F54><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F45><U0F74><U0F0B><U0F54><U0F0B>";/
+"<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F45><U0F74><U0F0B><U0F42><U0F45><U0F72><U0F42><U0F0B><U0F54><U0F0B>";/
+"<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F45><U0F74><U0F0B><U0F42><U0F49><U0F72><U0F66><U0F0B><U0F54><U0F0B>"
+
+
+
+
+% Appropriate date & time representation
+d_t_fmt      "<U0F54><U0F66><U0FB1><U0F72><U0F0B><U0F63><U0F7C><U0025><U0079><U0F5F><U0F63><U0025><U006D><U0F5A><U0F7A><U0F66>/
+<U0025><U0064><U0F46><U0F74><U0F0B><U0F5A><U0F7C><U0F51><U0025><U0048><U0F40><U0F66><U0F62><U0F0B><U0F58>/
+<U0025><U004D><U0F40><U0F66><U0F62><U0F0B><U0F46><U0025><U0053>"
+
+% Appropriate date representation
+d_fmt        "<U0F54><U0F66><U0FB1><U0F72><U0F0B><U0F63><U0F7C><U0025><U0079>/
+<U0F5F><U0F63><U0025><U006D><U0F5A><U0F7A><U0F66><U0025><U0064>"
+
+% Appropriate time representation  "%H:%M:%S"
+t_fmt        "<U0F46><U0F74><U0F0B><U0F5A><U0F7C><U0F51>/
+<U0025><U0048><U0F40><U0F66><U0F62><U0F0B><U0F58>/
+<U0025><U004D><U0F40><U0F66><U0F62><U0F0B><U0F46><U0025><U0053>"
+
+% AM/PM signs
+am_pm   "<U0F44><U0F66><U0F0B><U0F46>";"<U0F55><U0FB1><U0F72><U0F0B><U0F46>"
+
+% Appropriate 12-hour clock representation  "%I:%M:%S %p"
+t_fmt_ampm        "<U0F46><U0F74><U0F0B><U0F5A><U0F7C><U0F51>/
+<U0025><U0049><U0F40><U0F66><U0F62><U0F0B><U0F58>/
+<U0025><U004D><U0F40><U0F66><U0F62><U0F0B><U0F46><U0025><U0053><U0020>/
+<U0025><U0070>"
+
+
+END LC_TIME
+
+LC_MESSAGES
+yesstr  "<U0F68><U0F72><U0F53>"
+nostr   "<U0F58><U0F7A><U0F53>"
+yesexpr "<U005E><U005B><U0F68><U0059><U0079><U005D><U002E><U002A>"
+noexpr  "<U005E><U005B><U0F58><U004E><U006E><U005D><U002E><U002A>"
+END LC_MESSAGES
+
+LC_TELEPHONE
+copy "zh_CN"
+END LC_TELEPHONE
+
+LC_PAPER
+copy "zh_CN"
+END LC_PAPER
+
+LC_MEASUREMENT
+copy "zh_CN"
+END LC_MEASUREMENT
+
+LC_NAME
+% FIXME
+name_fmt	"FIXME"
+name_gen	"FIXME"
+name_miss	"FIXME"
+name_mr		"FIXME"
+name_mrs	"FIXME"
+name_ms		"FIXME"
+END LC_NAME
+
+LC_ADDRESS
+% FIXME
+postal_fmt	"FIXME"
+country_name	"FIXME"
+
+country_ab2	"<U0043><U004E>"
+country_ab3	"<U0043><U0048><U004E>"
+country_num	156
+%country_car	"FIXME"
+country_isbn	"<U0037>"
+
+lang_name     "<U0F54><U0F7C><U0F51><U0F0B><U0F66><U0F90><U0F51><U0F0B>"
+lang_ab       "<U0062><U006F>"
+lang_term     "<U0062><U006F><U0064>"
+lang_lib      "<U0074><U0069><U0062>"
+END LC_ADDRESS
diff --git a/localedata/locales/bo_IN b/localedata/locales/bo_IN
new file mode 100644
index 0000000000..724e286cf1
--- /dev/null
+++ b/localedata/locales/bo_IN
@@ -0,0 +1,94 @@
+comment_char %
+escape_char  /
+
+% Tibetan language locale for India
+%
+% Based on dz_BT by Pema Geyleg
+
+LC_IDENTIFICATION
+title      "Tibetan language locale for India"
+source     ""
+address    ""
+contact    ""
+email      "bug-glibc@gnu.org"
+tel        ""
+fax        ""
+language   "Tibetan"
+territory  "India"
+revision   "0.1"
+date       "2007-11-06"
+%
+category  "bo_IN:2007";LC_IDENTIFICATION
+category  "bo_IN:2007";LC_CTYPE
+category  "bo_IN:2007";LC_COLLATE
+category  "bo_IN:2007";LC_NUMERIC
+category  "bo_IN:2007";LC_MONETARY
+category  "bo_IN:2007";LC_MESSAGES
+category  "bo_IN:2007";LC_PAPER
+category  "bo_IN:2007";LC_NAME
+category  "bo_IN:2007";LC_ADDRESS
+category  "bo_IN:2007";LC_TELEPHONE
+
+END LC_IDENTIFICATION
+
+LC_CTYPE
+copy "bo_CN"
+END LC_CTYPE
+
+LC_COLLATE
+copy "bo_CN"
+END LC_COLLATE
+
+LC_MONETARY
+copy "hi_IN"
+END LC_MONETARY
+
+LC_NUMERIC
+% FIXME: check that grouping etc is correct
+copy "bo_CN"
+END LC_NUMERIC
+
+LC_TIME
+copy "bo_CN"
+END LC_TIME
+
+LC_MESSAGES
+copy "bo_CN"
+END LC_MESSAGES
+
+LC_TELEPHONE
+copy "hi_IN"
+END LC_TELEPHONE
+
+LC_PAPER
+copy "hi_IN"
+END LC_PAPER
+
+LC_MEASUREMENT
+copy "hi_IN"
+END LC_MEASUREMENT
+
+LC_NAME
+% FIXME
+name_fmt	"FIXME"
+name_gen	"FIXME"
+name_miss	"FIXME"
+name_mr		"FIXME"
+name_mrs	"FIXME"
+name_ms		"FIXME"
+END LC_NAME
+
+LC_ADDRESS
+% FIXME
+postal_fmt	"FIXME"
+country_name	"FIXME"
+
+country_ab2 "<U0049><U004E>"
+country_ab3 "<U0049><U004E><U0044>"
+country_num 356
+
+lang_name     "<U0F54><U0F7C><U0F51><U0F0B><U0F66><U0F90><U0F51><U0F0B>"
+lang_ab       "<U0062><U006F>"
+lang_term     "<U0062><U006F><U0064>"
+lang_lib      "<U0074><U0069><U0062>"
+END LC_ADDRESS
diff --git a/localedata/locales/dz_BT b/localedata/locales/dz_BT
index 596573797e..7b3fe1ee6c 100644
--- a/localedata/locales/dz_BT
+++ b/localedata/locales/dz_BT
@@ -1209,13 +1209,13 @@ END LC_COLLATE
 
 LC_MONETARY
 
-int_curr_symbol         "BTN "
+int_curr_symbol         "<U0042><U0054><U004E> "
 currency_symbol    "<U0F51><U0F44><U0F74><U0F63><U0F0B><U0F40><U0FB2><U0F58><U0F0B>"
-mon_decimal_point       "."
-mon_thousands_sep       ","
+mon_decimal_point       "<U002E>"
+mon_thousands_sep       "<U002C>"
 mon_grouping            3;2;
 positive_sign           ""
-negative_sign           "-"
+negative_sign           "<U002D>"
 int_frac_digits         3
 frac_digits             3
 p_cs_precedes           1
@@ -1229,8 +1229,8 @@ END LC_MONETARY
 
 LC_NUMERIC
 
-decimal_point           "."
-thousands_sep           ","
+decimal_point           "<U002E>"
+thousands_sep           "<U002C>"
 grouping                3;2
 
 END LC_NUMERIC
@@ -1283,26 +1283,28 @@ mon      "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F51><U0F44><U0F0B><U0F54><U0F0B>
 
 
 % Appropriate date & time representation
-d_t_fmt      "<U0F54><U0F66><U0FB1><U0F72><U0F0B><U0F63><U0F7C>%y<U0F5F><U0F63>%m<U0F5A><U0F7A><U0F66>/
-%d<U0F46><U0F74><U0F0B><U0F5A><U0F7C><U0F51>%H<U0F40><U0F66><U0F62><U0F0B><U0F58>/
-%M<U0F40><U0F66><U0F62><U0F0B><U0F46>%S"
+d_t_fmt      "<U0F54><U0F66><U0FB1><U0F72><U0F0B><U0F63><U0F7C><U0025><U0079>/
+<U0F5F><U0F63><U0025><U006D><U0F5A><U0F7A><U0F66><U0025><U0064>/
+<U0F46><U0F74><U0F0B><U0F5A><U0F7C><U0F51><U0025><U0048><U0F40>/
+<U0F66><U0F62><U0F0B><U0F58><U0025><U004D>/
+<U0F40><U0F66><U0F62><U0F0B><U0F46><U0025><U0053>"
 
 % Appropriate date representation
-d_fmt        "<U0F54><U0F66><U0FB1><U0F72><U0F0B><U0F63><U0F7C>%y<U0F5F>/
-<U0F63>%m<U0F5A><U0F7A><U0F66>%d"
+d_fmt        "<U0F54><U0F66><U0FB1><U0F72><U0F0B><U0F63><U0F7C><U0025><U0079>/
+<U0F5F><U0F63><U0025><U006D><U0F5A><U0F7A><U0F66><U0025><U0064>"
 
 % Appropriate time representation  "%H:%M:%S"
 t_fmt        "<U0F46><U0F74><U0F0B><U0F5A><U0F7C><U0F51>/
-%H<U0F40><U0F66><U0F62><U0F0B><U0F58>/
-%M<U0F40><U0F66><U0F62><U0F0B><U0F46>%S"
+<U0025><U0048><U0F40><U0F66><U0F62><U0F0B><U0F58>/
+<U0025><U004D><U0F40><U0F66><U0F62><U0F0B><U0F46><U0025><U0053>"
 
 % AM/PM signs
 am_pm   "<U0F44><U0F66><U0F0B><U0F46>";"<U0F55><U0FB1><U0F72><U0F0B><U0F46>"
 
 % Appropriate 12-hour clock representation  "%I:%M:%S %p"
 t_fmt_ampm        "<U0F46><U0F74><U0F0B><U0F5A><U0F7C><U0F51>/
-%I<U0F40><U0F66><U0F62><U0F0B><U0F58>/
-%M<U0F40><U0F66><U0F62><U0F0B><U0F46>%S %p"
+<U0025><U0049><U0F40><U0F66><U0F62><U0F0B><U0F58><U0025><U004D>/
+<U0F40><U0F66><U0F62><U0F0B><U0F46><U0025><U0053><U0020><U0025><U0070>"
 
 
 END LC_TIME
@@ -1332,7 +1334,8 @@ measurement    1
 END LC_MEASUREMENT
 
 LC_NAME
-name_fmt    "%p%t%g%t%m%t%f"
+name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
 name_gen    ""
 name_miss   "<U0F58><U0F7C>"
 name_mr     "<U0F55><U0F7C>"
diff --git a/localedata/locales/ig_NG b/localedata/locales/ig_NG
index ed871ec563..308182bfad 100644
--- a/localedata/locales/ig_NG
+++ b/localedata/locales/ig_NG
@@ -117,6 +117,11 @@ collating-element <O_2'> from "<U1ECC><U0301>"
 collating-element <o_2'> from "<U1ECD><U0301>"
 collating-element <O_2`> from "<U1ECC><U0300>"
 collating-element <o_2`> from "<U1ECD><U0300>"
+collating-symbol  <s-h-ig>
+collating-element <S-H> from "<U0053><U0048>"
+collating-element <S-h> from "<U0053><U0068>"
+collating-element <s-H> from "<U0073><U0048>"
+collating-element <s-h> from "<U0073><U0068>"
 collating-symbol  <ubelowdot>
 collating-element <U_>  from "<U0055><U0323>"
 collating-element <u_>  from "<U0075><U0323>"
diff --git a/localedata/locales/lo_LA b/localedata/locales/lo_LA
index cc764e1678..29ab3f322b 100644
--- a/localedata/locales/lo_LA
+++ b/localedata/locales/lo_LA
@@ -602,10 +602,10 @@ UNDEFINED      IGNORE;IGNORE;IGNORE;IGNORE
 
 <U0EDD>        <U0EDC>;<BLANK>;<BLANK>;<BLANK> % Lao CHARACTER HHOr
 <mhor-e>           "<U0EDD><U0EC0>";<BLANK>;<BLANK>;<BLANK>
-<mor-ae>           "<U0EDD><U0EC1>";<BLANK>;<BLANK>;<BLANK>
-<mor-o>            "<U0EDD><U0EC2>";<BLANK>;<BLANK>;<BLANK>
-<mor-ai-maimuan>   "<U0EDD><U0EC3>";<BLANK>;<BLANK>;<BLANK>
-<mor-ai-maimalai>  "<U0EDD><U0EC4>";<BLANK>;<BLANK>;<BLANK>
+<mhor-ae>          "<U0EDD><U0EC1>";<BLANK>;<BLANK>;<BLANK>
+<mhor-o>           "<U0EDD><U0EC2>";<BLANK>;<BLANK>;<BLANK>
+<mhor-ai-maimuan>  "<U0EDD><U0EC3>";<BLANK>;<BLANK>;<BLANK>
+<mhor-ai-maimalai> "<U0EDD><U0EC4>";<BLANK>;<BLANK>;<BLANK>
 
 
 % order of Lao vowels
diff --git a/localedata/locales/si_LK b/localedata/locales/si_LK
index a3f3bce92a..daf618caf0 100644
--- a/localedata/locales/si_LK
+++ b/localedata/locales/si_LK
@@ -114,7 +114,7 @@ abmon       "<U0DA2><U0DB1>";/
 %
 % Full month names (%B)
 mon         "<U0DA2><U0DB1><U0DC0><U0DCF><U0DBB><U0DD2>";/
-            "<U0DB4><U0DD9><U0DB6><U0DBB><U0DC0><U0DCF><U0DBD><U0DD2>";/
+	    "<U0DB4><U0DD9><U0DB6><U0DBB><U0DC0><U0DCF><U0DBB><U0DD2>";/
             "<U0DB8><U0DCF><U0DBB><U0DCA><U0DAD><U0DD4>";/
             "<U0D85><U0DB4><U0DCA><U200D><U0DBB><U0DD2><U0DBA><U0DD9><U0DBD><U0DCA>";/
             "<U0DB8><U0DD0><U0DBA><U0DD2>";/
@@ -123,7 +123,7 @@ mon         "<U0DA2><U0DB1><U0DC0><U0DCF><U0DBB><U0DD2>";/
             "<U0D85><U0D9C><U0DDD><U0DC3><U0DCA><U0DAD><U0DD4>";/
             "<U0DC3><U0DD0><U0DB4><U0DCA><U0DAD><U0DD0><U0DB8><U0DCA><U0DB6><U0DBB><U0DCA>";/
             "<U0D94><U0D9A><U0DCA><U0DAD><U0DDD><U0DB6><U0DBB><U0DCA>";/
-            "<U0DB1><U0DD9><U0DC0><U0DD0><U0DB8><U0DCA><U0DB6><U0DBB><U0DCA>";/
+            "<U0DB1><U0DDC><U0DC0><U0DD0><U0DB8><U0DCA><U0DB6><U0DBB><U0DCA>";/
             "<U0DAF><U0DD9><U0DC3><U0DD0><U0DB8><U0DCA><U0DB6><U0DBB><U0DCA>"
 %
 % Equivalent of AM PM
diff --git a/localedata/locales/ug_CN b/localedata/locales/ug_CN
index c4526416f9..3732d7bdc1 100644
--- a/localedata/locales/ug_CN
+++ b/localedata/locales/ug_CN
@@ -2,7 +2,7 @@ escape_char /
 comment_char %
 %
 % Uyghur language locale for China
-% Source: 
+% Source:
 % Contact: Pablo Saratxaga
 % Email: pablo@mandriva.com
 % Language: ug
@@ -56,8 +56,8 @@ LC_COLLATE
 % U+0224, U+0225 are also similar to ztail and are sorted the same.
 %
 % new arabic writting uses some extra letters too.
-% all vowels are noted, and in beginning of the word there is a 
-% "yeh with hamza" (U+0626) in the front; should it be ignored 
+% all vowels are noted, and in beginning of the word there is a
+% "yeh with hamza" (U+0626) in the front; should it be ignored
 % in sorting?
 %
 % arabic     old latin       turkic (from azeri, which has same phonemes)
@@ -107,7 +107,7 @@ collating-symbol  <htail>
 collating-symbol  <ktail>
 collating-symbol  <ztail>
 collating-symbol  <obar>
-collating-symbol  <udiaresis>
+collating-symbol  <udiaeresis>
 
 collating-element <h,> from "<U0068><U0321>"
 collating-element <H,> from "<U0048><U0321>"
@@ -238,7 +238,7 @@ reorder-after <U0648>
 <U06D0> <ar_e>;<BAS>;<MIN>;IGNORE
 <U06CC> <ar_i>;<BAS>;<MIN>;IGNORE
 <U064A> <ar_y>;<BAS>;<MIN>;IGNORE
- 
+
 reorder-end
 
 END LC_COLLATE
@@ -330,4 +330,3 @@ LC_ADDRESS
 % FIXME
 copy "en_DK"
 END LC_ADDRESS
-
diff --git a/malloc/arena.c b/malloc/arena.c
index ce64335567..9932ee049b 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -160,6 +160,10 @@ static void           (*save_free_hook) (__malloc_ptr_t __ptr,
 					 __const __malloc_ptr_t);
 static Void_t*        save_arena;
 
+#ifdef ATFORK_MEM
+ATFORK_MEM;
+#endif
+
 /* Magic value for the thread-specific arena pointer when
    malloc_atfork() is in use.  */
 
@@ -700,8 +704,8 @@ new_heap(size, top_pad) size_t size, top_pad;
   return h;
 }
 
-/* Grow or shrink a heap.  size is automatically rounded up to a
-   multiple of the page size if it is positive. */
+/* Grow a heap.  size is automatically rounded up to a
+   multiple of the page size. */
 
 static int
 #if __STD_C
@@ -713,41 +717,55 @@ grow_heap(h, diff) heap_info *h; long diff;
   size_t page_mask = malloc_getpagesize - 1;
   long new_size;
 
-  if(diff >= 0) {
-    diff = (diff + page_mask) & ~page_mask;
-    new_size = (long)h->size + diff;
-    if((unsigned long) new_size > (unsigned long) HEAP_MAX_SIZE)
-      return -1;
-    if((unsigned long) new_size > h->mprotect_size) {
-      if (mprotect((char *)h + h->mprotect_size,
-		   (unsigned long) new_size - h->mprotect_size,
-		   PROT_READ|PROT_WRITE) != 0)
-	return -2;
-      h->mprotect_size = new_size;
-    }
-  } else {
-    new_size = (long)h->size + diff;
-    if(new_size < (long)sizeof(*h))
-      return -1;
-    /* Try to re-map the extra heap space freshly to save memory, and
-       make it inaccessible. */
+  diff = (diff + page_mask) & ~page_mask;
+  new_size = (long)h->size + diff;
+  if((unsigned long) new_size > (unsigned long) HEAP_MAX_SIZE)
+    return -1;
+  if((unsigned long) new_size > h->mprotect_size) {
+    if (mprotect((char *)h + h->mprotect_size,
+		 (unsigned long) new_size - h->mprotect_size,
+		 PROT_READ|PROT_WRITE) != 0)
+      return -2;
+    h->mprotect_size = new_size;
+  }
+
+  h->size = new_size;
+  return 0;
+}
+
+/* Shrink a heap.  */
+
+static int
+#if __STD_C
+shrink_heap(heap_info *h, long diff)
+#else
+shrink_heap(h, diff) heap_info *h; long diff;
+#endif
+{
+  long new_size;
+
+  new_size = (long)h->size - diff;
+  if(new_size < (long)sizeof(*h))
+    return -1;
+  /* Try to re-map the extra heap space freshly to save memory, and
+     make it inaccessible. */
 #ifdef _LIBC
-    if (__builtin_expect (__libc_enable_secure, 0))
+  if (__builtin_expect (__libc_enable_secure, 0))
 #else
-    if (1)
+  if (1)
 #endif
-      {
-	if((char *)MMAP((char *)h + new_size, -diff, PROT_NONE,
-			MAP_PRIVATE|MAP_FIXED) == (char *) MAP_FAILED)
-	  return -2;
-	h->mprotect_size = new_size;
-      }
+    {
+      if((char *)MMAP((char *)h + new_size, diff, PROT_NONE,
+		      MAP_PRIVATE|MAP_FIXED) == (char *) MAP_FAILED)
+	return -2;
+      h->mprotect_size = new_size;
+    }
 #ifdef _LIBC
-    else
-      madvise ((char *)h + new_size, -diff, MADV_DONTNEED);
+  else
+    madvise ((char *)h + new_size, diff, MADV_DONTNEED);
 #endif
-    /*fprintf(stderr, "shrink %p %08lx\n", h, new_size);*/
-  }
+  /*fprintf(stderr, "shrink %p %08lx\n", h, new_size);*/
+
   h->size = new_size;
   return 0;
 }
@@ -807,7 +825,7 @@ heap_trim(heap, pad) heap_info *heap; size_t pad;
   if(extra < (long)pagesz)
     return 0;
   /* Try to shrink. */
-  if(grow_heap(heap, -extra) != 0)
+  if(shrink_heap(heap, extra) != 0)
     return 0;
   ar_ptr->system_mem -= extra;
   arena_mem -= extra;
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 39d5b3fa52..1e716089a2 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4475,7 +4475,7 @@ _int_malloc(mstate av, size_t bytes)
 
       We require that av->top always exists (i.e., has size >=
       MINSIZE) after initialization, so if it would otherwise be
-      exhuasted by current request, it is replenished. (The main
+      exhausted by current request, it is replenished. (The main
       reason for ensuring it exists is that we may need MINSIZE space
       to put in fenceposts in sysmalloc.)
     */
@@ -4515,7 +4515,7 @@ _int_malloc(mstate av, size_t bytes)
     */
     else {
       void *p = sYSMALLOc(nb, av);
-      if (__builtin_expect (perturb_byte, 0))
+      if (p != NULL && __builtin_expect (perturb_byte, 0))
 	alloc_perturb (p, bytes);
       return p;
     }
diff --git a/manual/arith.texi b/manual/arith.texi
index 99fe67ae72..078885e86f 100644
--- a/manual/arith.texi
+++ b/manual/arith.texi
@@ -778,8 +778,7 @@ non-zero value otherwise.
 
 @comment fenv.h
 @comment ISO
-@deftypefun int fesetexceptflag (const fexcept_t *@var{flagp}, int
-@var{excepts})
+@deftypefun int fesetexceptflag (const fexcept_t *@var{flagp}, int @var{excepts})
 This function restores the flags for the exceptions indicated by
 @var{excepts} to the values stored in the variable pointed to by
 @var{flagp}.
@@ -1521,7 +1520,7 @@ If @var{denominator} is zero, @code{fmod} signals a domain error.
 @comment math.h
 @comment BSD
 @deftypefunx {long double} dreml (long double @var{numerator}, long double @var{denominator})
-These functions are like @code{fmod} except that they rounds the
+These functions are like @code{fmod} except that they round the
 internal quotient @var{n} to the nearest integer instead of towards zero
 to an integer.  For example, @code{drem (6.5, 2.3)} returns @code{-0.4},
 which is @code{6.5} minus @code{6.9}.
diff --git a/manual/errno.texi b/manual/errno.texi
index 7d7ed1328a..fcba26750e 100644
--- a/manual/errno.texi
+++ b/manual/errno.texi
@@ -1494,7 +1494,7 @@ can be customized by defining a variable named
 
 @comment error.h
 @comment GNU
-@deftypevar {void (*} error_print_progname ) (void)
+@deftypevar {void (*) error_print_progname } (void)
 If the @code{error_print_progname} variable is defined to a non-zero
 value the function pointed to is called by @code{error} or
 @code{error_at_line}.  It is expected to print the program name or do
diff --git a/manual/libc.texinfo b/manual/libc.texinfo
index 232bb89060..864fe7e31e 100644
--- a/manual/libc.texinfo
+++ b/manual/libc.texinfo
@@ -18,9 +18,9 @@
 @comment %**end of header (This is for running Texinfo on a region.)
 
 @c sold 0.06/1.09, print run out 21may96
-@set EDITION 0.11
-@set VERSION 2.6
-@set UPDATED 2006-12-03
+@set EDITION 0.12
+@set VERSION 2.8
+@set UPDATED 2007-10-27
 @set ISBN 1-882114-55-8
 
 @copying
diff --git a/manual/process.texi b/manual/process.texi
index c17c4b0eab..1946793dec 100644
--- a/manual/process.texi
+++ b/manual/process.texi
@@ -277,7 +277,7 @@ a file as a process image.  You can use these functions to make a child
 process execute a new program after it has been forked.
 
 To see the effects of @code{exec} from the point of view of the called
-program, @xref{Program Basics}.
+program, see @ref{Program Basics}.
 
 @pindex unistd.h
 The functions in this family differ in how you specify the arguments,
diff --git a/manual/socket.texi b/manual/socket.texi
index f2f62adc4f..25f45a17f1 100644
--- a/manual/socket.texi
+++ b/manual/socket.texi
@@ -2070,7 +2070,7 @@ access to connect to the socket.
 
 @comment sys/socket.h
 @comment BSD
-@deftypefun int listen (int @var{socket}, unsigned int @var{n})
+@deftypefun int listen (int @var{socket}, int @var{n})
 The @code{listen} function enables the socket @var{socket} to accept
 connections, thus making it a server socket.
 
diff --git a/manual/startup.texi b/manual/startup.texi
index 79c79683f7..bccc708667 100644
--- a/manual/startup.texi
+++ b/manual/startup.texi
@@ -31,7 +31,7 @@ system, and telling the system the program is done.
 
 A program starts another program with the @code{exec} family of system calls.
 This chapter looks at program startup from the execee's point of view.  To
-see the event from the execor's point of view, @xref{Executing a File}.
+see the event from the execor's point of view, see @ref{Executing a File}.
 
 @menu
 * Program Arguments::           Parsing your program's command-line arguments.
@@ -309,9 +309,9 @@ character, since this is assumed to terminate the string.
 
 The value of an environment variable can be accessed with the
 @code{getenv} function.  This is declared in the header file
-@file{stdlib.h}.  All of the following functions can be safely used in
-multi-threaded programs.  It is made sure that concurrent modifications
-to the environment do not lead to errors.
+@file{stdlib.h}.  Modifications of enviroment variables are not
+allowed in Multi-threaded programs.  The @code{getenv} function
+can be safely used in multi-threaded programs
 @pindex stdlib.h
 
 @comment stdlib.h
diff --git a/manual/stdio.texi b/manual/stdio.texi
index a39262cbc6..6748513549 100644
--- a/manual/stdio.texi
+++ b/manual/stdio.texi
@@ -3907,7 +3907,7 @@ In GNU C, there is a special construct you can use to let the compiler
 know that a function uses a @code{scanf}-style format string.  Then it
 can check the number and types of arguments in each call to the
 function, and warn you when they do not match the format string.
-For details, @xref{Function Attributes, , Declaring Attributes of Functions,
+For details, see @ref{Function Attributes, , Declaring Attributes of Functions,
 gcc.info, Using GNU CC}.
 
 @node EOF and Errors
diff --git a/manual/sysinfo.texi b/manual/sysinfo.texi
index 8f2dd451be..bf8b138dad 100644
--- a/manual/sysinfo.texi
+++ b/manual/sysinfo.texi
@@ -78,7 +78,7 @@ canonical FQDN.
 
 In some contexts, the host name is called a ``node name.''
 
-For more information on DNS host naming, @xref{Host Names}.
+For more information on DNS host naming, see @ref{Host Names}.
 
 @pindex hostname
 @pindex hostid
@@ -1066,8 +1066,7 @@ The symbols used in this section are declared in the file @file{sysctl.h}.
 
 @comment sysctl.h
 @comment BSD
-@deftypefun int sysctl (int *@var{names}, int @var{nlen}, void *@var{oldval},
-        size_t *@var{oldlenp}, void *@var{newval}, size_t @var{newlen})
+@deftypefun int sysctl (int *@var{names}, int @var{nlen}, void *@var{oldval}, size_t *@var{oldlenp}, void *@var{newval}, size_t @var{newlen})
 
 @code{sysctl} gets or sets a specified system parameter.  There are so
 many of these parameters that it is not practical to list them all here,
diff --git a/manual/syslog.texi b/manual/syslog.texi
index 3d7def83f7..02c8e28a7a 100644
--- a/manual/syslog.texi
+++ b/manual/syslog.texi
@@ -90,7 +90,7 @@ more meaning than the system administrator gives to it.
 @item priority
 This tells how important the content of the message is.  Examples of
 defined priority values are: debug, informational, warning, critical.
-For the complete list, @xref{syslog; vsyslog}.  Except for
+For the complete list, see @ref{syslog; vsyslog}.  Except for
 the fact that the priorities have a defined order, the meaning of each
 of these priorities is entirely determined by the system administrator.
 
diff --git a/manual/texinfo.tex b/manual/texinfo.tex
index c93912a055..c49e670b02 100644
--- a/manual/texinfo.tex
+++ b/manual/texinfo.tex
@@ -3,16 +3,16 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2004-11-25.16}
+\def\texinfoversion{2007-09-03.05}
 %
-% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-% Foundation, Inc.
+% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 2007,
+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+% 2007 Free Software Foundation, Inc.
 %
-% This texinfo.tex file is free software; you can redistribute it and/or
+% This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
-% published by the Free Software Foundation; either version 2, or (at
-% your option) any later version.
+% published by the Free Software Foundation, either version 3 of the
+% License, or (at your option) any later version.
 %
 % This texinfo.tex file is distributed in the hope that it will be
 % useful, but WITHOUT ANY WARRANTY; without even the implied warranty
@@ -20,9 +20,7 @@
 % General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this texinfo.tex file; see the file COPYING.  If not, write
-% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 %
 % As a special exception, when this file is read by TeX when processing
 % a Texinfo source document, you may use the result without
@@ -67,7 +65,7 @@
 \everyjob{\message{[Texinfo version \texinfoversion]}%
   \catcode`+=\active \catcode`\_=\active}
 
-\message{Basics,}
+
 \chardef\other=12
 
 % We never want plain's \outer definition of \+ in Texinfo.
@@ -153,20 +151,22 @@
 \ifx\putwordDefopt\undefined    \gdef\putwordDefopt{User Option}\fi
 \ifx\putwordDeffunc\undefined   \gdef\putwordDeffunc{Function}\fi
 
-% In some macros, we cannot use the `\? notation---the left quote is
-% in some cases the escape char.
+% Since the category of space is not known, we have to be careful.
+\chardef\spacecat = 10
+\def\spaceisspace{\catcode`\ =\spacecat}
+
+% sometimes characters are active, so we need control sequences.
 \chardef\colonChar = `\:
 \chardef\commaChar = `\,
+\chardef\dashChar  = `\-
 \chardef\dotChar   = `\.
 \chardef\exclamChar= `\!
+\chardef\lquoteChar= `\`
 \chardef\questChar = `\?
+\chardef\rquoteChar= `\'
 \chardef\semiChar  = `\;
 \chardef\underChar = `\_
 
-\chardef\spaceChar = `\ %
-\chardef\spacecat = 10
-\def\spaceisspace{\catcode\spaceChar=\spacecat}
-
 % Ignore a token.
 %
 \def\gobble#1{}
@@ -277,6 +277,50 @@
 \newdimen\cornerthick \cornerthick=.3pt
 \newdimen\topandbottommargin \topandbottommargin=.75in
 
+% Output a mark which sets \thischapter, \thissection and \thiscolor.
+% We dump everything together because we only have one kind of mark.
+% This works because we only use \botmark / \topmark, not \firstmark.
+%
+% A mark contains a subexpression of the \ifcase ... \fi construct.
+% \get*marks macros below extract the needed part using \ifcase.
+%
+% Another complication is to let the user choose whether \thischapter
+% (\thissection) refers to the chapter (section) in effect at the top
+% of a page, or that at the bottom of a page.  The solution is
+% described on page 260 of The TeXbook.  It involves outputting two
+% marks for the sectioning macros, one before the section break, and
+% one after.  I won't pretend I can describe this better than DEK...
+\def\domark{%
+  \toks0=\expandafter{\lastchapterdefs}%
+  \toks2=\expandafter{\lastsectiondefs}%
+  \toks4=\expandafter{\prevchapterdefs}%
+  \toks6=\expandafter{\prevsectiondefs}%
+  \toks8=\expandafter{\lastcolordefs}%
+  \mark{%
+                   \the\toks0 \the\toks2
+      \noexpand\or \the\toks4 \the\toks6
+    \noexpand\else \the\toks8
+  }%
+}
+% \topmark doesn't work for the very first chapter (after the title
+% page or the contents), so we use \firstmark there -- this gets us
+% the mark with the chapter defs, unless the user sneaks in, e.g.,
+% @setcolor (or @url, or @link, etc.) between @contents and the very
+% first @chapter.
+\def\gettopheadingmarks{%
+  \ifcase0\topmark\fi
+  \ifx\thischapter\empty \ifcase0\firstmark\fi \fi
+}
+\def\getbottomheadingmarks{\ifcase1\botmark\fi}
+\def\getcolormarks{\ifcase2\topmark\fi}
+
+% Avoid "undefined control sequence" errors.
+\def\lastchapterdefs{}
+\def\lastsectiondefs{}
+\def\prevchapterdefs{}
+\def\prevsectiondefs{}
+\def\lastcolordefs{}
+
 % Main output routine.
 \chardef\PAGE = 255
 \output = {\onepageout{\pagecontents\PAGE}}
@@ -294,7 +338,9 @@
   %
   % Do this outside of the \shipout so @code etc. will be expanded in
   % the headline as they should be, not taken literally (outputting ''code).
+  \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
   \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
+  \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
   \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
   %
   {%
@@ -302,10 +348,14 @@
     % take effect in \write's, yet the group defined by the \vbox ends
     % before the \shipout runs.
     %
-    \escapechar = `\\     % use backslash in output files.
     \indexdummies         % don't expand commands in the output.
     \normalturnoffactive  % \ in index entries must not stay \, e.g., if
-                   % the page break happens to be in the middle of an example.
+               % the page break happens to be in the middle of an example.
+               % We don't want .vr (or whatever) entries like this:
+               % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
+               % "\acronym" won't work when it's read back in;
+               % it needs to be 
+               % {\code {{\tt \backslashcurfont }acronym}
     \shipout\vbox{%
       % Do this early so pdf references go to the beginning of the page.
       \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
@@ -333,9 +383,9 @@
       \pagebody{#1}%
       \ifdim\ht\footlinebox > 0pt
         % Only leave this space if the footline is nonempty.
-        % (We lessened \vsize for it in \oddfootingxxx.)
+        % (We lessened \vsize for it in \oddfootingyyy.)
         % The \baselineskip=24pt in plain's \makefootline has no effect.
-        \vskip 2\baselineskip
+        \vskip 24pt
         \unvbox\footlinebox
       \fi
       %
@@ -356,7 +406,7 @@
       \egroup % \vbox from first cropmarks clause
       \fi
     }% end of \shipout\vbox
-  }% end of group with \normalturnoffactive
+  }% end of group with \indexdummies
   \advancepageno
   \ifnum\outputpenalty>-20000 \else\dosupereject\fi
 }
@@ -369,7 +419,7 @@
 % marginal hacks, juha@viisa.uucp (Juha Takala)
 \ifvoid\margin\else % marginal info is present
   \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi
-\dimen@=\dp#1 \unvbox#1
+\dimen@=\dp#1\relax \unvbox#1\relax
 \ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi
 \ifr@ggedbottom \kern-\dimen@ \vfil \fi}
 }
@@ -391,7 +441,7 @@
 %
 \def\parsearg{\parseargusing{}}
 \def\parseargusing#1#2{%
-  \def\next{#2}%
+  \def\argtorun{#2}%
   \begingroup
     \obeylines
     \spaceisspace
@@ -422,8 +472,7 @@
 \def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
   \def\temp{#3}%
   \ifx\temp\empty
-    % We cannot use \next here, as it holds the macro to run;
-    % thus we reuse \temp.
+    % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
     \let\temp\finishparsearg
   \else
     \let\temp\argcheckspaces
@@ -435,14 +484,14 @@
 % If a _delimited_ argument is enclosed in braces, they get stripped; so
 % to get _exactly_ the rest of the line, we had to prevent such situation.
 % We prepended an \empty token at the very beginning and we expand it now,
-% just before passing the control to \next.
+% just before passing the control to \argtorun.
 % (Similarily, we have to think about #3 of \argcheckspacesY above: it is
 % either the null string, or it ends with \^^M---thus there is no danger
 % that a pair of braces would be stripped.
 %
 % But first, we have to remove the trailing space token.
 %
-\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}}
+\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
 
 % \parseargdef\foo{...}
 %	is roughly equivalent to
@@ -566,7 +615,7 @@
 \let\}=\myrbrace
 \begingroup
   % Definitions to produce \{ and \} commands for indices,
-  % and @{ and @} for the aux file.
+  % and @{ and @} for the aux/toc files.
   \catcode`\{ = \other \catcode`\} = \other
   \catcode`\[ = 1 \catcode`\] = 2
   \catcode`\! = 0 \catcode`\\ = \other
@@ -647,13 +696,28 @@
 \let\/=\allowbreak
 
 % @. is an end-of-sentence period.
-\def\.{.\spacefactor=3000 }
+\def\.{.\spacefactor=\endofsentencespacefactor\space}
 
 % @! is an end-of-sentence bang.
-\def\!{!\spacefactor=3000 }
+\def\!{!\spacefactor=\endofsentencespacefactor\space}
 
 % @? is an end-of-sentence query.
-\def\?{?\spacefactor=3000 }
+\def\?{?\spacefactor=\endofsentencespacefactor\space}
+
+% @frenchspacing on|off  says whether to put extra space after punctuation.
+% 
+\def\onword{on}
+\def\offword{off}
+%
+\parseargdef\frenchspacing{%
+  \def\temp{#1}%
+  \ifx\temp\onword \plainfrenchspacing
+  \else\ifx\temp\offword \plainnonfrenchspacing
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
+  \fi\fi
+}
 
 % @w prevents a word break.  Without the \leavevmode, @w at the
 % beginning of a paragraph, when TeX is still in vertical mode, would
@@ -1031,9 +1095,9 @@ where each line of input produces a line of output.}
 % _ active, and distinguish by seeing if the current family is \slfam,
 % which is what @var uses.
 {
-  \catcode\underChar = \active
+  \catcode`\_ = \active
   \gdef\mathunderscore{%
-    \catcode\underChar=\active
+    \catcode`\_=\active
     \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
   }
 }
@@ -1076,15 +1140,24 @@ where each line of input produces a line of output.}
 \def\minus{$-$}
 
 % @dots{} outputs an ellipsis using the current font.
-% We do .5em per period so that it has the same spacing in a typewriter
-% font as three actual period characters.
+% We do .5em per period so that it has the same spacing in the cm
+% typewriter fonts as three actual period characters; on the other hand,
+% in other typewriter fonts three periods are wider than 1.5em.  So do
+% whichever is larger.
 %
 \def\dots{%
   \leavevmode
-  \hbox to 1.5em{%
-    \hskip 0pt plus 0.25fil
-    .\hfil.\hfil.%
-    \hskip 0pt plus 0.5fil
+  \setbox0=\hbox{...}% get width of three periods
+  \ifdim\wd0 > 1.5em
+    \dimen0 = \wd0
+  \else
+    \dimen0 = 1.5em
+  \fi
+  \hbox to \dimen0{%
+    \hskip 0pt plus.25fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus.5fil
   }%
 }
 
@@ -1092,7 +1165,7 @@ where each line of input produces a line of output.}
 %
 \def\enddots{%
   \dots
-  \spacefactor=3000
+  \spacefactor=\endofsentencespacefactor
 }
 
 % @comma{} is so commas can be inserted into text without messing up
@@ -1176,13 +1249,134 @@ where each line of input produces a line of output.}
     \fi
   \fi
 \fi
-%
+
+% PDF uses PostScript string constants for the names of xref targets,
+% for display in the outlines, and in other places.  Thus, we have to
+% double any backslashes.  Otherwise, a name like "\node" will be
+% interpreted as a newline (\n), followed by o, d, e.  Not good.
+% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
+% (and related messages, the final outcome is that it is up to the TeX
+% user to double the backslashes and otherwise make the string valid, so
+% that's what we do).
+
+% double active backslashes.
+% 
+{\catcode`\@=0 \catcode`\\=\active
+ @gdef@activebackslashdouble{%
+   @catcode`@\=@active
+   @let\=@doublebackslash}
+}
+
+% To handle parens, we must adopt a different approach, since parens are
+% not active characters.  hyperref.dtx (which has the same problem as
+% us) handles it with this amazing macro to replace tokens, with minor
+% changes for Texinfo.  It is included here under the GPL by permission
+% from the author, Heiko Oberdiek.
+% 
+% #1 is the tokens to replace.
+% #2 is the replacement.
+% #3 is the control sequence with the string.
+% 
+\def\HyPsdSubst#1#2#3{%
+  \def\HyPsdReplace##1#1##2\END{%
+    ##1%
+    \ifx\\##2\\%
+    \else
+      #2%
+      \HyReturnAfterFi{%
+        \HyPsdReplace##2\END
+      }%
+    \fi
+  }%
+  \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
+}
+\long\def\HyReturnAfterFi#1\fi{\fi#1}
+
+% #1 is a control sequence in which to do the replacements.
+\def\backslashparens#1{%
+  \xdef#1{#1}% redefine it as its expansion; the definition is simply
+             % \lastnode when called from \setref -> \pdfmkdest.
+  \HyPsdSubst{(}{\realbackslash(}{#1}%
+  \HyPsdSubst{)}{\realbackslash)}{#1}%
+}
+
+\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
+with PDF output, and none of those formats could be found.  (.eps cannot
+be supported due to the design of the PDF format; use regular TeX (DVI
+output) for that.)}
+
 \ifpdf
-  \input pdfcolor
-  \pdfcatalog{/PageMode /UseOutlines}%
+  %
+  % Color manipulation macros based on pdfcolor.tex.
+  \def\cmykDarkRed{0.28 1 1 0.35}
+  \def\cmykBlack{0 0 0 1}
+  %
+  \def\pdfsetcolor#1{\pdfliteral{#1 k}}
+  % Set color, and create a mark which defines \thiscolor accordingly,
+  % so that \makeheadline knows which color to restore.
+  \def\setcolor#1{%
+    \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+    \domark
+    \pdfsetcolor{#1}%
+  }
+  %
+  \def\maincolor{\cmykBlack}
+  \pdfsetcolor{\maincolor}
+  \edef\thiscolor{\maincolor}
+  \def\lastcolordefs{}
+  %
+  \def\makefootline{%
+    \baselineskip24pt
+    \line{\pdfsetcolor{\maincolor}\the\footline}%
+  }
+  %
+  \def\makeheadline{%
+    \vbox to 0pt{%
+      \vskip-22.5pt
+      \line{%
+        \vbox to8.5pt{}%
+        % Extract \thiscolor definition from the marks.
+        \getcolormarks
+        % Typeset the headline with \maincolor, then restore the color.
+        \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}%
+      }%
+      \vss
+    }%
+    \nointerlineskip
+  }
+  %
+  %
+  \pdfcatalog{/PageMode /UseOutlines}
+  %
+  % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
   \def\dopdfimage#1#2#3{%
-    \def\imagewidth{#2}%
-    \def\imageheight{#3}%
+    \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
+    \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
+    %
+    % pdftex (and the PDF format) support .png, .jpg, .pdf (among
+    % others).  Let's try in that order.
+    \let\pdfimgext=\empty
+    \begingroup
+      \openin 1 #1.png \ifeof 1
+        \openin 1 #1.jpg \ifeof 1
+          \openin 1 #1.jpeg \ifeof 1
+            \openin 1 #1.JPG \ifeof 1
+              \openin 1 #1.pdf \ifeof 1
+                \errhelp = \nopdfimagehelp
+                \errmessage{Could not find image file #1 for pdf}%
+              \else \gdef\pdfimgext{pdf}%
+              \fi
+            \else \gdef\pdfimgext{JPG}%
+            \fi
+          \else \gdef\pdfimgext{jpeg}%
+          \fi
+        \else \gdef\pdfimgext{jpg}%
+        \fi
+      \else \gdef\pdfimgext{png}%
+      \fi
+      \closein 1
+    \endgroup
+    %
     % without \immediate, pdftex seg faults when the same image is
     % included twice.  (Version 3.14159-pre-1.0-unofficial-20010704.)
     \ifnum\pdftexversion < 14
@@ -1190,26 +1384,38 @@ where each line of input produces a line of output.}
     \else
       \immediate\pdfximage
     \fi
-      \ifx\empty\imagewidth\else width \imagewidth \fi
-      \ifx\empty\imageheight\else height \imageheight \fi
+      \ifdim \wd0 >0pt width \imagewidth \fi
+      \ifdim \wd2 >0pt height \imageheight \fi
       \ifnum\pdftexversion<13
-         #1.pdf%
+         #1.\pdfimgext
        \else
-         {#1.pdf}%
+         {#1.\pdfimgext}%
        \fi
     \ifnum\pdftexversion < 14 \else
       \pdfrefximage \pdflastximage
     \fi}
+  %
   \def\pdfmkdest#1{{%
-    % We have to set dummies so commands such as @code in a section title
-    % aren't expanded.
-    \atdummies
-    \normalturnoffactive
-    \pdfdest name{#1} xyz%
+    % We have to set dummies so commands such as @code, and characters
+    % such as \, aren't expanded when present in a section title.
+    \indexnofonts
+    \turnoffactive
+    \activebackslashdouble
+    \makevalueexpandable
+    \def\pdfdestname{#1}%
+    \backslashparens\pdfdestname
+    \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
   }}
+  %
+  % used to mark target names; must be expandable.
   \def\pdfmkpgn#1{#1}
-  \let\linkcolor = \Blue  % was Cyan, but that seems light?
-  \def\endlink{\Black\pdfendlink}
+  %
+  % by default, use a color that is dark enough to print on paper as
+  % nearly black, but still distinguishable for online viewing.
+  \def\urlcolor{\cmykDarkRed}
+  \def\linkcolor{\cmykDarkRed}
+  \def\endlink{\setcolor{\maincolor}\pdfendlink}
+  %
   % Adding outlines to PDF; macros for calculating structure of outlines
   % come from Petr Olsak
   \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
@@ -1218,20 +1424,31 @@ where each line of input produces a line of output.}
     \advance\tempnum by 1
     \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
   %
-  % #1 is the section text.  #2 is the pdf expression for the number
-  % of subentries (or empty, for subsubsections).  #3 is the node
-  % text, which might be empty if this toc entry had no
-  % corresponding node.  #4 is the page number.
+  % #1 is the section text, which is what will be displayed in the
+  % outline by the pdf viewer.  #2 is the pdf expression for the number
+  % of subentries (or empty, for subsubsections).  #3 is the node text,
+  % which might be empty if this toc entry had no corresponding node.
+  % #4 is the page number
   %
   \def\dopdfoutline#1#2#3#4{%
     % Generate a link to the node text if that exists; else, use the
     % page number.  We could generate a destination for the section
     % text in the case where a section has no node, but it doesn't
-    % seem worthwhile, since most documents are normally structured.
+    % seem worth the trouble, since most documents are normally structured.
     \def\pdfoutlinedest{#3}%
-    \ifx\pdfoutlinedest\empty \def\pdfoutlinedest{#4}\fi
+    \ifx\pdfoutlinedest\empty
+      \def\pdfoutlinedest{#4}%
+    \else
+      % Doubled backslashes in the name.
+      {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
+       \backslashparens\pdfoutlinedest}%
+    \fi
     %
-    \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{#1}%
+    % Also double the backslashes in the display string.
+    {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
+     \backslashparens\pdfoutlinetext}%
+    %
+    \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
   }
   %
   \def\pdfmakeoutlines{%
@@ -1272,7 +1489,7 @@ where each line of input produces a line of output.}
       \def\unnsecentry{\numsecentry}%
       \def\unnsubsecentry{\numsubsecentry}%
       \def\unnsubsubsecentry{\numsubsubsecentry}%
-      \input \jobname.toc
+      \readdatafile{toc}%
       %
       % Read toc second time, this time actually producing the outlines.
       % The `-' means take the \expnumber as the absolute number of
@@ -1298,41 +1515,12 @@ where each line of input produces a line of output.}
       % their "best" equivalent, based on the @documentencoding.  Right
       % now, I guess we'll just let the pdf reader have its way.
       \indexnofonts
-      \turnoffactive
-      \input \jobname.toc
+      \setupdatafile
+      \catcode`\\=\active \otherbackslash
+      \input \tocreadfilename
     \endgroup
   }
   %
-  \def\makelinks #1,{%
-    \def\params{#1}\def\E{END}%
-    \ifx\params\E
-      \let\nextmakelinks=\relax
-    \else
-      \let\nextmakelinks=\makelinks
-      \ifnum\lnkcount>0,\fi
-      \picknum{#1}%
-      \startlink attr{/Border [0 0 0]}
-        goto name{\pdfmkpgn{\the\pgn}}%
-      \linkcolor #1%
-      \advance\lnkcount by 1%
-      \endlink
-    \fi
-    \nextmakelinks
-  }
-  \def\picknum#1{\expandafter\pn#1}
-  \def\pn#1{%
-    \def\p{#1}%
-    \ifx\p\lbrace
-      \let\nextpn=\ppn
-    \else
-      \let\nextpn=\ppnn
-      \def\first{#1}
-    \fi
-    \nextpn
-  }
-  \def\ppn#1{\pgn=#1\gobble}
-  \def\ppnn{\pgn=\first}
-  \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,}
   \def\skipspaces#1{\def\PP{#1}\def\D{|}%
     \ifx\PP\D\let\nextsp\relax
     \else\let\nextsp\skipspaces
@@ -1347,11 +1535,19 @@ where each line of input produces a line of output.}
   \else
     \let \startlink \pdfstartlink
   \fi
+  % make a live url in pdf output.
   \def\pdfurl#1{%
     \begingroup
-      \normalturnoffactive\def\@{@}%
+      % it seems we really need yet another set of dummies; have not
+      % tried to figure out what each command should do in the context
+      % of @url.  for now, just make @/ a no-op, that's the only one
+      % people have actually reported a problem with.
+      % 
+      \normalturnoffactive
+      \def\@{@}%
+      \let\/=\empty
       \makevalueexpandable
-      \leavevmode\Red
+      \leavevmode\setcolor{\urlcolor}%
       \startlink attr{/Border [0 0 0]}%
         user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
     \endgroup}
@@ -1378,13 +1574,14 @@ where each line of input produces a line of output.}
     {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
   \def\pdflink#1{%
     \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
-    \linkcolor #1\endlink}
+    \setcolor{\linkcolor}#1\endlink}
   \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
 \else
   \let\pdfmkdest = \gobble
   \let\pdfurl = \gobble
   \let\endlink = \relax
-  \let\linkcolor = \relax
+  \let\setcolor = \gobble
+  \let\pdfsetcolor = \gobble
   \let\pdfmakeoutlines = \relax
 \fi  % \ifx\pdfoutput
 
@@ -1419,6 +1616,7 @@ where each line of input produces a line of output.}
 % We don't need math for this font style.
 \def\ttsl{\setfontstyle{ttsl}}
 
+
 % Default leading.
 \newdimen\textleading  \textleading = 13.2pt
 
@@ -1430,8 +1628,12 @@ where each line of input produces a line of output.}
 \def\strutheightpercent{.70833}
 \def\strutdepthpercent {.29167}
 %
+% can get a sort of poor man's double spacing by redefining this.
+\def\baselinefactor{1}
+%
 \def\setleading#1{%
-  \normalbaselineskip = #1\relax
+  \dimen0 = #1\relax
+  \normalbaselineskip = \baselinefactor\dimen0
   \normallineskip = \lineskipfactor\normalbaselineskip
   \normalbaselines
   \setbox\strutbox =\hbox{%
@@ -1440,10 +1642,277 @@ where each line of input produces a line of output.}
   }%
 }
 
+%
+% PDF CMaps.  See also LaTeX's t1.cmap.
+%
+% \cmapOT1
+\ifpdf
+  \begingroup
+    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1-0)
+%%Title: (TeX-OT1-0 TeX OT1 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+8 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<23> <26> <0023>
+<28> <3B> <0028>
+<3F> <5B> <003F>
+<5D> <5E> <005D>
+<61> <7A> <0061>
+<7B> <7C> <2013>
+endbfrange
+40 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <00660066>
+<0C> <00660069>
+<0D> <0066006C>
+<0E> <006600660069>
+<0F> <00660066006C>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<21> <0021>
+<22> <201D>
+<27> <2019>
+<3C> <00A1>
+<3D> <003D>
+<3E> <00BF>
+<5C> <201C>
+<5F> <02D9>
+<60> <2018>
+<7D> <02DD>
+<7E> <007E>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+    }\endgroup
+  \expandafter\edef\csname cmapOT1\endcsname#1{%
+    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+  }%
+%
+% \cmapOT1IT
+  \begingroup
+    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1IT-0)
+%%Title: (TeX-OT1IT-0 TeX OT1IT 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1IT)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1IT-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+8 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<25> <26> <0025>
+<28> <3B> <0028>
+<3F> <5B> <003F>
+<5D> <5E> <005D>
+<61> <7A> <0061>
+<7B> <7C> <2013>
+endbfrange
+42 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <00660066>
+<0C> <00660069>
+<0D> <0066006C>
+<0E> <006600660069>
+<0F> <00660066006C>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<21> <0021>
+<22> <201D>
+<23> <0023>
+<24> <00A3>
+<27> <2019>
+<3C> <00A1>
+<3D> <003D>
+<3E> <00BF>
+<5C> <201C>
+<5F> <02D9>
+<60> <2018>
+<7D> <02DD>
+<7E> <007E>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+    }\endgroup
+  \expandafter\edef\csname cmapOT1IT\endcsname#1{%
+    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+  }%
+%
+% \cmapOT1TT
+  \begingroup
+    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1TT-0)
+%%Title: (TeX-OT1TT-0 TeX OT1TT 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1TT)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1TT-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+5 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<21> <26> <0021>
+<28> <5F> <0028>
+<61> <7E> <0061>
+endbfrange
+32 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <2191>
+<0C> <2193>
+<0D> <0027>
+<0E> <00A1>
+<0F> <00BF>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<20> <2423>
+<27> <2019>
+<60> <2018>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+    }\endgroup
+  \expandafter\edef\csname cmapOT1TT\endcsname#1{%
+    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+  }%
+\else
+  \expandafter\let\csname cmapOT1\endcsname\gobble
+  \expandafter\let\csname cmapOT1IT\endcsname\gobble
+  \expandafter\let\csname cmapOT1TT\endcsname\gobble
+\fi
+
+
 % Set the font macro #1 to the font named #2, adding on the
 % specified font prefix (normally `cm').
-% #3 is the font's design size, #4 is a scale factor
-\def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
+% #3 is the font's design size, #4 is a scale factor, #5 is the CMap
+% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
+% empty to omit).
+\def\setfont#1#2#3#4#5{%
+  \font#1=\fontprefix#2#3 scaled #4
+  \csname cmap#5\endcsname#1%
+}
+% This is what gets called when #5 of \setfont is empty.
+\let\cmap\gobble
+
 
 % Use cm as the default font prefix.
 % To specify the font prefix, you must define \fontprefix
@@ -1468,118 +1937,297 @@ where each line of input produces a line of output.}
 \def\scshape{csc}
 \def\scbshape{csc}
 
+% Definitions for a main text size of 11pt.  This is the default in
+% Texinfo.
+% 
+\def\definetextfontsizexi{%
 % Text fonts (11.2pt, magstep1).
 \def\textnominalsize{11pt}
 \edef\mainmagstep{\magstephalf}
-\setfont\textrm\rmshape{10}{\mainmagstep}
-\setfont\texttt\ttshape{10}{\mainmagstep}
-\setfont\textbf\bfshape{10}{\mainmagstep}
-\setfont\textit\itshape{10}{\mainmagstep}
-\setfont\textsl\slshape{10}{\mainmagstep}
-\setfont\textsf\sfshape{10}{\mainmagstep}
-\setfont\textsc\scshape{10}{\mainmagstep}
-\setfont\textttsl\ttslshape{10}{\mainmagstep}
+\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
+\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
+\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
+\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
+\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
+\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
+\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
 \font\texti=cmmi10 scaled \mainmagstep
 \font\textsy=cmsy10 scaled \mainmagstep
+\def\textecsize{1095}
 
 % A few fonts for @defun names and args.
-\setfont\defbf\bfshape{10}{\magstep1}
-\setfont\deftt\ttshape{10}{\magstep1}
-\setfont\defttsl\ttslshape{10}{\magstep1}
+\setfont\defbf\bfshape{10}{\magstep1}{OT1}
+\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
+\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
 \def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
 
 % Fonts for indices, footnotes, small examples (9pt).
 \def\smallnominalsize{9pt}
-\setfont\smallrm\rmshape{9}{1000}
-\setfont\smalltt\ttshape{9}{1000}
-\setfont\smallbf\bfshape{10}{900}
-\setfont\smallit\itshape{9}{1000}
-\setfont\smallsl\slshape{9}{1000}
-\setfont\smallsf\sfshape{9}{1000}
-\setfont\smallsc\scshape{10}{900}
-\setfont\smallttsl\ttslshape{10}{900}
+\setfont\smallrm\rmshape{9}{1000}{OT1}
+\setfont\smalltt\ttshape{9}{1000}{OT1TT}
+\setfont\smallbf\bfshape{10}{900}{OT1}
+\setfont\smallit\itshape{9}{1000}{OT1IT}
+\setfont\smallsl\slshape{9}{1000}{OT1}
+\setfont\smallsf\sfshape{9}{1000}{OT1}
+\setfont\smallsc\scshape{10}{900}{OT1}
+\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
 \font\smalli=cmmi9
 \font\smallsy=cmsy9
+\def\smallecsize{0900}
 
 % Fonts for small examples (8pt).
 \def\smallernominalsize{8pt}
-\setfont\smallerrm\rmshape{8}{1000}
-\setfont\smallertt\ttshape{8}{1000}
-\setfont\smallerbf\bfshape{10}{800}
-\setfont\smallerit\itshape{8}{1000}
-\setfont\smallersl\slshape{8}{1000}
-\setfont\smallersf\sfshape{8}{1000}
-\setfont\smallersc\scshape{10}{800}
-\setfont\smallerttsl\ttslshape{10}{800}
+\setfont\smallerrm\rmshape{8}{1000}{OT1}
+\setfont\smallertt\ttshape{8}{1000}{OT1TT}
+\setfont\smallerbf\bfshape{10}{800}{OT1}
+\setfont\smallerit\itshape{8}{1000}{OT1IT}
+\setfont\smallersl\slshape{8}{1000}{OT1}
+\setfont\smallersf\sfshape{8}{1000}{OT1}
+\setfont\smallersc\scshape{10}{800}{OT1}
+\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
 \font\smalleri=cmmi8
 \font\smallersy=cmsy8
+\def\smallerecsize{0800}
 
 % Fonts for title page (20.4pt):
 \def\titlenominalsize{20pt}
-\setfont\titlerm\rmbshape{12}{\magstep3}
-\setfont\titleit\itbshape{10}{\magstep4}
-\setfont\titlesl\slbshape{10}{\magstep4}
-\setfont\titlett\ttbshape{12}{\magstep3}
-\setfont\titlettsl\ttslshape{10}{\magstep4}
-\setfont\titlesf\sfbshape{17}{\magstep1}
+\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
+\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
+\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
+\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
+\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
+\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
 \let\titlebf=\titlerm
-\setfont\titlesc\scbshape{10}{\magstep4}
+\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
 \font\titlei=cmmi12 scaled \magstep3
 \font\titlesy=cmsy10 scaled \magstep4
 \def\authorrm{\secrm}
 \def\authortt{\sectt}
+\def\titleecsize{2074}
 
 % Chapter (and unnumbered) fonts (17.28pt).
 \def\chapnominalsize{17pt}
-\setfont\chaprm\rmbshape{12}{\magstep2}
-\setfont\chapit\itbshape{10}{\magstep3}
-\setfont\chapsl\slbshape{10}{\magstep3}
-\setfont\chaptt\ttbshape{12}{\magstep2}
-\setfont\chapttsl\ttslshape{10}{\magstep3}
-\setfont\chapsf\sfbshape{17}{1000}
+\setfont\chaprm\rmbshape{12}{\magstep2}{OT1}
+\setfont\chapit\itbshape{10}{\magstep3}{OT1IT}
+\setfont\chapsl\slbshape{10}{\magstep3}{OT1}
+\setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT}
+\setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT}
+\setfont\chapsf\sfbshape{17}{1000}{OT1}
 \let\chapbf=\chaprm
-\setfont\chapsc\scbshape{10}{\magstep3}
+\setfont\chapsc\scbshape{10}{\magstep3}{OT1}
 \font\chapi=cmmi12 scaled \magstep2
 \font\chapsy=cmsy10 scaled \magstep3
+\def\chapecsize{1728}
 
 % Section fonts (14.4pt).
 \def\secnominalsize{14pt}
-\setfont\secrm\rmbshape{12}{\magstep1}
-\setfont\secit\itbshape{10}{\magstep2}
-\setfont\secsl\slbshape{10}{\magstep2}
-\setfont\sectt\ttbshape{12}{\magstep1}
-\setfont\secttsl\ttslshape{10}{\magstep2}
-\setfont\secsf\sfbshape{12}{\magstep1}
+\setfont\secrm\rmbshape{12}{\magstep1}{OT1}
+\setfont\secit\itbshape{10}{\magstep2}{OT1IT}
+\setfont\secsl\slbshape{10}{\magstep2}{OT1}
+\setfont\sectt\ttbshape{12}{\magstep1}{OT1TT}
+\setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT}
+\setfont\secsf\sfbshape{12}{\magstep1}{OT1}
 \let\secbf\secrm
-\setfont\secsc\scbshape{10}{\magstep2}
+\setfont\secsc\scbshape{10}{\magstep2}{OT1}
 \font\seci=cmmi12 scaled \magstep1
 \font\secsy=cmsy10 scaled \magstep2
+\def\sececsize{1440}
 
 % Subsection fonts (13.15pt).
 \def\ssecnominalsize{13pt}
-\setfont\ssecrm\rmbshape{12}{\magstephalf}
-\setfont\ssecit\itbshape{10}{1315}
-\setfont\ssecsl\slbshape{10}{1315}
-\setfont\ssectt\ttbshape{12}{\magstephalf}
-\setfont\ssecttsl\ttslshape{10}{1315}
-\setfont\ssecsf\sfbshape{12}{\magstephalf}
+\setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1}
+\setfont\ssecit\itbshape{10}{1315}{OT1IT}
+\setfont\ssecsl\slbshape{10}{1315}{OT1}
+\setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT}
+\setfont\ssecttsl\ttslshape{10}{1315}{OT1TT}
+\setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1}
 \let\ssecbf\ssecrm
-\setfont\ssecsc\scbshape{10}{1315}
+\setfont\ssecsc\scbshape{10}{1315}{OT1}
 \font\sseci=cmmi12 scaled \magstephalf
 \font\ssecsy=cmsy10 scaled 1315
+\def\ssececsize{1200}
 
 % Reduced fonts for @acro in text (10pt).
 \def\reducednominalsize{10pt}
-\setfont\reducedrm\rmshape{10}{1000}
-\setfont\reducedtt\ttshape{10}{1000}
-\setfont\reducedbf\bfshape{10}{1000}
-\setfont\reducedit\itshape{10}{1000}
-\setfont\reducedsl\slshape{10}{1000}
-\setfont\reducedsf\sfshape{10}{1000}
-\setfont\reducedsc\scshape{10}{1000}
-\setfont\reducedttsl\ttslshape{10}{1000}
+\setfont\reducedrm\rmshape{10}{1000}{OT1}
+\setfont\reducedtt\ttshape{10}{1000}{OT1TT}
+\setfont\reducedbf\bfshape{10}{1000}{OT1}
+\setfont\reducedit\itshape{10}{1000}{OT1IT}
+\setfont\reducedsl\slshape{10}{1000}{OT1}
+\setfont\reducedsf\sfshape{10}{1000}{OT1}
+\setfont\reducedsc\scshape{10}{1000}{OT1}
+\setfont\reducedttsl\ttslshape{10}{1000}{OT1TT}
 \font\reducedi=cmmi10
 \font\reducedsy=cmsy10
+\def\reducedecsize{1000}
+
+% reset the current fonts
+\textfonts
+\rm
+} % end of 11pt text font size definitions
+
+
+% Definitions to make the main text be 10pt Computer Modern, with
+% section, chapter, etc., sizes following suit.  This is for the GNU
+% Press printing of the Emacs 22 manual.  Maybe other manuals in the
+% future.  Used with @smallbook, which sets the leading to 12pt.
+% 
+\def\definetextfontsizex{%
+% Text fonts (10pt).
+\def\textnominalsize{10pt}
+\edef\mainmagstep{1000}
+\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
+\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
+\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
+\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
+\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
+\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
+\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
+\font\texti=cmmi10 scaled \mainmagstep
+\font\textsy=cmsy10 scaled \mainmagstep
+\def\textecsize{1000}
+
+% A few fonts for @defun names and args.
+\setfont\defbf\bfshape{10}{\magstephalf}{OT1}
+\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
+\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
+\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
+
+% Fonts for indices, footnotes, small examples (9pt).
+\def\smallnominalsize{9pt}
+\setfont\smallrm\rmshape{9}{1000}{OT1}
+\setfont\smalltt\ttshape{9}{1000}{OT1TT}
+\setfont\smallbf\bfshape{10}{900}{OT1}
+\setfont\smallit\itshape{9}{1000}{OT1IT}
+\setfont\smallsl\slshape{9}{1000}{OT1}
+\setfont\smallsf\sfshape{9}{1000}{OT1}
+\setfont\smallsc\scshape{10}{900}{OT1}
+\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
+\font\smalli=cmmi9
+\font\smallsy=cmsy9
+\def\smallecsize{0900}
+
+% Fonts for small examples (8pt).
+\def\smallernominalsize{8pt}
+\setfont\smallerrm\rmshape{8}{1000}{OT1}
+\setfont\smallertt\ttshape{8}{1000}{OT1TT}
+\setfont\smallerbf\bfshape{10}{800}{OT1}
+\setfont\smallerit\itshape{8}{1000}{OT1IT}
+\setfont\smallersl\slshape{8}{1000}{OT1}
+\setfont\smallersf\sfshape{8}{1000}{OT1}
+\setfont\smallersc\scshape{10}{800}{OT1}
+\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
+\font\smalleri=cmmi8
+\font\smallersy=cmsy8
+\def\smallerecsize{0800}
+
+% Fonts for title page (20.4pt):
+\def\titlenominalsize{20pt}
+\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
+\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
+\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
+\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
+\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
+\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
+\let\titlebf=\titlerm
+\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
+\font\titlei=cmmi12 scaled \magstep3
+\font\titlesy=cmsy10 scaled \magstep4
+\def\authorrm{\secrm}
+\def\authortt{\sectt}
+\def\titleecsize{2074}
+
+% Chapter fonts (14.4pt).
+\def\chapnominalsize{14pt}
+\setfont\chaprm\rmbshape{12}{\magstep1}{OT1}
+\setfont\chapit\itbshape{10}{\magstep2}{OT1IT}
+\setfont\chapsl\slbshape{10}{\magstep2}{OT1}
+\setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT}
+\setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT}
+\setfont\chapsf\sfbshape{12}{\magstep1}{OT1}
+\let\chapbf\chaprm
+\setfont\chapsc\scbshape{10}{\magstep2}{OT1}
+\font\chapi=cmmi12 scaled \magstep1
+\font\chapsy=cmsy10 scaled \magstep2
+\def\chapecsize{1440}
+
+% Section fonts (12pt).
+\def\secnominalsize{12pt}
+\setfont\secrm\rmbshape{12}{1000}{OT1}
+\setfont\secit\itbshape{10}{\magstep1}{OT1IT}
+\setfont\secsl\slbshape{10}{\magstep1}{OT1}
+\setfont\sectt\ttbshape{12}{1000}{OT1TT}
+\setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT}
+\setfont\secsf\sfbshape{12}{1000}{OT1}
+\let\secbf\secrm
+\setfont\secsc\scbshape{10}{\magstep1}{OT1}
+\font\seci=cmmi12 
+\font\secsy=cmsy10 scaled \magstep1
+\def\sececsize{1200}
+
+% Subsection fonts (10pt).
+\def\ssecnominalsize{10pt}
+\setfont\ssecrm\rmbshape{10}{1000}{OT1}
+\setfont\ssecit\itbshape{10}{1000}{OT1IT}
+\setfont\ssecsl\slbshape{10}{1000}{OT1}
+\setfont\ssectt\ttbshape{10}{1000}{OT1TT}
+\setfont\ssecttsl\ttslshape{10}{1000}{OT1TT}
+\setfont\ssecsf\sfbshape{10}{1000}{OT1}
+\let\ssecbf\ssecrm
+\setfont\ssecsc\scbshape{10}{1000}{OT1}
+\font\sseci=cmmi10
+\font\ssecsy=cmsy10
+\def\ssececsize{1000}
+
+% Reduced fonts for @acro in text (9pt).
+\def\reducednominalsize{9pt}
+\setfont\reducedrm\rmshape{9}{1000}{OT1}
+\setfont\reducedtt\ttshape{9}{1000}{OT1TT}
+\setfont\reducedbf\bfshape{10}{900}{OT1}
+\setfont\reducedit\itshape{9}{1000}{OT1IT}
+\setfont\reducedsl\slshape{9}{1000}{OT1}
+\setfont\reducedsf\sfshape{9}{1000}{OT1}
+\setfont\reducedsc\scshape{10}{900}{OT1}
+\setfont\reducedttsl\ttslshape{10}{900}{OT1TT}
+\font\reducedi=cmmi9
+\font\reducedsy=cmsy9
+\def\reducedecsize{0900}
+
+% reduce space between paragraphs
+\divide\parskip by 2
+
+% reset the current fonts
+\textfonts
+\rm
+} % end of 10pt text font size definitions
+
+
+% We provide the user-level command
+%   @fonttextsize 10
+% (or 11) to redefine the text font size.  pt is assumed.
+% 
+\def\xword{10}
+\def\xiword{11}
+%
+\parseargdef\fonttextsize{%
+  \def\textsizearg{#1}%
+  \wlog{doing @fonttextsize \textsizearg}%
+  %
+  % Set \globaldefs so that documents can use this inside @tex, since
+  % makeinfo 4.8 does not support it, but we need it nonetheless.
+  % 
+ \begingroup \globaldefs=1
+  \ifx\textsizearg\xword \definetextfontsizex
+  \else \ifx\textsizearg\xiword \definetextfontsizexi
+  \else
+    \errhelp=\EMsimple
+    \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'}
+  \fi\fi
+ \endgroup
+}
+
 
 % In order for the font changes to affect most math symbols and letters,
 % we have to define the \textfont of the standard families.  Since
@@ -1691,7 +2339,7 @@ where each line of input produces a line of output.}
 
 % Set up the default fonts, so we can use them for creating boxes.
 %
-\textfonts \rm
+\definetextfontsizexi
 
 % Define these so they can be easily changed for other fonts.
 \def\angleleft{$\langle$}
@@ -1701,10 +2349,10 @@ where each line of input produces a line of output.}
 \newcount\fontdepth \fontdepth=0
 
 % Fonts for short table of contents.
-\setfont\shortcontrm\rmshape{12}{1000}
-\setfont\shortcontbf\bfshape{10}{\magstep1}  % no cmb12
-\setfont\shortcontsl\slshape{12}{1000}
-\setfont\shortconttt\ttshape{12}{1000}
+\setfont\shortcontrm\rmshape{12}{1000}{OT1}
+\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1}  % no cmb12
+\setfont\shortcontsl\slshape{12}{1000}{OT1}
+\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
 
 %% Add scribe-like font environments, plus @l for inline lisp (usually sans
 %% serif) and @ii for TeX italic
@@ -1749,18 +2397,25 @@ where each line of input produces a line of output.}
 % sometimes \x has an active definition that messes things up.
 %
 \catcode`@=11
-  \def\frenchspacing{%
+  \def\plainfrenchspacing{%
     \sfcode\dotChar  =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
     \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m
+    \def\endofsentencespacefactor{1000}% for @. and friends
+  }
+  \def\plainnonfrenchspacing{%
+    \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
+    \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
+    \def\endofsentencespacefactor{3000}% for @. and friends
   }
 \catcode`@=\other
+\def\endofsentencespacefactor{3000}% default
 
 \def\t#1{%
-  {\tt \rawbackslash \frenchspacing #1}%
+  {\tt \rawbackslash \plainfrenchspacing #1}%
   \null
 }
 \def\samp#1{`\tclose{#1}'\null}
-\setfont\keyrm\rmshape{8}{1000}
+\setfont\keyrm\rmshape{8}{1000}{OT1}
 \font\keysy=cmsy9
 \def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
   \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
@@ -1768,6 +2423,7 @@ where each line of input produces a line of output.}
      \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
     \kern-0.4pt\hrule}%
   \kern-.06em\raise0.4pt\hbox{\angleright}}}}
+\def\key #1{{\nohyphenation \uppercase{#1}}\null}
 % The old definition, with no lozenge:
 %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
 \def\ctrl #1{{\tt \rawbackslash \hat}#1}
@@ -1793,7 +2449,7 @@ where each line of input produces a line of output.}
     \nohyphenation
     %
     \rawbackslash
-    \frenchspacing
+    \plainfrenchspacing
     #1%
   }%
   \null
@@ -1809,12 +2465,21 @@ where each line of input produces a line of output.}
 % and arrange explicitly to hyphenate at a dash.
 %  -- rms.
 {
-  \catcode`\-=\active
-  \catcode`\_=\active
+  \catcode`\-=\active \catcode`\_=\active
+  \catcode`\'=\active \catcode`\`=\active
   %
   \global\def\code{\begingroup
-    \catcode`\-=\active \let-\codedash
-    \catcode`\_=\active \let_\codeunder
+    \catcode\rquoteChar=\active \catcode\lquoteChar=\active
+    \let'\codequoteright \let`\codequoteleft
+    %
+    \catcode\dashChar=\active  \catcode\underChar=\active
+    \ifallowcodebreaks
+     \let-\codedash
+     \let_\codeunder
+    \else
+     \let-\realdash
+     \let_\realunder
+    \fi
     \codex
   }
 }
@@ -1834,6 +2499,28 @@ where each line of input produces a line of output.}
 }
 \def\codex #1{\tclose{#1}\endgroup}
 
+% An additional complication: the above will allow breaks after, e.g.,
+% each of the four underscores in __typeof__.  This is undesirable in
+% some manuals, especially if they don't have long identifiers in
+% general.  @allowcodebreaks provides a way to control this.
+% 
+\newif\ifallowcodebreaks  \allowcodebreakstrue
+
+\def\keywordtrue{true}
+\def\keywordfalse{false}
+
+\parseargdef\allowcodebreaks{%
+  \def\txiarg{#1}%
+  \ifx\txiarg\keywordtrue
+    \allowcodebreakstrue
+  \else\ifx\txiarg\keywordfalse
+    \allowcodebreaksfalse
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
+  \fi\fi
+}
+
 % @kbd is like @code, except that if the argument is just one @key command,
 % then @kbd has no effect.
 
@@ -1841,16 +2528,16 @@ where each line of input produces a line of output.}
 %   `example' (@kbd uses ttsl only inside of @example and friends),
 %   or `code' (@kbd uses normal tty font always).
 \parseargdef\kbdinputstyle{%
-  \def\arg{#1}%
-  \ifx\arg\worddistinct
+  \def\txiarg{#1}%
+  \ifx\txiarg\worddistinct
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
-  \else\ifx\arg\wordexample
+  \else\ifx\txiarg\wordexample
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
-  \else\ifx\arg\wordcode
+  \else\ifx\txiarg\wordcode
     \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
   \else
     \errhelp = \EMsimple
-    \errmessage{Unknown @kbdinputstyle option `\arg'}%
+    \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
   \fi\fi\fi
 }
 \def\worddistinct{distinct}
@@ -1962,7 +2649,7 @@ where each line of input produces a line of output.}
 % 
 \def\abbr#1{\doabbr #1,,\finish}
 \def\doabbr#1,#2,#3\finish{%
-  {\frenchspacing #1}%
+  {\plainfrenchspacing #1}%
   \def\temp{#2}%
   \ifx\temp\empty \else
     \space ({\unsepspaces \ignorespaces \temp \unskip})%
@@ -2000,7 +2687,7 @@ where each line of input produces a line of output.}
 \def\eurofont{%
   % We set the font at each command, rather than predefining it in
   % \textfonts and the other font-switching commands, so that
-  % installations which never need the symbold don't have to have the
+  % installations which never need the symbol don't have to have the
   % font installed.
   % 
   % There is only one designed size (nominal 10pt), so we always scale
@@ -2021,6 +2708,35 @@ where each line of input produces a line of output.}
   \thiseurofont
 }
 
+% Hacks for glyphs from the EC fonts similar to \euro.  We don't
+% use \let for the aliases, because sometimes we redefine the original
+% macro, and the alias should reflect the redefinition.
+\def\guillemetleft{{\ecfont \char"13}}
+\def\guillemotleft{\guillemetleft}
+\def\guillemetright{{\ecfont \char"14}}
+\def\guillemotright{\guillemetright}
+\def\guilsinglleft{{\ecfont \char"0E}}
+\def\guilsinglright{{\ecfont \char"0F}}
+\def\quotedblbase{{\ecfont \char"12}}
+\def\quotesinglbase{{\ecfont \char"0D}}
+%
+\def\ecfont{%
+  % We can't distinguish serif/sanserif and italic/slanted, but this
+  % is used for crude hacks anyway (like adding French and German
+  % quotes to documents typeset with CM, where we lose kerning), so
+  % hopefully nobody will notice/care.
+  \edef\ecsize{\csname\curfontsize ecsize\endcsname}%
+  \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
+  \ifx\curfontstyle\bfstylename
+    % bold:
+    \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
+  \else
+    % regular:
+    \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
+  \fi
+  \thisecfont
+}
+
 % @registeredsymbol - R in a circle.  The font for the R should really
 % be smaller yet, but lllsize is the best we can do for now.
 % Adapted from the plain.tex definition of \copyright.
@@ -2031,6 +2747,10 @@ where each line of input produces a line of output.}
     }$%
 }
 
+% @textdegree - the normal degrees sign.
+%
+\def\textdegree{$^\circ$}
+
 % Laurent Siebenmann reports \Orb undefined with:
 %  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
 % so we'll define it if necessary.
@@ -2039,6 +2759,11 @@ where each line of input produces a line of output.}
 \def\Orb{\mathhexbox20D}
 \fi
 
+% Quotes.
+\chardef\quotedblleft="5C
+\chardef\quotedblright=`\"
+\chardef\quoteleft=`\`
+\chardef\quoteright=`\'
 
 \message{page headings,}
 
@@ -2202,12 +2927,39 @@ where each line of input produces a line of output.}
   %
   % Leave some space for the footline.  Hopefully ok to assume
   % @evenfooting will not be used by itself.
-  \global\advance\pageheight by -\baselineskip
-  \global\advance\vsize by -\baselineskip
+  \global\advance\pageheight by -12pt
+  \global\advance\vsize by -12pt
 }
 
 \parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
 
+% @evenheadingmarks top     \thischapter <- chapter at the top of a page
+% @evenheadingmarks bottom  \thischapter <- chapter at the bottom of a page
+%
+% The same set of arguments for:
+%
+% @oddheadingmarks
+% @evenfootingmarks
+% @oddfootingmarks
+% @everyheadingmarks
+% @everyfootingmarks
+
+\def\evenheadingmarks{\headingmarks{even}{heading}}
+\def\oddheadingmarks{\headingmarks{odd}{heading}}
+\def\evenfootingmarks{\headingmarks{even}{footing}}
+\def\oddfootingmarks{\headingmarks{odd}{footing}}
+\def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1}
+                          \headingmarks{odd}{heading}{#1} }
+\def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1}
+                          \headingmarks{odd}{footing}{#1} }
+% #1 = even/odd, #2 = heading/footing, #3 = top/bottom.
+\def\headingmarks#1#2#3 {%
+  \expandafter\let\expandafter\temp \csname get#3headingmarks\endcsname
+  \global\expandafter\let\csname get#1#2marks\endcsname \temp
+}
+
+\everyheadingmarks bottom
+\everyfootingmarks bottom
 
 % @headings double      turns headings on for double-sided printing.
 % @headings single      turns headings on for single-sided printing.
@@ -2862,6 +3614,7 @@ where each line of input produces a line of output.}
 
 \def\doignore#1{\begingroup
   % Scan in ``verbatim'' mode:
+  \obeylines
   \catcode`\@ = \other
   \catcode`\{ = \other
   \catcode`\} = \other
@@ -2882,16 +3635,16 @@ where each line of input produces a line of output.}
   \gdef\dodoignore#1{%
     % #1 contains the command name as a string, e.g., `ifinfo'.
     %
-    % Define a command to find the next `@end #1', which must be on a line
-    % by itself.
-    \long\def\doignoretext##1^^M@end #1{\doignoretextyyy##1^^M@#1\_STOP_}%
+    % Define a command to find the next `@end #1'.
+    \long\def\doignoretext##1^^M@end #1{%
+      \doignoretextyyy##1^^M@#1\_STOP_}%
+    %
     % And this command to find another #1 command, at the beginning of a
     % line.  (Otherwise, we would consider a line `@c @ifset', for
     % example, to count as an @ifset for nesting.)
     \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
     %
     % And now expand that command.
-    \obeylines %
     \doignoretext ^^M%
   }%
 }
@@ -2921,7 +3674,12 @@ where each line of input produces a line of output.}
 }
 
 % Finish off ignored text.
-\def\enddoignore{\endgroup\ignorespaces}
+{ \obeylines%
+  % Ignore anything after the last `@end #1'; this matters in verbatim
+  % environments, where otherwise the newline after an ignored conditional
+  % would result in a blank line in the output.
+  \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
+}
 
 
 % @set VAR sets the variable VAR to an empty value.
@@ -3121,42 +3879,50 @@ where each line of input produces a line of output.}
 % we have to laboriously prevent expansion for those that we don't.
 %
 \def\indexdummies{%
+  \escapechar = `\\     % use backslash in output files.
   \def\@{@}% change to @@ when we switch to @ as escape char in index files.
   \def\ {\realbackslash\space }%
+  %
   % Need these in case \tex is in effect and \{ is a \delimiter again.
   % But can't use \lbracecmd and \rbracecmd because texindex assumes
   % braces and backslashes are used only as delimiters.
   \let\{ = \mylbrace
   \let\} = \myrbrace
   %
-  % \definedummyword defines \#1 as \realbackslash #1\space, thus
-  % effectively preventing its expansion.  This is used only for control
-  % words, not control letters, because the \space would be incorrect
-  % for control characters, but is needed to separate the control word
-  % from whatever follows.
-  %
-  % For control letters, we have \definedummyletter, which omits the
-  % space.
-  %
-  % These can be used both for control words that take an argument and
-  % those that do not.  If it is followed by {arg} in the input, then
-  % that will dutifully get written to the index (or wherever).
-  %
-  \def\definedummyword##1{%
-    \expandafter\def\csname ##1\endcsname{\realbackslash ##1\space}%
-  }%
-  \def\definedummyletter##1{%
-    \expandafter\def\csname ##1\endcsname{\realbackslash ##1}%
-  }%
-  \let\definedummyaccent\definedummyletter
+  % I don't entirely understand this, but when an index entry is
+  % generated from a macro call, the \endinput which \scanmacro inserts
+  % causes processing to be prematurely terminated.  This is,
+  % apparently, because \indexsorttmp is fully expanded, and \endinput
+  % is an expandable command.  The redefinition below makes \endinput
+  % disappear altogether for that purpose -- although logging shows that
+  % processing continues to some further point.  On the other hand, it
+  % seems \endinput does not hurt in the printed index arg, since that
+  % is still getting written without apparent harm.
+  % 
+  % Sample source (mac-idx3.tex, reported by Graham Percival to
+  % help-texinfo, 22may06):
+  % @macro funindex {WORD}
+  % @findex xyz
+  % @end macro
+  % ...
+  % @funindex commtest
+  % 
+  % The above is not enough to reproduce the bug, but it gives the flavor.
+  % 
+  % Sample whatsit resulting:
+  % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
+  % 
+  % So:
+  \let\endinput = \empty
   %
   % Do the redefinitions.
   \commondummies
 }
 
-% For the aux file, @ is the escape character.  So we want to redefine
-% everything using @ instead of \realbackslash.  When everything uses
-% @, this will be simpler.
+% For the aux and toc files, @ is the escape character.  So we want to
+% redefine everything using @ as the escape character (instead of
+% \realbackslash, still used for index files).  When everything uses @,
+% this will be simpler.
 %
 \def\atdummies{%
   \def\@{@@}%
@@ -3164,147 +3930,162 @@ where each line of input produces a line of output.}
   \let\{ = \lbraceatcmd
   \let\} = \rbraceatcmd
   %
-  % (See comments in \indexdummies.)
-  \def\definedummyword##1{%
-    \expandafter\def\csname ##1\endcsname{@##1\space}%
-  }%
-  \def\definedummyletter##1{%
-    \expandafter\def\csname ##1\endcsname{@##1}%
-  }%
-  \let\definedummyaccent\definedummyletter
-  %
   % Do the redefinitions.
   \commondummies
+  \otherbackslash
 }
 
-% Called from \indexdummies and \atdummies.  \definedummyword and
-% \definedummyletter must be defined first.
+% Called from \indexdummies and \atdummies.
 %
 \def\commondummies{%
   %
-  \normalturnoffactive
+  % \definedummyword defines \#1 as \string\#1\space, thus effectively
+  % preventing its expansion.  This is used only for control% words,
+  % not control letters, because the \space would be incorrect for
+  % control characters, but is needed to separate the control word
+  % from whatever follows.
+  %
+  % For control letters, we have \definedummyletter, which omits the
+  % space.
+  %
+  % These can be used both for control words that take an argument and
+  % those that do not.  If it is followed by {arg} in the input, then
+  % that will dutifully get written to the index (or wherever).
+  %
+  \def\definedummyword  ##1{\def##1{\string##1\space}}%
+  \def\definedummyletter##1{\def##1{\string##1}}%
+  \let\definedummyaccent\definedummyletter
   %
   \commondummiesnofonts
   %
-  \definedummyletter{_}%
+  \definedummyletter\_%
   %
   % Non-English letters.
-  \definedummyword{AA}%
-  \definedummyword{AE}%
-  \definedummyword{L}%
-  \definedummyword{OE}%
-  \definedummyword{O}%
-  \definedummyword{aa}%
-  \definedummyword{ae}%
-  \definedummyword{l}%
-  \definedummyword{oe}%
-  \definedummyword{o}%
-  \definedummyword{ss}%
-  \definedummyword{exclamdown}%
-  \definedummyword{questiondown}%
-  \definedummyword{ordf}%
-  \definedummyword{ordm}%
+  \definedummyword\AA
+  \definedummyword\AE
+  \definedummyword\L
+  \definedummyword\OE
+  \definedummyword\O
+  \definedummyword\aa
+  \definedummyword\ae
+  \definedummyword\l
+  \definedummyword\oe
+  \definedummyword\o
+  \definedummyword\ss
+  \definedummyword\exclamdown
+  \definedummyword\questiondown
+  \definedummyword\ordf
+  \definedummyword\ordm
   %
   % Although these internal commands shouldn't show up, sometimes they do.
-  \definedummyword{bf}%
-  \definedummyword{gtr}%
-  \definedummyword{hat}%
-  \definedummyword{less}%
-  \definedummyword{sf}%
-  \definedummyword{sl}%
-  \definedummyword{tclose}%
-  \definedummyword{tt}%
-  %
-  \definedummyword{LaTeX}%
-  \definedummyword{TeX}%
+  \definedummyword\bf
+  \definedummyword\gtr
+  \definedummyword\hat
+  \definedummyword\less
+  \definedummyword\sf
+  \definedummyword\sl
+  \definedummyword\tclose
+  \definedummyword\tt
+  %
+  \definedummyword\LaTeX
+  \definedummyword\TeX
   %
   % Assorted special characters.
-  \definedummyword{bullet}%
-  \definedummyword{comma}%
-  \definedummyword{copyright}%
-  \definedummyword{registeredsymbol}%
-  \definedummyword{dots}%
-  \definedummyword{enddots}%
-  \definedummyword{equiv}%
-  \definedummyword{error}%
-  \definedummyword{euro}%
-  \definedummyword{expansion}%
-  \definedummyword{minus}%
-  \definedummyword{pounds}%
-  \definedummyword{point}%
-  \definedummyword{print}%
-  \definedummyword{result}%
+  \definedummyword\bullet
+  \definedummyword\comma
+  \definedummyword\copyright
+  \definedummyword\registeredsymbol
+  \definedummyword\dots
+  \definedummyword\enddots
+  \definedummyword\equiv
+  \definedummyword\error
+  \definedummyword\euro
+  \definedummyword\guillemetleft
+  \definedummyword\guillemetright
+  \definedummyword\guilsinglleft
+  \definedummyword\guilsinglright
+  \definedummyword\expansion
+  \definedummyword\minus
+  \definedummyword\pounds
+  \definedummyword\point
+  \definedummyword\print
+  \definedummyword\quotedblbase
+  \definedummyword\quotedblleft
+  \definedummyword\quotedblright
+  \definedummyword\quoteleft
+  \definedummyword\quoteright
+  \definedummyword\quotesinglbase
+  \definedummyword\result
+  \definedummyword\textdegree
+  %
+  % We want to disable all macros so that they are not expanded by \write.
+  \macrolist
+  %
+  \normalturnoffactive
   %
   % Handle some cases of @value -- where it does not contain any
   % (non-fully-expandable) commands.
   \makevalueexpandable
-  %
-  % Normal spaces, not active ones.
-  \unsepspaces
-  %
-  % No macro expansion.
-  \turnoffmacros
 }
 
 % \commondummiesnofonts: common to \commondummies and \indexnofonts.
 %
-% Better have this without active chars.
-{
-  \catcode`\~=\other
-  \gdef\commondummiesnofonts{%
-    % Control letters and accents.
-    \definedummyletter{!}%
-    \definedummyaccent{"}%
-    \definedummyaccent{'}%
-    \definedummyletter{*}%
-    \definedummyaccent{,}%
-    \definedummyletter{.}%
-    \definedummyletter{/}%
-    \definedummyletter{:}%
-    \definedummyaccent{=}%
-    \definedummyletter{?}%
-    \definedummyaccent{^}%
-    \definedummyaccent{`}%
-    \definedummyaccent{~}%
-    \definedummyword{u}%
-    \definedummyword{v}%
-    \definedummyword{H}%
-    \definedummyword{dotaccent}%
-    \definedummyword{ringaccent}%
-    \definedummyword{tieaccent}%
-    \definedummyword{ubaraccent}%
-    \definedummyword{udotaccent}%
-    \definedummyword{dotless}%
-    %
-    % Texinfo font commands.
-    \definedummyword{b}%
-    \definedummyword{i}%
-    \definedummyword{r}%
-    \definedummyword{sc}%
-    \definedummyword{t}%
-    %
-    % Commands that take arguments.
-    \definedummyword{acronym}%
-    \definedummyword{cite}%
-    \definedummyword{code}%
-    \definedummyword{command}%
-    \definedummyword{dfn}%
-    \definedummyword{emph}%
-    \definedummyword{env}%
-    \definedummyword{file}%
-    \definedummyword{kbd}%
-    \definedummyword{key}%
-    \definedummyword{math}%
-    \definedummyword{option}%
-    \definedummyword{samp}%
-    \definedummyword{strong}%
-    \definedummyword{tie}%
-    \definedummyword{uref}%
-    \definedummyword{url}%
-    \definedummyword{var}%
-    \definedummyword{verb}%
-    \definedummyword{w}%
-  }
+\def\commondummiesnofonts{%
+  % Control letters and accents.
+  \definedummyletter\!%
+  \definedummyaccent\"%
+  \definedummyaccent\'%
+  \definedummyletter\*%
+  \definedummyaccent\,%
+  \definedummyletter\.%
+  \definedummyletter\/%
+  \definedummyletter\:%
+  \definedummyaccent\=%
+  \definedummyletter\?%
+  \definedummyaccent\^%
+  \definedummyaccent\`%
+  \definedummyaccent\~%
+  \definedummyword\u
+  \definedummyword\v
+  \definedummyword\H
+  \definedummyword\dotaccent
+  \definedummyword\ringaccent
+  \definedummyword\tieaccent
+  \definedummyword\ubaraccent
+  \definedummyword\udotaccent
+  \definedummyword\dotless
+  %
+  % Texinfo font commands.
+  \definedummyword\b
+  \definedummyword\i
+  \definedummyword\r
+  \definedummyword\sc
+  \definedummyword\t
+  %
+  % Commands that take arguments.
+  \definedummyword\acronym
+  \definedummyword\cite
+  \definedummyword\code
+  \definedummyword\command
+  \definedummyword\dfn
+  \definedummyword\emph
+  \definedummyword\env
+  \definedummyword\file
+  \definedummyword\kbd
+  \definedummyword\key
+  \definedummyword\math
+  \definedummyword\option
+  \definedummyword\pxref
+  \definedummyword\ref
+  \definedummyword\samp
+  \definedummyword\strong
+  \definedummyword\tie
+  \definedummyword\uref
+  \definedummyword\url
+  \definedummyword\var
+  \definedummyword\verb
+  \definedummyword\w
+  \definedummyword\xref
 }
 
 % \indexnofonts is used when outputting the strings to sort the index
@@ -3314,13 +4095,9 @@ where each line of input produces a line of output.}
 %
 \def\indexnofonts{%
   % Accent commands should become @asis.
-  \def\definedummyaccent##1{%
-    \expandafter\let\csname ##1\endcsname\asis
-  }%
+  \def\definedummyaccent##1{\let##1\asis}%
   % We can just ignore other control letters.
-  \def\definedummyletter##1{%
-    \expandafter\def\csname ##1\endcsname{}%
-  }%
+  \def\definedummyletter##1{\let##1\empty}%
   % Hopefully, all control words can become @asis.
   \let\definedummyword\definedummyaccent
   %
@@ -3367,15 +4144,35 @@ where each line of input produces a line of output.}
   \def\equiv{==}%
   \def\error{error}%
   \def\euro{euro}%
+  \def\guillemetleft{<<}%
+  \def\guillemetright{>>}%
+  \def\guilsinglleft{<}%
+  \def\guilsinglright{>}%
   \def\expansion{==>}%
   \def\minus{-}%
   \def\pounds{pounds}%
   \def\point{.}%
   \def\print{-|}%
+  \def\quotedblbase{"}%
+  \def\quotedblleft{"}%
+  \def\quotedblright{"}%
+  \def\quoteleft{`}%
+  \def\quoteright{'}%
+  \def\quotesinglbase{,}%
   \def\result{=>}%
+  \def\textdegree{degrees}%
   %
-  % Don't write macro names.
-  \emptyusermacros
+  % We need to get rid of all macros, leaving only the arguments (if present).
+  % Of course this is not nearly correct, but it is the best we can do for now.
+  % makeinfo does not expand macros in the argument to @deffn, which ends up
+  % writing an index entry, and texindex isn't prepared for an index sort entry
+  % that starts with \.
+  % 
+  % Since macro invocations are followed by braces, we can just redefine them
+  % to take a single TeX argument.  The case of a macro invocation that
+  % goes to end-of-line is not handled.
+  % 
+  \macrolist
 }
 
 \let\indexbackslash=0  %overridden during \printindex.
@@ -3403,11 +4200,7 @@ where each line of input produces a line of output.}
     %
     \edef\writeto{\csname#1indfile\endcsname}%
     %
-    \ifvmode
-      \dosubindsanitize
-    \else
-      \dosubindwrite
-    \fi
+    \safewhatsit\dosubindwrite
   }%
   \fi
 }
@@ -3422,7 +4215,6 @@ where each line of input produces a line of output.}
   %
   % Remember, we are within a group.
   \indexdummies % Must do this here, since \bf, etc expand at this stage
-  \escapechar=`\\
   \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
       % so it will be output as is; and it will print as backslash.
   %
@@ -3445,13 +4237,13 @@ where each line of input produces a line of output.}
   \temp
 }
 
-% Take care of unwanted page breaks:
+% Take care of unwanted page breaks/skips around a whatsit:
 %
 % If a skip is the last thing on the list now, preserve it
 % by backing up by \lastskip, doing the \write, then inserting
 % the skip again.  Otherwise, the whatsit generated by the
-% \write will make \lastskip zero.  The result is that sequences
-% like this:
+% \write or \pdfdest will make \lastskip zero.  The result is that
+% sequences like this:
 % @end defun
 % @tindex whatever
 % @defun ...
@@ -3475,25 +4267,31 @@ where each line of input produces a line of output.}
 %
 \edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname}
 %
+\newskip\whatsitskip
+\newcount\whatsitpenalty
+%
 % ..., ready, GO:
 %
-\def\dosubindsanitize{%
+\def\safewhatsit#1{%
+\ifhmode
+  #1%
+\else
   % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
-  \skip0 = \lastskip
+  \whatsitskip = \lastskip
   \edef\lastskipmacro{\the\lastskip}%
-  \count255 = \lastpenalty
+  \whatsitpenalty = \lastpenalty
   %
   % If \lastskip is nonzero, that means the last item was a
   % skip.  And since a skip is discardable, that means this
-  % -\skip0 glue we're inserting is preceded by a
+  % -\whatsitskip glue we're inserting is preceded by a
   % non-discardable item, therefore it is not a potential
   % breakpoint, therefore no \nobreak needed.
   \ifx\lastskipmacro\zeroskipmacro
   \else
-    \vskip-\skip0
+    \vskip-\whatsitskip
   \fi
   %
-  \dosubindwrite
+  #1%
   %
   \ifx\lastskipmacro\zeroskipmacro
     % If \lastskip was zero, perhaps the last item was a penalty, and
@@ -3507,13 +4305,14 @@ where each line of input produces a line of output.}
     %   Description.
     % would allow a break between the index-whatever whatsit
     % and the "Description." paragraph.
-    \ifnum\count255>9999 \penalty\count255 \fi
+    \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi
   \else
     % On the other hand, if we had a nonzero \lastskip,
     % this make-up glue would be preceded by a non-discardable item
     % (the whatsit from the \write), so we must insert a \nobreak.
-    \nobreak\vskip\skip0
+    \nobreak\vskip\whatsitskip
   \fi
+\fi
 }
 
 % The index entry written in the file actually looks like
@@ -3556,6 +4355,7 @@ where each line of input produces a line of output.}
   %
   \smallfonts \rm
   \tolerance = 9500
+  \plainfrenchspacing
   \everypar = {}% don't want the \kern\-parindent from indentation suppression.
   %
   % See if the index file exists and is nonempty.
@@ -3685,11 +4485,8 @@ where each line of input produces a line of output.}
     % The following is kludged to not output a line of dots in the index if
     % there are no page numbers.  The next person who breaks this will be
     % cursed by a Unix daemon.
-    \def\tempa{{\rm }}%
-    \def\tempb{#1}%
-    \edef\tempc{\tempa}%
-    \edef\tempd{\tempb}%
-    \ifx\tempc\tempd
+    \setbox\boxA = \hbox{#1}%
+    \ifdim\wd\boxA = 0pt
       \ %
     \else
       %
@@ -3713,9 +4510,9 @@ where each line of input produces a line of output.}
   \endgroup
 }
 
-% Like \dotfill except takes at least 1 em.
+% Like plain.tex's \dotfill, except uses up at least 1 em.
 \def\indexdotfill{\cleaders
-  \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill}
+  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
 
 \def\primary #1{\line{#1\hfil}}
 
@@ -3825,6 +4622,34 @@ where each line of input produces a line of output.}
 %
 % All done with double columns.
 \def\enddoublecolumns{%
+  % The following penalty ensures that the page builder is exercised
+  % _before_ we change the output routine.  This is necessary in the
+  % following situation:
+  %
+  % The last section of the index consists only of a single entry.
+  % Before this section, \pagetotal is less than \pagegoal, so no
+  % break occurs before the last section starts.  However, the last
+  % section, consisting of \initial and the single \entry, does not
+  % fit on the page and has to be broken off.  Without the following
+  % penalty the page builder will not be exercised until \eject
+  % below, and by that time we'll already have changed the output
+  % routine to the \balancecolumns version, so the next-to-last
+  % double-column page will be processed with \balancecolumns, which
+  % is wrong:  The two columns will go to the main vertical list, with
+  % the broken-off section in the recent contributions.  As soon as
+  % the output routine finishes, TeX starts reconsidering the page
+  % break.  The two columns and the broken-off section both fit on the
+  % page, because the two columns now take up only half of the page
+  % goal.  When TeX sees \eject from below which follows the final
+  % section, it invokes the new output routine that we've set after
+  % \balancecolumns below; \onepageout will try to fit the two columns
+  % and the final section into the vbox of \pageheight (see
+  % \pagebody), causing an overfull box.
+  %
+  % Note that glue won't work here, because glue does not exercise the
+  % page builder, unlike penalties (see The TeXbook, pp. 280-281).
+  \penalty0
+  %
   \output = {%
     % Split the last of the double-column material.  Leave it on the
     % current page, no automatic page break.
@@ -3934,11 +4759,15 @@ where each line of input produces a line of output.}
   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
 
-% Each @chapter defines this as the name of the chapter.
-% page headings and footings can use it.  @section does likewise.
-% However, they are not reliable, because we don't use marks.
+% Each @chapter defines these (using marks) as the number+name, number
+% and name of the chapter.  Page headings and footings can use
+% these.  @section does likewise.
 \def\thischapter{}
+\def\thischapternum{}
+\def\thischaptername{}
 \def\thissection{}
+\def\thissectionnum{}
+\def\thissectionname{}
 
 \newcount\absseclevel % used to calculate proper heading level
 \newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count
@@ -4239,7 +5068,20 @@ where each line of input produces a line of output.}
 
 \def\chapbreak{\dobreak \chapheadingskip {-4000}}
 \def\chappager{\par\vfill\supereject}
-\def\chapoddpage{\chappager \ifodd\pageno \else \hbox to 0pt{} \chappager\fi}
+% Because \domark is called before \chapoddpage, the filler page will
+% get the headings for the next chapter, which is wrong.  But we don't
+% care -- we just disable all headings on the filler page.
+\def\chapoddpage{%
+  \chappager
+  \ifodd\pageno \else
+    \begingroup
+      \evenheadline={\hfil}\evenfootline={\hfil}%
+      \oddheadline={\hfil}\oddfootline={\hfil}%
+      \hbox to 0pt{}%
+      \chappager
+    \endgroup
+  \fi
+}
 
 \def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
 
@@ -4273,41 +5115,72 @@ where each line of input produces a line of output.}
 \def\Yappendixkeyword{Yappendix}
 %
 \def\chapmacro#1#2#3{%
+  % Insert the first mark before the heading break (see notes for \domark).
+  \let\prevchapterdefs=\lastchapterdefs
+  \let\prevsectiondefs=\lastsectiondefs
+  \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
+                        \gdef\thissection{}}%
+  %
+  \def\temptype{#2}%
+  \ifx\temptype\Ynothingkeyword
+    \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+                          \gdef\thischapter{\thischaptername}}%
+  \else\ifx\temptype\Yomitfromtockeyword
+    \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+                          \gdef\thischapter{}}%
+  \else\ifx\temptype\Yappendixkeyword
+    \toks0={#1}%
+    \xdef\lastchapterdefs{%
+      \gdef\noexpand\thischaptername{\the\toks0}%
+      \gdef\noexpand\thischapternum{\appendixletter}%
+      \gdef\noexpand\thischapter{\putwordAppendix{} \noexpand\thischapternum:
+                                 \noexpand\thischaptername}%
+    }%
+  \else
+    \toks0={#1}%
+    \xdef\lastchapterdefs{%
+      \gdef\noexpand\thischaptername{\the\toks0}%
+      \gdef\noexpand\thischapternum{\the\chapno}%
+      \gdef\noexpand\thischapter{\putwordChapter{} \noexpand\thischapternum:
+                                 \noexpand\thischaptername}%
+    }%
+  \fi\fi\fi
+  %
+  % Output the mark.  Pass it through \safewhatsit, to take care of
+  % the preceding space.
+  \safewhatsit\domark
+  %
+  % Insert the chapter heading break.
   \pchapsepmacro
+  %
+  % Now the second mark, after the heading break.  No break points
+  % between here and the heading.
+  \let\prevchapterdefs=\lastchapterdefs
+  \let\prevsectiondefs=\lastsectiondefs
+  \domark
+  %
   {%
     \chapfonts \rm
     %
-    % Have to define \thissection before calling \donoderef, because the
+    % Have to define \lastsection before calling \donoderef, because the
     % xref code eventually uses it.  On the other hand, it has to be called
     % after \pchapsepmacro, or the headline will change too soon.
-    \gdef\thissection{#1}%
-    \gdef\thischaptername{#1}%
+    \gdef\lastsection{#1}%
     %
     % Only insert the separating space if we have a chapter/appendix
     % number, and don't print the unnumbered ``number''.
-    \def\temptype{#2}%
     \ifx\temptype\Ynothingkeyword
       \setbox0 = \hbox{}%
       \def\toctype{unnchap}%
-      \def\thischapter{#1}%
     \else\ifx\temptype\Yomitfromtockeyword
       \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
       \def\toctype{omit}%
-      \xdef\thischapter{}%
     \else\ifx\temptype\Yappendixkeyword
       \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
       \def\toctype{app}%
-      % We don't substitute the actual chapter name into \thischapter
-      % because we don't want its macros evaluated now.  And we don't
-      % use \thissection because that changes with each section.
-      %
-      \xdef\thischapter{\putwordAppendix{} \appendixletter:
-                        \noexpand\thischaptername}%
     \else
       \setbox0 = \hbox{#3\enspace}%
       \def\toctype{numchap}%
-      \xdef\thischapter{\putwordChapter{} \the\chapno:
-                        \noexpand\thischaptername}%
     \fi\fi\fi
     %
     % Write the toc entry for this chapter.  Must come before the
@@ -4323,6 +5196,7 @@ where each line of input produces a line of output.}
     \donoderef{#2}%
     %
     % Typeset the actual heading.
+    \nobreak % Avoid page breaks at the interline glue.
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
           \hangindent=\wd0 \centerparametersmaybe
           \unhbox0 #1\par}%
@@ -4385,45 +5259,95 @@ where each line of input produces a line of output.}
 % the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the
 % section number.
 %
+\def\seckeyword{sec}
+%
 \def\sectionheading#1#2#3#4{%
   {%
     % Switch to the right set of fonts.
     \csname #2fonts\endcsname \rm
     %
+    \def\sectionlevel{#2}%
+    \def\temptype{#3}%
+    %
+    % Insert first mark before the heading break (see notes for \domark).
+    \let\prevsectiondefs=\lastsectiondefs
+    \ifx\temptype\Ynothingkeyword
+      \ifx\sectionlevel\seckeyword
+        \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
+                              \gdef\thissection{\thissectionname}}%
+      \fi
+    \else\ifx\temptype\Yomitfromtockeyword
+      % Don't redefine \thissection.
+    \else\ifx\temptype\Yappendixkeyword
+      \ifx\sectionlevel\seckeyword
+        \toks0={#1}%
+        \xdef\lastsectiondefs{%
+          \gdef\noexpand\thissectionname{\the\toks0}%
+          \gdef\noexpand\thissectionnum{#4}%
+          \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum:
+                                     \noexpand\thissectionname}%
+        }%
+      \fi
+    \else
+      \ifx\sectionlevel\seckeyword
+        \toks0={#1}%
+        \xdef\lastsectiondefs{%
+          \gdef\noexpand\thissectionname{\the\toks0}%
+          \gdef\noexpand\thissectionnum{#4}%
+          \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum:
+                                     \noexpand\thissectionname}%
+        }%
+      \fi
+    \fi\fi\fi
+    %
+    % Output the mark.  Pass it through \safewhatsit, to take care of
+    % the preceding space.
+    \safewhatsit\domark
+    %
     % Insert space above the heading.
     \csname #2headingbreak\endcsname
     %
-    % Only insert the space after the number if we have a section number.
-    \def\sectionlevel{#2}%
-    \def\temptype{#3}%
+    % Now the second mark, after the heading break.  No break points
+    % between here and the heading.
+    \let\prevsectiondefs=\lastsectiondefs
+    \domark
     %
+    % Only insert the space after the number if we have a section number.
     \ifx\temptype\Ynothingkeyword
       \setbox0 = \hbox{}%
       \def\toctype{unn}%
-      \gdef\thissection{#1}%
+      \gdef\lastsection{#1}%
     \else\ifx\temptype\Yomitfromtockeyword
       % for @headings -- no section number, don't include in toc,
-      % and don't redefine \thissection.
+      % and don't redefine \lastsection.
       \setbox0 = \hbox{}%
       \def\toctype{omit}%
       \let\sectionlevel=\empty
     \else\ifx\temptype\Yappendixkeyword
       \setbox0 = \hbox{#4\enspace}%
       \def\toctype{app}%
-      \gdef\thissection{#1}%
+      \gdef\lastsection{#1}%
     \else
       \setbox0 = \hbox{#4\enspace}%
       \def\toctype{num}%
-      \gdef\thissection{#1}%
+      \gdef\lastsection{#1}%
     \fi\fi\fi
     %
-    % Write the toc entry (before \donoderef).  See comments in \chfplain.
+    % Write the toc entry (before \donoderef).  See comments in \chapmacro.
     \writetocentry{\toctype\sectionlevel}{#1}{#4}%
     %
     % Write the node reference (= pdf destination for pdftex).
-    % Again, see comments in \chfplain.
+    % Again, see comments in \chapmacro.
     \donoderef{#3}%
     %
+    % Interline glue will be inserted when the vbox is completed.
+    % That glue will be a valid breakpoint for the page, since it'll be
+    % preceded by a whatsit (usually from the \donoderef, or from the
+    % \writetocentry if there was no node).  We don't want to allow that
+    % break, since then the whatsits could end up on page n while the
+    % section is on page n+1, thus toc/etc. are wrong.  Debian bug 276000.
+    \nobreak
+    %
     % Output the actual section heading.
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
           \hangindent=\wd0  % zero if no section number
@@ -4482,11 +5406,11 @@ where each line of input produces a line of output.}
     \fi
     %
     \iflinks
-      \toks0 = {#2}%
-      \toks2 = \expandafter{\lastnode}%
-      \edef\temp{\write\tocfile{\realbackslash #1entry{\the\toks0}{#3}%
-                               {\the\toks2}{\noexpand\folio}}}%
-      \temp
+      {\atdummies
+       \edef\temp{%
+         \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}%
+       \temp
+      }%
     \fi
   \fi
   %
@@ -4499,6 +5423,31 @@ where each line of input produces a line of output.}
   \ifpdf \global\pdfmakepagedesttrue \fi
 }
 
+
+% These characters do not print properly in the Computer Modern roman
+% fonts, so we must take special care.  This is more or less redundant
+% with the Texinfo input format setup at the end of this file.
+% 
+\def\activecatcodes{%
+  \catcode`\"=\active
+  \catcode`\$=\active
+  \catcode`\<=\active
+  \catcode`\>=\active
+  \catcode`\\=\active
+  \catcode`\^=\active
+  \catcode`\_=\active
+  \catcode`\|=\active
+  \catcode`\~=\active
+}
+
+
+% Read the toc file, which is essentially Texinfo input.
+\def\readtocfile{%
+  \setupdatafile
+  \activecatcodes
+  \input \tocreadfilename
+}
+
 \newskip\contentsrightmargin \contentsrightmargin=1in
 \newcount\savepageno
 \newcount\lastnegativepageno \lastnegativepageno = -1
@@ -4515,29 +5464,29 @@ where each line of input produces a line of output.}
   %
   % Don't need to put `Contents' or `Short Contents' in the headline.
   % It is abundantly clear what they are.
-  \def\thischapter{}%
   \chapmacro{#1}{Yomitfromtoc}{}%
   %
   \savepageno = \pageno
   \begingroup                  % Set up to handle contents files properly.
-    \catcode`\\=0  \catcode`\{=1  \catcode`\}=2  \catcode`\@=11
-    % We can't do this, because then an actual ^ in a section
-    % title fails, e.g., @chapter ^ -- exponentiation.  --karl, 9jul97.
-    %\catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi
-    \raggedbottom             % Worry more about breakpoints than the bottom.
+    \raggedbottom              % Worry more about breakpoints than the bottom.
     \advance\hsize by -\contentsrightmargin % Don't use the full line length.
     %
     % Roman numerals for page numbers.
     \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
 }
 
+% redefined for the two-volume lispref.  We always output on
+% \jobname.toc even if this is redefined.
+% 
+\def\tocreadfilename{\jobname.toc}
 
 % Normal (long) toc.
+%
 \def\contents{%
   \startcontents{\putwordTOC}%
-    \openin 1 \jobname.toc
+    \openin 1 \tocreadfilename\space
     \ifeof 1 \else
-      \input \jobname.toc
+      \readtocfile
     \fi
     \vfill \eject
     \contentsalignmacro % in case @setchapternewpage odd is in effect
@@ -4573,9 +5522,9 @@ where each line of input produces a line of output.}
     \let\numsubsubsecentry = \numsecentry
     \let\appsubsubsecentry = \numsecentry
     \let\unnsubsubsecentry = \numsecentry
-    \openin 1 \jobname.toc
+    \openin 1 \tocreadfilename\space
     \ifeof 1 \else
-      \input \jobname.toc
+      \readtocfile
     \fi
     \closein 1
     \vfill \eject
@@ -4717,7 +5666,7 @@ where each line of input produces a line of output.}
 {\tentt \global\dimen0 = 3em}% Width of the box.
 \dimen2 = .55pt % Thickness of rules
 % The text. (`r' is open on the right, `e' somewhat less so on the left.)
-\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
+\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
 %
 \setbox\errorbox=\hbox to \dimen0{\hfil
    \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
@@ -4765,6 +5714,7 @@ where each line of input produces a line of output.}
   \let\/=\ptexslash
   \let\*=\ptexstar
   \let\t=\ptext
+  \let\frenchspacing=\plainfrenchspacing
   %
   \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
   \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
@@ -4810,7 +5760,8 @@ where each line of input produces a line of output.}
 
 \let\afterenvbreak = \aboveenvbreak
 
-% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins.
+% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins; it will
+% also clear it, so that its embedded environments do the narrowing again.
 \let\nonarrowing=\relax
 
 % @cartouche ... @end cartouche: draw rectangle w/rounded corners around
@@ -4847,7 +5798,7 @@ where each line of input produces a line of output.}
 				% each corner char, and rule thickness
   \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
   % Flag to tell @lisp, etc., not to narrow margin.
-  \let\nonarrowing=\comment
+  \let\nonarrowing = t%
   \vbox\bgroup
       \baselineskip=0pt\parskip=0pt\lineskip=0pt
       \carttop
@@ -4887,11 +5838,11 @@ where each line of input produces a line of output.}
   \parskip = 0pt
   \parindent = 0pt
   \emergencystretch = 0pt % don't try to avoid overfull boxes
-  % @cartouche defines \nonarrowing to inhibit narrowing
-  % at next level down.
   \ifx\nonarrowing\relax
     \advance \leftskip by \lispnarrowing
     \exdentamount=\lispnarrowing
+  \else
+    \let\nonarrowing = \relax
   \fi
   \let\exdent=\nofillexdent
 }
@@ -4906,12 +5857,18 @@ where each line of input produces a line of output.}
 \let\SETdispenvsize\relax
 \def\setnormaldispenv{%
   \ifx\SETdispenvsize\smallword
+    % end paragraph for sake of leading, in case document has no blank
+    % line.  This is redundant with what happens in \aboveenvbreak, but
+    % we need to do it before changing the fonts, and it's inconvenient
+    % to change the fonts afterward.
+    \ifnum \lastpenalty=10000 \else \endgraf \fi
     \smallexamplefonts \rm
   \fi
 }
 \def\setsmalldispenv{%
   \ifx\SETdispenvsize\nosmallword
   \else
+    \ifnum \lastpenalty=10000 \else \endgraf \fi
     \smallexamplefonts \rm
   \fi
 }
@@ -4938,11 +5895,10 @@ where each line of input produces a line of output.}
 %
 \maketwodispenvs {lisp}{example}{%
   \nonfillstart
-  \tt
+  \tt\quoteexpand
   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
   \gobble       % eat return
 }
-
 % @display/@smalldisplay: same as @lisp except keep current font.
 %
 \makedispenv {display}{%
@@ -4991,6 +5947,7 @@ where each line of input produces a line of output.}
     \advance\leftskip by \lispnarrowing
     \advance\rightskip by \lispnarrowing
     \exdentamount = \lispnarrowing
+  \else
     \let\nonarrowing = \relax
   \fi
   \parsearg\quotationlabel
@@ -5069,6 +6026,34 @@ where each line of input produces a line of output.}
 \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
 %
 \def\starttabbox{\setbox0=\hbox\bgroup}
+
+% Allow an option to not replace quotes with a regular directed right
+% quote/apostrophe (char 0x27), but instead use the undirected quote
+% from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
+% the default, but it works for pasting with more pdf viewers (at least
+% evince), the lilypond developers report.  xpdf does work with the
+% regular 0x27.  
+% 
+\def\codequoteright{%
+  \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
+    \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
+      '%
+    \else \char'15 \fi
+  \else \char'15 \fi
+}
+%
+% and a similar option for the left quote char vs. a grave accent.
+% Modern fonts display ASCII 0x60 as a grave accent, so some people like
+% the code environments to do likewise.
+% 
+\def\codequoteleft{%
+  \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
+    \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
+      `%
+    \else \char'22 \fi
+  \else \char'22 \fi
+}
+%
 \begingroup
   \catcode`\^^I=\active
   \gdef\tabexpand{%
@@ -5081,15 +6066,25 @@ where each line of input produces a line of output.}
       \wd0=\dimen0 \box0 \starttabbox
     }%
   }
+  \catcode`\'=\active
+  \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}%
+  %
+  \catcode`\`=\active
+  \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}%
+  %
+  \gdef\quoteexpand{\rquoteexpand \lquoteexpand}%
 \endgroup
+
+% start the verbatim environment.
 \def\setupverbatim{%
+  \let\nonarrowing = t%
   \nonfillstart
-  \advance\leftskip by -\defbodyindent
   % Easiest (and conventionally used) font for verbatim
   \tt
   \def\par{\leavevmode\egroup\box0\endgraf}%
   \catcode`\`=\active
   \tabexpand
+  \quoteexpand
   % Respect line breaks,
   % print special symbols as themselves, and
   % make each space count
@@ -5174,27 +6169,35 @@ where each line of input produces a line of output.}
   \endgroup
 }
 
+
 \message{defuns,}
 % @defun etc.
 
 \newskip\defbodyindent \defbodyindent=.4in
 \newskip\defargsindent \defargsindent=50pt
 \newskip\deflastargmargin \deflastargmargin=18pt
+\newcount\defunpenalty
 
 % Start the processing of @deffn:
 \def\startdefun{%
   \ifnum\lastpenalty<10000
     \medbreak
+    \defunpenalty=10003 % Will keep this @deffn together with the
+                        % following @def command, see below.
   \else
     % If there are two @def commands in a row, we'll have a \nobreak,
     % which is there to keep the function description together with its
     % header.  But if there's nothing but headers, we need to allow a
     % break somewhere.  Check specifically for penalty 10002, inserted
-    % by \defargscommonending, instead of 10000, since the sectioning
+    % by \printdefunline, instead of 10000, since the sectioning
     % commands also insert a nobreak penalty, and we don't want to allow
     % a break between a section heading and a defun.
-    % 
-    \ifnum\lastpenalty=10002 \penalty2000 \fi
+    %
+    % As a minor refinement, we avoid "club" headers by signalling
+    % with penalty of 10003 after the very first @deffn in the
+    % sequence (see above), and penalty of 10002 after any following
+    % @def command.
+    \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi
     %
     % Similarly, after a section heading, do not allow a break.
     % But do insert the glue.
@@ -5212,7 +6215,7 @@ where each line of input produces a line of output.}
   %
   % As above, allow line break if we have multiple x headers in a row.
   % It's not a great place, though.
-  \ifnum\lastpenalty=10002 \penalty3000 \fi
+  \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi
   %
   % And now, it's time to reuse the body of the original defun:
   \expandafter\gobbledefun#1%
@@ -5230,7 +6233,7 @@ where each line of input produces a line of output.}
     \advance\rightskip by 0pt plus 1fil
     \endgraf
     \nobreak\vskip -\parskip
-    \penalty 10002  % signal to \startdefun and \dodefunx
+    \penalty\defunpenalty  % signal to \startdefun and \dodefunx
     % Some of the @defun-type tags do not enable magic parentheses,
     % rendering the following check redundant.  But we don't optimize.
     \checkparencounts
@@ -5499,12 +6502,14 @@ where each line of input produces a line of output.}
   \ifnum\parencount=0 \else \badparencount \fi
   \ifnum\brackcount=0 \else \badbrackcount \fi
 }
+% these should not use \errmessage; the glibc manual, at least, actually
+% has such constructs (when documenting function pointers).
 \def\badparencount{%
-  \errmessage{Unbalanced parentheses in @def}%
+  \message{Warning: unbalanced parentheses in @def...}%
   \global\parencount=0
 }
 \def\badbrackcount{%
-  \errmessage{Unbalanced square braces in @def}%
+  \message{Warning: unbalanced square brackets in @def...}%
   \global\brackcount=0
 }
 
@@ -5539,7 +6544,6 @@ where each line of input produces a line of output.}
     \spaceisspace
     %
     % Append \endinput to make sure that TeX does not see the ending newline.
-    %
     % I've verified that it is necessary both for e-TeX and for ordinary TeX
     %							--kasal, 29nov03
     \scantokens{#1\endinput}%
@@ -5554,8 +6558,19 @@ where each line of input produces a line of output.}
 \newcount\paramno   % Count of parameters
 \newtoks\macname    % Macro name
 \newif\ifrecursive  % Is it recursive?
-\def\macrolist{}    % List of all defined macros in the form
-                    % \do\macro1\do\macro2...
+
+% List of all defined macros in the form
+%    \definedummyword\macro1\definedummyword\macro2...
+% Currently is also contains all @aliases; the list can be split
+% if there is a need.
+\def\macrolist{}
+
+% Add the macro to \macrolist
+\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
+\def\addtomacrolistxxx#1{%
+     \toks0 = \expandafter{\macrolist\definedummyword#1}%
+     \xdef\macrolist{\the\toks0}%
+}
 
 % Utility routines.
 % This does \let #1 = #2, with \csnames; that is,
@@ -5589,6 +6604,10 @@ where each line of input produces a line of output.}
 % all characters are catcode 10, 11 or 12, except \ which is active
 % (as in normal texinfo). It is necessary to change the definition of \.
 
+% Non-ASCII encodings make 8-bit characters active, so un-activate
+% them to avoid their expansion.  Must do this non-globally, to
+% confine the change to the current group.
+
 % It's necessary to have hard CRs when the macro is executed. This is
 % done by  making ^^M (\endlinechar) catcode 12 when reading the macro
 % body, and then making it the \newlinechar in \scanmacro.
@@ -5603,6 +6622,7 @@ where each line of input produces a line of output.}
   \catcode`\_=\other
   \catcode`\|=\other
   \catcode`\~=\other
+  \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi
 }
 
 \def\scanargctxt{%
@@ -5653,10 +6673,7 @@ where each line of input produces a line of output.}
      \else \errmessage{Macro name \the\macname\space already defined}\fi
      \global\cslet{macsave.\the\macname}{\the\macname}%
      \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
-     % Add the macroname to \macrolist
-     \toks0 = \expandafter{\macrolist\do}%
-     \xdef\macrolist{\the\toks0
-       \expandafter\noexpand\csname\the\macname\endcsname}%
+     \addtomacrolist{\the\macname}%
   \fi
   \begingroup \macrobodyctxt
   \ifrecursive \expandafter\parsermacbody
@@ -5670,7 +6687,7 @@ where each line of input produces a line of output.}
     % Remove the macro name from \macrolist:
     \begingroup
       \expandafter\let\csname#1\endcsname \relax
-      \let\do\unmacrodo
+      \let\definedummyword\unmacrodo
       \xdef\macrolist{\macrolist}%
     \endgroup
   \else
@@ -5682,10 +6699,10 @@ where each line of input produces a line of output.}
 % macro definitions that have been changed to \relax.
 %
 \def\unmacrodo#1{%
-  \ifx#1\relax
+  \ifx #1\relax
     % remove this
   \else
-    \noexpand\do \noexpand #1%
+    \noexpand\definedummyword \noexpand#1%
   \fi
 }
 
@@ -5798,30 +6815,11 @@ where each line of input produces a line of output.}
 % {.  If so it reads up to the closing }, if not, it reads the whole
 % line.  Whatever was read is then fed to the next control sequence
 % as an argument (by \parsebrace or \parsearg)
-\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx}
+\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
 \def\braceorlinexxx{%
   \ifx\nchar\bgroup\else
     \expandafter\parsearg
-  \fi \next}
-
-% We want to disable all macros during \shipout so that they are not
-% expanded by \write.
-\def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}%
-  \edef\next{\macrolist}\expandafter\endgroup\next}
-
-% For \indexnofonts, we need to get rid of all macros, leaving only the
-% arguments (if present).  Of course this is not nearly correct, but it
-% is the best we can do for now.  makeinfo does not expand macros in the
-% argument to @deffn, which ends up writing an index entry, and texindex
-% isn't prepared for an index sort entry that starts with \.
-% 
-% Since macro invocations are followed by braces, we can just redefine them
-% to take a single TeX argument.  The case of a macro invocation that
-% goes to end-of-line is not handled.
-% 
-\def\emptyusermacros{\begingroup
-  \def\do##1{\let\noexpand##1=\noexpand\asis}%
-  \edef\next{\macrolist}\expandafter\endgroup\next}
+  \fi \macnamexxx}
 
 
 % @alias.
@@ -5832,6 +6830,7 @@ where each line of input produces a line of output.}
 \def\aliasyyy #1=#2\relax{%
   {%
     \expandafter\let\obeyedspace=\empty
+    \addtomacrolist{#1}%
     \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
   }%
   \next
@@ -5841,7 +6840,6 @@ where each line of input produces a line of output.}
 \message{cross references,}
 
 \newwrite\auxfile
-
 \newif\ifhavexrefs    % True if xref values are known.
 \newif\ifwarnedxrefs  % True if we warned once that they aren't known.
 
@@ -5886,7 +6884,7 @@ where each line of input produces a line of output.}
 
 % \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
 % anchor), which consists of three parts:
-% 1) NAME-title - the current sectioning name taken from \thissection,
+% 1) NAME-title - the current sectioning name taken from \lastsection,
 %                 or the anchor name.
 % 2) NAME-snt   - section number and type, passed as the SNT arg, or
 %                 empty for anchors.
@@ -5901,16 +6899,14 @@ where each line of input produces a line of output.}
   \iflinks
     {%
       \atdummies  % preserve commands, but don't expand them
-      \turnoffactive
-      \otherbackslash
       \edef\writexrdef##1##2{%
 	\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
 	  ##1}{##2}}% these are parameters of \writexrdef
       }%
-      \toks0 = \expandafter{\thissection}%
+      \toks0 = \expandafter{\lastsection}%
       \immediate \writexrdef{title}{\the\toks0 }%
       \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
-      \writexrdef{pg}{\folio}% will be written later, during \shipout
+      \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout
     }%
   \fi
 }
@@ -5956,16 +6952,21 @@ where each line of input produces a line of output.}
   \ifpdf
     \leavevmode
     \getfilename{#4}%
-    {\turnoffactive \otherbackslash
+    {\indexnofonts
+     \turnoffactive
+     % See comments at \activebackslashdouble.
+     {\activebackslashdouble \xdef\pdfxrefdest{#1}%
+      \backslashparens\pdfxrefdest}%
+     %
      \ifnum\filenamelength>0
        \startlink attr{/Border [0 0 0]}%
-         goto file{\the\filename.pdf} name{#1}%
+         goto file{\the\filename.pdf} name{\pdfxrefdest}%
      \else
        \startlink attr{/Border [0 0 0]}%
-         goto name{\pdfmkpgn{#1}}%
+         goto name{\pdfmkpgn{\pdfxrefdest}}%
      \fi
     }%
-    \linkcolor
+    \setcolor{\linkcolor}%
   \fi
   %
   % Float references are printed completely differently: "Figure 1.2"
@@ -5976,7 +6977,6 @@ where each line of input produces a line of output.}
     % include an _ in the xref name, etc.
     \indexnofonts
     \turnoffactive
-    \otherbackslash
     \expandafter\global\expandafter\let\expandafter\Xthisreftitle
       \csname XR#1-title\endcsname
   }%
@@ -5984,7 +6984,7 @@ where each line of input produces a line of output.}
     % If the user specified the print name (third arg) to the ref,
     % print it instead of our usual "Figure 1.2".
     \ifdim\wd0 = 0pt
-      \refx{#1-snt}%
+      \refx{#1-snt}{}%
     \else
       \printedrefname
     \fi
@@ -6004,14 +7004,14 @@ where each line of input produces a line of output.}
     % is a loss.  Therefore, we give the text of the node name again, so it
     % is as if TeX is seeing it for the first time.
     \ifdim \wd1 > 0pt
-      \putwordsection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
+      \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
     \else
       % _ (for example) has to be the character _ for the purposes of the
       % control sequence corresponding to the node, but it has to expand
       % into the usual \leavevmode...\vrule stuff for purposes of
       % printing. So we \turnoffactive for the \refx-snt, back on for the
       % printing, back off for the \refx-pg.
-      {\turnoffactive \otherbackslash
+      {\turnoffactive
        % Only output a following space if the -snt ref is nonempty; for
        % @unnumbered and @anchor, it won't be.
        \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
@@ -6024,7 +7024,7 @@ where each line of input produces a line of output.}
       ,\space
       %
       % output the `page 3'.
-      \turnoffactive \otherbackslash \putwordpage\tie\refx{#1-pg}{}%
+      \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
     \fi
   \fi
   \endlink
@@ -6100,10 +7100,18 @@ where each line of input produces a line of output.}
 % collisions).  But if this is a float type, we have more work to do.
 %
 \def\xrdef#1#2{%
-  \expandafter\gdef\csname XR#1\endcsname{#2}% remember this xref value.
+  {% The node name might contain 8-bit characters, which in our current
+   % implementation are changed to commands like @'e.  Don't let these
+   % mess up the control sequence name.
+    \indexnofonts
+    \turnoffactive
+    \xdef\safexrefname{#1}%
+  }%
+  %
+  \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref
   %
   % Was that xref control sequence that we just defined for a float?
-  \expandafter\iffloat\csname XR#1\endcsname
+  \expandafter\iffloat\csname XR\safexrefname\endcsname
     % it was a float, and we have the (safe) float type in \iffloattype.
     \expandafter\let\expandafter\floatlist
       \csname floatlist\iffloattype\endcsname
@@ -6118,7 +7126,8 @@ where each line of input produces a line of output.}
     %
     % Remember this xref in the control sequence \floatlistFLOATTYPE,
     % for later use in \listoffloats.
-    \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0{#1}}%
+    \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0
+      {\safexrefname}}%
   \fi
 }
 
@@ -6127,13 +7136,13 @@ where each line of input produces a line of output.}
 \def\tryauxfile{%
   \openin 1 \jobname.aux
   \ifeof 1 \else
-    \readauxfile
+    \readdatafile{aux}%
     \global\havexrefstrue
   \fi
   \closein 1
 }
 
-\def\readauxfile{\begingroup
+\def\setupdatafile{%
   \catcode`\^^@=\other
   \catcode`\^^A=\other
   \catcode`\^^B=\other
@@ -6202,11 +7211,11 @@ where each line of input produces a line of output.}
   %
   % Make the characters 128-255 be printing characters.
   {%
-    \count 1=128
+    \count1=128
     \def\loop{%
-      \catcode\count 1=\other
-      \advance\count 1 by 1
-      \ifnum \count 1<256 \loop \fi
+      \catcode\count1=\other
+      \advance\count1 by 1
+      \ifnum \count1<256 \loop \fi
     }%
   }%
   %
@@ -6214,8 +7223,12 @@ where each line of input produces a line of output.}
   \catcode`\{=1
   \catcode`\}=2
   \catcode`\@=0
-  %
-  \input \jobname.aux
+}
+
+\def\readdatafile#1{%
+\begingroup
+  \setupdatafile
+  \input\jobname.#1
 \endgroup}
 
 
@@ -6411,7 +7424,7 @@ where each line of input produces a line of output.}
     % above and below.
     \nobreak\vskip\parskip
     \nobreak
-    \line\bgroup\hss
+    \line\bgroup
   \fi
   %
   % Output the image.
@@ -6424,7 +7437,7 @@ where each line of input produces a line of output.}
     \epsfbox{#1.eps}%
   \fi
   %
-  \ifimagevmode \hss \egroup \bigbreak \fi  % space after the image
+  \ifimagevmode \egroup \bigbreak \fi  % space after the image
 \endgroup}
 
 
@@ -6491,13 +7504,13 @@ where each line of input produces a line of output.}
       \global\advance\floatno by 1
       %
       {%
-        % This magic value for \thissection is output by \setref as the
+        % This magic value for \lastsection is output by \setref as the
         % XREFLABEL-title value.  \xrefX uses it to distinguish float
         % labels (which have a completely different output format) from
         % node and anchor labels.  And \xrdef uses it to construct the
         % lists of floats.
         %
-        \edef\thissection{\floatmagic=\safefloattype}%
+        \edef\lastsection{\floatmagic=\safefloattype}%
         \setref{\floatlabel}{Yfloat}%
       }%
     \fi
@@ -6564,7 +7577,8 @@ where each line of input produces a line of output.}
       % \floatlabel-lof.  Besides \floatident, we include the short
       % caption if specified, else the full caption if specified, else nothing.
       {%
-        \atdummies \turnoffactive \otherbackslash
+        \atdummies
+        %
         % since we read the caption text in the macro world, where ^^M
         % is turned into a normal character, we have to scan it back, so
         % we don't write the literal three characters "^^M" into the aux file.
@@ -6585,8 +7599,9 @@ where each line of input produces a line of output.}
   %
   % place the captured inserts
   %
-  % BEWARE: when the floats start float, we have to issue warning whenever an
-  % insert appears inside a float which could possibly float. --kasal, 26may04
+  % BEWARE: when the floats start floating, we have to issue warning
+  % whenever an insert appears inside a float which could possibly
+  % float. --kasal, 26may04
   %
   \checkinserts
 }
@@ -6630,7 +7645,7 @@ where each line of input produces a line of output.}
 
 % #1 is the control sequence we are passed; we expand into a conditional
 % which is true if #1 represents a float ref.  That is, the magic
-% \thissection value which we \setref above.
+% \lastsection value which we \setref above.
 %
 \def\iffloat#1{\expandafter\doiffloat#1==\finish}
 %
@@ -6691,39 +7706,871 @@ where each line of input produces a line of output.}
   \writeentry
 }}
 
+
 \message{localization,}
-% and i18n.
 
 % @documentlanguage is usually given very early, just after
 % @setfilename.  If done too late, it may not override everything
-% properly.  Single argument is the language abbreviation.
-% It would be nice if we could set up a hyphenation file here.
+% properly.  Single argument is the language (de) or locale (de_DE)
+% abbreviation.  It would be nice if we could set up a hyphenation file.
 %
-\parseargdef\documentlanguage{%
+{
+  \catcode`\_ = \active
+  \globaldefs=1
+\parseargdef\documentlanguage{\begingroup
+  \let_=\normalunderscore  % normal _ character for filenames
   \tex % read txi-??.tex file in plain TeX.
-    % Read the file if it exists.
+    % Read the file by the name they passed if it exists.
     \openin 1 txi-#1.tex
     \ifeof 1
-      \errhelp = \nolanghelp
-      \errmessage{Cannot read language file txi-#1.tex}%
+      \documentlanguagetrywithoutunderscore{#1_\finish}%
     \else
       \input txi-#1.tex
     \fi
     \closein 1
   \endgroup
+\endgroup}
 }
+%
+% If they passed de_DE, and txi-de_DE.tex doesn't exist,
+% try txi-de.tex.
+% 
+\def\documentlanguagetrywithoutunderscore#1_#2\finish{%
+  \openin 1 txi-#1.tex
+  \ifeof 1
+    \errhelp = \nolanghelp
+    \errmessage{Cannot read language file txi-#1.tex}%
+  \else
+    \input txi-#1.tex
+  \fi
+  \closein 1
+}
+%
 \newhelp\nolanghelp{The given language definition file cannot be found or
 is empty.  Maybe you need to install it?  In the current directory
 should work if nowhere else does.}
 
+% Set the catcode of characters 128 through 255 to the specified number.
+%
+\def\setnonasciicharscatcode#1{%
+   \count255=128
+   \loop\ifnum\count255<256
+      \global\catcode\count255=#1\relax
+      \advance\count255 by 1
+   \repeat
+}
 
-% @documentencoding should change something in TeX eventually, most
-% likely, but for now just recognize it.
-\let\documentencoding = \comment
+\def\setnonasciicharscatcodenonglobal#1{%
+   \count255=128
+   \loop\ifnum\count255<256
+      \catcode\count255=#1\relax
+      \advance\count255 by 1
+   \repeat
+}
 
+% @documentencoding sets the definition of non-ASCII characters
+% according to the specified encoding.
+%
+\parseargdef\documentencoding{%
+  % Encoding being declared for the document.
+  \def\declaredencoding{\csname #1.enc\endcsname}%
+  %
+  % Supported encodings: names converted to tokens in order to be able
+  % to compare them with \ifx.
+  \def\ascii{\csname US-ASCII.enc\endcsname}%
+  \def\latnine{\csname ISO-8859-15.enc\endcsname}%
+  \def\latone{\csname ISO-8859-1.enc\endcsname}%
+  \def\lattwo{\csname ISO-8859-2.enc\endcsname}%
+  \def\utfeight{\csname UTF-8.enc\endcsname}%
+  %
+  \ifx \declaredencoding \ascii
+     \asciichardefs
+  %
+  \else \ifx \declaredencoding \lattwo
+     \setnonasciicharscatcode\active
+     \lattwochardefs
+  %
+  \else \ifx \declaredencoding \latone 
+     \setnonasciicharscatcode\active
+     \latonechardefs
+  %
+  \else \ifx \declaredencoding \latnine
+     \setnonasciicharscatcode\active
+     \latninechardefs
+  %
+  \else \ifx \declaredencoding \utfeight
+     \setnonasciicharscatcode\active
+     \utfeightchardefs
+  %
+  \else 
+    \message{Unknown document encoding #1, ignoring.}%
+  %
+  \fi % utfeight
+  \fi % latnine
+  \fi % latone
+  \fi % lattwo
+  \fi % ascii
+}
+
+% A message to be logged when using a character that isn't available
+% the default font encoding (OT1).
+% 
+\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
+
+% Take account of \c (plain) vs. \, (Texinfo) difference.
+\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi}
+
+% First, make active non-ASCII characters in order for them to be
+% correctly categorized when TeX reads the replacement text of
+% macros containing the character definitions.
+\setnonasciicharscatcode\active
+%
+% Latin1 (ISO-8859-1) character definitions.
+\def\latonechardefs{%
+  \gdef^^a0{~} 
+  \gdef^^a1{\exclamdown}
+  \gdef^^a2{\missingcharmsg{CENT SIGN}} 
+  \gdef^^a3{{\pounds}}
+  \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
+  \gdef^^a5{\missingcharmsg{YEN SIGN}}
+  \gdef^^a6{\missingcharmsg{BROKEN BAR}} 
+  \gdef^^a7{\S}
+  \gdef^^a8{\"{}} 
+  \gdef^^a9{\copyright} 
+  \gdef^^aa{\ordf}
+  \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}} 
+  \gdef^^ac{$\lnot$}
+  \gdef^^ad{\-} 
+  \gdef^^ae{\registeredsymbol} 
+  \gdef^^af{\={}}
+  %
+  \gdef^^b0{\textdegree}
+  \gdef^^b1{$\pm$}
+  \gdef^^b2{$^2$}
+  \gdef^^b3{$^3$}
+  \gdef^^b4{\'{}}
+  \gdef^^b5{$\mu$}
+  \gdef^^b6{\P}
+  %
+  \gdef^^b7{$^.$}
+  \gdef^^b8{\cedilla\ }
+  \gdef^^b9{$^1$}
+  \gdef^^ba{\ordm}
+  %
+  \gdef^^bb{\missingcharmsg{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}}
+  \gdef^^bc{$1\over4$}
+  \gdef^^bd{$1\over2$}
+  \gdef^^be{$3\over4$}
+  \gdef^^bf{\questiondown}
+  %
+  \gdef^^c0{\`A}
+  \gdef^^c1{\'A}
+  \gdef^^c2{\^A}
+  \gdef^^c3{\~A}
+  \gdef^^c4{\"A}
+  \gdef^^c5{\ringaccent A} 
+  \gdef^^c6{\AE}
+  \gdef^^c7{\cedilla C}
+  \gdef^^c8{\`E}
+  \gdef^^c9{\'E}
+  \gdef^^ca{\^E}
+  \gdef^^cb{\"E}
+  \gdef^^cc{\`I}
+  \gdef^^cd{\'I}
+  \gdef^^ce{\^I}
+  \gdef^^cf{\"I}
+  %
+  \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}}
+  \gdef^^d1{\~N}
+  \gdef^^d2{\`O}
+  \gdef^^d3{\'O}
+  \gdef^^d4{\^O}
+  \gdef^^d5{\~O}
+  \gdef^^d6{\"O}
+  \gdef^^d7{$\times$}
+  \gdef^^d8{\O}
+  \gdef^^d9{\`U}
+  \gdef^^da{\'U}
+  \gdef^^db{\^U}
+  \gdef^^dc{\"U}
+  \gdef^^dd{\'Y}
+  \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}}
+  \gdef^^df{\ss}
+  %
+  \gdef^^e0{\`a}
+  \gdef^^e1{\'a}
+  \gdef^^e2{\^a}
+  \gdef^^e3{\~a}
+  \gdef^^e4{\"a}
+  \gdef^^e5{\ringaccent a}
+  \gdef^^e6{\ae}
+  \gdef^^e7{\cedilla c}
+  \gdef^^e8{\`e}
+  \gdef^^e9{\'e}
+  \gdef^^ea{\^e}
+  \gdef^^eb{\"e}
+  \gdef^^ec{\`{\dotless i}}
+  \gdef^^ed{\'{\dotless i}}
+  \gdef^^ee{\^{\dotless i}}
+  \gdef^^ef{\"{\dotless i}}
+  %
+  \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}}
+  \gdef^^f1{\~n}
+  \gdef^^f2{\`o}
+  \gdef^^f3{\'o}
+  \gdef^^f4{\^o}
+  \gdef^^f5{\~o}
+  \gdef^^f6{\"o}
+  \gdef^^f7{$\div$}
+  \gdef^^f8{\o}
+  \gdef^^f9{\`u}
+  \gdef^^fa{\'u}
+  \gdef^^fb{\^u}
+  \gdef^^fc{\"u}
+  \gdef^^fd{\'y}
+  \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}}
+  \gdef^^ff{\"y}
+}
+
+% Latin9 (ISO-8859-15) encoding character definitions.
+\def\latninechardefs{%
+  % Encoding is almost identical to Latin1.
+  \latonechardefs
+  %
+  \gdef^^a4{\euro}
+  \gdef^^a6{\v S}
+  \gdef^^a8{\v s}
+  \gdef^^b4{\v Z}
+  \gdef^^b8{\v z}
+  \gdef^^bc{\OE}
+  \gdef^^bd{\oe}
+  \gdef^^be{\"Y}
+}
+
+% Latin2 (ISO-8859-2) character definitions.
+\def\lattwochardefs{%
+  \gdef^^a0{~}
+  \gdef^^a1{\missingcharmsg{LATIN CAPITAL LETTER A WITH OGONEK}}
+  \gdef^^a2{\u{}}
+  \gdef^^a3{\L}
+  \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
+  \gdef^^a5{\v L}
+  \gdef^^a6{\'S}
+  \gdef^^a7{\S}
+  \gdef^^a8{\"{}}
+  \gdef^^a9{\v S}
+  \gdef^^aa{\cedilla S}
+  \gdef^^ab{\v T}
+  \gdef^^ac{\'Z}
+  \gdef^^ad{\-}
+  \gdef^^ae{\v Z}
+  \gdef^^af{\dotaccent Z}
+  %
+  \gdef^^b0{\textdegree}
+  \gdef^^b1{\missingcharmsg{LATIN SMALL LETTER A WITH OGONEK}}
+  \gdef^^b2{\missingcharmsg{OGONEK}}
+  \gdef^^b3{\l}
+  \gdef^^b4{\'{}}
+  \gdef^^b5{\v l}
+  \gdef^^b6{\'s}
+  \gdef^^b7{\v{}}
+  \gdef^^b8{\cedilla\ }
+  \gdef^^b9{\v s}
+  \gdef^^ba{\cedilla s}
+  \gdef^^bb{\v t}
+  \gdef^^bc{\'z}
+  \gdef^^bd{\H{}}
+  \gdef^^be{\v z}
+  \gdef^^bf{\dotaccent z}
+  %
+  \gdef^^c0{\'R}
+  \gdef^^c1{\'A}
+  \gdef^^c2{\^A}
+  \gdef^^c3{\u A}
+  \gdef^^c4{\"A}
+  \gdef^^c5{\'L}
+  \gdef^^c6{\'C}
+  \gdef^^c7{\cedilla C}
+  \gdef^^c8{\v C}
+  \gdef^^c9{\'E}
+  \gdef^^ca{\missingcharmsg{LATIN CAPITAL LETTER E WITH OGONEK}}
+  \gdef^^cb{\"E}
+  \gdef^^cc{\v E}
+  \gdef^^cd{\'I}
+  \gdef^^ce{\^I}
+  \gdef^^cf{\v D}
+  %
+  \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}}
+  \gdef^^d1{\'N}
+  \gdef^^d2{\v N}
+  \gdef^^d3{\'O}
+  \gdef^^d4{\^O}
+  \gdef^^d5{\H O}
+  \gdef^^d6{\"O}
+  \gdef^^d7{$\times$}
+  \gdef^^d8{\v R}
+  \gdef^^d9{\ringaccent U} 
+  \gdef^^da{\'U}
+  \gdef^^db{\H U}
+  \gdef^^dc{\"U}
+  \gdef^^dd{\'Y}
+  \gdef^^de{\cedilla T}
+  \gdef^^df{\ss}
+  %
+  \gdef^^e0{\'r}
+  \gdef^^e1{\'a}
+  \gdef^^e2{\^a}
+  \gdef^^e3{\u a}
+  \gdef^^e4{\"a}
+  \gdef^^e5{\'l}
+  \gdef^^e6{\'c}
+  \gdef^^e7{\cedilla c}
+  \gdef^^e8{\v c}
+  \gdef^^e9{\'e}
+  \gdef^^ea{\missingcharmsg{LATIN SMALL LETTER E WITH OGONEK}}
+  \gdef^^eb{\"e}
+  \gdef^^ec{\v e}
+  \gdef^^ed{\'\i}
+  \gdef^^ee{\^\i}
+  \gdef^^ef{\v d}
+  %
+  \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}}
+  \gdef^^f1{\'n}
+  \gdef^^f2{\v n}
+  \gdef^^f3{\'o}
+  \gdef^^f4{\^o}
+  \gdef^^f5{\H o}
+  \gdef^^f6{\"o}
+  \gdef^^f7{$\div$}
+  \gdef^^f8{\v r}
+  \gdef^^f9{\ringaccent u}
+  \gdef^^fa{\'u}
+  \gdef^^fb{\H u}
+  \gdef^^fc{\"u}
+  \gdef^^fd{\'y}
+  \gdef^^fe{\cedilla t}
+  \gdef^^ff{\dotaccent{}}
+}
+
+% UTF-8 character definitions.
+% 
+% This code to support UTF-8 is based on LaTeX's utf8.def, with some
+% changes for Texinfo conventions.  It is included here under the GPL by
+% permission from Frank Mittelbach and the LaTeX team.
+% 
+\newcount\countUTFx
+\newcount\countUTFy
+\newcount\countUTFz
 
-% Page size parameters.
+\gdef\UTFviiiTwoOctets#1#2{\expandafter
+   \UTFviiiDefined\csname u8:#1\string #2\endcsname}
 %
+\gdef\UTFviiiThreeOctets#1#2#3{\expandafter
+   \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname}
+%
+\gdef\UTFviiiFourOctets#1#2#3#4{\expandafter
+   \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname}
+
+\gdef\UTFviiiDefined#1{%
+  \ifx #1\relax
+    \message{\linenumber Unicode char \string #1 not defined for Texinfo}%
+  \else
+    \expandafter #1%
+  \fi
+}
+
+\begingroup
+  \catcode`\~13
+  \catcode`\"12
+
+  \def\UTFviiiLoop{%
+    \global\catcode\countUTFx\active
+    \uccode`\~\countUTFx
+    \uppercase\expandafter{\UTFviiiTmp}%
+    \advance\countUTFx by 1
+    \ifnum\countUTFx < \countUTFy
+      \expandafter\UTFviiiLoop
+    \fi}
+
+  \countUTFx = "C2
+  \countUTFy = "E0
+  \def\UTFviiiTmp{%
+    \xdef~{\noexpand\UTFviiiTwoOctets\string~}}
+  \UTFviiiLoop
+
+  \countUTFx = "E0
+  \countUTFy = "F0
+  \def\UTFviiiTmp{%
+    \xdef~{\noexpand\UTFviiiThreeOctets\string~}}
+  \UTFviiiLoop
+
+  \countUTFx = "F0
+  \countUTFy = "F4
+  \def\UTFviiiTmp{%
+    \xdef~{\noexpand\UTFviiiFourOctets\string~}}
+  \UTFviiiLoop
+\endgroup
+
+\begingroup
+  \catcode`\"=12
+  \catcode`\<=12
+  \catcode`\.=12
+  \catcode`\,=12
+  \catcode`\;=12
+  \catcode`\!=12
+  \catcode`\~=13
+
+  \gdef\DeclareUnicodeCharacter#1#2{%
+    \countUTFz = "#1\relax
+    \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
+    \begingroup
+      \parseXMLCharref
+      \def\UTFviiiTwoOctets##1##2{%
+        \csname u8:##1\string ##2\endcsname}%
+      \def\UTFviiiThreeOctets##1##2##3{%
+        \csname u8:##1\string ##2\string ##3\endcsname}%
+      \def\UTFviiiFourOctets##1##2##3##4{%
+        \csname u8:##1\string ##2\string ##3\string ##4\endcsname}%
+      \expandafter\expandafter\expandafter\expandafter
+       \expandafter\expandafter\expandafter
+       \gdef\UTFviiiTmp{#2}%
+    \endgroup}
+
+  \gdef\parseXMLCharref{%
+    \ifnum\countUTFz < "A0\relax
+      \errhelp = \EMsimple
+      \errmessage{Cannot define Unicode char value < 00A0}%
+    \else\ifnum\countUTFz < "800\relax
+      \parseUTFviiiA,%
+      \parseUTFviiiB C\UTFviiiTwoOctets.,%
+    \else\ifnum\countUTFz < "10000\relax
+      \parseUTFviiiA;%
+      \parseUTFviiiA,%
+      \parseUTFviiiB E\UTFviiiThreeOctets.{,;}%
+    \else
+      \parseUTFviiiA;%
+      \parseUTFviiiA,%
+      \parseUTFviiiA!%
+      \parseUTFviiiB F\UTFviiiFourOctets.{!,;}%
+    \fi\fi\fi
+  }
+
+  \gdef\parseUTFviiiA#1{%
+    \countUTFx = \countUTFz
+    \divide\countUTFz by 64
+    \countUTFy = \countUTFz
+    \multiply\countUTFz by 64
+    \advance\countUTFx by -\countUTFz
+    \advance\countUTFx by 128
+    \uccode `#1\countUTFx
+    \countUTFz = \countUTFy}
+
+  \gdef\parseUTFviiiB#1#2#3#4{%
+    \advance\countUTFz by "#10\relax
+    \uccode `#3\countUTFz
+    \uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
+\endgroup
+
+\def\utfeightchardefs{%
+  \DeclareUnicodeCharacter{00A0}{\tie}
+  \DeclareUnicodeCharacter{00A1}{\exclamdown}
+  \DeclareUnicodeCharacter{00A3}{\pounds}
+  \DeclareUnicodeCharacter{00A8}{\"{ }}
+  \DeclareUnicodeCharacter{00A9}{\copyright}
+  \DeclareUnicodeCharacter{00AA}{\ordf}
+  \DeclareUnicodeCharacter{00AB}{\guillemetleft}
+  \DeclareUnicodeCharacter{00AD}{\-}
+  \DeclareUnicodeCharacter{00AE}{\registeredsymbol}
+  \DeclareUnicodeCharacter{00AF}{\={ }}
+
+  \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
+  \DeclareUnicodeCharacter{00B4}{\'{ }}
+  \DeclareUnicodeCharacter{00B8}{\cedilla{ }}
+  \DeclareUnicodeCharacter{00BA}{\ordm}
+  \DeclareUnicodeCharacter{00BB}{\guillemetright}
+  \DeclareUnicodeCharacter{00BF}{\questiondown}
+
+  \DeclareUnicodeCharacter{00C0}{\`A}
+  \DeclareUnicodeCharacter{00C1}{\'A}
+  \DeclareUnicodeCharacter{00C2}{\^A}
+  \DeclareUnicodeCharacter{00C3}{\~A}
+  \DeclareUnicodeCharacter{00C4}{\"A}
+  \DeclareUnicodeCharacter{00C5}{\AA}
+  \DeclareUnicodeCharacter{00C6}{\AE}
+  \DeclareUnicodeCharacter{00C7}{\cedilla{C}}
+  \DeclareUnicodeCharacter{00C8}{\`E}
+  \DeclareUnicodeCharacter{00C9}{\'E}
+  \DeclareUnicodeCharacter{00CA}{\^E}
+  \DeclareUnicodeCharacter{00CB}{\"E}
+  \DeclareUnicodeCharacter{00CC}{\`I}
+  \DeclareUnicodeCharacter{00CD}{\'I}
+  \DeclareUnicodeCharacter{00CE}{\^I}
+  \DeclareUnicodeCharacter{00CF}{\"I}
+
+  \DeclareUnicodeCharacter{00D1}{\~N}
+  \DeclareUnicodeCharacter{00D2}{\`O}
+  \DeclareUnicodeCharacter{00D3}{\'O}
+  \DeclareUnicodeCharacter{00D4}{\^O}
+  \DeclareUnicodeCharacter{00D5}{\~O}
+  \DeclareUnicodeCharacter{00D6}{\"O}
+  \DeclareUnicodeCharacter{00D8}{\O}
+  \DeclareUnicodeCharacter{00D9}{\`U}
+  \DeclareUnicodeCharacter{00DA}{\'U}
+  \DeclareUnicodeCharacter{00DB}{\^U}
+  \DeclareUnicodeCharacter{00DC}{\"U}
+  \DeclareUnicodeCharacter{00DD}{\'Y}
+  \DeclareUnicodeCharacter{00DF}{\ss}
+
+  \DeclareUnicodeCharacter{00E0}{\`a}
+  \DeclareUnicodeCharacter{00E1}{\'a}
+  \DeclareUnicodeCharacter{00E2}{\^a}
+  \DeclareUnicodeCharacter{00E3}{\~a}
+  \DeclareUnicodeCharacter{00E4}{\"a}
+  \DeclareUnicodeCharacter{00E5}{\aa}
+  \DeclareUnicodeCharacter{00E6}{\ae}
+  \DeclareUnicodeCharacter{00E7}{\cedilla{c}}
+  \DeclareUnicodeCharacter{00E8}{\`e}
+  \DeclareUnicodeCharacter{00E9}{\'e}
+  \DeclareUnicodeCharacter{00EA}{\^e}
+  \DeclareUnicodeCharacter{00EB}{\"e}
+  \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}
+  \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}
+  \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
+  \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
+
+  \DeclareUnicodeCharacter{00F1}{\~n}
+  \DeclareUnicodeCharacter{00F2}{\`o}
+  \DeclareUnicodeCharacter{00F3}{\'o}
+  \DeclareUnicodeCharacter{00F4}{\^o}
+  \DeclareUnicodeCharacter{00F5}{\~o}
+  \DeclareUnicodeCharacter{00F6}{\"o}
+  \DeclareUnicodeCharacter{00F8}{\o}
+  \DeclareUnicodeCharacter{00F9}{\`u}
+  \DeclareUnicodeCharacter{00FA}{\'u}
+  \DeclareUnicodeCharacter{00FB}{\^u}
+  \DeclareUnicodeCharacter{00FC}{\"u}
+  \DeclareUnicodeCharacter{00FD}{\'y}
+  \DeclareUnicodeCharacter{00FF}{\"y}
+
+  \DeclareUnicodeCharacter{0100}{\=A}
+  \DeclareUnicodeCharacter{0101}{\=a}
+  \DeclareUnicodeCharacter{0102}{\u{A}}
+  \DeclareUnicodeCharacter{0103}{\u{a}}
+  \DeclareUnicodeCharacter{0106}{\'C}
+  \DeclareUnicodeCharacter{0107}{\'c}
+  \DeclareUnicodeCharacter{0108}{\^C}
+  \DeclareUnicodeCharacter{0109}{\^c}
+  \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
+  \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
+  \DeclareUnicodeCharacter{010C}{\v{C}}
+  \DeclareUnicodeCharacter{010D}{\v{c}}
+  \DeclareUnicodeCharacter{010E}{\v{D}}
+
+  \DeclareUnicodeCharacter{0112}{\=E}
+  \DeclareUnicodeCharacter{0113}{\=e}
+  \DeclareUnicodeCharacter{0114}{\u{E}}
+  \DeclareUnicodeCharacter{0115}{\u{e}}
+  \DeclareUnicodeCharacter{0116}{\dotaccent{E}}
+  \DeclareUnicodeCharacter{0117}{\dotaccent{e}}
+  \DeclareUnicodeCharacter{011A}{\v{E}}
+  \DeclareUnicodeCharacter{011B}{\v{e}}
+  \DeclareUnicodeCharacter{011C}{\^G}
+  \DeclareUnicodeCharacter{011D}{\^g}
+  \DeclareUnicodeCharacter{011E}{\u{G}}
+  \DeclareUnicodeCharacter{011F}{\u{g}}
+
+  \DeclareUnicodeCharacter{0120}{\dotaccent{G}}
+  \DeclareUnicodeCharacter{0121}{\dotaccent{g}}
+  \DeclareUnicodeCharacter{0124}{\^H}
+  \DeclareUnicodeCharacter{0125}{\^h}
+  \DeclareUnicodeCharacter{0128}{\~I}
+  \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
+  \DeclareUnicodeCharacter{012A}{\=I}
+  \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
+  \DeclareUnicodeCharacter{012C}{\u{I}}
+  \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
+
+  \DeclareUnicodeCharacter{0130}{\dotaccent{I}}
+  \DeclareUnicodeCharacter{0131}{\dotless{i}}
+  \DeclareUnicodeCharacter{0132}{IJ}
+  \DeclareUnicodeCharacter{0133}{ij}
+  \DeclareUnicodeCharacter{0134}{\^J}
+  \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
+  \DeclareUnicodeCharacter{0139}{\'L}
+  \DeclareUnicodeCharacter{013A}{\'l}
+
+  \DeclareUnicodeCharacter{0141}{\L}
+  \DeclareUnicodeCharacter{0142}{\l}
+  \DeclareUnicodeCharacter{0143}{\'N}
+  \DeclareUnicodeCharacter{0144}{\'n}
+  \DeclareUnicodeCharacter{0147}{\v{N}}
+  \DeclareUnicodeCharacter{0148}{\v{n}}
+  \DeclareUnicodeCharacter{014C}{\=O}
+  \DeclareUnicodeCharacter{014D}{\=o}
+  \DeclareUnicodeCharacter{014E}{\u{O}}
+  \DeclareUnicodeCharacter{014F}{\u{o}}
+
+  \DeclareUnicodeCharacter{0150}{\H{O}}
+  \DeclareUnicodeCharacter{0151}{\H{o}}
+  \DeclareUnicodeCharacter{0152}{\OE}
+  \DeclareUnicodeCharacter{0153}{\oe}
+  \DeclareUnicodeCharacter{0154}{\'R}
+  \DeclareUnicodeCharacter{0155}{\'r}
+  \DeclareUnicodeCharacter{0158}{\v{R}}
+  \DeclareUnicodeCharacter{0159}{\v{r}}
+  \DeclareUnicodeCharacter{015A}{\'S}
+  \DeclareUnicodeCharacter{015B}{\'s}
+  \DeclareUnicodeCharacter{015C}{\^S}
+  \DeclareUnicodeCharacter{015D}{\^s}
+  \DeclareUnicodeCharacter{015E}{\cedilla{S}}
+  \DeclareUnicodeCharacter{015F}{\cedilla{s}}
+
+  \DeclareUnicodeCharacter{0160}{\v{S}}
+  \DeclareUnicodeCharacter{0161}{\v{s}}
+  \DeclareUnicodeCharacter{0162}{\cedilla{t}}
+  \DeclareUnicodeCharacter{0163}{\cedilla{T}}
+  \DeclareUnicodeCharacter{0164}{\v{T}}
+
+  \DeclareUnicodeCharacter{0168}{\~U}
+  \DeclareUnicodeCharacter{0169}{\~u}
+  \DeclareUnicodeCharacter{016A}{\=U}
+  \DeclareUnicodeCharacter{016B}{\=u}
+  \DeclareUnicodeCharacter{016C}{\u{U}}
+  \DeclareUnicodeCharacter{016D}{\u{u}}
+  \DeclareUnicodeCharacter{016E}{\ringaccent{U}}
+  \DeclareUnicodeCharacter{016F}{\ringaccent{u}}
+
+  \DeclareUnicodeCharacter{0170}{\H{U}}
+  \DeclareUnicodeCharacter{0171}{\H{u}}
+  \DeclareUnicodeCharacter{0174}{\^W}
+  \DeclareUnicodeCharacter{0175}{\^w}
+  \DeclareUnicodeCharacter{0176}{\^Y}
+  \DeclareUnicodeCharacter{0177}{\^y}
+  \DeclareUnicodeCharacter{0178}{\"Y}
+  \DeclareUnicodeCharacter{0179}{\'Z}
+  \DeclareUnicodeCharacter{017A}{\'z}
+  \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}
+  \DeclareUnicodeCharacter{017C}{\dotaccent{z}}
+  \DeclareUnicodeCharacter{017D}{\v{Z}}
+  \DeclareUnicodeCharacter{017E}{\v{z}}
+
+  \DeclareUnicodeCharacter{01C4}{D\v{Z}}
+  \DeclareUnicodeCharacter{01C5}{D\v{z}}
+  \DeclareUnicodeCharacter{01C6}{d\v{z}}
+  \DeclareUnicodeCharacter{01C7}{LJ}
+  \DeclareUnicodeCharacter{01C8}{Lj}
+  \DeclareUnicodeCharacter{01C9}{lj}
+  \DeclareUnicodeCharacter{01CA}{NJ}
+  \DeclareUnicodeCharacter{01CB}{Nj}
+  \DeclareUnicodeCharacter{01CC}{nj}
+  \DeclareUnicodeCharacter{01CD}{\v{A}}
+  \DeclareUnicodeCharacter{01CE}{\v{a}}
+  \DeclareUnicodeCharacter{01CF}{\v{I}}
+
+  \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}
+  \DeclareUnicodeCharacter{01D1}{\v{O}}
+  \DeclareUnicodeCharacter{01D2}{\v{o}}
+  \DeclareUnicodeCharacter{01D3}{\v{U}}
+  \DeclareUnicodeCharacter{01D4}{\v{u}}
+
+  \DeclareUnicodeCharacter{01E2}{\={\AE}}
+  \DeclareUnicodeCharacter{01E3}{\={\ae}}
+  \DeclareUnicodeCharacter{01E6}{\v{G}}
+  \DeclareUnicodeCharacter{01E7}{\v{g}}
+  \DeclareUnicodeCharacter{01E8}{\v{K}}
+  \DeclareUnicodeCharacter{01E9}{\v{k}}
+
+  \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}
+  \DeclareUnicodeCharacter{01F1}{DZ}
+  \DeclareUnicodeCharacter{01F2}{Dz}
+  \DeclareUnicodeCharacter{01F3}{dz}
+  \DeclareUnicodeCharacter{01F4}{\'G}
+  \DeclareUnicodeCharacter{01F5}{\'g}
+  \DeclareUnicodeCharacter{01F8}{\`N}
+  \DeclareUnicodeCharacter{01F9}{\`n}
+  \DeclareUnicodeCharacter{01FC}{\'{\AE}}
+  \DeclareUnicodeCharacter{01FD}{\'{\ae}}
+  \DeclareUnicodeCharacter{01FE}{\'{\O}}
+  \DeclareUnicodeCharacter{01FF}{\'{\o}}
+
+  \DeclareUnicodeCharacter{021E}{\v{H}}
+  \DeclareUnicodeCharacter{021F}{\v{h}}
+
+  \DeclareUnicodeCharacter{0226}{\dotaccent{A}}
+  \DeclareUnicodeCharacter{0227}{\dotaccent{a}}
+  \DeclareUnicodeCharacter{0228}{\cedilla{E}}
+  \DeclareUnicodeCharacter{0229}{\cedilla{e}}
+  \DeclareUnicodeCharacter{022E}{\dotaccent{O}}
+  \DeclareUnicodeCharacter{022F}{\dotaccent{o}}
+
+  \DeclareUnicodeCharacter{0232}{\=Y}
+  \DeclareUnicodeCharacter{0233}{\=y}
+  \DeclareUnicodeCharacter{0237}{\dotless{j}}
+
+  \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
+  \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
+  \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
+  \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}
+  \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}
+  \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}
+  \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}
+  \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}
+  \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}
+  \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}
+  \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}
+  \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}
+
+  \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}
+  \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}
+
+  \DeclareUnicodeCharacter{1E20}{\=G}
+  \DeclareUnicodeCharacter{1E21}{\=g}
+  \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}
+  \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}
+  \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}
+  \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}
+  \DeclareUnicodeCharacter{1E26}{\"H}
+  \DeclareUnicodeCharacter{1E27}{\"h}
+
+  \DeclareUnicodeCharacter{1E30}{\'K}
+  \DeclareUnicodeCharacter{1E31}{\'k}
+  \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}
+  \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}
+  \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}
+  \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}
+  \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}
+  \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}
+  \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}
+  \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}
+  \DeclareUnicodeCharacter{1E3E}{\'M}
+  \DeclareUnicodeCharacter{1E3F}{\'m}
+
+  \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}
+  \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}
+  \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}
+  \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}
+  \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}
+  \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}
+  \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}
+  \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}
+  \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}
+  \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}
+
+  \DeclareUnicodeCharacter{1E54}{\'P}
+  \DeclareUnicodeCharacter{1E55}{\'p}
+  \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}
+  \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}
+  \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}
+  \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}
+  \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}
+  \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}
+  \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}
+  \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}
+
+  \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}
+  \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}
+  \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}
+  \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}
+  \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}
+  \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}
+  \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}
+  \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}
+  \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}
+  \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}
+
+  \DeclareUnicodeCharacter{1E7C}{\~V}
+  \DeclareUnicodeCharacter{1E7D}{\~v}
+  \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}
+  \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}
+
+  \DeclareUnicodeCharacter{1E80}{\`W}
+  \DeclareUnicodeCharacter{1E81}{\`w}
+  \DeclareUnicodeCharacter{1E82}{\'W}
+  \DeclareUnicodeCharacter{1E83}{\'w}
+  \DeclareUnicodeCharacter{1E84}{\"W}
+  \DeclareUnicodeCharacter{1E85}{\"w}
+  \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}
+  \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}
+  \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}
+  \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}
+  \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}
+  \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}
+  \DeclareUnicodeCharacter{1E8C}{\"X}
+  \DeclareUnicodeCharacter{1E8D}{\"x}
+  \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}
+  \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}
+
+  \DeclareUnicodeCharacter{1E90}{\^Z}
+  \DeclareUnicodeCharacter{1E91}{\^z}
+  \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}
+  \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}
+  \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}
+  \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}
+  \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}
+  \DeclareUnicodeCharacter{1E97}{\"t}
+  \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}
+  \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}
+
+  \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}
+  \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}
+
+  \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}
+  \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}
+  \DeclareUnicodeCharacter{1EBC}{\~E}
+  \DeclareUnicodeCharacter{1EBD}{\~e}
+
+  \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}
+  \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}
+  \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}
+  \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}
+
+  \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}
+  \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}
+
+  \DeclareUnicodeCharacter{1EF2}{\`Y}
+  \DeclareUnicodeCharacter{1EF3}{\`y}
+  \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}
+
+  \DeclareUnicodeCharacter{1EF8}{\~Y}
+  \DeclareUnicodeCharacter{1EF9}{\~y}
+
+  \DeclareUnicodeCharacter{2013}{--}
+  \DeclareUnicodeCharacter{2014}{---}
+  \DeclareUnicodeCharacter{2018}{\quoteleft}
+  \DeclareUnicodeCharacter{2019}{\quoteright}
+  \DeclareUnicodeCharacter{201A}{\quotesinglbase}
+  \DeclareUnicodeCharacter{201C}{\quotedblleft}
+  \DeclareUnicodeCharacter{201D}{\quotedblright}
+  \DeclareUnicodeCharacter{201E}{\quotedblbase}
+  \DeclareUnicodeCharacter{2022}{\bullet}
+  \DeclareUnicodeCharacter{2026}{\dots}
+  \DeclareUnicodeCharacter{2039}{\guilsinglleft}
+  \DeclareUnicodeCharacter{203A}{\guilsinglright}
+  \DeclareUnicodeCharacter{20AC}{\euro}
+
+  \DeclareUnicodeCharacter{2192}{\expansion}
+  \DeclareUnicodeCharacter{21D2}{\result}
+
+  \DeclareUnicodeCharacter{2212}{\minus}
+  \DeclareUnicodeCharacter{2217}{\point}
+  \DeclareUnicodeCharacter{2261}{\equiv}
+}% end of \utfeightchardefs
+
+
+% US-ASCII character definitions.
+\def\asciichardefs{% nothing need be done
+   \relax
+}
+
+% Make non-ASCII characters printable again for compatibility with
+% existing Texinfo documents that may use them, even without declaring a
+% document encoding.
+%
+\setnonasciicharscatcode \other
+
+
+\message{formatting,}
+
 \newdimen\defaultparindent \defaultparindent = 15pt
 
 \chapheadingskip = 15pt plus 4pt minus 2pt
@@ -6736,7 +8583,7 @@ should work if nowhere else does.}
 % Don't be so finicky about underfull hboxes, either.
 \hbadness = 2000
 
-% Following George Bush, just get rid of widows and orphans.
+% Following George Bush, get rid of widows and orphans.
 \widowpenalty=10000
 \clubpenalty=10000
 
@@ -6754,9 +8601,9 @@ should work if nowhere else does.}
   \fi
 }
 
-% Parameters in order: 1) textheight; 2) textwidth; 3) voffset;
-% 4) hoffset; 5) binding offset; 6) topskip; 7) physical page height; 8)
-% physical page width.
+% Parameters in order: 1) textheight; 2) textwidth;
+% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip;
+% 7) physical page height; 8) physical page width.
 %
 % We also call \setleading{\textleading}, so the caller should define
 % \textleading.  The caller should also set \parskip.
@@ -6783,6 +8630,10 @@ should work if nowhere else does.}
   \ifpdf
     \pdfpageheight #7\relax
     \pdfpagewidth #8\relax
+    % if we don't reset these, they will remain at "1 true in" of
+    % whatever layout pdftex was dumped with.
+    \pdfhorigin = 1 true in
+    \pdfvorigin = 1 true in
   \fi
   %
   \setleading{\textleading}
@@ -6797,19 +8648,19 @@ should work if nowhere else does.}
   \textleading = 13.2pt
   %
   % If page is nothing but text, make it come out even.
-  \internalpagesizes{46\baselineskip}{6in}%
+  \internalpagesizes{607.2pt}{6in}% that's 46 lines
                     {\voffset}{.25in}%
                     {\bindingoffset}{36pt}%
                     {11in}{8.5in}%
 }}
 
-% Use @smallbook to reset parameters for 7x9.5 (or so) format.
+% Use @smallbook to reset parameters for 7x9.25 trim size.
 \def\smallbook{{\globaldefs = 1
   \parskip = 2pt plus 1pt
   \textleading = 12pt
   %
   \internalpagesizes{7.5in}{5in}%
-                    {\voffset}{.25in}%
+                    {-.2in}{0in}%
                     {\bindingoffset}{16pt}%
                     {9.25in}{7in}%
   %
@@ -6820,6 +8671,24 @@ should work if nowhere else does.}
   \defbodyindent = .5cm
 }}
 
+% Use @smallerbook to reset parameters for 6x9 trim size.
+% (Just testing, parameters still in flux.)
+\def\smallerbook{{\globaldefs = 1
+  \parskip = 1.5pt plus 1pt
+  \textleading = 12pt
+  %
+  \internalpagesizes{7.4in}{4.8in}%
+                    {-.2in}{-.4in}%
+                    {0pt}{14pt}%
+                    {9in}{6in}%
+  %
+  \lispnarrowing = 0.25in
+  \tolerance = 700
+  \hfuzz = 1pt
+  \contentsrightmargin = 0pt
+  \defbodyindent = .4cm
+}}
+
 % Use @afourpaper to print on European A4 paper.
 \def\afourpaper{{\globaldefs = 1
   \parskip = 3pt plus 2pt minus 1pt
@@ -6835,7 +8704,7 @@ should work if nowhere else does.}
   % \global\normaloffset = -6mm
   % \global\bindingoffset = 10mm
   % @end tex
-  \internalpagesizes{51\baselineskip}{160mm}
+  \internalpagesizes{673.2pt}{160mm}% that's 51 lines
                     {\voffset}{\hoffset}%
                     {\bindingoffset}{44pt}%
                     {297mm}{210mm}%
@@ -6900,7 +8769,7 @@ should work if nowhere else does.}
   \parskip = 3pt plus 2pt minus 1pt
   \setleading{\textleading}%
   %
-  \dimen0 = #1
+  \dimen0 = #1\relax
   \advance\dimen0 by \voffset
   %
   \dimen2 = \hsize
@@ -6972,6 +8841,7 @@ should work if nowhere else does.}
 
 \catcode`\_=\active
 \def_{\ifusingtt\normalunderscore\_}
+\let\realunder=_
 % Subroutine for the previous macro.
 \def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
 
@@ -6994,6 +8864,13 @@ should work if nowhere else does.}
 % \otherifyactive is called near the end of this file.
 \def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
 
+% Used sometimes to turn off (effectively) the active characters even after
+% parsing them.
+\def\turnoffactive{%
+  \normalturnoffactive
+  \otherbackslash
+}
+
 \catcode`\@=0
 
 % \backslashcurfont outputs one backslash character in current font,
@@ -7001,27 +8878,29 @@ should work if nowhere else does.}
 \global\chardef\backslashcurfont=`\\
 \global\let\rawbackslashxx=\backslashcurfont  % let existing .??s files work
 
+% \realbackslash is an actual character `\' with catcode other, and
+% \doublebackslash is two of them (for the pdf outlines).
+{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
+
+% In texinfo, backslash is an active character; it prints the backslash
+% in fixed width font.
+\catcode`\\=\active
+@def@normalbackslash{{@tt@backslashcurfont}}
+% On startup, @fixbackslash assigns:
+%  @let \ = @normalbackslash
+
 % \rawbackslash defines an active \ to do \backslashcurfont.
 % \otherbackslash defines an active \ to be a literal `\' character with
 % catcode other.
-{\catcode`\\=\active
- @gdef@rawbackslash{@let\=@backslashcurfont}
- @gdef@otherbackslash{@let\=@realbackslash}
-}
-
-% \realbackslash is an actual character `\' with catcode other.
-{\catcode`\\=\other @gdef@realbackslash{\}}
-
-% \normalbackslash outputs one backslash in fixed width font.
-\def\normalbackslash{{\tt\backslashcurfont}}
-
-\catcode`\\=\active
+@gdef@rawbackslash{@let\=@backslashcurfont}
+@gdef@otherbackslash{@let\=@realbackslash}
 
-% Used sometimes to turn off (effectively) the active characters
-% even after parsing them.
-@def@turnoffactive{%
+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
+% the literal character `\'.
+% 
+@def@normalturnoffactive{%
+  @let\=@normalbackslash
   @let"=@normaldoublequote
-  @let\=@realbackslash
   @let~=@normaltilde
   @let^=@normalcaret
   @let_=@normalunderscore
@@ -7033,12 +8912,6 @@ should work if nowhere else does.}
   @unsepspaces
 }
 
-% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.  (Thus, \ is not expandable when this is in
-% effect.)
-%
-@def@normalturnoffactive{@turnoffactive @let\=@normalbackslash}
-
 % Make _ and + \other characters, temporarily.
 % This is canceled by @fixbackslash.
 @otherifyactive
@@ -7051,9 +8924,9 @@ should work if nowhere else does.}
 @global@let\ = @eatinput
 
 % On the other hand, perhaps the file did not have a `\input texinfo'. Then
-% the first `\{ in the file would cause an error. This macro tries to fix
+% the first `\' in the file would cause an error. This macro tries to fix
 % that, assuming it is called before the first `\' could plausibly occur.
-% Also back turn on active characters that might appear in the input
+% Also turn back on active characters that might appear in the input
 % file name, in case not using a pre-dumped format.
 %
 @gdef@fixbackslash{%
diff --git a/manual/time.texi b/manual/time.texi
index a3e8438bce..64763a2d21 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -212,7 +212,7 @@ Note that the clock can wrap around.  On a 32bit system with
 same value approximately every 72 minutes.
 
 For additional functions to examine a process' use of processor time,
-and to control it, @xref{Resource Usage And Limitation}.
+and to control it, see @ref{Resource Usage And Limitation}.
 
 
 @menu
diff --git a/math/libm-test.inc b/math/libm-test.inc
index da68d40bb4..e698923f4e 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -487,11 +487,24 @@ check_float_internal (const char *test_name, FLOAT computed, FLOAT expected,
   else
     {
       diff = FUNC(fabs) (computed - expected);
-      /* ilogb (0) isn't allowed.  */
-      if (expected == 0.0)
-	ulp = diff / FUNC(ldexp) (1.0, - MANT_DIG);
-      else
-	ulp = diff / FUNC(ldexp) (1.0, FUNC(ilogb) (expected) - MANT_DIG);
+      switch (fpclassify (expected))
+	{
+	case FP_ZERO:
+	  /* ilogb (0) isn't allowed. */
+	  ulp = diff / FUNC(ldexp) (1.0, - MANT_DIG);
+	  break;
+	case FP_NORMAL:
+	  ulp = diff / FUNC(ldexp) (1.0, FUNC(ilogb) (expected) - MANT_DIG);
+	  break;
+	case FP_SUBNORMAL:
+	  ulp = (FUNC(ldexp) (diff, MANT_DIG)
+		 / FUNC(ldexp) (1.0, FUNC(ilogb) (expected)));
+	  break;
+	default:
+	  /* It should never happen. */
+	  abort ();
+	  break;
+	}
       set_max_error (ulp, curr_max_error);
       print_diff = 1;
       if ((exceptions & IGNORE_ZERO_INF_SIGN) == 0
diff --git a/nis/nss_compat/compat-initgroups.c b/nis/nss_compat/compat-initgroups.c
index fd16475ea9..76ca95d1e6 100644
--- a/nis/nss_compat/compat-initgroups.c
+++ b/nis/nss_compat/compat-initgroups.c
@@ -303,10 +303,19 @@ getgrent_next_nss (ent_t *ent, char *buffer, size_t buflen, const char *user,
 		else
 		  tmpbuf = extend_alloca (tmpbuf, tmplen, 2 * tmplen);
 
-	      if (!in_blacklist (grpbuf.gr_name,
-				 strlen (grpbuf.gr_name), ent))
-		check_and_add_group (user, group, start, size, groupsp,
-				     limit, &grpbuf);
+	      if (__builtin_expect  (status != NSS_STATUS_NOTFOUND, 1))
+		{
+		  if (__builtin_expect  (status != NSS_STATUS_SUCCESS, 0))
+		    {
+		      free (mygroups);
+		      return status;
+		    }
+
+		  if (!in_blacklist (grpbuf.gr_name,
+				     strlen (grpbuf.gr_name), ent))
+		    check_and_add_group (user, group, start, size, groupsp,
+					 limit, &grpbuf);
+		}
 	    }
 
 	  free (mygroups);
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 62e6ae3120..9e0e839f19 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,96 @@
+2007-12-12  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5465]
+	* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S [!SHARED]
+	(__pthread_cond_timedwait): Don't use VDSO.
+	Patch by Michal Januszewski.
+
+2007-12-07  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5455]
+	* sysdeps/pthread/pthread.h [!__EXCEPTIONS] (pthread_cleanup_pop):
+	Allow label before pthread_cleanup_pop.
+	(pthread_cleanup_pop_restore_np): Likewise.
+
+2007-12-04  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* sysdeps/unix/sysv/linux/sh/lowlevellock.S (__lll_timedlock_wait):
+	Store 2 before returning ETIMEDOUT.
+
+2007-11-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S (__lll_timedlock_wait):
+	Store 2 before returning ETIMEDOUT.
+	* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Likewise
+	* sysdeps/unix/sysv/linux/lowlevellock.c: Likewise.
+	(__lll_lock_wait_private): Optimize.
+	(__lll_lock_wait): Likewise.
+
+2007-11-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/pthread/pthread.h (pthread_cleanup_push,
+	pthread_cleanup_push_defer_np): Add extra (void *) cast to shut up
+	g++ 4.1 and 4.2 -Wstrict-aliasing warnings.
+
+2007-11-08  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5240]
+	* sysdeps/unix/sysv/linux/lowlevellock.c (__lll_timedlock_wait):
+	If we time out, try one last time to lock the futex to avoid
+	losing a wakeup signal.
+	* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Likewise.
+
+	[BZ #5245]
+	* sysdeps/pthread/createthread.c (do_clone): Translate clone error
+	if necessary.
+
+2007-11-07  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5245]
+	* allocatestack.c (allocate_stack): Change ENOMEM error in case
+	mmap failed to EAGAIN.
+	* Makefile (tests): Add tst-basic7.
+	* tst-basic7.c: New file.
+
+2007-11-05  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/register-atfork.c (__register_atfork):
+	Use __linkin_atfork.
+
+2007-11-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* sysdeps/unix/sysv/linux/sh/lowlevellock.S (LOAD_FUTEX_WAIT): Add
+	missing line continuations.
+	* sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S (LOAD_FUTEX_WAIT,
+	LOAD_FUTEX_WAKE): Likewise.  Also add missing 3rd parameter.
+
+2007-10-28  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5220]
+	* sysdeps/unix/sysv/linux/kernel-posix-timers.h: Declare
+	__active_timer_sigev_thread and __active_timer_sigev_thread_lock.
+	(struct timer): Add next element.
+	* sysdeps/unix/sysv/linux/timer_create.c: For SIGEV_THREAD timers,
+	enqueue timer structure into __active_timer_sigev_thread list.
+	* sysdeps/unix/sysv/linux/timer_delete.c: For SIGEV_THREAD timers,
+	remove timer struct from __active_timer_sigev_thread.
+	* sysdeps/unix/sysv/linux/timer_routines.c (timer_helper_thread):
+	Before using timer structure make sure it is still on the
+	__active_timer_sigev_thread list.  Keep lock until done.
+	Define __active_timer_sigev_thread and
+	__active_timer_sigev_thread_lock.
+
+2007-10-27  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/pthread/malloc-machine.h: Define ATFORK_MEM.
+	Redefine thread_atfork for use of ATFORK_MEM.
+	* sysdeps/unix/sysv/linux/fork.h: Define __linkin_atfork.
+	* sysdeps/unix/sysv/linux/register-atfork.c (__linkin_atfork): New
+	function.
+	* sysdeps/unix/sysv/linux/unregister-atfork.c (__unregister_atfork):
+	Use atomic operation when removing first element of list.
+
 2007-10-17  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/i386/i486/sem_post.S (__old_sem_post): New
diff --git a/nptl/Makefile b/nptl/Makefile
index 5ed2c21145..407ccecaa9 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -222,6 +222,7 @@ tests = tst-typesizes \
 	tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \
 	tst-align tst-align2 tst-align3 \
 	tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
+	tst-basic7 \
 	tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \
 	tst-raise1 \
 	tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 tst-join6 \
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index c894e96a28..f75599c668 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -462,7 +462,12 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
 	      mem = ARCH_RETRY_MMAP (size);
 	      if (__builtin_expect (mem == MAP_FAILED, 0))
 #endif
-		return errno;
+		{
+		  if (errno == ENOMEM)
+		    errno = EAGAIN;
+
+		  return errno;
+		}
 	    }
 
 	  /* SIZE is guaranteed to be greater than zero.
diff --git a/nptl/sysdeps/pthread/createthread.c b/nptl/sysdeps/pthread/createthread.c
index 66571b2175..59e62c2dcf 100644
--- a/nptl/sysdeps/pthread/createthread.c
+++ b/nptl/sysdeps/pthread/createthread.c
@@ -56,8 +56,8 @@ do_clone (struct pthread *pd, const struct pthread_attr *attr,
   PREPARE_CREATE;
 #endif
 
-  if (stopped)
-    /* We Make sure the thread does not run far by forcing it to get a
+  if (__builtin_expect (stopped != 0, 0))
+    /* We make sure the thread does not run far by forcing it to get a
        lock.  We lock it here too so that the new thread cannot continue
        until we tell it to.  */
     lll_lock (pd->lock, LLL_PRIVATE);
@@ -84,7 +84,8 @@ do_clone (struct pthread *pd, const struct pthread_attr *attr,
       if (IS_DETACHED (pd))
 	__deallocate_stack (pd);
 
-      return errno;
+      /* We have to translate error codes.  */
+      return errno == ENOMEM ? EAGAIN : errno;
     }
 
   /* Now we have the possibility to set scheduling parameters etc.  */
diff --git a/nptl/sysdeps/pthread/malloc-machine.h b/nptl/sysdeps/pthread/malloc-machine.h
index efab230aa8..33a3d20531 100644
--- a/nptl/sysdeps/pthread/malloc-machine.h
+++ b/nptl/sysdeps/pthread/malloc-machine.h
@@ -1,6 +1,6 @@
 /* Basic platform-independent macro definitions for mutexes,
    thread-specific data and parameters for malloc.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007 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
@@ -38,13 +38,24 @@ extern void *__dso_handle __attribute__ ((__weak__));
 
 #include <fork.h>
 
+#define ATFORK_MEM static struct fork_handler atfork_mem
+
 #ifdef SHARED
 # define thread_atfork(prepare, parent, child) \
-   __register_atfork (prepare, parent, child, __dso_handle)
+  atfork_mem.prepare_handler = prepare;					      \
+  atfork_mem.parent_handler = parent;					      \
+  atfork_mem.child_handler = child;					      \
+  atfork_mem.dso_handle = __dso_handle;					      \
+  atfork_mem.refcntr = 1;						      \
+  __linkin_atfork (&atfork_mem)
 #else
 # define thread_atfork(prepare, parent, child) \
-   __register_atfork (prepare, parent, child,				      \
-		      &__dso_handle == NULL ? NULL : __dso_handle)
+  atfork_mem.prepare_handler = prepare;					      \
+  atfork_mem.parent_handler = parent;					      \
+  atfork_mem.child_handler = child;					      \
+  atfork_mem.dso_handle = &__dso_handle == NULL ? NULL : __dso_handle;	      \
+  atfork_mem.refcntr = 1;						      \
+  __linkin_atfork (&atfork_mem)
 #endif
 
 /* thread specific data for glibc */
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index d175f312ee..f3ab0ae711 100644
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -638,7 +638,7 @@ __pthread_cleanup_routine (struct __pthread_cleanup_frame *__frame)
     __pthread_unwind_buf_t __cancel_buf;				      \
     void (*__cancel_routine) (void *) = (routine);			      \
     void *__cancel_arg = (arg);						      \
-    int not_first_call = __sigsetjmp ((struct __jmp_buf_tag *)		      \
+    int not_first_call = __sigsetjmp ((struct __jmp_buf_tag *) (void *)	      \
 				      __cancel_buf.__cancel_jmp_buf, 0);      \
     if (__builtin_expect (not_first_call, 0))				      \
       {									      \
@@ -655,6 +655,7 @@ extern void __pthread_register_cancel (__pthread_unwind_buf_t *__buf)
 /* Remove a cleanup handler installed by the matching pthread_cleanup_push.
    If EXECUTE is non-zero, the handler function is called. */
 # define pthread_cleanup_pop(execute) \
+      do; while (0); /* Empty to allow label before pthread_cleanup_pop.  */  \
     } while (0);							      \
     __pthread_unregister_cancel (&__cancel_buf);			      \
     if (execute)							      \
@@ -672,7 +673,7 @@ extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf)
     __pthread_unwind_buf_t __cancel_buf;				      \
     void (*__cancel_routine) (void *) = (routine);			      \
     void *__cancel_arg = (arg);						      \
-    int not_first_call = __sigsetjmp ((struct __jmp_buf_tag *)		      \
+    int not_first_call = __sigsetjmp ((struct __jmp_buf_tag *) (void *)	      \
 				      __cancel_buf.__cancel_jmp_buf, 0);      \
     if (__builtin_expect (not_first_call, 0))				      \
       {									      \
@@ -690,6 +691,7 @@ extern void __pthread_register_cancel_defer (__pthread_unwind_buf_t *__buf)
    restores the cancellation type that was in effect when the matching
    pthread_cleanup_push_defer was called.  */
 #  define pthread_cleanup_pop_restore_np(execute) \
+      do; while (0); /* Empty to allow label before pthread_cleanup_pop.  */  \
     } while (0);							      \
     __pthread_unregister_cancel_restore (&__cancel_buf);		      \
     if (execute)							      \
diff --git a/nptl/sysdeps/unix/sysv/linux/fork.h b/nptl/sysdeps/unix/sysv/linux/fork.h
index 032b68f083..a00cfabe26 100644
--- a/nptl/sysdeps/unix/sysv/linux/fork.h
+++ b/nptl/sysdeps/unix/sysv/linux/fork.h
@@ -55,3 +55,6 @@ extern int __register_atfork (void (*__prepare) (void),
 			      void (*__child) (void),
 			      void *dso_handle);
 libc_hidden_proto (__register_atfork)
+
+/* Add a new element to the fork list.  */
+extern void __linkin_atfork (struct fork_handler *newp) attribute_hidden;
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
index 745ab91239..9c8a68f5b2 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
@@ -184,6 +184,12 @@ __lll_timedlock_wait:
 	movl	%ecx, %ebp
 	movl	%edx, %edi
 
+	movl	$2, %edx
+	xchgl	%edx, (%ebp)
+
+	test	%edx, %edx
+	je	6f
+
 1:
 	/* Get current time.  */
 	movl	%esp, %ebx
@@ -203,36 +209,30 @@ __lll_timedlock_wait:
 	addl	$1000000000, %edx
 	subl	$1, %ecx
 4:	testl	%ecx, %ecx
-	js	5f		/* Time is already up.  */
+	js	2f		/* Time is already up.  */
 
 	/* Store relative timeout.  */
 	movl	%ecx, (%esp)
 	movl	%edx, 4(%esp)
 
+	/* Futex call.  */
 	movl	%ebp, %ebx
-
-	movl	$1, %eax
 	movl	$2, %edx
-	LOCK
-	cmpxchgl %edx, (%ebx)
-
-	testl	%eax, %eax
-	je	8f
-
-	/* Futex call.  */
 	movl	%esp, %esi
 	movl	16(%esp), %ecx
 	LOAD_FUTEX_WAIT (%ecx)
 	movl	$SYS_futex, %eax
 	ENTER_KERNEL
-	movl	%eax, %ecx
 
-8:				/* NB: %edx == 2 */
-	xorl	%eax, %eax
-	LOCK
-	cmpxchgl %edx, (%ebx)
+	/* NB: %edx == 2 */
+	xchgl	%edx, (%ebp)
+
+	testl	%edx, %edx
+	je	6f
 
-	jnz	7f
+	cmpl	$-ETIMEDOUT, %eax
+	jne	1b
+2:	movl	$ETIMEDOUT, %edx
 
 6:	addl	$8, %esp
 	cfi_adjust_cfa_offset(-8)
@@ -248,29 +248,11 @@ __lll_timedlock_wait:
 	popl	%edi
 	cfi_adjust_cfa_offset(-4)
 	cfi_restore(%edi)
+	movl	%edx, %eax
 	ret
 
 3:	movl	$EINVAL, %eax
 	ret
-
-	cfi_adjust_cfa_offset(24)
-	cfi_offset(%edi, -8)
-	cfi_offset(%esi, -12)
-	cfi_offset(%ebx, -16)
-	cfi_offset(%ebp, -20)
-	/* Check whether the time expired.  */
-7:	cmpl	$-ETIMEDOUT, %ecx
-	je	5f
-
-	/* Make sure the current holder knows we are going to sleep.  */
-	movl	%edx, %eax
-	xchgl	%eax, (%ebx)
-	testl	%eax, %eax
-	jz	6b
-	jmp	1b
-
-5:	movl	$ETIMEDOUT, %eax
-	jmp	6b
 	cfi_endproc
 	.size	__lll_timedlock_wait,.-__lll_timedlock_wait
 #endif
diff --git a/nptl/sysdeps/unix/sysv/linux/kernel-posix-timers.h b/nptl/sysdeps/unix/sysv/linux/kernel-posix-timers.h
index 3ff4cda3f4..5f419c2144 100644
--- a/nptl/sysdeps/unix/sysv/linux/kernel-posix-timers.h
+++ b/nptl/sysdeps/unix/sysv/linux/kernel-posix-timers.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
 
@@ -35,6 +35,11 @@ extern pthread_once_t __helper_once attribute_hidden;
 /* TID of the helper thread.  */
 extern pid_t __helper_tid attribute_hidden;
 
+/* List of active SIGEV_THREAD timers.  */
+extern struct timer *__active_timer_sigev_thread attribute_hidden;
+/* Lock for the __active_timer_sigev_thread.  */
+extern pthread_mutex_t __active_timer_sigev_thread_lock attribute_hidden;
+
 
 /* Type of timers in the kernel.  */
 typedef int kernel_timer_t;
@@ -57,4 +62,7 @@ struct timer
   void (*thrfunc) (sigval_t);
   sigval_t sival;
   pthread_attr_t attr;
+
+  /* Next element in list of active SIGEV_THREAD timers.  */
+  struct timer *next;
 };
diff --git a/nptl/sysdeps/unix/sysv/linux/lowlevellock.c b/nptl/sysdeps/unix/sysv/linux/lowlevellock.c
index f0e42957c2..01c4f4861a 100644
--- a/nptl/sysdeps/unix/sysv/linux/lowlevellock.c
+++ b/nptl/sysdeps/unix/sysv/linux/lowlevellock.c
@@ -27,13 +27,11 @@
 void
 __lll_lock_wait_private (int *futex)
 {
-  do
-    {
-      int oldval = atomic_compare_and_exchange_val_acq (futex, 2, 1);
-      if (oldval != 0)
-	lll_futex_wait (futex, 2, LLL_PRIVATE);
-    }
-  while (atomic_compare_and_exchange_bool_acq (futex, 2, 0) != 0);
+  if (*futex == 2)
+    lll_futex_wait (futex, 2, LLL_PRIVATE);
+
+  while (atomic_exchange_acq (futex, 2) != 0)
+    lll_futex_wait (futex, 2, LLL_PRIVATE);
 }
 
 
@@ -42,13 +40,11 @@ __lll_lock_wait_private (int *futex)
 void
 __lll_lock_wait (int *futex, int private)
 {
-  do
-    {
-      int oldval = atomic_compare_and_exchange_val_acq (futex, 2, 1);
-      if (oldval != 0)
-	lll_futex_wait (futex, 2, private);
-    }
-  while (atomic_compare_and_exchange_bool_acq (futex, 2, 0) != 0);
+  if (*futex == 2)
+    lll_futex_wait (futex, 2, private);
+
+  while (atomic_exchange_acq (futex, 2) != 0)
+    lll_futex_wait (futex, 2, private);
 }
 
 
@@ -59,15 +55,16 @@ __lll_timedlock_wait (int *futex, const struct timespec *abstime, int private)
   if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
     return EINVAL;
 
-  do
+  /* Try locking.  */
+  while (atomic_exchange_acq (futex, 2) != 0)
     {
       struct timeval tv;
-      struct timespec rt;
 
       /* Get the current time.  */
       (void) __gettimeofday (&tv, NULL);
 
       /* Compute relative timeout.  */
+      struct timespec rt;
       rt.tv_sec = abstime->tv_sec - tv.tv_sec;
       rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000;
       if (rt.tv_nsec < 0)
@@ -76,16 +73,12 @@ __lll_timedlock_wait (int *futex, const struct timespec *abstime, int private)
 	  --rt.tv_sec;
 	}
 
-      /* Already timed out?  */
       if (rt.tv_sec < 0)
 	return ETIMEDOUT;
 
       /* Wait.  */
-      int oldval = atomic_compare_and_exchange_val_acq (futex, 2, 1);
-      if (oldval != 0)
-	lll_futex_timed_wait (futex, 2, &rt, private);
+      lll_futex_timed_wait (futex, 2, &rt, private);
     }
-  while (atomic_compare_and_exchange_bool_acq (futex, 2, 0) != 0);
 
   return 0;
 }
diff --git a/nptl/sysdeps/unix/sysv/linux/register-atfork.c b/nptl/sysdeps/unix/sysv/linux/register-atfork.c
index 231fc9b091..bd103295fb 100644
--- a/nptl/sysdeps/unix/sysv/linux/register-atfork.c
+++ b/nptl/sysdeps/unix/sysv/linux/register-atfork.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <fork.h>
+#include <atomic.h>
 
 
 /* Lock to protect allocation and deallocation of fork handlers.  */
@@ -97,8 +98,7 @@ __register_atfork (prepare, parent, child, dso_handle)
       newp->child_handler = child;
       newp->dso_handle = dso_handle;
 
-      newp->next = __fork_handlers;
-      __fork_handlers = newp;
+      __linkin_atfork (newp);
     }
 
   /* Release the lock.  */
@@ -109,6 +109,17 @@ __register_atfork (prepare, parent, child, dso_handle)
 libc_hidden_def (__register_atfork)
 
 
+void
+attribute_hidden
+__linkin_atfork (struct fork_handler *newp)
+{
+  do
+    newp->next = __fork_handlers;
+  while (catomic_compare_and_exchange_bool_acq (&__fork_handlers,
+						newp, newp->next) != 0);
+}
+
+
 libc_freeres_fn (free_mem)
 {
   /* Get the lock to not conflict with running forks.  */
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
index e929e28499..afcf0be299 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
@@ -76,7 +76,7 @@
 	add	tmp2, tmp 	; \
 	mov.l	@tmp, tmp2	; \
 	bra	98f		; \
-	 mov	#FUTEX_PRIVATE_FLAG, tmp
+	 mov	#FUTEX_PRIVATE_FLAG, tmp ; \
 99:	.word	PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
 98:	extu.b	tmp, tmp	; \
 	xor	tmp, reg	; \
@@ -88,7 +88,7 @@
 	add	tmp2, tmp 	; \
 	mov.l	@tmp, tmp2	; \
 	bra	98f		; \
-	 mov	#FUTEX_PRIVATE_FLAG, tmp
+	 mov	#FUTEX_PRIVATE_FLAG, tmp ; \
 99:	.word	PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
 98:	extu.b	tmp, tmp	; \
 	xor	tmp, reg	; \
@@ -96,13 +96,13 @@
 	mov	#FUTEX_WAIT, tmp ; \
 	or	tmp, reg
 # endif
-# define LOAD_FUTEX_WAKE(reg,tmp) \
+# define LOAD_FUTEX_WAKE(reg,tmp,tmp2) \
 	stc	gbr, tmp	; \
 	mov.w	99f, tmp2	; \
 	add	tmp2, tmp 	; \
 	mov.l	@tmp, tmp2	; \
 	bra	98f		; \
-	 mov	#FUTEX_PRIVATE_FLAG, tmp
+	 mov	#FUTEX_PRIVATE_FLAG, tmp ; \
 99:	.word	PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
 98:	extu.b	tmp, tmp	; \
 	xor	tmp, reg	; \
@@ -225,6 +225,12 @@ __lll_timedlock_wait:
 	add	#-8, r15
 	cfi_adjust_cfa_offset(8)
 
+	mov	#2, r2
+	XCHG (r2, @r8, r3)
+
+	tst	r3, r3
+	bt	6f
+	
 1:
 	/* Get current time.  */
 	mov	r15, r4
@@ -250,17 +256,11 @@ __lll_timedlock_wait:
 	add	#-1, r2
 4:
 	cmp/pz	r2
-	bf	5f		/* Time is already up.  */
+	bf	2f		/* Time is already up.  */
 
 	mov.l	r2, @r15	/* Store relative timeout.  */
 	mov.l	r3, @(4,r15)
 
-	mov	#1, r3
-	mov	#2, r4
-	CMPXCHG (r3, @r8, r4, r2)
-	tst	r2, r2
-	bt	8f
-
 	mov	r8, r4
 	mov	r11, r5
 	LOAD_FUTEX_WAIT (r5, r0, r1)
@@ -272,39 +272,29 @@ __lll_timedlock_wait:
 	SYSCALL_INST_PAD
 	mov	r0, r5
 
-8:
-	mov	#0, r3
-	mov	#2, r4
-	CMPXCHG (r3, @r8, r4, r2)
-	bf/s	7f
-	 mov	#0, r0
+	mov	#2, r2
+	XCHG (r2, @r8, r3)
+
+	tst	r3, r3
+	bt/s	6f
+	 mov	#-ETIMEDOUT, r1
+	cmp/eq	r5, r1
+	bf	1b
+
+2:	mov	#ETIMEDOUT, r3
 
 6:
+	mov	r3, r0
 	add	#8, r15
 	mov.l	@r15+, r8
 	mov.l	@r15+, r9
 	mov.l	@r15+, r10
 	rts
 	 mov.l	@r15+, r11
-7:
-	/* Check whether the time expired.  */
-	mov	#-ETIMEDOUT, r1
-	cmp/eq	r5, r1
-	bt	5f
 
-	/* Make sure the current holder knows we are going to sleep.  */
-	XCHG (r2, @r8, r3)
-	tst	r3, r3
-	bt/s	6b
-	 mov	#0, r0
-	bra	1b
-	 nop
 3:
 	rts
 	 mov	#EINVAL, r0
-5:
-	bra	6b
-	 mov	#ETIMEDOUT, r0
 	cfi_endproc
 
 .L1k:
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
index 0ebfbfe8c9..13093422a3 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
@@ -42,7 +42,7 @@
 	add	tmp2, tmp 	; \
 	mov.l	@tmp, tmp2	; \
 	bra	98f		; \
-	 mov	#FUTEX_PRIVATE_FLAG, tmp
+	 mov	#FUTEX_PRIVATE_FLAG, tmp ; \
 99:	.word	PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
 98:	extu.b	tmp, tmp	; \
 	xor	tmp, reg	; \
@@ -54,7 +54,7 @@
 	add	tmp2, tmp 	; \
 	mov.l	@tmp, tmp2	; \
 	bra	98f		; \
-	 mov	#FUTEX_PRIVATE_FLAG, tmp
+	 mov	#FUTEX_PRIVATE_FLAG, tmp ; \
 99:	.word	PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
 98:	extu.b	tmp, tmp	; \
 	xor	tmp, reg	; \
diff --git a/nptl/sysdeps/unix/sysv/linux/timer_create.c b/nptl/sysdeps/unix/sysv/linux/timer_create.c
index 497068b554..a07234d7d1 100644
--- a/nptl/sysdeps/unix/sysv/linux/timer_create.c
+++ b/nptl/sysdeps/unix/sysv/linux/timer_create.c
@@ -206,6 +206,13 @@ timer_create (clock_id, evp, timerid)
 				      syscall_clockid, &sev, &newp->ktimerid);
 	      if (! INTERNAL_SYSCALL_ERROR_P (res, err))
 		{
+		  /* Add to the queue of active timers with thread
+		     delivery.  */
+		  pthread_mutex_lock (&__active_timer_sigev_thread_lock);
+		  newp->next = __active_timer_sigev_thread;
+		  __active_timer_sigev_thread = newp;
+		  pthread_mutex_unlock (&__active_timer_sigev_thread_lock);
+
 		  *timerid = (timer_t) newp;
 		  return 0;
 		}
diff --git a/nptl/sysdeps/unix/sysv/linux/timer_delete.c b/nptl/sysdeps/unix/sysv/linux/timer_delete.c
index 35055212a3..510541fc2a 100644
--- a/nptl/sysdeps/unix/sysv/linux/timer_delete.c
+++ b/nptl/sysdeps/unix/sysv/linux/timer_delete.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
 
@@ -54,6 +54,27 @@ timer_delete (timerid)
 
       if (res == 0)
 	{
+	  if (kt->sigev_notify == SIGEV_THREAD)
+	    {
+	      /* Remove the timer from the list.  */
+	      pthread_mutex_lock (&__active_timer_sigev_thread_lock);
+	      if (__active_timer_sigev_thread == kt)
+		__active_timer_sigev_thread = kt->next;
+	      else
+		{
+		  struct timer *prevp = __active_timer_sigev_thread;
+		  while (prevp->next != NULL)
+		    if (prevp->next == kt)
+		      {
+			prevp->next = kt->next;
+			break;
+		      }
+		    else
+		      prevp = prevp->next;
+		}
+	      pthread_mutex_unlock (&__active_timer_sigev_thread_lock);
+	    }
+
 # ifndef __ASSUME_POSIX_TIMERS
 	  /* We know the syscall support is available.  */
 	  __no_posix_timers = 1;
diff --git a/nptl/sysdeps/unix/sysv/linux/timer_routines.c b/nptl/sysdeps/unix/sysv/linux/timer_routines.c
index a5eb442251..b159316fb2 100644
--- a/nptl/sysdeps/unix/sysv/linux/timer_routines.c
+++ b/nptl/sysdeps/unix/sysv/linux/timer_routines.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
 
@@ -27,6 +27,12 @@
 #include "kernel-posix-timers.h"
 
 
+/* List of active SIGEV_THREAD timers.  */
+struct timer *__active_timer_sigev_thread;
+/* Lock for the __active_timer_sigev_thread.  */
+pthread_mutex_t __active_timer_sigev_thread_lock = PTHREAD_MUTEX_INITIALIZER;
+
+
 struct thread_start_data
 {
   void (*thrfunc) (sigval_t);
@@ -95,19 +101,36 @@ timer_helper_thread (void *arg)
 	  if (si.si_code == SI_TIMER)
 	    {
 	      struct timer *tk = (struct timer *) si.si_ptr;
-	      struct thread_start_data *td = malloc (sizeof (*td));
 
-	      /* There is not much we can do if the allocation fails.  */
-	      if (td != NULL)
-		{
-		  /* That is the signal we are waiting for.  */
-		  td->thrfunc = tk->thrfunc;
-		  td->sival = tk->sival;
+	      /* Check the timer is still used and will not go away
+		 while we are reading the values here.  */
+	      pthread_mutex_lock (&__active_timer_sigev_thread_lock);
 
-		  pthread_t th;
-		  (void) pthread_create (&th, &tk->attr, timer_sigev_thread,
-					 td);
+	      struct timer *runp = __active_timer_sigev_thread;
+	      while (runp != NULL)
+		if (runp == tk)
+		  break;
+		else
+		  runp = runp->next;
+
+	      if (runp != NULL)
+		{
+		  struct thread_start_data *td = malloc (sizeof (*td));
+
+		  /* There is not much we can do if the allocation fails.  */
+		  if (td != NULL)
+		    {
+		      /* This is the signal we are waiting for.  */
+		      td->thrfunc = tk->thrfunc;
+		      td->sival = tk->sival;
+
+		      pthread_t th;
+		      (void) pthread_create (&th, &tk->attr,
+					     timer_sigev_thread, td);
+		    }
 		}
+
+	      pthread_mutex_unlock (&__active_timer_sigev_thread_lock);
 	    }
 	  else if (si.si_code == SI_TKILL)
 	    /* The thread is canceled.  */
diff --git a/nptl/sysdeps/unix/sysv/linux/unregister-atfork.c b/nptl/sysdeps/unix/sysv/linux/unregister-atfork.c
index 56a4f149e1..c738acd0c3 100644
--- a/nptl/sysdeps/unix/sysv/linux/unregister-atfork.c
+++ b/nptl/sysdeps/unix/sysv/linux/unregister-atfork.c
@@ -67,10 +67,21 @@ __unregister_atfork (dso_handle)
      It's a single linked list so readers are.  */
   do
     {
+    again:
       if (runp->dso_handle == dso_handle)
 	{
 	  if (lastp == NULL)
-	    __fork_handlers = runp->next;
+	    {
+	      /* We have to use an atomic operation here because
+		 __linkin_atfork also uses one.  */
+	      if (catomic_compare_and_exchange_bool_acq (&__fork_handlers,
+							 runp->next, runp)
+		  != 0)
+		{
+		  runp = __fork_handlers;
+		  goto again;
+		}
+	    }
 	  else
 	    lastp->next = runp->next;
 
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
index 7065cfac32..4505e2cec6 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
@@ -178,6 +178,12 @@ __lll_timedlock_wait:
 	movq	%rdi, %r12
 	movq	%rdx, %r13
 
+	movl	$2, %edx
+	xchgl	%edx, (%r12)
+
+	testl	%edx, %edx
+	je	6f
+
 1:
 	/* Get current time.  */
 	movq	%rsp, %rdi
@@ -199,33 +205,31 @@ __lll_timedlock_wait:
 	addq	$1000000000, %rsi
 	decq	%rdi
 4:	testq	%rdi, %rdi
-	js	5f		/* Time is already up.  */
+	js	2f		/* Time is already up.  */
 
-	/* Futex call.  */
-	movq	%rdi, (%rsp)	/* Store relative timeout.  */
+	/* Store relative timeout.  */
+	movq	%rdi, (%rsp)
 	movq	%rsi, 8(%rsp)
 
-	movl	$1, %eax
+	/* Futex call.  */
 	movl	$2, %edx
-	LOCK
-	cmpxchgl %edx, (%r12)
-
-	testl	%eax, %eax
-	je	8f
-
+	movl	$1, %eax
 	movq	%rsp, %r10
 	movl	24(%rsp), %esi
 	LOAD_FUTEX_WAIT (%esi)
 	movq	%r12, %rdi
 	movl	$SYS_futex, %eax
 	syscall
-	movq	%rax, %rcx
 
-8:				/* NB: %edx == 2 */
-	xorl	%eax, %eax
-	LOCK
-	cmpxchgl %edx, (%r12)
-	jnz	7f
+	/* NB: %edx == 2 */
+	xchgl	%edx, (%r12)
+
+	testl	%edx, %edx
+	je	6f
+
+	cmpl	$-ETIMEDOUT, %eax
+	jne	1b
+2:	movl	$ETIMEDOUT, %edx
 
 6:	addq	$32, %rsp
 	cfi_adjust_cfa_offset(-32)
@@ -244,30 +248,11 @@ __lll_timedlock_wait:
 	popq	%r8
 	cfi_adjust_cfa_offset(-8)
 	cfi_restore(%r8)
+	movl	%edx, %eax
 	retq
 
 3:	movl	$EINVAL, %eax
 	retq
-
-	cfi_adjust_cfa_offset(72)
-	cfi_offset(%r8, -16)
-	cfi_offset(%r9, -24)
-	cfi_offset(%r12, -32)
-	cfi_offset(%r13, -40)
-	cfi_offset(%r14, -48)
-	/* Check whether the time expired.  */
-7:	cmpq	$-ETIMEDOUT, %rcx
-	je	5f
-
-	/* Make sure the current holder knows we are going to sleep.  */
-	movl	%edx, %eax
-	xchgl	%eax, (%rdi)
-	testl	%eax, %eax
-	jz	6b
-	jmp	1b
-
-5:	movl	$ETIMEDOUT, %eax
-	jmp	6b
 	cfi_endproc
 	.size	__lll_timedlock_wait,.-__lll_timedlock_wait
 #endif
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
index d730a7e12d..20bc59db9c 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
@@ -134,12 +134,14 @@ __pthread_cond_timedwait:
 	/* Only clocks 0 and 1 are allowed so far.  Both are handled in the
 	   kernel.  */
 	leaq	24(%rsp), %rsi
+# ifdef SHARED
 	movq	__vdso_clock_gettime@GOTPCREL(%rip), %rax
 	movq	(%rax), %rax
 	PTR_DEMANGLE (%rax)
 	jz	26f
 	call	*%rax
 	jmp	27f
+# endif
 26:	movl	$__NR_clock_gettime, %eax
 	syscall
 27:
diff --git a/nptl/tst-basic7.c b/nptl/tst-basic7.c
new file mode 100644
index 0000000000..da461e43df
--- /dev/null
+++ b/nptl/tst-basic7.c
@@ -0,0 +1,56 @@
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/resource.h>
+
+static void
+use_up_memory (void)
+{
+  struct rlimit rl;
+  getrlimit (RLIMIT_AS, &rl);
+  rl.rlim_cur = 10 * 1024 * 1024;
+  setrlimit (RLIMIT_AS, &rl);
+
+  char *c;
+  int PAGESIZE = getpagesize ();
+  while (1)
+    {
+      c = mmap (NULL, PAGESIZE, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0);
+      if (c == MAP_FAILED)
+	break;
+    }
+}
+
+static void *
+child (void *arg)
+{
+  sleep (1);
+  return arg;
+}
+
+static int
+do_test (void)
+{
+  int err;
+  pthread_t tid;
+
+  use_up_memory ();
+
+  err = pthread_create (&tid, NULL, child, NULL);
+  if (err != 0)
+    {
+      printf ("pthread_create returns %d: %s\n", err,
+	      err == EAGAIN ? "OK" : "FAIL");
+      return err != EAGAIN;
+    }
+
+  /* We did not fail to allocate memory despite the preparation.  Oh well.  */
+  return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/nscd/Makefile b/nscd/Makefile
index ecd8c89998..f83e40049a 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -32,7 +32,7 @@ include ../Makeconfig
 vpath %.c ../locale/programs
 
 nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
-		getgrnam_r getgrgid_r hstcache gethstbyad_r gethstbynm2_r \
+		getgrnam_r getgrgid_r hstcache gethstbyad_r gethstbynm3_r \
 		getsrvbynm_r getsrvbypt_r servicescache \
 		dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \
 		xmalloc xstrdup aicache initgrcache gai res_hconf
@@ -106,7 +106,7 @@ CFLAGS-getgrnam_r.c += $(nscd-cflags)
 CFLAGS-getgrgid_r.c += $(nscd-cflags)
 CFLAGS-hstcache.c += $(nscd-cflags)
 CFLAGS-gethstbyad_r.c += $(nscd-cflags)
-CFLAGS-gethstbynm2_r.c += $(nscd-cflags)
+CFLAGS-gethstbynm3_r.c += $(nscd-cflags)
 CFLAGS-dbg_log.c += $(nscd-cflags)
 CFLAGS-nscd_conf.c += $(nscd-cflags)
 CFLAGS-nscd_stat.c += $(nscd-cflags)
diff --git a/nscd/aicache.c b/nscd/aicache.c
index 0dc892bc74..a69a7781d3 100644
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
@@ -110,7 +110,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
   size_t tmpbuf4len = 0;
   char *tmpbuf4 = NULL;
   char *canon = NULL;
-  int32_t ttl = UINT32_MAX;
+  int32_t ttl = INT32_MAX;
   ssize_t total = 0;
   char *key_copy = NULL;
   bool alloca_used = false;
@@ -157,20 +157,20 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
 	      tmpbuf4 = tmpbuf6;
 	    }
 
-	  /* Next collect IPv4 information first.  */
+	  /* Next collect IPv4 information.  */
 	  while (1)
 	    {
 	      rc4 = 0;
 	      status[1] = DL_CALL_FCT (fct, (key, AF_INET, &th[1], tmpbuf4,
 					     tmpbuf4len, &rc4, &herrno,
-					     ttl == UINT32_MAX ? &ttl : NULL,
+					     ttl == INT32_MAX ? &ttl : NULL,
 					     canon == NULL ? &canon : NULL));
 	      if (rc4 != ERANGE || herrno != NETDB_INTERNAL)
 		break;
 	      tmpbuf4 = extend_alloca (tmpbuf4, tmpbuf4len, 2 * tmpbuf4len);
 	    }
 
-	  if (rc4 != 0 || herrno == NETDB_INTERNAL)
+	  if (rc4 != 0 && herrno == NETDB_INTERNAL)
 	    goto out;
 
 	  if (status[0] == NSS_STATUS_SUCCESS
@@ -233,9 +233,9 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
 		      int rc;
 		      while (1)
 			{
-			  rc = __gethostbyaddr_r (addr, addrlen, addrfamily,
-						  &he_mem, tmpbuf, tmpbuflen,
-						  &he, &herrno);
+			  rc = __gethostbyaddr2_r (addr, addrlen, addrfamily,
+						   &he_mem, tmpbuf, tmpbuflen,
+						   &he, &herrno, NULL);
 			  if (rc != ERANGE || herrno != NETDB_INTERNAL)
 			    break;
 			  tmpbuf = extend_alloca (tmpbuf, tmpbuflen,
@@ -285,7 +285,8 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
 	      dataset->head.usable = true;
 
 	      /* Compute the timeout time.  */
-	      dataset->head.timeout = time (NULL) + MIN (db->postimeout, ttl);
+	      dataset->head.timeout = time (NULL) + (ttl == INT32_MAX
+						     ? db->postimeout : ttl);
 
 	      dataset->resp.version = NSCD_VERSION;
 	      dataset->resp.found = 1;
@@ -338,7 +339,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
 			= (struct dataset *) mempool_alloc (db,
 							    total
 							    + req->key_len);
-		      if (newp != NULL)
+		      if (__builtin_expect (newp != NULL, 1))
 			{
 			  /* Adjust pointer into the memory block.  */
 			  key_copy = (char *) newp + (key_copy
@@ -348,6 +349,8 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
 					    total + req->key_len);
 			  alloca_used = false;
 			}
+		      else
+			++db->head->addfailed;
 
 		      /* Mark the old record as obsolete.  */
 		      dh->usable = false;
diff --git a/nscd/cache.c b/nscd/cache.c
index 56198f6b6e..12c4f01e40 100644
--- a/nscd/cache.c
+++ b/nscd/cache.c
@@ -36,6 +36,10 @@
 #include "dbg_log.h"
 
 
+/* Wrapper functions with error checking for standard functions.  */
+extern void *xcalloc (size_t n, size_t s);
+
+
 /* Number of times a value is reloaded without being used.  UINT_MAX
    means unlimited.  */
 unsigned int reload_count = DEFAULT_RELOAD_LIMIT;
@@ -197,6 +201,20 @@ cache_add (int type, const void *key, size_t len, struct datahead *packet,
 	   (char *) &table->head->array[hash] - (char *) table->head
 	   + sizeof (ref_t), MS_ASYNC);
 
+  /* Perhaps the prune thread for the data is not running in a long
+     time.  Wake it if necessary.  */
+  time_t next_wakeup = table->wakeup_time;
+  while (next_wakeup + CACHE_PRUNE_INTERVAL > packet->timeout)
+    if (atomic_compare_and_exchange_bool_acq (&table->wakeup_time,
+					      packet->timeout,
+					      next_wakeup) == 0)
+      {
+	pthread_cond_signal (&table->prune_cond);
+	break;
+      }
+    else
+      next_wakeup = table->wakeup_time;
+
   return 0;
 }
 
@@ -212,7 +230,7 @@ cache_add (int type, const void *key, size_t len, struct datahead *packet,
    actually remove them.  This is complicated by the way we have to
    free the data structures since some hash table entries share the same
    data.  */
-void
+time_t
 prune_cache (struct database_dyn *table, time_t now, int fd)
 {
   size_t cnt = table->head->module;
@@ -226,25 +244,14 @@ prune_cache (struct database_dyn *table, time_t now, int fd)
 	  int32_t resp = 0;
 	  writeall (fd, &resp, sizeof (resp));
 	}
-      return;
-    }
 
-  /* This function can be called from the cleanup thread but also in
-     response to an invalidate command.  Make sure only one thread is
-     running.  When not serving INVALIDATE request, no need for the
-     second to wait around.  */
-  if (fd == -1)
-    {
-      if (pthread_mutex_trylock (&table->prunelock) != 0)
-	/* The work is already being done.  */
-	return;
+      /* No need to do this again anytime soon.  */
+      return 24 * 60 * 60;
     }
-  else
-    pthread_mutex_lock (&table->prunelock);
 
   /* If we check for the modification of the underlying file we invalidate
      the entries also in this case.  */
-  if (table->check_file)
+  if (table->check_file && now != LONG_MAX)
     {
       struct stat64 st;
 
@@ -275,7 +282,20 @@ prune_cache (struct database_dyn *table, time_t now, int fd)
      we don't need to get any lock.  It is at all timed assured that the
      linked lists are set up correctly and that no second thread prunes
      the cache.  */
-  bool mark[cnt];
+  bool *mark;
+  size_t memory_needed = cnt * sizeof (bool);
+  bool mark_use_alloca;
+  if (__builtin_expect (memory_needed <= MAX_STACK_USE, 1))
+    {
+      mark = alloca (cnt * sizeof (bool));
+      memset (mark, '\0', memory_needed);
+      mark_use_alloca = true;
+    }
+  else
+    {
+      mark = xcalloc (1, memory_needed);
+      mark_use_alloca = false;
+    }
   size_t first = cnt + 1;
   size_t last = 0;
   char *const data = table->data;
@@ -285,6 +305,8 @@ prune_cache (struct database_dyn *table, time_t now, int fd)
     dbg_log (_("pruning %s cache; time %ld"),
 	     dbnames[table - dbs], (long int) now);
 
+#define NO_TIMEOUT LONG_MAX
+  time_t next_timeout = NO_TIMEOUT;
   do
     {
       ref_t run = table->head->array[--cnt];
@@ -363,14 +385,17 @@ prune_cache (struct database_dyn *table, time_t now, int fd)
 		}
 	    }
 	  else
-	    assert (dh->usable);
+	    {
+	      assert (dh->usable);
+	      next_timeout = MIN (next_timeout, dh->timeout);
+	    }
 
 	  run = runp->next;
 	}
     }
   while (cnt > 0);
 
-  if (fd != -1)
+  if (__builtin_expect (fd != -1, 0))
     {
       /* Reply to the INVALIDATE initiator that the cache has been
 	 invalidated.  */
@@ -463,9 +488,14 @@ prune_cache (struct database_dyn *table, time_t now, int fd)
 	}
     }
 
+  if (__builtin_expect (! mark_use_alloca, 0))
+    free (mark);
+
   /* Run garbage collection if any entry has been removed or replaced.  */
   if (any)
     gc (table);
 
-  pthread_mutex_unlock (&table->prunelock);
+  /* If there is no entry in the database and we therefore have no new
+     timeout value, tell the caller to wake up in 24 hours.  */
+  return next_timeout == NO_TIMEOUT ? 24 * 60 * 60 : next_timeout - now;
 }
diff --git a/nscd/connections.c b/nscd/connections.c
index 89a1ea4967..3d98889eba 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -69,7 +69,6 @@ static gid_t *server_groups;
 # define NGROUPS 32
 #endif
 static int server_ngroups;
-static volatile int sighup_pending;
 
 static pthread_attr_t attr;
 
@@ -105,7 +104,7 @@ struct database_dyn dbs[lastdb] =
 {
   [pwddb] = {
     .lock = PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP,
-    .prunelock = PTHREAD_MUTEX_INITIALIZER,
+    .prune_lock = PTHREAD_MUTEX_INITIALIZER,
     .enabled = 0,
     .check_file = 1,
     .persistent = 0,
@@ -124,7 +123,7 @@ struct database_dyn dbs[lastdb] =
   },
   [grpdb] = {
     .lock = PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP,
-    .prunelock = PTHREAD_MUTEX_INITIALIZER,
+    .prune_lock = PTHREAD_MUTEX_INITIALIZER,
     .enabled = 0,
     .check_file = 1,
     .persistent = 0,
@@ -143,7 +142,7 @@ struct database_dyn dbs[lastdb] =
   },
   [hstdb] = {
     .lock = PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP,
-    .prunelock = PTHREAD_MUTEX_INITIALIZER,
+    .prune_lock = PTHREAD_MUTEX_INITIALIZER,
     .enabled = 0,
     .check_file = 1,
     .persistent = 0,
@@ -162,7 +161,7 @@ struct database_dyn dbs[lastdb] =
   },
   [servdb] = {
     .lock = PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP,
-    .prunelock = PTHREAD_MUTEX_INITIALIZER,
+    .prune_lock = PTHREAD_MUTEX_INITIALIZER,
     .enabled = 0,
     .check_file = 1,
     .persistent = 0,
@@ -211,10 +210,6 @@ static struct
 };
 
 
-/* Number of seconds between two cache pruning runs.  */
-#define CACHE_PRUNE_INTERVAL	15
-
-
 /* Initial number of threads to use.  */
 int nthreads = -1;
 /* Maximum number of threads to use.  */
@@ -496,7 +491,7 @@ nscd_init (void)
 
   if (nthreads == -1)
     /* No configuration for this value, assume a default.  */
-    nthreads = 2 * lastdb;
+    nthreads = 4;
 
   for (size_t cnt = 0; cnt < lastdb; ++cnt)
     if (dbs[cnt].enabled)
@@ -899,7 +894,11 @@ invalidate_cache (char *key, int fd)
     }
 
   if (dbs[number].enabled)
-    prune_cache (&dbs[number], LONG_MAX, fd);
+    {
+      pthread_mutex_lock (&dbs[number].prune_lock);
+      prune_cache (&dbs[number], LONG_MAX, fd);
+      pthread_mutex_unlock (&dbs[number].prune_lock);
+    }
   else
     {
       resp = 0;
@@ -971,9 +970,13 @@ cannot handle old request version %d; current version is %d"),
       return;
     }
 
-  /* Make the SELinux check before we go on to the standard checks.  */
+  /* Perform the SELinux check before we go on to the standard checks.  */
   if (selinux_enabled && nscd_request_avc_has_perm (fd, req->type) != 0)
-    return;
+    {
+      if (debug_level > 0)
+	dbg_log (_("request not handled due to missing permission"));
+      return;
+    }
 
   struct database_dyn *db = reqinfo[req->type].db;
 
@@ -1337,7 +1340,7 @@ static struct fdlist *readylist;
 /* Conditional variable and mutex to signal availability of entries in
    READYLIST.  The condvar is initialized dynamically since we might
    use a different clock depending on availability.  */
-static pthread_cond_t readylist_cond;
+static pthread_cond_t readylist_cond = PTHREAD_COND_INITIALIZER;
 static pthread_mutex_t readylist_lock = PTHREAD_MUTEX_INITIALIZER;
 
 /* The clock to use with the condvar.  */
@@ -1347,32 +1350,76 @@ static clockid_t timeout_clock = CLOCK_REALTIME;
 static unsigned long int nready;
 
 
-/* This is the main loop.  It is replicated in different threads but the
-   `poll' call makes sure only one thread handles an incoming connection.  */
+/* Function for the clean-up threads.  */
 static void *
 __attribute__ ((__noreturn__))
-nscd_run (void *p)
+nscd_run_prune (void *p)
 {
   const long int my_number = (long int) p;
-  const int run_prune = my_number < lastdb && dbs[my_number].enabled;
+  assert (dbs[my_number].enabled);
+
+  int dont_need_update = setup_thread (&dbs[my_number]);
+
+  /* We are running.  */
+  dbs[my_number].head->timestamp = time (NULL);
+
   struct timespec prune_ts;
-  int to = 0;
-  char buf[256];
+  if (clock_gettime (timeout_clock, &prune_ts) == -1)
+    /* Should never happen.  */
+    abort ();
 
-  if (run_prune)
+  /* Compute the initial timeout time.  Prevent all the timers to go
+     off at the same time by adding a db-based value.  */
+  prune_ts.tv_sec += CACHE_PRUNE_INTERVAL + my_number;
+
+  pthread_mutex_lock (&dbs[my_number].prune_lock);
+  while (1)
     {
-      setup_thread (&dbs[my_number]);
+      /* Wait, but not forever.  */
+      int e = pthread_cond_timedwait (&dbs[my_number].prune_cond,
+				      &dbs[my_number].prune_lock,
+				      &prune_ts);
+      assert (e == 0 || e == ETIMEDOUT);
 
-      /* We are running.  */
-      dbs[my_number].head->timestamp = time (NULL);
+      time_t next_wait;
+      time_t now = time (NULL);
+      if (e == ETIMEDOUT now >= dbs[my_number].wakeup_time)
+	{
+	  next_wait = prune_cache (&dbs[my_number], now, -1);
+	  next_wait = MAX (next_wait, CACHE_PRUNE_INTERVAL);
+	  /* If clients cannot determine for sure whether nscd is running
+	     we need to wake up occasionally to update the timestamp.
+	     Wait 90% of the update period.  */
+#define UPDATE_MAPPING_TIMEOUT (MAPPING_TIMEOUT * 9 / 10)
+	  if (__builtin_expect (! dont_need_update, 0))
+	    next_wait = MIN (UPDATE_MAPPING_TIMEOUT, next_wait);
+
+	  /* Make it known when we will wake up again.  */
+	  dbs[my_number].wakeup_time = now + next_wait;
+	}
+      else
+	/* The cache was just pruned.  Do not do it again now.  Just
+	   use the new timeout value.  */
+	next_wait = dbs[my_number].wakeup_time - now;
 
       if (clock_gettime (timeout_clock, &prune_ts) == -1)
 	/* Should never happen.  */
 	abort ();
 
-      /* Compute timeout time.  */
-      prune_ts.tv_sec += CACHE_PRUNE_INTERVAL;
+      /* Compute next timeout time.  */
+      prune_ts.tv_sec += next_wait;
     }
+}
+
+
+/* This is the main loop.  It is replicated in different threads but
+   the the use of the ready list makes sure only one thread handles an
+   incoming connection.  */
+static void *
+__attribute__ ((__noreturn__))
+nscd_run_worker (void *p)
+{
+  char buf[256];
 
   /* Initial locking.  */
   pthread_mutex_lock (&readylist_lock);
@@ -1383,58 +1430,7 @@ nscd_run (void *p)
   while (1)
     {
       while (readylist == NULL)
-	{
-	  if (run_prune)
-	    {
-	      /* Wait, but not forever.  */
-	      to = pthread_cond_timedwait (&readylist_cond, &readylist_lock,
-					   &prune_ts);
-
-	      /* If we were woken and there is no work to be done,
-		 just start pruning.  */
-	      if (readylist == NULL && to == ETIMEDOUT)
-		{
-		  --nready;
-
-		  if (sighup_pending)
-		    goto sighup_prune;
-
-		  pthread_mutex_unlock (&readylist_lock);
-		  goto only_prune;
-		}
-	    }
-	  else
-	    /* No need to timeout.  */
-	    pthread_cond_wait (&readylist_cond, &readylist_lock);
-	}
-
-      if (sighup_pending)
-	{
-	  --nready;
-	  pthread_cond_signal (&readylist_cond);
-	sighup_prune:
-	  sighup_pending = 0;
-	  pthread_mutex_unlock (&readylist_lock);
-
-	  /* Prune the password database.  */
-	  if (dbs[pwddb].enabled)
-	    prune_cache (&dbs[pwddb], LONG_MAX, -1);
-
-	  /* Prune the group database.  */
-	  if (dbs[grpdb].enabled)
-	    prune_cache (&dbs[grpdb], LONG_MAX, -1);
-
-	  /* Prune the host database.  */
-	  if (dbs[hstdb].enabled)
-	    prune_cache (&dbs[hstdb], LONG_MAX, -1);
-
-	  /* Re-locking.  */
-	  pthread_mutex_lock (&readylist_lock);
-
-	  /* One more thread available.  */
-	  ++nready;
-	  continue;
-	}
+	pthread_cond_wait (&readylist_cond, &readylist_lock);
 
       struct fdlist *it = readylist->next;
       if (readylist->next == readylist)
@@ -1537,28 +1533,6 @@ handle_request: request received (Version = %d)"), req.version);
       /* We are done.  */
       close (fd);
 
-      /* Check whether we should be pruning the cache. */
-      assert (run_prune || to == 0);
-      if (to == ETIMEDOUT)
-	{
-	only_prune:
-	  /* The pthread_cond_timedwait() call timed out.  It is time
-		 to clean up the cache.  */
-	  assert (my_number < lastdb);
-	  prune_cache (&dbs[my_number], time (NULL), -1);
-
-	  if (clock_gettime (timeout_clock, &prune_ts) == -1)
-	    /* Should never happen.  */
-	    abort ();
-
-	  /* Compute next timeout time.  */
-	  prune_ts.tv_sec += CACHE_PRUNE_INTERVAL;
-
-	  /* In case the list is emtpy we do not want to run the prune
-	     code right away again.  */
-	  to = 0;
-	}
-
       /* Re-locking.  */
       pthread_mutex_lock (&readylist_lock);
 
@@ -1601,7 +1575,7 @@ fd_ready (int fd)
       /* Try to start another thread to help out.  */
       pthread_t th;
       if (nthreads < max_nthreads
-	  && pthread_create (&th, &attr, nscd_run,
+	  && pthread_create (&th, &attr, nscd_run_worker,
 			     (void *) (long int) nthreads) == 0)
 	{
 	  /* We got another thread.  */
@@ -1861,34 +1835,57 @@ start_threads (void)
 	timeout_clock = CLOCK_MONOTONIC;
 #endif
 
-  pthread_cond_init (&readylist_cond, &condattr);
-  pthread_condattr_destroy (&condattr);
-
-
   /* Create the attribute for the threads.  They are all created
      detached.  */
   pthread_attr_init (&attr);
   pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
   /* Use 1MB stacks, twice as much for 64-bit architectures.  */
-  pthread_attr_setstacksize (&attr, 1024 * 1024 * (sizeof (void *) / 4));
+  pthread_attr_setstacksize (&attr, NSCD_THREAD_STACKSIZE);
 
   /* We allow less than LASTDB threads only for debugging.  */
   if (debug_level == 0)
     nthreads = MAX (nthreads, lastdb);
 
-  int nfailed = 0;
-  for (long int i = 0; i < nthreads; ++i)
+  /* Create the threads which prune the databases.  */
+  // XXX Ideally this work would be done by some of the worker threads.
+  // XXX But this is problematic since we would need to be able to wake
+  // XXX them up explicitly as well as part of the group handling the
+  // XXX ready-list.  This requires an operation where we can wait on
+  // XXX two conditional variables at the same time.  This operation
+  // XXX does not exist (yet).
+  for (long int i = 0; i < lastdb; ++i)
     {
+      /* Initialize the conditional variable.  */
+      if (pthread_cond_init (&dbs[i].prune_cond, &condattr) != 0)
+	{
+	  dbg_log (_("could not initialize conditional variable"));
+	  exit (1);
+	}
+
       pthread_t th;
-      if (pthread_create (&th, &attr, nscd_run, (void *) (i - nfailed)) != 0)
-	++nfailed;
+      if (dbs[i].enabled
+	  && pthread_create (&th, &attr, nscd_run_prune, (void *) i) != 0)
+	{
+	  dbg_log (_("could not start clean-up thread; terminating"));
+	  exit (1);
+	}
     }
-  if (nthreads - nfailed < lastdb)
+
+  pthread_condattr_destroy (&condattr);
+
+  for (long int i = 0; i < nthreads; ++i)
     {
-      /* We could not start enough threads.  */
-      dbg_log (_("could only start %d threads; terminating"),
-	       nthreads - nfailed);
-      exit (1);
+      pthread_t th;
+      if (pthread_create (&th, &attr, nscd_run_worker, NULL) != 0)
+	{
+	  if (i == 0)
+	    {
+	      dbg_log (_("could not start any worker thread; terminating"));
+	      exit (1);
+	    }
+
+	  break;
+	}
     }
 
   /* Determine how much room for descriptors we should initially
@@ -2011,10 +2008,3 @@ finish_drop_privileges (void)
   install_real_capabilities (new_caps);
 #endif
 }
-
-/* Handle the HUP signal which will force a dump of the cache */
-void
-sighup_handler (int signum)
-{
-  sighup_pending = 1;
-}
diff --git a/nscd/gai.c b/nscd/gai.c
index f2db5299aa..7bea8c4294 100644
--- a/nscd/gai.c
+++ b/nscd/gai.c
@@ -22,6 +22,7 @@
 /* This file uses the getaddrinfo code but it compiles it without NSCD
    support.  We just need a few symbol renames.  */
 #define __inet_aton inet_aton
+#define __ioctl ioctl
 #define __getsockname getsockname
 #define __socket socket
 #define __recvmsg recvmsg
@@ -36,6 +37,7 @@
 
 /* Support code.  */
 #include <check_pf.c>
+#include <check_native.c>
 #ifdef HAVE_LIBIDN
 # include <libidn/idn-stub.c>
 #endif
diff --git a/nscd/gethstbyad_r.c b/nscd/gethstbyad_r.c
index e2e8dfe2cc..2e7a09c2bd 100644
--- a/nscd/gethstbyad_r.c
+++ b/nscd/gethstbyad_r.c
@@ -20,12 +20,25 @@
 
 
 #define LOOKUP_TYPE	struct hostent
-#define FUNCTION_NAME	gethostbyaddr
+#define FUNCTION_NAME	gethostbyaddr2
+#define FUNCTION2_NAME	gethostbyaddr
 #define DATABASE_NAME	hosts
 #define ADD_PARAMS	const void *addr, socklen_t len, int type
+#define EXTRA_PARAMS	, int32_t *ttlp
 #define ADD_VARIABLES	addr, len, type
+#define EXTRA_VARIABLES , ttlp
 #define NEED_H_ERRNO	1
 #define NEED__RES	1
 #define NEED__RES_HCONF 1
 
 #include "../nss/getXXbyYY_r.c"
+
+
+int
+__gethostbyaddr_r (const void *addr, socklen_t len, int type,
+		   struct hostent *result_buf, char *buf, size_t buflen,
+		   struct hostent **result, int *h_errnop)
+{
+  return __gethostbyaddr2_r (addr, len, type, result_buf, buf, buflen,
+			     result, h_errnop, NULL);
+}
diff --git a/nscd/gethstbynm2_r.c b/nscd/gethstbynm3_r.c
index 85e95d4a63..a917f893b1 100644
--- a/nscd/gethstbynm2_r.c
+++ b/nscd/gethstbynm3_r.c
@@ -25,10 +25,13 @@
 
 
 #define LOOKUP_TYPE	struct hostent
-#define FUNCTION_NAME	gethostbyname2
+#define FUNCTION_NAME	gethostbyname3
+#define FUNCTION2_NAME	gethostbyname2
 #define DATABASE_NAME	hosts
 #define ADD_PARAMS	const char *name, int af
+#define EXTRA_PARAMS	, int32_t *ttlp, char **canonp
 #define ADD_VARIABLES	name, af
+#define EXTRA_VARIABLES	, ttlp, canonp
 #define NEED_H_ERRNO	1
 #define NEED__RES_HCONF 1
 
@@ -39,3 +42,12 @@
 #define __inet_aton inet_aton
 
 #include "../nss/getXXbyYY_r.c"
+
+
+int
+__gethostbyname2_r (const char *name, int af, struct hostent *ret, char *buf,
+		    size_t buflen, struct hostent **result, int *h_errnop)
+{
+  return __gethostbyname3_r (name, af, ret, buf, buflen, result, h_errnop,
+			     NULL, NULL);
+}
diff --git a/nscd/grpcache.c b/nscd/grpcache.c
index 9cb6105f3c..002f04fb3e 100644
--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
@@ -285,6 +285,8 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
 		  dataset = memcpy (newp, dataset, total + n);
 		  alloca_used = false;
 		}
+	      else
+		++db->head->addfailed;
 
 	      /* Mark the old record as obsolete.  */
 	      dh->usable = false;
diff --git a/nscd/hstcache.c b/nscd/hstcache.c
index 54222a3408..cc041581e1 100644
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -80,7 +80,8 @@ static const hst_response_header notfound =
 static void
 cache_addhst (struct database_dyn *db, int fd, request_header *req,
 	      const void *key, struct hostent *hst, uid_t owner,
-	      struct hashentry *he, struct datahead *dh, int errval)
+	      struct hashentry *he, struct datahead *dh, int errval,
+	      int32_t ttl)
 {
   ssize_t total;
   ssize_t written;
@@ -131,7 +132,8 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
 	      dataset->head.usable = true;
 
 	      /* Compute the timeout time.  */
-	      dataset->head.timeout = t + db->negtimeout;
+	      dataset->head.timeout = t + (ttl == INT32_MAX
+					   ? db->negtimeout : ttl);
 
 	      /* This is the reply.  */
 	      memcpy (&dataset->resp, &notfound, total);
@@ -247,7 +249,7 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
       dataset->head.usable = true;
 
       /* Compute the timeout time.  */
-      dataset->head.timeout = t + db->postimeout;
+      dataset->head.timeout = t + (ttl == INT32_MAX ? db->postimeout : ttl);
 
       dataset->resp.version = NSCD_VERSION;
       dataset->resp.found = 1;
@@ -323,6 +325,8 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
 		      dataset = memcpy (newp, dataset, total + req->key_len);
 		      alloca_used = false;
 		    }
+		  else
+		    ++db->head->addfailed;
 		}
 
 	      /* Mark the old record as obsolete.  */
@@ -423,19 +427,19 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
 
 static int
 lookup (int type, void *key, struct hostent *resultbufp, char *buffer,
-	size_t buflen, struct hostent **hst)
+	size_t buflen, struct hostent **hst, int32_t *ttlp)
 {
   if (type == GETHOSTBYNAME)
-    return __gethostbyname2_r (key, AF_INET, resultbufp, buffer, buflen, hst,
-			       &h_errno);
+    return __gethostbyname3_r (key, AF_INET, resultbufp, buffer, buflen, hst,
+			       &h_errno, ttlp, NULL);
   if (type == GETHOSTBYNAMEv6)
-    return __gethostbyname2_r (key, AF_INET6, resultbufp, buffer, buflen, hst,
-			       &h_errno);
+    return __gethostbyname3_r (key, AF_INET6, resultbufp, buffer, buflen, hst,
+			       &h_errno, ttlp, NULL);
   if (type == GETHOSTBYADDR)
-    return __gethostbyaddr_r (key, NS_INADDRSZ, AF_INET, resultbufp, buffer,
-			      buflen, hst, &h_errno);
-  return __gethostbyaddr_r (key, NS_IN6ADDRSZ, AF_INET6, resultbufp, buffer,
-			    buflen, hst, &h_errno);
+    return __gethostbyaddr2_r (key, NS_INADDRSZ, AF_INET, resultbufp, buffer,
+			       buflen, hst, &h_errno, ttlp);
+  return __gethostbyaddr2_r (key, NS_IN6ADDRSZ, AF_INET6, resultbufp, buffer,
+			     buflen, hst, &h_errno, ttlp);
 }
 
 
@@ -453,6 +457,7 @@ addhstbyX (struct database_dyn *db, int fd, request_header *req,
   struct hostent *hst;
   bool use_malloc = false;
   int errval = 0;
+  int32_t ttl = INT32_MAX;
 
   if (__builtin_expect (debug_level > 0, 0))
     {
@@ -470,7 +475,7 @@ addhstbyX (struct database_dyn *db, int fd, request_header *req,
 	dbg_log (_("Reloading \"%s\" in hosts cache!"), (char *) str);
     }
 
-  while (lookup (req->type, key, &resultbuf, buffer, buflen, &hst) != 0
+  while (lookup (req->type, key, &resultbuf, buffer, buflen, &hst, &ttl) != 0
 	 && h_errno == NETDB_INTERNAL
 	 && (errval = errno) == ERANGE)
     {
@@ -504,7 +509,7 @@ addhstbyX (struct database_dyn *db, int fd, request_header *req,
     }
 
   cache_addhst (db, fd, req, key, hst, uid, he, dh,
-		h_errno == TRY_AGAIN ? errval : 0);
+		h_errno == TRY_AGAIN ? errval : 0, ttl);
 
   if (use_malloc)
     free (buffer);
diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
index bb4ac37efc..157cd7860c 100644
--- a/nscd/initgrcache.c
+++ b/nscd/initgrcache.c
@@ -110,7 +110,7 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
   bool all_tryagain = true;
   bool any_success = false;
 
-  /* This is temporary memory, we need not (ad must not) call
+  /* This is temporary memory, we need not (and must not) call
      mempool_alloc.  */
   // XXX This really should use alloca.  need to change the backends.
   gid_t *groups = (gid_t *) malloc (size * sizeof (gid_t));
@@ -338,6 +338,8 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
 		  dataset = memcpy (newp, dataset, total + req->key_len);
 		  alloca_used = false;
 		}
+	      else
+		++db->head->addfailed;
 
 	      /* Mark the old record as obsolete.  */
 	      dh->usable = false;
diff --git a/nscd/mem.c b/nscd/mem.c
index d7c59244aa..048e3ddd32 100644
--- a/nscd/mem.c
+++ b/nscd/mem.c
@@ -34,6 +34,11 @@
 #include "nscd.h"
 
 
+/* Wrapper functions with error checking for standard functions.  */
+extern void *xmalloc (size_t n);
+extern void *xcalloc (size_t n, size_t s);
+
+
 static int
 sort_he (const void *p1, const void *p2)
 {
@@ -117,13 +122,47 @@ gc (struct database_dyn *db)
      we have to look at the memory.  We use a mark and sweep algorithm
      where the marks are placed in this array.  */
   assert (db->head->first_free % BLOCK_ALIGN == 0);
-  BITMAP_T mark[(db->head->first_free / BLOCK_ALIGN + BITS - 1) / BITS];
-  memset (mark, '\0', sizeof (mark));
+
+  BITMAP_T *mark;
+  bool mark_use_malloc;
+  /* In prune_cache we are also using a dynamically allocated array.
+     If the array in the caller is too large we have malloc'ed it.  */
+  size_t stack_used = sizeof (bool) * db->head->module;
+  if (__builtin_expect (stack_used > MAX_STACK_USE, 0))
+    stack_used = 0;
+  size_t memory_needed = ((db->head->first_free / BLOCK_ALIGN + BITS - 1)
+			  / BITS) * sizeof (BITMAP_T);
+  if (memory_needed <= MAX_STACK_USE)
+    {
+      mark = (BITMAP_T *) alloca (memory_needed);
+      mark_use_malloc = false;
+      memset (mark, '\0', memory_needed);
+      stack_used = memory_needed;
+    }
+  else
+    {
+      mark = (BITMAP_T *) xcalloc (1, memory_needed);
+      mark_use_malloc = true;
+    }
 
   /* Create an array which can hold pointer to all the entries in hash
      entries.  */
-  struct hashentry *he[db->head->nentries];
-  struct hashentry *he_data[db->head->nentries];
+  memory_needed = 2 * db->head->nentries * sizeof (struct hashentry *);
+  struct hashentry **he;
+  struct hashentry **he_data;
+  bool he_use_malloc;
+  if (stack_used + memory_needed <= MAX_STACK_USE)
+    {
+      he = alloca (db->head->nentries * sizeof (struct hashentry *));
+      he_data = alloca (db->head->nentries * sizeof (struct hashentry *));
+      he_use_malloc = false;
+    }
+  else
+    {
+      he = xmalloc (memory_needed);
+      he_data = &he[db->head->nentries * sizeof (struct hashentry *)];
+      he_use_malloc = true;
+    }
 
   size_t cnt = 0;
   for (size_t idx = 0; idx < db->head->module; ++idx)
@@ -455,6 +494,11 @@ gc (struct database_dyn *db)
  out:
   pthread_mutex_unlock (&db->memlock);
   pthread_rwlock_unlock (&db->lock);
+
+  if (he_use_malloc)
+    free (he);
+  if (mark_use_malloc)
+    free (mark);
 }
 
 
@@ -481,7 +525,8 @@ mempool_alloc (struct database_dyn *db, size_t len)
 	{
 	  /* Try to resize the database.  Grow size of 1/8th.  */
 	  size_t oldtotal = (sizeof (struct database_pers_head)
-			     + roundup (db->head->module * sizeof (ref_t), ALIGN)
+			     + roundup (db->head->module * sizeof (ref_t),
+					ALIGN)
 			     + db->head->data_size);
 	  size_t new_data_size = (db->head->data_size
 				  + MAX (2 * len, db->head->data_size / 8));
diff --git a/nscd/nscd.c b/nscd/nscd.c
index cd4dabfdb1..e007694218 100644
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -120,9 +120,6 @@ static struct argp argp =
   options, parse_opt, NULL, doc,
 };
 
-/* The SIGHUP handler is extern to this file */
-extern void sighup_handler(int signum);
-
 /* True if only statistics are requested.  */
 static bool get_stats;
 
@@ -267,7 +264,6 @@ main (int argc, char **argv)
   signal (SIGINT, termination_handler);
   signal (SIGQUIT, termination_handler);
   signal (SIGTERM, termination_handler);
-  signal (SIGHUP, sighup_handler);
   signal (SIGPIPE, SIG_IGN);
 
   /* Cleanup files created by a previous 'bind'.  */
diff --git a/nscd/nscd.conf b/nscd/nscd.conf
index b0762fbb53..5e8b3f45b8 100644
--- a/nscd/nscd.conf
+++ b/nscd/nscd.conf
@@ -31,10 +31,10 @@
 
 
 #	logfile			/var/log/nscd.log
-#	threads			6
-#	max-threads		128
+#	threads			4
+#	max-threads		32
 	server-user		nscd
-#	stat-user		nocpulse
+#	stat-user		somebody
 	debug-level		0
 #	reload-count		5
 	paranoia		no
diff --git a/nscd/nscd.h b/nscd/nscd.h
index e8199b8009..cd6fe15c30 100644
--- a/nscd/nscd.h
+++ b/nscd/nscd.h
@@ -55,11 +55,21 @@ typedef enum
 #define RESTART_INTERVAL (60 * 60)
 
 
+/* Stack size for worker threads.  */
+#define NSCD_THREAD_STACKSIZE 1024 * 1024 * (sizeof (void *) / 4)
+
+/* Maximum size of stack frames we allow the thread to use.  We use
+   80% of the thread stack size.  */
+#define MAX_STACK_USE ((8 * NSCD_THREAD_STACKSIZE) / 10)
+
+
 /* Structure describing dynamic part of one database.  */
 struct database_dyn
 {
   pthread_rwlock_t lock;
-  pthread_mutex_t prunelock;
+  pthread_cond_t prune_cond;
+  pthread_mutex_t prune_lock;
+  time_t wakeup_time;
 
   int enabled;
   int check_file;
@@ -111,6 +121,11 @@ struct database_dyn
 #define DEFAULT_DATASIZE_PER_BUCKET 1024
 
 
+/* Number of seconds between two cache pruning runs if we do not have
+   better information when it is really needed.  */
+#define CACHE_PRUNE_INTERVAL	15
+
+
 /* Global variables.  */
 extern struct database_dyn dbs[lastdb];
 extern const char *const dbnames[lastdb];
@@ -189,7 +204,7 @@ extern struct datahead *cache_search (request_type, void *key, size_t len,
 extern int cache_add (int type, const void *key, size_t len,
 		      struct datahead *packet, bool first,
 		      struct database_dyn *table, uid_t owner);
-extern void prune_cache (struct database_dyn *table, time_t now, int fd);
+extern time_t prune_cache (struct database_dyn *table, time_t now, int fd);
 
 /* pwdcache.c */
 extern void addpwbyname (struct database_dyn *db, int fd, request_header *req,
@@ -258,7 +273,7 @@ extern void gc (struct database_dyn *db);
 
 
 /* nscd_setup_thread.c */
-extern void setup_thread (struct database_dyn *db);
+extern int setup_thread (struct database_dyn *db);
 
 
 /* Special version of TEMP_FAILURE_RETRY for functions returning error
diff --git a/nscd/nscd.init b/nscd/nscd.init
index dcf92df3da..8ab3fbf731 100644
--- a/nscd/nscd.init
+++ b/nscd/nscd.init
@@ -93,9 +93,12 @@ case "$1" in
 	;;
     force-reload | reload)
     	echo -n $"Reloading $prog: "
-	killproc /usr/sbin/nscd -HUP
-	RETVAL=$?
-	echo
+    	RETVAL=0
+    	/usr/sbin/nscd -i passwd || RETVAL=$?
+    	/usr/sbin/nscd -i group || RETVAL=$?
+    	/usr/sbin/nscd -i hosts || RETVAL=$?
+    	/usr/sbin/nscd -i services || RETVAL=$?
+    	echo
 	;;
     *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
diff --git a/nscd/nscd_setup_thread.c b/nscd/nscd_setup_thread.c
index c17fbd5638..4b6671e300 100644
--- a/nscd/nscd_setup_thread.c
+++ b/nscd/nscd_setup_thread.c
@@ -20,8 +20,9 @@
 #include <nscd.h>
 
 
-void
+int
 setup_thread (struct database_dyn *db)
 {
   /* Nothing.  */
+  return 0;
 }
diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
index 51ea113476..bc1b6bab2f 100644
--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
@@ -280,6 +280,8 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
 		  dataset = memcpy (newp, dataset, total + n);
 		  alloca_used = false;
 		}
+	      else
+		++db->head->addfailed;
 
 	      /* Mark the old record as obsolete.  */
 	      dh->usable = false;
diff --git a/nscd/selinux.c b/nscd/selinux.c
index 6cbcbea19c..9a167ec14d 100644
--- a/nscd/selinux.c
+++ b/nscd/selinux.c
@@ -368,6 +368,14 @@ nscd_request_avc_has_perm (int fd, request_type req)
       goto out;
     }
 
+#ifndef NSCD__GETSERV
+  if (perms[req] == 0)
+    {
+      dbg_log (_("compile-time support for database policy missing"));
+      goto out;
+    }
+#endif
+
   rc = avc_has_perm (ssid, tsid, SECCLASS_NSCD, perms[req], &aeref, NULL) < 0;
 
 out:
diff --git a/nscd/servicescache.c b/nscd/servicescache.c
index d6bf51d29f..e122cb3f16 100644
--- a/nscd/servicescache.c
+++ b/nscd/servicescache.c
@@ -272,6 +272,8 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
 		  dataset = memcpy (newp, dataset, total + req->key_len);
 		  alloca_used = false;
 		}
+	      else
+		++db->head->addfailed;
 
 	      /* Mark the old record as obsolete.  */
 	      dh->usable = false;
diff --git a/nss/Versions b/nss/Versions
index 365f9e229b..8f2f0fb371 100644
--- a/nss/Versions
+++ b/nss/Versions
@@ -9,7 +9,10 @@ libc {
   }
   GLIBC_PRIVATE {
     _nss_files_parse_grent; _nss_files_parse_pwent; _nss_files_parse_spent;
-    __nss_disable_nscd; __nss_lookup_function; __nss_services_lookup;
+    __nss_disable_nscd; __nss_lookup_function;
+
+    __nss_passwd_lookup2; __nss_group_lookup2; __nss_hosts_lookup2;
+    __nss_services_lookup2; __nss_next2;
   }
 }
 
diff --git a/nss/XXX-lookup.c b/nss/XXX-lookup.c
index da0e6f4510..f88d69e9ec 100644
--- a/nss/XXX-lookup.c
+++ b/nss/XXX-lookup.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1999, 2000, 2002, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -34,7 +34,8 @@
 |* 								   *|
 \*******************************************************************/
 
-#define DB_LOOKUP_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup)
+#define DB_LOOKUP_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup2)
+#define DB_COMPAT_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup)
 #define CONCAT3_1(Pre, Name, Post) CONCAT3_2 (Pre, Name, Post)
 #define CONCAT3_2(Pre, Name, Post) Pre##Name##Post
 
@@ -56,12 +57,14 @@
 service_user *DATABASE_NAME_SYMBOL attribute_hidden;
 
 extern int DB_LOOKUP_FCT (service_user **ni, const char *fct_name,
-			  void **fctp) internal_function;
+			  const char *fct2_name, void **fctp)
+  internal_function;
 libc_hidden_proto (DB_LOOKUP_FCT)
 
 int
 internal_function
-DB_LOOKUP_FCT (service_user **ni, const char *fct_name, void **fctp)
+DB_LOOKUP_FCT (service_user **ni, const char *fct_name, const char *fct2_name,
+	       void **fctp)
 {
   if (DATABASE_NAME_SYMBOL == NULL
       && __nss_database_lookup (DATABASE_NAME_STRING, ALTERNATE_NAME_STRING,
@@ -70,6 +73,16 @@ DB_LOOKUP_FCT (service_user **ni, const char *fct_name, void **fctp)
 
   *ni = DATABASE_NAME_SYMBOL;
 
-  return __nss_lookup (ni, fct_name, fctp);
+  return __nss_lookup (ni, fct_name, fct2_name, fctp);
 }
 libc_hidden_def (DB_LOOKUP_FCT)
+
+
+#ifndef NO_COMPAT
+int
+internal_function attribute_compat_text_section
+DB_COMPAT_FCT (service_user **ni, const char *fct_name, void **fctp)
+{
+  return DB_LOOKUP_FCT (ni, fct_name, NULL, fctp);
+}
+#endif
diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
index 6c90ba543d..b535f67a7b 100644
--- a/nss/getXXbyYY_r.c
+++ b/nss/getXXbyYY_r.c
@@ -42,12 +42,18 @@
 |* DATABASE_NAME - name of the database the function accesses	   *|
 |*		   (e.g., host, services, ...)			   *|
 |*								   *|
-|* ADD_PARAMS    - additional parameter, can vary in number	   *|
+|* ADD_PARAMS    - additional parameters, can vary in number	   *|
 |*								   *|
-|* ADD_VARIABLES - names of additional parameter		   *|
+|* ADD_VARIABLES - names of additional parameters		   *|
 |*								   *|
 |* Optionally the following vars can be defined:		   *|
 |*								   *|
+|* EXTRA_PARAMS  - optional parameters, can vary in number	   *|
+|*								   *|
+|* EXTRA_VARIABLES - names of optional parameter		   *|
+|*								   *|
+|* FUNCTION_NAME - alternative name of the non-reentrant function  *|
+|*								   *|
 |* NEED_H_ERRNO  - an extra parameter will be passed to point to   *|
 |*		   the global `h_errno' variable.		   *|
 |*								   *|
@@ -62,6 +68,11 @@
 
 /* To make the real sources a bit prettier.  */
 #define REENTRANT_NAME APPEND_R (FUNCTION_NAME)
+#ifdef FUNCTION2_NAME
+# define REENTRANT2_NAME APPEND_R (FUNCTION2_NAME)
+#else
+# define REENTRANT2_NAME NULL
+#endif
 #define APPEND_R(name) APPEND_R1 (name)
 #define APPEND_R1(name) name##_r
 #define INTERNAL(name) INTERNAL1 (name)
@@ -80,12 +91,17 @@
 
 #define FUNCTION_NAME_STRING STRINGIZE (FUNCTION_NAME)
 #define REENTRANT_NAME_STRING STRINGIZE (REENTRANT_NAME)
+#ifdef FUNCTION2_NAME
+# define REENTRANT2_NAME_STRING STRINGIZE (REENTRANT2_NAME)
+#else
+# define REENTRANT2_NAME_STRING NULL
+#endif
 #define DATABASE_NAME_STRING STRINGIZE (DATABASE_NAME)
 #define STRINGIZE(name) STRINGIZE1 (name)
 #define STRINGIZE1(name) #name
 
 #ifndef DB_LOOKUP_FCT
-# define DB_LOOKUP_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup)
+# define DB_LOOKUP_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup2)
 # define CONCAT3_1(Pre, Name, Post) CONCAT3_2 (Pre, Name, Post)
 # define CONCAT3_2(Pre, Name, Post) Pre##Name##Post
 #endif
@@ -101,6 +117,13 @@
 # define H_ERRNO_VAR_P NULL
 #endif
 
+#ifndef EXTRA_PARAMS
+# define EXTRA_PARAMS
+#endif
+#ifndef EXTRA_VARIABLES
+# define EXTRA_VARIABLES
+#endif
+
 #ifdef HAVE_AF
 # define AF_VAL af
 #else
@@ -109,17 +132,20 @@
 
 /* Type of the lookup function we need here.  */
 typedef enum nss_status (*lookup_function) (ADD_PARAMS, LOOKUP_TYPE *, char *,
-					    size_t, int * H_ERRNO_PARM);
+					    size_t, int * H_ERRNO_PARM
+					    EXTRA_PARAMS);
 
 /* The lookup function for the first entry of this service.  */
-extern int DB_LOOKUP_FCT (service_user **nip, const char *name, void **fctp)
+extern int DB_LOOKUP_FCT (service_user **nip, const char *name,
+			  const char *name2, void **fctp)
      internal_function;
 libc_hidden_proto (DB_LOOKUP_FCT)
 
 
 int
 INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
-			   size_t buflen, LOOKUP_TYPE **result H_ERRNO_PARM)
+			   size_t buflen, LOOKUP_TYPE **result H_ERRNO_PARM
+			   EXTRA_PARAMS)
 {
   static bool startp_initialized;
   static service_user *startp;
@@ -171,7 +197,8 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
 
   if (! startp_initialized)
     {
-      no_more = DB_LOOKUP_FCT (&nip, REENTRANT_NAME_STRING, &fct.ptr);
+      no_more = DB_LOOKUP_FCT (&nip, REENTRANT_NAME_STRING,
+			       REENTRANT2_NAME_STRING, &fct.ptr);
       if (no_more)
 	{
 	  void *tmp_ptr = (service_user *) -1l;
@@ -224,7 +251,7 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
 #endif
 
       status = DL_CALL_FCT (fct.l, (ADD_VARIABLES, resbuf, buffer, buflen,
-				    &errno H_ERRNO_VAR));
+				    &errno H_ERRNO_VAR EXTRA_VARIABLES));
 
       /* The status is NSS_STATUS_TRYAGAIN and errno is ERANGE the
 	 provided buffer is too small.  In this case we should give
@@ -238,8 +265,8 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
 	  && errno == ERANGE)
 	break;
 
-      no_more = __nss_next (&nip, REENTRANT_NAME_STRING,
-			    &fct.ptr, status, 0);
+      no_more = __nss_next2 (&nip, REENTRANT_NAME_STRING,
+			     REENTRANT2_NAME_STRING, &fct.ptr, status, 0);
     }
 
 #ifdef HANDLE_DIGITS_DOTS
@@ -274,10 +301,11 @@ done:
 }
 
 
-#include <shlib-compat.h>
-#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1_2)
-#define OLD(name) OLD1 (name)
-#define OLD1(name) __old_##name
+#ifndef FUNCTION2_NAME
+# include <shlib-compat.h>
+# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1_2)
+#  define OLD(name) OLD1 (name)
+#  define OLD1(name) __old_##name
 
 int
 attribute_compat_text_section
@@ -293,19 +321,20 @@ OLD (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
   return ret;
 }
 
-#define do_symbol_version(real, name, version) \
+#  define do_symbol_version(real, name, version) \
   compat_symbol (libc, real, name, version)
 do_symbol_version (OLD (REENTRANT_NAME), REENTRANT_NAME, GLIBC_2_0);
-#endif
+# endif
 
 /* As INTERNAL (REENTRANT_NAME) may be hidden, we need an alias
    in between so that the REENTRANT_NAME@@GLIBC_2.1.2 is not
    hidden too.  */
 strong_alias (INTERNAL (REENTRANT_NAME), NEW (REENTRANT_NAME));
 
-#define do_default_symbol_version(real, name, version) \
+# define do_default_symbol_version(real, name, version) \
   versioned_symbol (libc, real, name, version)
 do_default_symbol_version (NEW (REENTRANT_NAME),
 			   REENTRANT_NAME, GLIBC_2_1_2);
+#endif
 
 static_link_warning (REENTRANT_NAME)
diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c
index db4abaf5d7..7a881c02ac 100644
--- a/nss/getXXent_r.c
+++ b/nss/getXXent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,97,98,99,2000,2002,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000,2002,2004,2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -64,7 +64,7 @@
 #define STRINGIZE1(Name) #Name
 
 #ifndef DB_LOOKUP_FCT
-# define DB_LOOKUP_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup)
+# define DB_LOOKUP_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup2)
 # define CONCAT3_1(Pre, Name, Post) CONCAT3_2 (Pre, Name, Post)
 # define CONCAT3_2(Pre, Name, Post) Pre##Name##Post
 #endif
@@ -113,7 +113,8 @@ static STAYOPEN_TMP;
 __libc_lock_define_initialized (static, lock)
 
 /* The lookup function for the first entry of this service.  */
-extern int DB_LOOKUP_FCT (service_user **nip, const char *name, void **fctp)
+extern int DB_LOOKUP_FCT (service_user **nip, const char *name,
+			  const char *name2, void **fctp)
      internal_function;
 libc_hidden_proto (DB_LOOKUP_FCT)
 
diff --git a/nss/getnssent_r.c b/nss/getnssent_r.c
index a0cfa72bd2..f50667a18e 100644
--- a/nss/getnssent_r.c
+++ b/nss/getnssent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2002, 2004, 2007 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
@@ -30,7 +30,7 @@ setup (const char *func_name, db_lookup_function lookup_fct,
   int no_more;
   if (*startp == NULL)
     {
-      no_more = lookup_fct (nip, func_name, fctp);
+      no_more = lookup_fct (nip, func_name, NULL, fctp);
       *startp = no_more ? (service_user *) -1l : *nip;
     }
   else if (*startp == (service_user *) -1l)
@@ -42,7 +42,7 @@ setup (const char *func_name, db_lookup_function lookup_fct,
 	/* Reset to the beginning of the service list.  */
 	*nip = *startp;
       /* Look up the first function.  */
-      no_more = __nss_lookup (nip, func_name, fctp);
+      no_more = __nss_lookup (nip, func_name, NULL, fctp);
     }
   return no_more;
 }
@@ -80,8 +80,7 @@ __nss_setent (const char *func_name, db_lookup_function lookup_fct,
       else
 	status = DL_CALL_FCT (fct.f, (0));
 
-      no_more = __nss_next (nip, func_name, &fct.ptr,
-			    status, 0);
+      no_more = __nss_next2 (nip, func_name, NULL, &fct.ptr, status, 0);
       if (is_last_nip)
 	*last_nip = *nip;
     }
@@ -120,7 +119,7 @@ __nss_endent (const char *func_name, db_lookup_function lookup_fct,
 	/* We have processed all services which were used.  */
 	break;
 
-      no_more = __nss_next (nip, func_name, &fct.ptr, 0, 1);
+      no_more = __nss_next2 (nip, func_name, NULL, &fct.ptr, 0, 1);
     }
   *last_nip = *nip = NULL;
 }
@@ -177,8 +176,8 @@ __nss_getent_r (const char *getent_func_name,
 
       do
 	{
-	  no_more = __nss_next (nip, getent_func_name, &fct.ptr,
-				status, 0);
+	  no_more = __nss_next2 (nip, getent_func_name, NULL, &fct.ptr,
+				 status, 0);
 
 	  if (is_last_nip)
 	    *last_nip = *nip;
@@ -192,8 +191,7 @@ __nss_getent_r (const char *getent_func_name,
 		void *ptr;
 	      } sfct;
 
-	      no_more = __nss_lookup (nip, setent_func_name,
-				      &sfct.ptr);
+	      no_more = __nss_lookup (nip, setent_func_name, NULL, &sfct.ptr);
 
 	      if (! no_more)
 	        {
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 46965fd8ff..28aa1b4f34 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -145,9 +145,12 @@ libc_hidden_def (__nss_database_lookup)
     0 == function found
     1 == finished */
 int
-__nss_lookup (service_user **ni, const char *fct_name, void **fctp)
+__nss_lookup (service_user **ni, const char *fct_name, const char *fct2_name,
+	      void **fctp)
 {
   *fctp = __nss_lookup_function (*ni, fct_name);
+  if (*fctp == NULL && fct2_name != NULL)
+    *fctp = __nss_lookup_function (*ni, fct_name);
 
   while (*fctp == NULL
 	 && nss_next_action (*ni, NSS_STATUS_UNAVAIL) == NSS_ACTION_CONTINUE
@@ -156,6 +159,8 @@ __nss_lookup (service_user **ni, const char *fct_name, void **fctp)
       *ni = (*ni)->next;
 
       *fctp = __nss_lookup_function (*ni, fct_name);
+      if (*fctp == NULL && fct2_name != NULL)
+	*fctp = __nss_lookup_function (*ni, fct_name);
     }
 
   return *fctp != NULL ? 0 : (*ni)->next == NULL ? 1 : -1;
@@ -166,8 +171,8 @@ __nss_lookup (service_user **ni, const char *fct_name, void **fctp)
     0 == adjusted for next function
     1 == finished */
 int
-__nss_next (service_user **ni, const char *fct_name, void **fctp, int status,
-	    int all_values)
+__nss_next2 (service_user **ni, const char *fct_name, const char *fct2_name,
+	     void **fctp, int status, int all_values)
 {
   if (all_values)
     {
@@ -180,7 +185,8 @@ __nss_next (service_user **ni, const char *fct_name, void **fctp, int status,
   else
     {
       /* This is really only for debugging.  */
-       if (NSS_STATUS_TRYAGAIN > status || status > NSS_STATUS_RETURN)
+      if (__builtin_expect (NSS_STATUS_TRYAGAIN > status
+			    || status > NSS_STATUS_RETURN, 0))
 	 __libc_fatal ("illegal status in __nss_next");
 
        if (nss_next_action (*ni, status) == NSS_ACTION_RETURN)
@@ -195,6 +201,8 @@ __nss_next (service_user **ni, const char *fct_name, void **fctp, int status,
       *ni = (*ni)->next;
 
       *fctp = __nss_lookup_function (*ni, fct_name);
+      if (*fctp == NULL && fct2_name != NULL)
+	*fctp = __nss_lookup_function (*ni, fct2_name);
     }
   while (*fctp == NULL
 	 && nss_next_action (*ni, NSS_STATUS_UNAVAIL) == NSS_ACTION_CONTINUE
@@ -202,7 +210,16 @@ __nss_next (service_user **ni, const char *fct_name, void **fctp, int status,
 
   return *fctp != NULL ? 0 : -1;
 }
-libc_hidden_def (__nss_next)
+libc_hidden_def (__nss_next2)
+
+
+int
+attribute_compat_text_section
+__nss_next (service_user **ni, const char *fct_name, void **fctp, int status,
+	    int all_values)
+{
+  return __nss_next2 (ni, fct_name, NULL, fctp, status, all_values);
+}
 
 
 int
diff --git a/nss/nsswitch.h b/nss/nsswitch.h
index d222e0d443..b80edef651 100644
--- a/nss/nsswitch.h
+++ b/nss/nsswitch.h
@@ -110,7 +110,8 @@ libc_hidden_proto (__nss_database_lookup)
 /* Put first function with name FCT_NAME for SERVICE in FCTP.  The
    position is remembered in NI.  The function returns a value < 0 if
    an error occurred or no such function exists.  */
-extern int __nss_lookup (service_user **ni, const char *fct_name, void **fctp);
+extern int __nss_lookup (service_user **ni, const char *fct_name,
+			 const char *fct2_name, void **fctp) attribute_hidden;
 
 /* Determine the next step in the lookup process according to the
    result STATUS of the call to the last function returned by
@@ -125,9 +126,12 @@ extern int __nss_lookup (service_user **ni, const char *fct_name, void **fctp);
    services.  In other words, only if all four lookup results have
    the action RETURN associated the lookup process stops before the
    natural end.  */
+extern int __nss_next2 (service_user **ni, const char *fct_name,
+			const char *fct2_name, void **fctp, int status,
+			int all_values) attribute_hidden;
+libc_hidden_proto (__nss_next2)
 extern int __nss_next (service_user **ni, const char *fct_name, void **fctp,
 		       int status, int all_values);
-libc_hidden_proto (__nss_next)
 
 /* Search for the service described in NI for a function named FCT_NAME
    and return a pointer to this function if successful.  */
@@ -139,7 +143,8 @@ libc_hidden_proto (__nss_lookup_function)
 extern void __nss_disable_nscd (void);
 
 
-typedef int (*db_lookup_function) (service_user **, const char *, void **)
+typedef int (*db_lookup_function) (service_user **, const char *, const char *,
+				   void **)
      internal_function;
 typedef enum nss_status (*setent_function) (int);
 typedef enum nss_status (*endent_function) (void);
diff --git a/nss/service-lookup.c b/nss/service-lookup.c
index 67d401e080..f3561855d4 100644
--- a/nss/service-lookup.c
+++ b/nss/service-lookup.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -18,5 +18,6 @@
    02111-1307 USA.  */
 
 #define DATABASE_NAME services
+#define NO_COMPAT
 
 #include "XXX-lookup.c"
diff --git a/po/ca.po b/po/ca.po
index 07c0143528..add3c495e7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,347 +1,1381 @@
 # Catalan messages for GNU libc.
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# Ivan Vilata i Balaguer <ivan@selidor.net>, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+# Ivan Vilata i Balaguer <ivan@selidor.net>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007.
 #
+# Sóc Ivan, aquestes són les convencions que adopte per a la 2.4:
+#
+# * Sempre que es puga s’usaran els caràcters adequats per al text en català:
+#   l’apòstrof (’), ela geminada (Å€, Ä¿), cometes («, », “, â€, ‘, ’, en aquest
+#   ordre de d’aparició), guionet (â€), guionet dur (‑), guió (—) i punts
+#   suspensius (…).  Compte, perquè *cap*, repetesc, *CAP* dels anteriors és el
+#   caràcter que s’obté teclejant directament; vegeu
+#   http://www.selidor.net/~ivan/blog/bits/20060304T0023-ortotipografia.html.
+# * Use 2 espais després d’un punt.
+# * Missatges d’ajuda:
+#
+#   * La capçalera::
+#
+#       Forma d'ús: …
+#             o bé: …
+#
+#   * ARGUMENT_COMPOST, però ARGCOMP
+#   * FILE(s) -> cada FITXER (si és possible)
+#   * Cada línia de descripció d’una opció comença en la columna 24, i sempre
+#     es manté com a mínim a 4 espais del nom de l’opció.  Quan l’opció arriba
+#     a la columna 24, la descripció comença en la línia inferior.  Les
+#     descripcions que no caben en una línia es parteixen i continuen en la
+#     columna 24 de la línia següent.
+#   * Les descripcions d’ítems que no són opcions es mantenen alineades a 4
+#     espais de l’ítem més llarg del bloc.  Les que no caben en una línia es
+#     parteixen i continuen en la mateixa columna on comencen.
+#
+# * Errors i avisos:
+#
+#   * No és igual «no es pot obrir» que «no s’ha pogut obrir».
+#   * No és igual «s’està obrint X» que «en obrir X» (error).
+#   * «avís:» comença amb minúscula, la cadena següent també.
+#   * Sempre van en una sola línia, a no ser que els retorns importen; en
+#     aquest cas, les noves línies comencen amb un caràcter de tabulació.
+#
+# * VARIABLE_ENTORN, però «valor de variable»
+# * Noms de funció: printf()
+# * Noms de fitxer: «fitxer»
+# * Noms d’opcions: «--opció=ARGUMENT»
+# * El text com a molt arriba a la columna 78, amb el caràcter de nova línia
+#   en la 79.  Les línies es parteixen de forma automàtica (no per a que quede
+#   bonic, excepte quan quede realment horrend o porte a confusió).
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.3.3\n"
-"POT-Creation-Date: 2004-08-05 09:16+0200\n"
-"PO-Revision-Date: 2004-08-09 19:02+0200\n"
+"Project-Id-Version: libc 2.7\n"
+"POT-Creation-Date: 2007-10-15 21:18-0700\n"
+"PO-Revision-Date: 2007-12-02 18:45+0100\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sysdeps/generic/siglist.h:29 stdio-common/../sysdeps/unix/siglist.c:27
-msgid "Hangup"
-msgstr "Penjat"
+#: argp/argp-help.c:228
+#, c-format
+msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
+msgstr "%.*s: el paràmetre ARGP_HELP_FMT necessita un valor"
 
-#: sysdeps/generic/siglist.h:30 stdio-common/../sysdeps/unix/siglist.c:28
-msgid "Interrupt"
-msgstr "Interromput"
+#: argp/argp-help.c:238
+#, c-format
+msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
+msgstr "%.*s: el paràmetre d’ARGP_HELP_FMT no és conegut"
 
-#: sysdeps/generic/siglist.h:31 stdio-common/../sysdeps/unix/siglist.c:29
-msgid "Quit"
-msgstr "Eixit"
+#: argp/argp-help.c:251
+#, c-format
+msgid "Garbage in ARGP_HELP_FMT: %s"
+msgstr "brossa a ARGP_HELP_FMT: %s"
 
-#: sysdeps/generic/siglist.h:32 stdio-common/../sysdeps/unix/siglist.c:30
-msgid "Illegal instruction"
-msgstr "La instrucció no és permesa"
+#: argp/argp-help.c:1215
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Els arguments obligatoris o opcionals per a les opcions llargues també ho són per a les opcions curtes corresponents."
 
-#: sysdeps/generic/siglist.h:33 stdio-common/../sysdeps/unix/siglist.c:31
-msgid "Trace/breakpoint trap"
-msgstr "Trampa de traçat/punt de parada"
+#: argp/argp-help.c:1601
+msgid "Usage:"
+msgstr "Forma d’ús:"
 
-#: sysdeps/generic/siglist.h:34
-msgid "Aborted"
-msgstr "Avortat"
+#: argp/argp-help.c:1605
+msgid "  or: "
+msgstr "      o bé: "
 
-#: sysdeps/generic/siglist.h:35 stdio-common/../sysdeps/unix/siglist.c:34
-msgid "Floating point exception"
-msgstr "Excepció de coma flotant"
+#: argp/argp-help.c:1617
+msgid " [OPTION...]"
+msgstr " [OPCIÓ…]"
 
-#: sysdeps/generic/siglist.h:36 stdio-common/../sysdeps/unix/siglist.c:35
-msgid "Killed"
-msgstr "Matat"
+#: argp/argp-help.c:1644
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "Proveu «%s --help» o «%s --usage» per a obtenir més informació.\n"
 
-#: sysdeps/generic/siglist.h:37 stdio-common/../sysdeps/unix/siglist.c:36
-msgid "Bus error"
-msgstr "Error de bus"
+#: argp/argp-help.c:1672
+#, c-format
+msgid "Report bugs to %s.\n"
+msgstr "Informeu dels errors a %s.\n"
 
-#: sysdeps/generic/siglist.h:38 stdio-common/../sysdeps/unix/siglist.c:37
-msgid "Segmentation fault"
-msgstr "Violació de segment"
+# Més ajudes.  ivb
+#: argp/argp-parse.c:102
+msgid "Give this help list"
+msgstr "Mostra aquest llistat d’ajuda."
 
-#. 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 "La canonada s'ha trencat"
+#: argp/argp-parse.c:103
+msgid "Give a short usage message"
+msgstr "Mostra un missatge breu amb la forma d’ús."
 
-#: sysdeps/generic/siglist.h:40 stdio-common/../sysdeps/unix/siglist.c:40
-msgid "Alarm clock"
-msgstr "Temporitzador"
+#: argp/argp-parse.c:104
+msgid "Set the program name"
+msgstr "Estableix el nom del programa."
 
-#: sysdeps/generic/siglist.h:41 stdio-common/../sysdeps/unix/siglist.c:41
-msgid "Terminated"
-msgstr "Terminat"
+# ivb (2002/10/21)
+# ivb  La cadena «SECS» no està traduïda en l'estructura d'opcions.
+#: argp/argp-parse.c:106
+msgid "Hang for SECS seconds (default 3600)"
+msgstr "Espera durant un nombre de segons (3600 per defecte)."
 
-#: sysdeps/generic/siglist.h:42 stdio-common/../sysdeps/unix/siglist.c:42
-msgid "Urgent I/O condition"
-msgstr "Condició urgent d'E/S"
+#: argp/argp-parse.c:167
+msgid "Print program version"
+msgstr "Mostra la versió del programa."
 
-#: sysdeps/generic/siglist.h:43 stdio-common/../sysdeps/unix/siglist.c:43
-msgid "Stopped (signal)"
-msgstr "Parat (senyal)"
+#: argp/argp-parse.c:183
+msgid "(PROGRAM ERROR) No version known!?"
+msgstr "(ERROR DEL PROGRAMA) No es coneix cap versió!?"
 
-#: sysdeps/generic/siglist.h:44 stdio-common/../sysdeps/unix/siglist.c:44
-msgid "Stopped"
-msgstr "Parat"
+#: argp/argp-parse.c:623
+#, c-format
+msgid "%s: Too many arguments\n"
+msgstr "%s: Sobren arguments\n"
 
-#: sysdeps/generic/siglist.h:45 stdio-common/../sysdeps/unix/siglist.c:45
-msgid "Continued"
-msgstr "Continuat"
+#: argp/argp-parse.c:766
+msgid "(PROGRAM ERROR) Option should have been recognized!?"
+msgstr "(ERROR DEL PROGRAMA) L’opció hauria d’haver estat reconeguda!?"
 
-#: sysdeps/generic/siglist.h:46 stdio-common/../sysdeps/unix/siglist.c:46
-msgid "Child exited"
-msgstr "Un fill ha eixit"
+#: assert/assert-perr.c:57
+#, c-format
+msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
+msgstr "%s%s%s:%u: %s%sError inesperat: %s.\n"
 
-#: sysdeps/generic/siglist.h:47 stdio-common/../sysdeps/unix/siglist.c:47
-msgid "Stopped (tty input)"
-msgstr "Parat (esperant entrada del terminal)"
+#: assert/assert.c:57
+#, c-format
+msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
+msgstr "%s%s%s:%u: %s%sL’asserció «%s» ha fallat.\n"
 
-#: sysdeps/generic/siglist.h:48 stdio-common/../sysdeps/unix/siglist.c:48
-msgid "Stopped (tty output)"
-msgstr "Parat (esperant escriure en el terminal)"
+#: catgets/gencat.c:110 catgets/gencat.c:114 nscd/nscd.c:97 nss/makedb.c:61
+msgid "NAME"
+msgstr "NOM"
 
-# ivb (2000/10/28)
-# ivb  És clar, E/S significa «Entrada/Sortida», perquè «Entrada/Eixida»
-# ivb  queda ambigu (d'açò es diu discriminació objectiva %-P ).
-#: sysdeps/generic/siglist.h:49 stdio-common/../sysdeps/unix/siglist.c:49
-msgid "I/O possible"
-msgstr "L'operació d'E/S és possible"
+# Més ajudes.  ivb
+#: catgets/gencat.c:111
+msgid "Create C header file NAME containing symbol definitions"
+msgstr "Crea el fitxer capçalera C NOM que contindrà les definicions de símbols."
 
-#: sysdeps/generic/siglist.h:50 stdio-common/../sysdeps/unix/siglist.c:50
-msgid "CPU time limit exceeded"
-msgstr "S'ha excedit el temps límit de CPU"
+#: catgets/gencat.c:113
+msgid "Do not use existing catalog, force new output file"
+msgstr "No empra el catàleg existent, i crea un nou fitxer d’eixida."
 
-#: sysdeps/generic/siglist.h:51 stdio-common/../sysdeps/unix/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "S'ha excedit la mida màxima de fitxer"
+#: catgets/gencat.c:114 nss/makedb.c:61
+msgid "Write output to file NAME"
+msgstr "Escriu l’eixida al fitxer NOM."
 
-#: sysdeps/generic/siglist.h:52 stdio-common/../sysdeps/unix/siglist.c:52
-msgid "Virtual timer expired"
-msgstr "Ha expirat el temporitzador virtual"
+# FIXME: Don't use \v.
+#: catgets/gencat.c:119
+msgid ""
+"Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n"
+"is -, output is written to standard output.\n"
+msgstr ""
+"Genera un catàleg de missatges.\n"
+"\n"
+"Si FITXER_ENTRADA és «-», l’entrada es llegirà de l’entrada estàndard.\n"
+"Si FITXER_EIXIDA és «-», l’eixida s’escriurà a l’eixida estàndard.\n"
 
-#: sysdeps/generic/siglist.h:53 stdio-common/../sysdeps/unix/siglist.c:53
-msgid "Profiling timer expired"
-msgstr "El temps de perfilat ha expirat"
+#: catgets/gencat.c:124
+msgid ""
+"-o OUTPUT-FILE [INPUT-FILE]...\n"
+"[OUTPUT-FILE [INPUT-FILE]...]"
+msgstr ""
+"-o FITXER_EIXIDA [FITXER_ENTRADA]…\n"
+"[FITXER_EIXIDA [FITXER_ENTRADA]…]"
 
-#: sysdeps/generic/siglist.h:54 stdio-common/../sysdeps/unix/siglist.c:54
-msgid "Window changed"
-msgstr "Ha canviat la mida de la finestra"
+#: catgets/gencat.c:232 debug/pcprofiledump.c:204 iconv/iconv_prog.c:411
+#: iconv/iconvconfig.c:380 locale/programs/localedef.c:371
+#: login/programs/pt_chown.c:88 malloc/memusagestat.c:526 nss/makedb.c:231
+msgid ""
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+"Per a obtenir instruccions sobre com informar d’un error, vegeu\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
 
-#: sysdeps/generic/siglist.h:55 stdio-common/../sysdeps/unix/siglist.c:56
-msgid "User defined signal 1"
-msgstr "Senyal 1 definit per l'usuari"
+#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:296
+#: elf/ldd.bash.in:39 elf/sprof.c:355 iconv/iconv_prog.c:426
+#: iconv/iconvconfig.c:395 locale/programs/locale.c:275
+#: locale/programs/localedef.c:387 login/programs/pt_chown.c:59
+#: malloc/memusage.sh:71 nscd/nscd.c:406 nss/getent.c:83 nss/makedb.c:245
+#: posix/getconf.c:1012
+#, 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"
+"Aquest és programari lliure; vegeu el codi font per les condicions\n"
+"de còpia.  No hi ha CAP garantia; ni tan sols de COMERCIABILITAT o\n"
+"ADEQUACIÓ PER A UN PROPÒSIT PARTICULAR.\n"
 
-#: sysdeps/generic/siglist.h:56 stdio-common/../sysdeps/unix/siglist.c:57
-msgid "User defined signal 2"
-msgstr "Senyal 2 definit per l'usuari"
+#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:301 elf/sprof.c:361
+#: iconv/iconv_prog.c:431 iconv/iconvconfig.c:400 locale/programs/locale.c:280
+#: locale/programs/localedef.c:392 malloc/memusage.sh:75 nscd/nscd.c:411
+#: nss/getent.c:88 nss/makedb.c:250 posix/getconf.c:1017
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Escrit per %s.\n"
 
-#: sysdeps/generic/siglist.h:60 stdio-common/../sysdeps/unix/siglist.c:33
-msgid "EMT trap"
-msgstr "Trampa EMT"
+#: catgets/gencat.c:282
+msgid "*standard input*"
+msgstr "*entrada estàndard*"
 
-#: sysdeps/generic/siglist.h:63 stdio-common/../sysdeps/unix/siglist.c:38
-msgid "Bad system call"
-msgstr "La crida al sistema no és vàlida"
+#: catgets/gencat.c:288 iconv/iconv_charmap.c:158 iconv/iconv_prog.c:298
+#: nss/makedb.c:170
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "no s’ha pogut obrir el fitxer d’entrada «%s»"
 
-#: sysdeps/generic/siglist.h:66
-msgid "Stack fault"
-msgstr "Fallada de pila"
+#: catgets/gencat.c:417 catgets/gencat.c:494
+msgid "illegal set number"
+msgstr "el número de joc de missatges no és vàlid"
 
-#: sysdeps/generic/siglist.h:69
-msgid "Information request"
-msgstr "Petició d'informació"
+#: catgets/gencat.c:444
+msgid "duplicate set definition"
+msgstr "la definició del joc de missatges és duplicada"
 
-#: sysdeps/generic/siglist.h:71
-msgid "Power failure"
-msgstr "Fallada d'alimentació"
+#: catgets/gencat.c:446 catgets/gencat.c:623 catgets/gencat.c:677
+msgid "this is the first definition"
+msgstr "aquesta és la primera definició"
 
-# ivb (2000/10/28)
-# ivb  Sona més a llenguatge jurídic que a altra cosa...
-#: sysdeps/generic/siglist.h:74 stdio-common/../sysdeps/unix/siglist.c:55
-msgid "Resource lost"
-msgstr "S'ha perdut el recurs"
+#: catgets/gencat.c:522
+#, c-format
+msgid "unknown set `%s'"
+msgstr "el joc de missatges «%s» no és conegut"
+
+#: catgets/gencat.c:563
+msgid "invalid quote character"
+msgstr "el caràcter de citació no és vàlid"
+
+#: catgets/gencat.c:576
+#, c-format
+msgid "unknown directive `%s': line ignored"
+msgstr "la directiva «%s» no és coneguda: es descarta la línia"
+
+#: catgets/gencat.c:621
+msgid "duplicated message number"
+msgstr "el número de missatge és duplicat"
+
+#: catgets/gencat.c:674
+msgid "duplicated message identifier"
+msgstr "l’identificador de missatge és duplicat"
+
+#: catgets/gencat.c:731
+msgid "invalid character: message ignored"
+msgstr "el caràcter no és vàlid: es descarta el missatge"
+
+#: catgets/gencat.c:774
+msgid "invalid line"
+msgstr "la línia no és vàlida"
+
+#: catgets/gencat.c:828
+msgid "malformed line ignored"
+msgstr "es descarta la línia en mal estat"
+
+#: catgets/gencat.c:992 catgets/gencat.c:1033 nss/makedb.c:183
+#, c-format
+msgid "cannot open output file `%s'"
+msgstr "no s’ha pogut obrir el fitxer d’eixida «%s»"
+
+#: catgets/gencat.c:1195 locale/programs/linereader.c:560
+msgid "invalid escape sequence"
+msgstr "la seqüència d’escapada no és vàlida"
+
+#: catgets/gencat.c:1217
+msgid "unterminated message"
+msgstr "el missatge no està acabat"
+
+#: catgets/gencat.c:1241
+#, c-format
+msgid "while opening old catalog file"
+msgstr "en obrir el fitxer antic de catàleg"
+
+#: catgets/gencat.c:1332
+#, c-format
+msgid "conversion modules not available"
+msgstr "els mòduls de conversió no es troben disponibles"
+
+#: catgets/gencat.c:1358
+#, c-format
+msgid "cannot determine escape character"
+msgstr "no s’ha pogut determinar el caràcter d’escapada"
+
+# Més ajudes.  ivb
+#: debug/pcprofiledump.c:53
+msgid "Don't buffer output"
+msgstr "No empra memòria intermèdia per a l’eixida."
+
+# ivb (2001/11/06)
+# ivb  És possible que en comptes de
+# ivb    PC = Program Counter (comptador de programa)
+# ivb  es referira a
+# ivb    PC = Procedure Call (crides a procediment)
+# ivb  tot i que el codi del programa cada volta que fa referència a «pc»
+# ivb  o «PC» parla del «lowpc» i del «highpc», sempre en referència al
+# ivb  segment de text (codi) del programa.
+#: debug/pcprofiledump.c:58
+msgid "Dump information generated by PC profiling."
+msgstr "Bolca la informació generada en perfilar el comptador de programa."
+
+#: debug/pcprofiledump.c:61
+msgid "[FILE]"
+msgstr "[FITXER]"
+
+#: debug/pcprofiledump.c:104
+#, c-format
+msgid "cannot open input file"
+msgstr "no s’ha pogut obrir el fitxer d’entrada"
+
+#: debug/pcprofiledump.c:111
+#, c-format
+msgid "cannot read header"
+msgstr "no s’ha pogut llegir la capçalera"
+
+#: debug/pcprofiledump.c:175
+#, c-format
+msgid "invalid pointer size"
+msgstr "la mida del punter no és vàlida"
+
+#: debug/xtrace.sh:27 debug/xtrace.sh:45
+msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
+msgstr "Forma d’ús: xtrace [OPCIÓ]… PROGRAMA [OPCIÓ_DE_PROGRAMA]…\\n"
+
+#: debug/xtrace.sh:33
+msgid "Try \\`xtrace --help' for more information.\\n"
+msgstr "Proveu «xtrace --help» per a obtenir més informació.\\n"
+
+#: debug/xtrace.sh:39
+msgid "xtrace: option \\`$1' requires an argument.\\n"
+msgstr "xtrace: l’opció «$1» necessita un 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 ""
+"Traça l’execució d’un programa mostrant la funció que s’està executant\n"
+"actualment.\n"
+"\n"
+"      --data=FITXER    No executa el programa, només mostra les dades del\n"
+"                       FITXER.\n"
+"\n"
+"  -?, --help           Mostra aquesta ajuda i ix.\n"
+"      --usage          Mostra un missatge breu amb la forma d’ús.\n"
+"  -V, --version        Mostra informació sobre la versió i ix.\n"
+"\n"
+"Els arguments obligatoris per a les opcions llargues també ho són per a les\n"
+"opcions curtes corresponents.\n"
+"\n"
+"Per a obtenir instruccions sobre com informar d’un error, vegeu\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\\n"
+
+#: debug/xtrace.sh:125
+msgid "xtrace: unrecognized option \\`$1'\\n"
+msgstr "xtrace: l’opció «$1» no és reconeguda\\n"
+
+#: debug/xtrace.sh:138
+msgid "No program name given\\n"
+msgstr "no s’ha indicat un nom de programa\\n"
+
+#: debug/xtrace.sh:146
+#, sh-format
+msgid "executable \\`$program' not found\\n"
+msgstr "no s’ha trobat l’executable «$program»\\n"
+
+#: debug/xtrace.sh:150
+#, sh-format
+msgid "\\`$program' is no executable\\n"
+msgstr "«$program» no és executable\\n"
+
+#: dlfcn/dlinfo.c:64
+msgid "RTLD_SELF used in code not dynamically loaded"
+msgstr "S’ha emprat RTLD_SELF en un codi no carregat dinàmicament"
+
+#: dlfcn/dlinfo.c:73
+msgid "unsupported dlinfo request"
+msgstr "dlinfo() no permet l’ús d’aquesta petició"
+
+#: dlfcn/dlmopen.c:64
+msgid "invalid namespace"
+msgstr "l’espai de noms no és vàlid"
+
+#: dlfcn/dlmopen.c:69
+msgid "invalid mode"
+msgstr "el mode no és vàlid"
+
+#: dlfcn/dlopen.c:64
+msgid "invalid mode parameter"
+msgstr "el paràmetre de mode no és vàlid"
+
+# ivb (2001/11/01)
+# ivb  Es refereix al tipus de la biblioteca (libc{4,5,6}) -> masculí.
+#: elf/cache.c:69
+msgid "unknown"
+msgstr "desconegut"
+
+# ivb (2001/11/06)
+# ivb  Cal mantenir-ho curt...
+#: elf/cache.c:112
+msgid "Unknown OS"
+msgstr "SO desconegut"
+
+# ivb (2001/11/06)
+# ivb  Cal mantenir-ho curt...
+#: elf/cache.c:117
+#, c-format
+msgid ", OS ABI: %s %d.%d.%d"
+msgstr ", ABI del SO: %s %d.%d.%d"
+
+#: elf/cache.c:134 elf/ldconfig.c:1270
+#, c-format
+msgid "Can't open cache file %s\n"
+msgstr "no s’ha pogut obrir el fitxer «%s» de memòria cau\n"
+
+#: elf/cache.c:148
+#, c-format
+msgid "mmap of cache file failed.\n"
+msgstr "ha fallat mmap() sobre el fitxer de memòria cau\n"
+
+#: elf/cache.c:152 elf/cache.c:166
+#, c-format
+msgid "File is not a cache file.\n"
+msgstr "el fitxer no és un fitxer de memòria cau\n"
+
+# No és un error.  ivb
+#: elf/cache.c:199 elf/cache.c:209
+#, c-format
+msgid "%d libs found in cache `%s'\n"
+msgstr "S’han trobat %d biblioteques a la memòria cau «%s».\n"
+
+#: elf/cache.c:403
+#, c-format
+msgid "Can't create temporary cache file %s"
+msgstr "no s’ha pogut crear el fitxer temporal de memòria cau «%s»"
+
+#: elf/cache.c:411 elf/cache.c:421 elf/cache.c:425 elf/cache.c:430
+#, c-format
+msgid "Writing of cache data failed"
+msgstr "no s’han pogut escriure les dades de la memòria cau"
+
+#: elf/cache.c:435
+#, c-format
+msgid "Changing access rights of %s to %#o failed"
+msgstr "no s’ha pogut canviar els drets d’accés de «%s» a %#o"
+
+#: elf/cache.c:440
+#, c-format
+msgid "Renaming of %s to %s failed"
+msgstr "no s’ha pogut reanomenar «%s» a «%s»"
+
+#: elf/dl-close.c:378 elf/dl-open.c:460
+msgid "cannot create scope list"
+msgstr "no s’ha pogut crear la llista d’àmbits"
+
+#: elf/dl-close.c:724
+msgid "shared object not open"
+msgstr "l’objecte compartit no és obert"
+
+# ivb (2001/11/05)
+# ivb  DST = Dynamic String Token (component cadena dinàmica)
+#: elf/dl-deps.c:114
+msgid "DST not allowed in SUID/SGID programs"
+msgstr "no es permeten components cadena dinàmica (DST) en programes SUID/SGID"
+
+#: elf/dl-deps.c:127 elf/dl-open.c:282
+msgid "empty dynamic string token substitution"
+msgstr "la substitució del component cadena dinàmica és buida"
+
+# ivb (2002/10/21)
+# ivb  Es refereix a _objectes_ auxiliars, segons el codi.
+#: elf/dl-deps.c:133
+#, c-format
+msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
+msgstr "no s’ha pogut carregar l’objecte auxiliar «%s» perquè la substitució del component cadena dinàmica és buida\n"
+
+#: elf/dl-deps.c:474
+msgid "cannot allocate dependency list"
+msgstr "no s’ha pogut reservar la llista de dependències"
+
+#: elf/dl-deps.c:510 elf/dl-deps.c:565
+msgid "cannot allocate symbol search list"
+msgstr "no s’ha pogut reservar la llista de cerca de símbols"
+
+# ivb (2002/10/21)
+# ivb  LD_TRACE_PRELINKING és una variable d'entorn, no és part del filtre.
+#: elf/dl-deps.c:550
+msgid "Filters not supported with LD_TRACE_PRELINKING"
+msgstr "LD_TRACE_PRELINKING no permet l’ús de filtres"
+
+#: elf/dl-error.c:77
+msgid "DYNAMIC LINKER BUG!!!"
+msgstr "ERROR A L’ENLLAÇADOR DINÀMIC!!!"
+
+#: elf/dl-error.c:124
+msgid "error while loading shared libraries"
+msgstr "error en carregar les biblioteques dinàmiques"
+
+#: elf/dl-fptr.c:88
+msgid "cannot map pages for fdesc table"
+msgstr "no s’han pogut mapar pàgines per a la taula «fdesc»"
+
+#: elf/dl-fptr.c:192
+msgid "cannot map pages for fptr table"
+msgstr "no s’han pogut mapar pàgines per a la taula «fptr»"
+
+#: elf/dl-fptr.c:221
+msgid "internal error: symidx out of range of fptr table"
+msgstr "error intern: «symidx» és fora de rang respecte la taula «fptr»"
+
+#: elf/dl-load.c:372
+msgid "cannot allocate name record"
+msgstr "no s’ha pogut reservar el registre de nom"
+
+#: elf/dl-load.c:474 elf/dl-load.c:582 elf/dl-load.c:667 elf/dl-load.c:780
+msgid "cannot create cache for search path"
+msgstr "no s’ha pogut crear la memòria cau dels camins de cerca"
+
+#: elf/dl-load.c:565
+msgid "cannot create RUNPATH/RPATH copy"
+msgstr "no s’ha pogut crear una còpia de RUNPATH o RPATH"
+
+#: elf/dl-load.c:653
+msgid "cannot create search path array"
+msgstr "no s’ha pogut crear el vector de camins de cerca"
+
+#: elf/dl-load.c:864
+msgid "cannot stat shared object"
+msgstr "ha fallat stat() sobre l’objecte compartit"
 
 # ivb (2001/10/28)
-# ivb  Codi -> sembla que aquesta és la traducció correcta, ja que tracta
-# ivb  d'identificar l'error dins un vector de sistemes d'errors del mach. (?)
-#: sysdeps/mach/hurd/mips/dl-machine.c:68
-#: string/../sysdeps/mach/_strerror.c:57
-msgid "Error in unknown error system: "
-msgstr "Error en un sistema d'errors desconegut: "
+# ivb  Es refereix a /dev/zero .
+#: elf/dl-load.c:934
+msgid "cannot open zero fill device"
+msgstr "no s’ha pogut obrir el dispositiu de zeros"
 
-#: sysdeps/mach/hurd/mips/dl-machine.c:83
-#: string/../sysdeps/generic/_strerror.c:44
-#: string/../sysdeps/mach/_strerror.c:87
-msgid "Unknown error "
-msgstr "Error desconegut "
+#: elf/dl-load.c:979 elf/dl-load.c:2224
+msgid "cannot create shared object descriptor"
+msgstr "no s’ha pogut crear el descriptor d’objecte compartit"
 
-#: sysdeps/unix/sysv/linux/lddlibc4.c:64
+#: elf/dl-load.c:998 elf/dl-load.c:1656 elf/dl-load.c:1748
+msgid "cannot read file data"
+msgstr "no s’han pogut llegir les dades del fitxer"
+
+#: elf/dl-load.c:1042
+msgid "ELF load command alignment not page-aligned"
+msgstr "l’alineament de l’ordre ELF de càrrega no està alineada amb la pàgina"
+
+#: elf/dl-load.c:1049
+msgid "ELF load command address/offset not properly aligned"
+msgstr "l’adreça o desplaçament de l’ordre ELF de càrrega no està correctament alineada"
+
+#: elf/dl-load.c:1132
+msgid "cannot allocate TLS data structures for initial thread"
+msgstr "no s’han pogut reservar les estructures de dades TLS per al fil inicial"
+
+#: elf/dl-load.c:1155
+msgid "cannot handle TLS data"
+msgstr "no es pot tractar amb dades TLS"
+
+#: elf/dl-load.c:1174
+msgid "object file has no loadable segments"
+msgstr "el fitxer objecte no té segments carregables"
+
+#: elf/dl-load.c:1210
+msgid "failed to map segment from shared object"
+msgstr "no s’ha pogut mapar un segment de l’objecte compartit"
+
+#: elf/dl-load.c:1236
+msgid "cannot dynamically load executable"
+msgstr "no s’ha pogut carregar dinàmicament l’executable"
+
+#: elf/dl-load.c:1298
+msgid "cannot change memory protections"
+msgstr "no s’han pogut canviar les proteccions de memòria"
+
+#: elf/dl-load.c:1317
+msgid "cannot map zero-fill pages"
+msgstr "no s’han pogut mapar les pàgines plenes de zeros"
+
+#: elf/dl-load.c:1331
+msgid "object file has no dynamic section"
+msgstr "el fitxer objecte no té secció dinàmica"
+
+#: elf/dl-load.c:1354
+msgid "shared object cannot be dlopen()ed"
+msgstr "ha fallat dlopen() sobre l’objecte compartit"
+
+#: elf/dl-load.c:1367
+msgid "cannot allocate memory for program header"
+msgstr "no s’ha pogut reservar memòria per a la capçalera del programa"
+
+#: elf/dl-load.c:1384 elf/dl-open.c:218
+msgid "invalid caller"
+msgstr "la biblioteca que ha fet la crida no és vàlida"
+
+#: elf/dl-load.c:1423
+msgid "cannot enable executable stack as shared object requires"
+msgstr "no s’ha pogut habilitar la pila executable a requeriment de l’objecte compartit"
+
+#: elf/dl-load.c:1436
+msgid "cannot close file descriptor"
+msgstr "no s’ha pogut tancar un descriptor de fitxer"
+
+#: elf/dl-load.c:1478
+msgid "cannot create searchlist"
+msgstr "no s’ha pogut crear la llista de cerca"
+
+#: elf/dl-load.c:1656
+msgid "file too short"
+msgstr "el fitxer és massa curt"
+
+#: elf/dl-load.c:1685
+msgid "invalid ELF header"
+msgstr "la capçalera ELF no és vàlida"
+
+#: elf/dl-load.c:1697
+msgid "ELF file data encoding not big-endian"
+msgstr "la codificació de les dades del fitxer ELF no és bigâ€endian"
+
+#: elf/dl-load.c:1699
+msgid "ELF file data encoding not little-endian"
+msgstr "la codificació de les dades del fitxer ELF no és littleâ€endian"
+
+#: elf/dl-load.c:1703
+msgid "ELF file version ident does not match current one"
+msgstr "la identificació de la versió del fitxer ELF no concorda amb l’actual"
+
+# ivb (2001/11(06)
+# ivb  ABI = Application Binary Interface (interfície binària d'aplicació)
+#: elf/dl-load.c:1707
+msgid "ELF file OS ABI invalid"
+msgstr "l’ABI de sistema operatiu del fitxer ELF no és vàlida"
+
+#: elf/dl-load.c:1709
+msgid "ELF file ABI version invalid"
+msgstr "la versió de l’ABI del fitxer ELF no és vàlida"
+
+#: elf/dl-load.c:1712
+msgid "internal error"
+msgstr "error intern"
+
+#: elf/dl-load.c:1719
+msgid "ELF file version does not match current one"
+msgstr "la versió del fitxer ELF no concorda amb l’actual"
+
+#: elf/dl-load.c:1727
+msgid "only ET_DYN and ET_EXEC can be loaded"
+msgstr "només es poden carregar els tipus ET_DYN i ET_EXEC"
+
+# ivb (2001/11/01)
+# ivb  La traducció completa de «phentsize» vindria a ser: mida d'entrada
+# ivb  de taula de la capçalera de programa.
+#: elf/dl-load.c:1733
+msgid "ELF file's phentsize not the expected size"
+msgstr "el valor de «phentsize» del fitxer ELF no és l’esperat"
+
+#: elf/dl-load.c:2240
+msgid "wrong ELF class: ELFCLASS64"
+msgstr "la classe ELF no és vàlida: ELFCLASS64"
+
+#: elf/dl-load.c:2241
+msgid "wrong ELF class: ELFCLASS32"
+msgstr "la classe ELF no és vàlida: ELFCLASS32"
+
+#: elf/dl-load.c:2244
+msgid "cannot open shared object file"
+msgstr "no s’ha pogut obrir el fitxer objecte compartit"
+
+#: elf/dl-lookup.c:356
+msgid "relocation error"
+msgstr "error de reubicació"
+
+#: elf/dl-lookup.c:384
+msgid "symbol lookup error"
+msgstr "error en cercar el símbol"
+
+#: elf/dl-open.c:114
+msgid "cannot extend global scope"
+msgstr "no s’ha pogut estendre l’àmbit global"
+
+# ivb (2002/10/29)
+# ivb  TLS = Thread Local Storage
+#: elf/dl-open.c:512
+msgid "TLS generation counter wrapped!  Please report this."
+msgstr "El comptador de generació de TLS s’ha esgotat!  Per favor, informeu d’açò."
+
+#: elf/dl-open.c:549
+msgid "invalid mode for dlopen()"
+msgstr "el mode de dlopen() no és vàlid"
+
+#: elf/dl-open.c:566
+msgid "no more namespaces available for dlmopen()"
+msgstr "no resten espais de noms disponibles per a dlmopen()"
+
+#: elf/dl-open.c:579
+msgid "invalid target namespace in dlmopen()"
+msgstr "l’espai de noms destí de dlmopen() no és vàlid"
+
+#: elf/dl-reloc.c:54
+msgid "cannot allocate memory in static TLS block"
+msgstr "no s’ha pogut reservar memòria al bloc TLS estàtic"
+
+#: elf/dl-reloc.c:196
+msgid "cannot make segment writable for relocation"
+msgstr "no s’ha pogut fer escrivible el segment per a reubicarâ€lo"
+
+# ivb (2002/10/21)
+# ivb  PLT = Procedure Linkage Table, Taula d'Enllaçat de Procediments
+# ivb  PLTREL = tipus de reubicació usada per la PLT
+#: elf/dl-reloc.c:277
 #, c-format
-msgid "cannot open `%s'"
-msgstr "no s'ha pogut obrir «%s»"
+msgid "%s: no PLTREL found in object %s\n"
+msgstr "%s: no s’ha trobat el PLTREL de l’objecte «%s»\n"
 
-#: sysdeps/unix/sysv/linux/lddlibc4.c:68
+#: elf/dl-reloc.c:288
 #, c-format
-msgid "cannot read header from `%s'"
-msgstr "no s'ha pogut llegir la capçalera de «%s»"
+msgid "%s: out of memory to store relocation results for %s\n"
+msgstr "%s: no resta memòria per a guardar els resultats de reubicar «%s»\n"
+
+#: elf/dl-reloc.c:304
+msgid "cannot restore segment prot after reloc"
+msgstr "no s’ha pogut restaurar la protecció del segment després de reubicarâ€lo"
+
+#: elf/dl-reloc.c:329
+msgid "cannot apply additional memory protection after relocation"
+msgstr "no s’ha pogut protegir la memòria després de reubicar"
+
+#: elf/dl-sym.c:162
+msgid "RTLD_NEXT used in code not dynamically loaded"
+msgstr "s’ha emprat RTLD_NEXT en un codi no carregat dinàmicament"
+
+#: elf/dl-sysdep.c:469 elf/dl-sysdep.c:481
+msgid "cannot create capability list"
+msgstr "no s’ha pogut crear la llista de capacitats"
+
+#: elf/dl-tls.c:825
+msgid "cannot create TLS data structures"
+msgstr "no s’han pogut crear les estructures de dades TLS"
+
+#: elf/dl-version.c:303
+msgid "cannot allocate version reference table"
+msgstr "no s’ha pogut reservar la taula de referències de versions"
+
+# Més ajudes.  ivb
+#: elf/ldconfig.c:138
+msgid "Print cache"
+msgstr "Mostra la memòria cau."
+
+#: elf/ldconfig.c:139
+msgid "Generate verbose messages"
+msgstr "Genera missatges detallats."
+
+#: elf/ldconfig.c:140
+msgid "Don't build cache"
+msgstr "No construeix la memòria cau."
+
+#: elf/ldconfig.c:141
+msgid "Don't generate links"
+msgstr "No genera enllaços."
+
+#: elf/ldconfig.c:142
+msgid "Change to and use ROOT as root directory"
+msgstr "Canvia a i empra ARREL com a directori arrel."
+
+#: elf/ldconfig.c:142
+msgid "ROOT"
+msgstr "ARREL"
+
+#: elf/ldconfig.c:143
+msgid "CACHE"
+msgstr "CACHE"
+
+#: elf/ldconfig.c:143
+msgid "Use CACHE as cache file"
+msgstr "Empra CACHE com a fitxer de memòria cau."
+
+#: elf/ldconfig.c:144
+msgid "CONF"
+msgstr "CONF"
+
+#: elf/ldconfig.c:144
+msgid "Use CONF as configuration file"
+msgstr "Empra CONF com a fitxer de configuració."
+
+#: elf/ldconfig.c:145
+msgid "Only process directories specified on the command line.  Don't build cache."
+msgstr "Només processa els directoris especificats a la línia d’ordres.  No construeix la memòria cau."
+
+#: elf/ldconfig.c:146
+msgid "Manually link individual libraries."
+msgstr "Per a enllaçar les biblioteques manualment."
+
+#: elf/ldconfig.c:147
+msgid "FORMAT"
+msgstr "FORMAT"
+
+#: elf/ldconfig.c:147
+msgid "Format to use: new, old or compat (default)"
+msgstr "FORMAT a emprar: «new» (nou), «old» (antic) o «compat» (compatible, per defecte)."
 
-#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:295 catgets/gencat.c:288
+#: elf/ldconfig.c:148
+msgid "Ignore auxiliary cache file"
+msgstr "No té en compte el fitxer de memòria cau auxilar."
+
+#: elf/ldconfig.c:156
+msgid "Configure Dynamic Linker Run Time Bindings."
+msgstr "Configura els vincles en temps d’execució de l’enllaçador dinàmic."
+
+#: elf/ldconfig.c:319
 #, c-format
-msgid "cannot open input file `%s'"
-msgstr "no s'ha pogut obrir el fitxer d'entrada «%s»"
+msgid "Path `%s' given more than once"
+msgstr "s’ha indicat el camí «%s» més d’una volta"
+
+#: elf/ldconfig.c:359
+#, c-format
+msgid "%s is not a known library type"
+msgstr "«%s» no és un tipus conegut de biblioteca"
+
+#: elf/ldconfig.c:384
+#, c-format
+msgid "Can't stat %s"
+msgstr "ha fallat stat() sobre «%s»"
+
+#: elf/ldconfig.c:458
+#, c-format
+msgid "Can't stat %s\n"
+msgstr "ha fallat stat() sobre «%s»\n"
+
+#: elf/ldconfig.c:468
+#, c-format
+msgid "%s is not a symbolic link\n"
+msgstr "«%s» no és un enllaç simbòlic\n"
+
+#: elf/ldconfig.c:487
+#, c-format
+msgid "Can't unlink %s"
+msgstr "no s’ha pogut desenllaçar «%s»"
+
+#: elf/ldconfig.c:493
+#, c-format
+msgid "Can't link %s to %s"
+msgstr "no s’ha pogut crear un enllaç des de «%s» cap a «%s»"
+
+# ivb (2001/10/28)
+# ivb  Es refereix a un enllaç -> masculí.
+#: elf/ldconfig.c:499
+msgid " (changed)\n"
+msgstr " (canviat)\n"
+
+# ivb (2001/10/28)
+# ivb  Es refereix a fer o no l'enllaç, no importa el gènere.
+#: elf/ldconfig.c:501
+msgid " (SKIPPED)\n"
+msgstr " (SALTAT)\n"
+
+#: elf/ldconfig.c:556
+#, c-format
+msgid "Can't find %s"
+msgstr "no s’ha pogut trobar «%s»"
+
+#: elf/ldconfig.c:572 elf/ldconfig.c:745 elf/ldconfig.c:793 elf/ldconfig.c:827
+#, c-format
+msgid "Cannot lstat %s"
+msgstr "ha fallat lstat() sobre «%s»"
+
+#: elf/ldconfig.c:579
+#, c-format
+msgid "Ignored file %s since it is not a regular file."
+msgstr "es descarta el fitxer «%s» que no és un fitxer ordinari"
+
+#: elf/ldconfig.c:588
+#, c-format
+msgid "No link created since soname could not be found for %s"
+msgstr "no s’ha creat l’enllaç perquè no s’ha trobat el nom d’objecte compartit de «%s»"
+
+#: elf/ldconfig.c:671
+#, c-format
+msgid "Can't open directory %s"
+msgstr "no s’ha pogut obrir el directori «%s»"
+
+#: elf/ldconfig.c:759
+#, c-format
+msgid "Cannot stat %s"
+msgstr "ha fallat stat() sobre «%s»"
+
+#: elf/ldconfig.c:814 elf/readlib.c:91
+#, c-format
+msgid "Input file %s not found.\n"
+msgstr "no s’ha trobat el fitxer d’entrada «%s»\n"
+
+#: elf/ldconfig.c:888
+#, c-format
+msgid "libc5 library %s in wrong directory"
+msgstr "la biblioteca «%s» per a libc5 es troba en un directori incorrecte"
 
-#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:313
+#: elf/ldconfig.c:891
+#, c-format
+msgid "libc6 library %s in wrong directory"
+msgstr "la biblioteca «%s» per a libc6 es troba en un directori incorrecte"
+
+#: elf/ldconfig.c:894
+#, c-format
+msgid "libc4 library %s in wrong directory"
+msgstr "la biblioteca «%s» per a libc4 es troba en un directori incorrecte"
+
+#: elf/ldconfig.c:922
+#, c-format
+msgid "libraries %s and %s in directory %s have same soname but different type."
+msgstr "les biblioteques «%s» i «%s» del directori «%s» tenen el mateix nom d’objecte compartit però diferent tipus."
+
+#: elf/ldconfig.c:1031
+#, c-format
+msgid "Can't open configuration file %s"
+msgstr "no s’ha pogut obrir el fitxer «%s» de configuració"
+
+#: elf/ldconfig.c:1095
+#, c-format
+msgid "%s:%u: bad syntax in hwcap line"
+msgstr "%s:%u: la sintaxi de la línia «hwcap» no és vàlida"
+
+#: elf/ldconfig.c:1101
+#, c-format
+msgid "%s:%u: hwcap index %lu above maximum %u"
+msgstr "%s:%u: la «hwcap» amb índex %lu està sobre el màxim %u"
+
+# La substitució final és per un nom.  ivb
+#: elf/ldconfig.c:1108 elf/ldconfig.c:1116
+#, c-format
+msgid "%s:%u: hwcap index %lu already defined as %s"
+msgstr "%s:%u: la «hwcap» amb índex %lu ja ha estat definida com a «%s»"
+
+#: elf/ldconfig.c:1119
+#, c-format
+msgid "%s:%u: duplicate hwcap %lu %s"
+msgstr "%s:%u: la «hwcap» %lu amb nom «%s» està duplicada"
+
+#: elf/ldconfig.c:1141
+#, c-format
+msgid "need absolute file name for configuration file when using -r"
+msgstr "cal indicar el camí absolut del fitxer de configuració en emprar «-r»"
+
+#: elf/ldconfig.c:1148 locale/programs/xmalloc.c:70 malloc/obstack.c:434
+#: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1163
+#, c-format
+msgid "memory exhausted"
+msgstr "la memòria s’ha exhaurit"
+
+#: elf/ldconfig.c:1178
+#, c-format
+msgid "%s:%u: cannot read directory %s"
+msgstr "%s:%u: no s’ha pogut llegir el directori «%s»"
+
+#: elf/ldconfig.c:1223
+#, c-format
+msgid "relative path `%s' used to build cache"
+msgstr "s’ha indicat el camí relatiu «%s» per a construir la memòria cau"
+
+#: elf/ldconfig.c:1249
+#, c-format
+msgid "Can't chdir to /"
+msgstr "no s’ha pogut canviar al directori arrel"
+
+#: elf/ldconfig.c:1291
+#, c-format
+msgid "Can't open cache file directory %s\n"
+msgstr "no s’ha pogut obrir el directori «%s» de fitxers de memòria cau\n"
+
+#: elf/ldd.bash.in:43
+msgid "Written by %s and %s.\n"
+msgstr "Escrit per %s i %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 ""
+"Forma d’ús: ldd [OPCIÓ]… FITXER…\n"
+"\n"
+"  -d, --data-relocs    Processa les reubicacions de dades.\n"
+"  -r, --function-relocs    Processa les reubicacions de dades i funcions.\n"
+"  -u, --unused         Mostra les dependències directes no emprades.\n"
+"  -v, --verbose        Mostra tota la informació.\n"
+"      --help           Mostra aquesta ajuda i ix.\n"
+"      --version        Mostra informació sobre la versió i ix.\n"
+"\n"
+"Per a obtenir instruccions sobre com informar d’un error, vegeu\n"
+"<http://www.gnu.org/software/libc/bugs.html>."
+
+#: elf/ldd.bash.in:80
+msgid "ldd: option \\`$1' is ambiguous"
+msgstr "ldd: l’opció «$1» és ambígua"
+
+#: elf/ldd.bash.in:87
+msgid "unrecognized option"
+msgstr "l’opció no és reconeguda"
+
+#: elf/ldd.bash.in:88 elf/ldd.bash.in:126
+msgid "Try \\`ldd --help' for more information."
+msgstr "Proveu «ldd --help» per a obtenir més informació."
+
+#: elf/ldd.bash.in:125
+msgid "missing file arguments"
+msgstr "manquen arguments fitxer"
+
+#. 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 "El fitxer o directori no existeix"
+
+# ivb (2001/10/31)
+# ivb  Cal tenir en compte que «ordinary» a l'anglés és cosa pler diferent ;)
+#: elf/ldd.bash.in:151 inet/rcmd.c:483
+msgid "not regular file"
+msgstr "no és un fitxer ordinari"
+
+# Darrere va el nom de fitxer, no puc canviar les cometes. :(  ivb
+#: elf/ldd.bash.in:154
+msgid "warning: you do not have execution permission for"
+msgstr "avís: no teniu permís d’execució per a"
+
+#: elf/ldd.bash.in:183
+msgid "\tnot a dynamic executable"
+msgstr "\tno és un executable dinàmic"
+
+# Davant va el nom de fitxer, no puc canviar les cometes. :(  ivb
+#: elf/ldd.bash.in:191
+msgid "exited with unknown exit code"
+msgstr "ha finalitzat amb un codi d’eixida desconegut"
+
+# Darrere va el nom de fitxer, no puc canviar les cometes. :(  ivb
+#: elf/ldd.bash.in:196
+msgid "error: you do not have read permission for"
+msgstr "error: no teniu permís de lectura per a"
+
+#: elf/readelflib.c:35
+#, c-format
+msgid "file %s is truncated\n"
+msgstr "el fitxer «%s» està truncat\n"
+
+#: elf/readelflib.c:67
+#, c-format
+msgid "%s is a 32 bit ELF file.\n"
+msgstr "«%s» és un fitxer ELF de 32 bits\n"
+
+#: elf/readelflib.c:69
+#, c-format
+msgid "%s is a 64 bit ELF file.\n"
+msgstr "«%s» és un fitxer ELF de 64 bits\n"
+
+#: elf/readelflib.c:71
+#, c-format
+msgid "Unknown ELFCLASS in file %s.\n"
+msgstr "la classe ELF del fitxer «%s» no és coneguda\n"
+
+#: elf/readelflib.c:78
+#, c-format
+msgid "%s is not a shared object file (Type: %d).\n"
+msgstr "«%s» no és un fitxer objecte compartit (tipus: %d)\n"
+
+#: elf/readelflib.c:109
+#, c-format
+msgid "more than one dynamic segment\n"
+msgstr "hi ha més d’un segment dinàmic\n"
+
+#: elf/readlib.c:97
+#, c-format
+msgid "Cannot fstat file %s.\n"
+msgstr "ha fallat fstat() sobre el fitxer «%s»\n"
+
+#: elf/readlib.c:108
+#, c-format
+msgid "File %s is empty, not checked."
+msgstr "el fitxer «%s» és buit, no es comprova"
+
+#: elf/readlib.c:114
+#, c-format
+msgid "File %s is too small, not checked."
+msgstr "el fitxer «%s» és massa menut, no es comprova"
+
+#: elf/readlib.c:124
+#, c-format
+msgid "Cannot mmap file %s.\n"
+msgstr "ha fallat mmap() sobre el fitxer «%s»\n"
+
+#: elf/readlib.c:162
+#, c-format
+msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
+msgstr "«%s» no és un fitxer ELF: els octets màgics del començament no són correctes\n"
+
+# Més ajudes.  ivb
+#: elf/sprof.c:77
+msgid "Output selection:"
+msgstr "Selecció de l’eixida:"
+
+#: elf/sprof.c:79
+msgid "print list of count paths and their number of use"
+msgstr "Mostra una llista de camins de recompte i les voltes que han estat emprats."
+
+#: elf/sprof.c:81
+msgid "generate flat profile with counts and ticks"
+msgstr "Genera un perfil pla amb recomptes i unitats de temps."
+
+#: elf/sprof.c:82
+msgid "generate call graph"
+msgstr "Genera un gràfic de crides."
+
+# FIXME: Don't use \v.
+#: elf/sprof.c:89
+msgid ""
+"Read and display shared object profiling data.\vFor bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+"Llig i mostra les dades de perfilat d’un objecte compartit.\n"
+"\n"
+"Per a obtenir instruccions sobre com informar d’un error, vegeu\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+
+#: elf/sprof.c:94
+msgid "SHOBJ [PROFDATA]"
+msgstr "OBJECTE_COMPARTIT [DADES_PERFILAT]"
+
+#: elf/sprof.c:400
+#, c-format
+msgid "failed to load shared object `%s'"
+msgstr "no s’ha pogut carregar l’objecte compartit «%s»"
+
+#: elf/sprof.c:409
+#, c-format
+msgid "cannot create internal descriptors"
+msgstr "no s’han pogut crear els descriptors interns"
+
+#: elf/sprof.c:528
+#, c-format
+msgid "Reopening shared object `%s' failed"
+msgstr "no s’ha pogut reobrir l’objecte compartit «%s»"
+
+#: elf/sprof.c:535 elf/sprof.c:629
+#, c-format
+msgid "reading of section headers failed"
+msgstr "la lectura de les capçaleres de secció ha fallat"
+
+#: elf/sprof.c:543 elf/sprof.c:637
+#, c-format
+msgid "reading of section header string table failed"
+msgstr "la lectura de la taula de cadenes de capçalera de secció ha fallat"
+
+#: elf/sprof.c:569
+#, c-format
+msgid "*** Cannot read debuginfo file name: %m\n"
+msgstr "*** No s’ha pogut llegir el nom del fitxer d’informació de depuració: %m\n"
+
+#: elf/sprof.c:589
+#, c-format
+msgid "cannot determine file name"
+msgstr "no s’ha pogut determinar un nom de fitxer"
+
+#: elf/sprof.c:622
+#, c-format
+msgid "reading of ELF header failed"
+msgstr "la lectura de la capçalera ELF ha fallat"
+
+#: elf/sprof.c:658
+#, c-format
+msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
+msgstr "*** El fitxer «%s» no conté símbols: no és possible l’anàlisi detallada\n"
+
+#: elf/sprof.c:688
+#, c-format
+msgid "failed to load symbol data"
+msgstr "no s’han pogut carregar les dades simbòliques"
+
+#: elf/sprof.c:755
+#, c-format
+msgid "cannot load profiling data"
+msgstr "no s’han pogut carregar les dades de perfilat"
+
+#: elf/sprof.c:764
+#, c-format
+msgid "while stat'ing profiling data file"
+msgstr "en cridar stat() sobre el fitxer de dades de perfilat"
+
+#: elf/sprof.c:772
+#, c-format
+msgid "profiling data file `%s' does not match shared object `%s'"
+msgstr "el fitxer «%s» de dades de perfilat no correspon a l’objecte compartit «%s»"
+
+#: elf/sprof.c:783
+#, c-format
+msgid "failed to mmap the profiling data file"
+msgstr "ha fallat mmap() sobre el fitxer de dades de perfilat"
+
+#: elf/sprof.c:791
+#, c-format
+msgid "error while closing the profiling data file"
+msgstr "error en tancar el fitxer de dades de perfilat"
+
+#: elf/sprof.c:800 elf/sprof.c:870
+#, c-format
+msgid "cannot create internal descriptor"
+msgstr "no s’ha pogut crear un descriptor intern"
+
+#: elf/sprof.c:846
+#, c-format
+msgid "`%s' is no correct profile data file for `%s'"
+msgstr "«%s» no és un fitxer vàlid de perfilat de «%s»"
+
+#: elf/sprof.c:1027 elf/sprof.c:1085
+#, c-format
+msgid "cannot allocate symbol data"
+msgstr "no s’han pogut reservar les dades de símbols"
+
+#: iconv/iconv_charmap.c:176 iconv/iconv_prog.c:316
 #, c-format
 msgid "error while closing input `%s'"
-msgstr "error en tancar l'entrada «%s»"
+msgstr "error en tancar l’entrada «%s»"
 
-#: iconv/iconv_charmap.c:443
+#: iconv/iconv_charmap.c:450
 #, c-format
 msgid "illegal input sequence at position %Zd"
-msgstr "hi ha una seqüència d'entrada no vàlida en la posició %Zd"
+msgstr "hi ha una seqüència d’entrada no vàlida a la posició %Zd"
 
-#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:506
+#: iconv/iconv_charmap.c:469 iconv/iconv_prog.c:526
+#, c-format
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr "hi ha un caràcter o seqüència de desplaçament incompleta al final de la memòria intermèdia"
 
-#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:549
-#: iconv/iconv_prog.c:585
+#: iconv/iconv_charmap.c:514 iconv/iconv_charmap.c:550 iconv/iconv_prog.c:569
+#: iconv/iconv_prog.c:605
+#, c-format
 msgid "error while reading the input"
-msgstr "error en llegir l'entrada"
+msgstr "error en llegir l’entrada"
 
-#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:567
+#: iconv/iconv_charmap.c:532 iconv/iconv_prog.c:587
+#, c-format
 msgid "unable to allocate buffer for input"
-msgstr "no s'ha pogut reservar memòria intermèdia per a l'entrada"
+msgstr "no s’ha pogut reservar memòria intermèdia per a l’entrada"
 
-#: iconv/iconv_prog.c:61
+#: iconv/iconv_prog.c:60
 msgid "Input/Output format specification:"
-msgstr "Especificació de format de l'entrada/eixida:"
+msgstr "Especificació de format de l’entrada/eixida:"
 
 # Els següents són missatges d'ajuda.  ivb
-#: iconv/iconv_prog.c:62
+#: iconv/iconv_prog.c:61
 msgid "encoding of original text"
 msgstr "Codificació del text original."
 
-#: iconv/iconv_prog.c:63
+#: iconv/iconv_prog.c:62
 msgid "encoding for output"
-msgstr "Codificació de l'eixida."
+msgstr "Codificació de l’eixida."
 
-#: iconv/iconv_prog.c:64
+#: iconv/iconv_prog.c:63
 msgid "Information:"
 msgstr "Informació:"
 
-#: iconv/iconv_prog.c:65
+#: iconv/iconv_prog.c:64
 msgid "list all known coded character sets"
 msgstr "Llista tots els jocs de caràcters codificats coneguts."
 
-#: iconv/iconv_prog.c:66 locale/programs/localedef.c:128
+#: iconv/iconv_prog.c:65 locale/programs/localedef.c:127
 msgid "Output control:"
-msgstr "Control de l'eixida:"
+msgstr "Control de l’eixida:"
 
-#: iconv/iconv_prog.c:67
+#: iconv/iconv_prog.c:66
 msgid "omit invalid characters from output"
-msgstr "Omet en l'eixida els caràcters no vàlids."
+msgstr "Omet a l’eixida els caràcters no vàlids."
 
-#: iconv/iconv_prog.c:68
+#: iconv/iconv_prog.c:67
 msgid "output file"
-msgstr "Fitxer d'eixida."
+msgstr "Fitxer d’eixida."
 
-#: iconv/iconv_prog.c:69
+#: iconv/iconv_prog.c:68
 msgid "suppress warnings"
 msgstr "Elimina els avisos."
 
-#: iconv/iconv_prog.c:70
+#: iconv/iconv_prog.c:69
 msgid "print progress information"
 msgstr "Mostra informació del progrés."
 
-#: iconv/iconv_prog.c:75
+#: iconv/iconv_prog.c:74
 msgid "Convert encoding of given files from one encoding to another."
-msgstr "Converteix els fitxers especificats d'una codificació a una altra."
+msgstr "Converteix els fitxers especificats d’una codificació a una altra."
 
-#: iconv/iconv_prog.c:79
+#: iconv/iconv_prog.c:78
 msgid "[FILE...]"
-msgstr "[FITXER...]"
+msgstr "[FITXER…]"
 
-#: iconv/iconv_prog.c:201
+#: iconv/iconv_prog.c:200
+#, c-format
 msgid "cannot open output file"
-msgstr "no s'ha pogut obrir el fitxer d'eixida"
+msgstr "no s’ha pogut obrir el fitxer d’eixida"
 
-#: iconv/iconv_prog.c:243
+#: iconv/iconv_prog.c:242
 #, c-format
 msgid "conversions from `%s' and to `%s' are not supported"
-msgstr "no es suporta la conversió de «%s» ni a «%s»"
+msgstr "les conversions de «%s» i a «%s» no estan implementades"
 
-#: iconv/iconv_prog.c:248
+#: iconv/iconv_prog.c:247
 #, c-format
 msgid "conversion from `%s' is not supported"
-msgstr "no es suporta la conversió de «%s»"
+msgstr "la conversió de «%s» no està implementada"
 
-#: iconv/iconv_prog.c:255
+#: iconv/iconv_prog.c:254
 #, c-format
 msgid "conversion to `%s' is not supported"
-msgstr "no es suporta la conversió a «%s»"
+msgstr "la conversió a «%s» no està implementada"
 
-#: iconv/iconv_prog.c:259
+#: iconv/iconv_prog.c:258
 #, c-format
 msgid "conversion from `%s' to `%s' is not supported"
-msgstr "no es suporta la conversió de «%s» a «%s»"
+msgstr "la conversió de «%s» a «%s» no està implementada"
 
-#: iconv/iconv_prog.c:265
+#: iconv/iconv_prog.c:268
+#, c-format
 msgid "failed to start conversion processing"
-msgstr "no s'ha pogut començar a processar la conversió"
+msgstr "no s’ha pogut començar a processar la conversió"
 
-#: iconv/iconv_prog.c:360
-msgid "error while closing output file"
-msgstr "error en tancar el fitxer d'eixida"
-
-#: 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 "Informeu dels errors amb el guió «glibcbug» a <bugs@gnu.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:362
 #, 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"
-"Aquest és programari lliure; vegeu el codi font per les condicions\n"
-"de còpia.  No hi ha CAP garantia; ni tan sols de COMERCIABILITAT o\n"
-"ADEQUACIÓ PER UN PROPÒSIT PARTICULAR.\n"
+msgid "error while closing output file"
+msgstr "error en tancar el fitxer d’eixida"
 
-#: 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:471 iconv/iconv_prog.c:497
 #, c-format
-msgid "Written by %s.\n"
-msgstr "Escrit per %s.\n"
-
-#: iconv/iconv_prog.c:458 iconv/iconv_prog.c:484
 msgid "conversion stopped due to problem in writing the output"
-msgstr "la conversió s'ha detingut degut a un problema en escriure l'eixida"
+msgstr "la conversió s’ha detingut a causa d’un problema en escriure l’eixida"
 
-#: iconv/iconv_prog.c:502
+#: iconv/iconv_prog.c:522
 #, c-format
 msgid "illegal input sequence at position %ld"
-msgstr "hi ha una seqüència d'entrada no vàlida en la posició %ld"
+msgstr "hi ha una seqüència d’entrada no vàlida a la posició %ld"
 
-#: iconv/iconv_prog.c:510
+#: iconv/iconv_prog.c:530
+#, c-format
 msgid "internal error (illegal descriptor)"
 msgstr "error intern (el descriptor no és vàlid)"
 
-#: iconv/iconv_prog.c:513
+#: iconv/iconv_prog.c:533
 #, c-format
 msgid "unknown iconv() error %d"
-msgstr "error desconegut %d en iconv()"
+msgstr "error desconegut %d a iconv()"
 
-#: iconv/iconv_prog.c:756
+#: iconv/iconv_prog.c:779
 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"
@@ -351,8 +1385,8 @@ msgid ""
 "  "
 msgstr ""
 "La llista següent conté tots els jocs de caràcters codificats coneguts.  Açò\n"
-"no significa necessàriament que totes les combinacions d'aquests noms siguen\n"
-"possibles en els paràmetres d'origen i destí de la línia d'ordres.  Un joc de\n"
+"no significa necessàriament que totes les combinacions d’aquests noms siguen\n"
+"possibles als paràmetres d’origen i destí de la línia d’ordres.  Un joc de\n"
 "caràcters codificat pot estar llistat amb noms diferents (àlies).\n"
 "\n"
 "  "
@@ -365,793 +1399,917 @@ msgstr "Crea un fitxer de configuració de càrrega ràpida per al mòdul iconv.
 
 #: iconv/iconvconfig.c:114
 msgid "[DIR...]"
-msgstr " [DIRECTORI...]"
+msgstr " [DIRECTORI…]"
 
 # És un missatge d'ajuda.  ivb
-#: iconv/iconvconfig.c:126
+#: iconv/iconvconfig.c:127
 msgid "Prefix used for all file accesses"
-msgstr "Prefix a usar en tots els accessos a fitxer."
+msgstr "Prefix a emprar per a tots els accessos a fitxer."
 
-#: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
+#: iconv/iconvconfig.c:128
+msgid "Put output in FILE instead of installed location (--prefix does not apply to FILE)"
+msgstr "Desa l’eixida en el FITXER en lloc de la ubicació d’instaŀlació («--prefix» no s’aplica al FITXER)."
+
+#: iconv/iconvconfig.c:132
+msgid "Do not search standard directories, only those on the command line"
+msgstr "No cerca en els directoris estàndard, només en els indicats a la línia d’ordres."
+
+#: iconv/iconvconfig.c:301
+#, c-format
+msgid "Directory arguments required when using --nostdlib"
+msgstr "Cal proporcionar arguments directori en emprar «--nostdlib»."
+
+#: iconv/iconvconfig.c:343 locale/programs/localedef.c:291
+#, c-format
 msgid "no output file produced because warnings were issued"
-msgstr "no s'ha generat el fitxer d'eixida perquè s'han produït avisos"
+msgstr "no s’ha generat el fitxer d’eixida perquè s’han produït avisos"
 
-#: iconv/iconvconfig.c:405
+#: iconv/iconvconfig.c:429
+#, c-format
 msgid "while inserting in search tree"
-msgstr "en inserir en l'arbre de recerca"
+msgstr "en inserir a l’arbre de cerca"
 
-#: iconv/iconvconfig.c:1204
+#: iconv/iconvconfig.c:1238
+#, c-format
 msgid "cannot generate output file"
-msgstr "no s'ha pogut generar el fitxer d'eixida"
+msgstr "no s’ha pogut generar el fitxer d’eixida"
+
+#: inet/rcmd.c:157
+msgid "rcmd: Cannot allocate memory\n"
+msgstr "rcmd: no s’ha pogut reservar memòria\n"
+
+#: inet/rcmd.c:172
+msgid "rcmd: socket: All ports in use\n"
+msgstr "rcmd: socket: tots els ports estan sent emprats\n"
+
+#: inet/rcmd.c:200
+#, c-format
+msgid "connect to address %s: "
+msgstr "connexió amb l’adreça «%s»: "
+
+#: inet/rcmd.c:213
+#, c-format
+msgid "Trying %s...\n"
+msgstr "S’està provant amb «%s»…\n"
+
+#: inet/rcmd.c:249
+#, c-format
+msgid "rcmd: write (setting up stderr): %m\n"
+msgstr "rcmd: write (en preparar l’eixida estàndard d’errors): %m\n"
+
+#: inet/rcmd.c:265
+#, c-format
+msgid "rcmd: poll (setting up stderr): %m\n"
+msgstr "rcmd: poll (en preparar l’eixida estàndard d’errors): %m\n"
+
+#: inet/rcmd.c:268
+msgid "poll: protocol failure in circuit setup\n"
+msgstr "poll: fallada del protocol en configurar el circuit\n"
+
+#: inet/rcmd.c:301
+msgid "socket: protocol failure in circuit setup\n"
+msgstr "socket: fallada del protocol en configurar el circuit\n"
+
+#: inet/rcmd.c:325
+#, c-format
+msgid "rcmd: %s: short read"
+msgstr "rcmd: %s: lectura incompleta"
+
+#: inet/rcmd.c:481
+msgid "lstat failed"
+msgstr "ha fallat lstat()"
+
+#: inet/rcmd.c:488
+msgid "cannot open"
+msgstr "no s’ha pogut obrir"
+
+#: inet/rcmd.c:490
+msgid "fstat failed"
+msgstr "ha fallat fstat()"
+
+#: inet/rcmd.c:492
+msgid "bad owner"
+msgstr "el propietari no és vàlid"
+
+#: inet/rcmd.c:494
+msgid "writeable by other than owner"
+msgstr "és modificable per altres que no en són el propietari"
+
+#: inet/rcmd.c:496
+msgid "hard linked somewhere"
+msgstr "té un enllaç fort en altre lloc"
+
+#: inet/ruserpass.c:170 inet/ruserpass.c:193
+msgid "out of memory"
+msgstr "no resta memòria"
+
+#: inet/ruserpass.c:184
+msgid "Error: .netrc file is readable by others."
+msgstr "Error: el fitxer «.netrc» és llegible per altres que no en són el propietari."
+
+#: inet/ruserpass.c:185
+msgid "Remove password or make file unreadable by others."
+msgstr "Elimineu la contrasenya o feu iŀlegible el fitxer per a altres."
+
+#: inet/ruserpass.c:277
+#, c-format
+msgid "Unknown .netrc keyword %s"
+msgstr "la paraula clau «%s» de «.netrc» no és coneguda"
+
+#: libidn/nfkc.c:464
+msgid "Character out of range for UTF-8"
+msgstr "el caràcter és fora de rang respecte UTF-8"
 
 #: locale/programs/charmap-dir.c:59
 #, c-format
 msgid "cannot read character map directory `%s'"
-msgstr "no s'ha pogut llegir el directori «%s» de taules de caràcters"
+msgstr "no s’ha pogut llegir el directori «%s» de taules de caràcters"
 
-#: locale/programs/charmap.c:136
+#: locale/programs/charmap.c:138
 #, c-format
 msgid "character map file `%s' not found"
-msgstr "no s'ha trobat el fitxer «%s» de mapa de caràcters"
+msgstr "no s’ha trobat el fitxer «%s» de mapa de caràcters"
 
-#: locale/programs/charmap.c:194
+#: locale/programs/charmap.c:195
 #, c-format
 msgid "default character map file `%s' not found"
-msgstr "no s'ha trobat el fitxer «%s» de mapa de caràcters per defecte"
+msgstr "no s’ha trobat el fitxer «%s» de mapa de caràcters per defecte"
 
-#: locale/programs/charmap.c:257
+#: locale/programs/charmap.c:258
 #, c-format
 msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
 msgstr "el mapa de caràcters «%s» no és compatible amb ASCII, el locale no és conforme amb ISO C\n"
 
 # La variable porta els símbols inclosos.  ivb
-#: locale/programs/charmap.c:336
+#: locale/programs/charmap.c:337
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max> ha de ser major que <mb_cur_min>\n"
 
-#: locale/programs/charmap.c:356 locale/programs/charmap.c:373
-#: locale/programs/repertoire.c:175
+#: locale/programs/charmap.c:357 locale/programs/charmap.c:374
+#: locale/programs/repertoire.c:174
 #, c-format
 msgid "syntax error in prolog: %s"
-msgstr "error de sintaxi en el pròleg: %s"
+msgstr "error de sintaxi al pròleg: %s"
 
-#: locale/programs/charmap.c:357
+#: locale/programs/charmap.c:358
 msgid "invalid definition"
 msgstr "la definició no és vàlida"
 
-#: locale/programs/charmap.c:374 locale/programs/locfile.c:126
-#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
+#: locale/programs/charmap.c:375 locale/programs/locfile.c:126
+#: locale/programs/locfile.c:153 locale/programs/repertoire.c:175
 msgid "bad argument"
-msgstr "l'argument no és vàlid"
+msgstr "l’argument no és vàlid"
 
 # Les variables inclouen els símbols «<>».  ivb
-#: locale/programs/charmap.c:402
+#: locale/programs/charmap.c:403
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr "la definició de <%s> és duplicada"
 
-#: locale/programs/charmap.c:409
+#: locale/programs/charmap.c:410
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr "el valor de <%s> ha de ser 1 o major"
 
-#: locale/programs/charmap.c:421
+#: locale/programs/charmap.c:422
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "el valor de «%s» ha de ser major o igual que el de «%s»"
 
-#: locale/programs/charmap.c:444 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
 #, c-format
 msgid "argument to <%s> must be a single character"
-msgstr "l'argument de «%s» ha de ser un sol caràcter"
+msgstr "l’argument de «%s» ha de ser un sol caràcter"
 
-#: locale/programs/charmap.c:470
+#: locale/programs/charmap.c:471
 msgid "character sets with locking states are not supported"
-msgstr "els jocs de caràcters amb estats blocadors no són suportats"
+msgstr "l’ús de jocs de caràcters amb estats blocadors no està implementat"
 
 # El primer és el nom d'una variable (en majúscules).  ivb
-#: locale/programs/charmap.c:497 locale/programs/charmap.c:551
-#: locale/programs/charmap.c:583 locale/programs/charmap.c:677
-#: locale/programs/charmap.c:732 locale/programs/charmap.c:773
-#: locale/programs/charmap.c:814
+#: locale/programs/charmap.c:498 locale/programs/charmap.c:552
+#: locale/programs/charmap.c:584 locale/programs/charmap.c:678
+#: locale/programs/charmap.c:733 locale/programs/charmap.c:774
+#: locale/programs/charmap.c:815
 #, c-format
 msgid "syntax error in %s definition: %s"
-msgstr "error de sintaxi en la definició %s: %s"
+msgstr "error de sintaxi a la definició %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:499 locale/programs/charmap.c:679
+#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
 msgid "no symbolic name given"
-msgstr "no s'ha indicat un nom simbòlic"
+msgstr "no s’ha indicat un nom simbòlic"
 
-#: locale/programs/charmap.c:552
+#: locale/programs/charmap.c:553
 msgid "invalid encoding given"
 msgstr "la codificació especificada no és vàlida"
 
-#: locale/programs/charmap.c:561
+#: locale/programs/charmap.c:562
 msgid "too few bytes in character encoding"
-msgstr "manquen octets en la codificació del caràcter"
+msgstr "manquen octets a la codificació del caràcter"
 
-#: locale/programs/charmap.c:563
+#: locale/programs/charmap.c:564
 msgid "too many bytes in character encoding"
-msgstr "sobren octets en la codificació del caràcter"
+msgstr "sobren octets a la codificació del caràcter"
 
-#: locale/programs/charmap.c:585 locale/programs/charmap.c:733
-#: locale/programs/charmap.c:816 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:586 locale/programs/charmap.c:734
+#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296
 msgid "no symbolic name given for end of range"
-msgstr "no s'ha indicat un nom simbòlic per a la fi del rang"
-
-#: locale/programs/charmap.c:609 locale/programs/locfile.c:818
-#: locale/programs/repertoire.c:314
+msgstr "no s’ha indicat un nom simbòlic per a la fi del rang"
+
+#: locale/programs/charmap.c:610 locale/programs/ld-address.c:600
+#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3924
+#: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984
+#: locale/programs/ld-identification.c:452
+#: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
+#: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307
+#: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241
+#: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221
+#: locale/programs/repertoire.c:313
 #, c-format
-msgid "`%1$s' definition does not end with `END %1$s'"
-msgstr "la definició «%1$s» no termina en «END %1$s»"
+msgid "%1$s: definition does not end with `END %1$s'"
+msgstr "%1$s: la definició no acaba en «END %1$s»"
 
-#: locale/programs/charmap.c:642
+#: locale/programs/charmap.c:643
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr "només es permeten definicions WIDTH després de la definició CHARMAP"
 
 # El primer és el nom d'una variable (en majúscules).  ivb
-#: locale/programs/charmap.c:650 locale/programs/charmap.c:713
+#: locale/programs/charmap.c:651 locale/programs/charmap.c:714
 #, c-format
 msgid "value for %s must be an integer"
 msgstr "el valor de %s ha de ser un enter"
 
-#: locale/programs/charmap.c:841
+#: locale/programs/charmap.c:842
 #, c-format
 msgid "%s: error in state machine"
-msgstr "%s: error en la màquina d'estats"
-
-#: 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: error a la màquina d’estats"
+
+#: locale/programs/charmap.c:850 locale/programs/ld-address.c:616
+#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4115
+#: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001
+#: locale/programs/ld-identification.c:468
+#: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
+#: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323
+#: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257
+#: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237
+#: locale/programs/locfile.c:826 locale/programs/repertoire.c:324
 #, c-format
 msgid "%s: premature end of file"
-msgstr "%s: fí de fitxer prematura"
+msgstr "%s: final prematur del fitxer"
 
-#: locale/programs/charmap.c:868 locale/programs/charmap.c:879
+#: locale/programs/charmap.c:869 locale/programs/charmap.c:880
 #, c-format
 msgid "unknown character `%s'"
 msgstr "el caràcter «%s» no és conegut"
 
-#: locale/programs/charmap.c:887
+#: locale/programs/charmap.c:888
 #, c-format
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
-msgstr "el nombre d'octets de les seqüències d'inici i final del rang no són iguals: %d i %d"
+msgstr "el nombre d’octets de les seqüències d’inici i final del rang no són iguals: %d i %d"
 
-#: locale/programs/charmap.c:991 locale/programs/ld-collate.c:2930
-#: locale/programs/repertoire.c:420
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3047
+#: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr "els noms del rang de caràcters no són vàlids"
 
 # ivb (2001/11/05)
 # ivb  El rang també pot contenir dígits.  El text original pot fer pensar
 # ivb  que _només_ s'accepten lletres majúscules.
-#: locale/programs/charmap.c:1003 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
 msgid "hexadecimal range format should use only capital characters"
-msgstr "les lletres usades en un rang amb format hexadecimal han de ser majúscules"
+msgstr "les lletres emprades en un rang amb format hexadecimal han de ser majúscules"
 
-# Les variables inclouen els símbols «<>».  ivb
-#: locale/programs/charmap.c:1021
+#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449
 #, c-format
-msgid "<%s> and <%s> are illegal names for range"
-msgstr "<%s> i <%s> no són noms de rang permesos"
+msgid "<%s> and <%s> are invalid names for range"
+msgstr "<%s> i <%s> no són noms de rang vàlids"
 
-#: locale/programs/charmap.c:1027
-msgid "upper limit in range is not higher then lower limit"
-msgstr "el límit superior del rang no és major que l'inferior"
+#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456
+msgid "upper limit in range is smaller than lower limit"
+msgstr "el límit superior del rang és menor que l’inferior"
 
-#: locale/programs/charmap.c:1085
+#: locale/programs/charmap.c:1087
 msgid "resulting bytes for range not representable."
 msgstr "els octets resultants del rang no són representables"
 
-#: 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:133 locale/programs/ld-collate.c:1556
+#: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133
+#: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
+#: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
+#: locale/programs/ld-numeric.c:98 locale/programs/ld-paper.c:91
+#: locale/programs/ld-telephone.c:94 locale/programs/ld-time.c:159
 #, c-format
 msgid "No definition for %s category found"
-msgstr "no s'ha trobat cap definició de la categoria «%s»"
+msgstr "no s’ha trobat cap definició de la categoria «%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-address.c:144 locale/programs/ld-address.c:182
+#: locale/programs/ld-address.c:200 locale/programs/ld-address.c:229
+#: locale/programs/ld-address.c:301 locale/programs/ld-address.c:320
+#: locale/programs/ld-address.c:333 locale/programs/ld-identification.c:146
+#: locale/programs/ld-measurement.c:105 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
+#: locale/programs/ld-monetary.c:278 locale/programs/ld-name.c:105
+#: locale/programs/ld-name.c:142 locale/programs/ld-numeric.c:112
+#: locale/programs/ld-numeric.c:126 locale/programs/ld-paper.c:102
+#: locale/programs/ld-paper.c:111 locale/programs/ld-telephone.c:105
+#: locale/programs/ld-telephone.c:162 locale/programs/ld-time.c:175
+#: locale/programs/ld-time.c:196
 #, c-format
 msgid "%s: field `%s' not defined"
-msgstr "%s: no s'ha definit el camp «%s»"
+msgstr "%s: no s’ha definit el camp «%s»"
 
-#: 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:156 locale/programs/ld-address.c:208
+#: locale/programs/ld-address.c:238 locale/programs/ld-address.c:276
+#: locale/programs/ld-name.c:117 locale/programs/ld-telephone.c:117
 #, c-format
 msgid "%s: field `%s' must not be empty"
-msgstr "%s: el camp «%s» no ha d'estar buit"
+msgstr "%s: el camp «%s» no ha d’estar buit"
 
-#: locale/programs/ld-address.c:169
+#: locale/programs/ld-address.c:168
 #, c-format
 msgid "%s: invalid escape `%%%c' sequence in field `%s'"
-msgstr "%s: la seqüència d'escapada «%%%c» del camp «%s» no és vàlida"
+msgstr "%s: la seqüència d’escapada «%%%c» del camp «%s» no és vàlida"
 
 # ivb (2001/10/28)
 # ivb  Pel que sembla hi ha un codi terminològic de llengua i un
 # ivb  codi bibliogràfic de llengua.
 # ivb  http://anubis.dkuug.dk/i18n/iso-639-2-dis.txt
-#: locale/programs/ld-address.c:220
+#: locale/programs/ld-address.c:219
 #, c-format
 msgid "%s: terminology language code `%s' not defined"
-msgstr "%s: no s'ha definit el codi terminològic de llengua «%s»"
+msgstr "%s: no s’ha definit el codi terminològic de llengua «%s»"
+
+#: locale/programs/ld-address.c:244
+#, c-format
+msgid "%s: field `%s' must not be defined"
+msgstr "%s: no s’ha de definir el camp «%s»"
 
-#: locale/programs/ld-address.c:247 locale/programs/ld-address.c:276
+#: locale/programs/ld-address.c:258 locale/programs/ld-address.c:287
 #, c-format
 msgid "%s: language abbreviation `%s' not defined"
-msgstr "%s: no s'ha definit l'abreviatura de llengua «%s»"
+msgstr "%s: no s’ha definit l’abreviatura de llengua «%s»"
 
-#: 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:265 locale/programs/ld-address.c:293
+#: locale/programs/ld-address.c:327 locale/programs/ld-address.c:339
 #, c-format
 msgid "%s: `%s' value does not match `%s' value"
 msgstr "%s: el valor de «%s» no concorda amb el valor de «%s»"
 
-#: locale/programs/ld-address.c:301
+#: locale/programs/ld-address.c:312
 #, c-format
 msgid "%s: numeric country code `%d' not valid"
 msgstr "%s: el codi numèric de país «%d» no és vàlid"
 
-#: 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
+#: locale/programs/ld-address.c:508 locale/programs/ld-address.c:545
+#: locale/programs/ld-address.c:583 locale/programs/ld-ctype.c:2608
+#: locale/programs/ld-identification.c:364
+#: locale/programs/ld-measurement.c:221 locale/programs/ld-messages.c:301
+#: locale/programs/ld-monetary.c:701 locale/programs/ld-monetary.c:736
+#: locale/programs/ld-monetary.c:777 locale/programs/ld-name.c:280
+#: locale/programs/ld-numeric.c:263 locale/programs/ld-paper.c:224
+#: locale/programs/ld-telephone.c:288 locale/programs/ld-time.c:1126
+#: locale/programs/ld-time.c:1168
 #, c-format
 msgid "%s: field `%s' declared more than once"
-msgstr "%s: el camp «%s» ha estat declarat més d'una volta"
+msgstr "%s: el camp «%s» ha estat declarat més d’una volta"
 
-#: 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:512 locale/programs/ld-address.c:550
+#: locale/programs/ld-identification.c:368 locale/programs/ld-messages.c:311
+#: locale/programs/ld-monetary.c:705 locale/programs/ld-monetary.c:740
+#: locale/programs/ld-name.c:284 locale/programs/ld-numeric.c:267
+#: locale/programs/ld-telephone.c:292 locale/programs/ld-time.c:1020
+#: locale/programs/ld-time.c:1089 locale/programs/ld-time.c:1131
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: el camp «%s» conté un caràcter desconegut"
 
-#: 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:597 locale/programs/ld-collate.c:3922
+#: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449
+#: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
+#: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305
+#: locale/programs/ld-numeric.c:366 locale/programs/ld-paper.c:239
+#: locale/programs/ld-telephone.c:311 locale/programs/ld-time.c:1219
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr "%s: la línia «END» és incompleta"
 
-#: 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
-#, c-format
-msgid "%1$s: definition does not end with `END %1$s'"
-msgstr "%1$s: la definició no termina en «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
+#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:542
+#: locale/programs/ld-collate.c:594 locale/programs/ld-collate.c:890
+#: locale/programs/ld-collate.c:903 locale/programs/ld-collate.c:2733
+#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4105
+#: locale/programs/ld-ctype.c:1960 locale/programs/ld-ctype.c:2219
+#: locale/programs/ld-ctype.c:2806 locale/programs/ld-ctype.c:2992
+#: locale/programs/ld-identification.c:459
+#: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
+#: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314
+#: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248
+#: locale/programs/ld-telephone.c:320 locale/programs/ld-time.c:1228
 #, c-format
 msgid "%s: syntax error"
 msgstr "%s: error de sintaxi"
 
-#: locale/programs/ld-collate.c:398
+#: locale/programs/ld-collate.c:417
 #, c-format
 msgid "`%.*s' already defined in charmap"
-msgstr "«%.*s» ja ha estat definit en el mapa de caràcters"
+msgstr "«%.*s» ja ha estat definit al mapa de caràcters"
 
-#: locale/programs/ld-collate.c:407
+#: locale/programs/ld-collate.c:426
 #, c-format
 msgid "`%.*s' already defined in repertoire"
-msgstr "«%.*s» ja ha estat definit en el repertori"
+msgstr "«%.*s» ja ha estat definit al repertori"
 
-#: locale/programs/ld-collate.c:414
+#: locale/programs/ld-collate.c:433
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
-msgstr "«%.*s» ja ha estat definit com a símbol d'ordenació"
+msgstr "«%.*s» ja ha estat definit com a símbol d’ordenació"
 
-#: locale/programs/ld-collate.c:421
+#: locale/programs/ld-collate.c:440
 #, c-format
 msgid "`%.*s' already defined as collating element"
-msgstr "«%.*s» ja ha estat definit com a element d'ordenació"
+msgstr "«%.*s» ja ha estat definit com a element d’ordenació"
 
-#: locale/programs/ld-collate.c:452 locale/programs/ld-collate.c:478
+#: locale/programs/ld-collate.c:471 locale/programs/ld-collate.c:497
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: «forward» i «backward» són mútuament excloents"
 
-#: locale/programs/ld-collate.c:462 locale/programs/ld-collate.c:488
-#: locale/programs/ld-collate.c:504
+#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507
+#: locale/programs/ld-collate.c:523
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
-msgstr "%s: s'ha mencionat «%s» més d'una volta en la definició de pes %d"
+msgstr "%s: s’ha mencionat «%s» més d’una volta a la definició de pes %d"
 
-#: locale/programs/ld-collate.c:560
+#: locale/programs/ld-collate.c:579
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: sobren regles; la primera entrada només en tenia %d"
 
-#: locale/programs/ld-collate.c:596
+#: locale/programs/ld-collate.c:615
 #, c-format
 msgid "%s: not enough sorting rules"
-msgstr "%s: no hi ha suficients regles d'ordenació"
+msgstr "%s: no hi ha suficients regles d’ordenació"
 
-#: locale/programs/ld-collate.c:761
+#: locale/programs/ld-collate.c:780
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: no es permet la cadena buida com a nom de pes"
 
-#: locale/programs/ld-collate.c:856
+#: locale/programs/ld-collate.c:875
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
-msgstr "%s: els pesos han d'usar el mateix símbol d'eŀlipsi que el nom"
+msgstr "%s: els pesos han d’emprar el mateix símbol d’eŀlipsi que el nom"
 
-#: locale/programs/ld-collate.c:912
+#: locale/programs/ld-collate.c:931
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: sobren valors"
 
-#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
+#: locale/programs/ld-collate.c:1051 locale/programs/ld-collate.c:1226
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
-msgstr "l'ordre de «%.*s» ja ha estat definit en %s:%Zu"
+msgstr "l’ordre de «%.*s» ja ha estat definit a %s:%Zu"
 
-#: locale/programs/ld-collate.c:1081
+#: locale/programs/ld-collate.c:1101
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
-msgstr "%s: els símbols inicial i final d'un rang han de representar caràcters"
+msgstr "%s: els símbols inicial i final d’un rang han de representar caràcters"
 
-#: locale/programs/ld-collate.c:1108
+#: locale/programs/ld-collate.c:1128
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
-msgstr "%s: les seqüències d'octets del primer i l'últim caràcter han de tenir la mateixa longitud"
+msgstr "%s: les seqüències d’octets del primer i darrer caràcter han de tenir la mateixa longitud"
 
-#: locale/programs/ld-collate.c:1150
+#: locale/programs/ld-collate.c:1170
 #, c-format
-msgid "%s: byte sequence of first character of sequence is not lower than that of the last character"
-msgstr "%s: la seqüència d'octets del primer caràcter de la seqüència no és menor que la de l'últim caràcter"
+msgid "%s: byte sequence of first character of range is not lower than that of the last character"
+msgstr "%s: la seqüència d’octets del primer caràcter del rang no és menor que la del darrer caràcter"
 
-#: locale/programs/ld-collate.c:1275
+#: locale/programs/ld-collate.c:1295
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
-msgstr "%s: un rang simbòlic amb eŀlipsi no pot anar just darrere d'«order_start»"
+msgstr "%s: un rang simbòlic amb eŀlipsi no pot anar just darrere d’«order_start»"
 
-#: locale/programs/ld-collate.c:1279
+#: locale/programs/ld-collate.c:1299
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
-msgstr "%s: un rang simbòlic amb eŀlipsi no pot anar just davant d'«order_end»"
+msgstr "%s: un rang simbòlic amb eŀlipsi no pot anar just davant d’«order_end»"
 
-#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
+#: locale/programs/ld-collate.c:1319 locale/programs/ld-ctype.c:1477
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "«%s» i «%.*s» no són noms vàlids de rangs simbòlics"
 
-#: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
+#: locale/programs/ld-collate.c:1369 locale/programs/ld-collate.c:3858
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
-msgstr "%s: l'ordre de «%.*s» ja ha estat definit en %s:%Zu"
+msgstr "%s: l’ordre de «%.*s» ja ha estat definit a %s:%Zu"
 
-#: locale/programs/ld-collate.c:1357
+#: locale/programs/ld-collate.c:1378
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: «%s» ha de ser un caràcter"
 
-#: locale/programs/ld-collate.c:1550
+#: locale/programs/ld-collate.c:1573
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
-msgstr "%s: cal usar «position» per a un nivell específic en totes les seccions o en cap"
+msgstr "%s: cal emprar «position» per a un nivell específic a totes les seccions o a cap"
 
-#: locale/programs/ld-collate.c:1575
+#: locale/programs/ld-collate.c:1598
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "el símbol «%s» no ha estat definit"
 
-#: locale/programs/ld-collate.c:1651 locale/programs/ld-collate.c:1757
+#: locale/programs/ld-collate.c:1674 locale/programs/ld-collate.c:1780
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "el símbol «%s» té la mateixa codificació que"
 
-#: locale/programs/ld-collate.c:1655 locale/programs/ld-collate.c:1761
+#: locale/programs/ld-collate.c:1678 locale/programs/ld-collate.c:1784
 #, c-format
 msgid "symbol `%s'"
 msgstr "el símbol «%s»"
 
-#: locale/programs/ld-collate.c:1803
+#: locale/programs/ld-collate.c:1826
+#, c-format
 msgid "no definition of `UNDEFINED'"
-msgstr "no s'ha definit «UNDEFINED»"
+msgstr "no s’ha definit «UNDEFINED»"
 
-#: locale/programs/ld-collate.c:1832
+#: locale/programs/ld-collate.c:1855
+#, c-format
 msgid "too many errors; giving up"
-msgstr "hi ha massa errors: s'abandona"
+msgstr "hi ha massa errors: s’abandona"
+
+#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4044
+#, c-format
+msgid "%s: nested conditionals not supported"
+msgstr "%s: no es permeten els condicionals niats"
+
+#: locale/programs/ld-collate.c:2677
+#, c-format
+msgid "%s: more then one 'else'"
+msgstr "%s: hi ha més d’una clàusula «else»"
 
-#: locale/programs/ld-collate.c:2735
+#: locale/programs/ld-collate.c:2852
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: la definició de «%s» és duplicada"
 
-#: locale/programs/ld-collate.c:2771
+#: locale/programs/ld-collate.c:2888
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: la declaració de la secció «%s» és duplicada"
 
-#: locale/programs/ld-collate.c:2910
+#: locale/programs/ld-collate.c:3027
 #, c-format
 msgid "%s: unknown character in collating symbol name"
-msgstr "%s: el nom del símbol d'ordenació conté un caràcter desconegut"
+msgstr "%s: el nom del símbol d’ordenació conté un caràcter desconegut"
 
-#: locale/programs/ld-collate.c:3042
+#: locale/programs/ld-collate.c:3159
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: el nom de la definició equivalent conté un caràcter desconegut"
 
-#: locale/programs/ld-collate.c:3055
+#: locale/programs/ld-collate.c:3172
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: el valor de la definició equivalent conté un caràcter desconegut"
 
-#: locale/programs/ld-collate.c:3065
+#: locale/programs/ld-collate.c:3182
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: la definició equivalent conté el símbol desconegut «%s»"
 
-#: locale/programs/ld-collate.c:3074
+#: locale/programs/ld-collate.c:3191
 msgid "error while adding equivalent collating symbol"
-msgstr "error en afegir un símbol d'ordenació equivalent"
+msgstr "error en afegir un símbol d’ordenació equivalent"
 
-#: locale/programs/ld-collate.c:3104
+#: locale/programs/ld-collate.c:3221
 #, c-format
 msgid "duplicate definition of script `%s'"
-msgstr "la definició de l'escriptura «%s» és duplicada"
+msgstr "la definició de l’escriptura «%s» és duplicada"
 
-#: locale/programs/ld-collate.c:3152
+#: locale/programs/ld-collate.c:3269
 #, c-format
-msgid "%s: unknown section name `%s'"
-msgstr "%s: el nom de secció «%s» no és conegut"
+msgid "%s: unknown section name `%.*s'"
+msgstr "%s: el nom de secció «%.*s» no és conegut"
 
-#: locale/programs/ld-collate.c:3180
+#: locale/programs/ld-collate.c:3298
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
-msgstr "%s: hi ha múltiples definicions d'ordre de la secció «%s»"
+msgstr "%s: hi ha múltiples definicions d’ordre de la secció «%s»"
 
-#: locale/programs/ld-collate.c:3205
+#: locale/programs/ld-collate.c:3326
 #, c-format
 msgid "%s: invalid number of sorting rules"
-msgstr "%s: el nombre de regles d'ordenació no és vàlid"
+msgstr "%s: el nombre de regles d’ordenació no és vàlid"
 
-#: locale/programs/ld-collate.c:3232
+#: locale/programs/ld-collate.c:3353
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
-msgstr "%s: hi ha múltiples definicions d'ordre en la secció sense nom"
+msgstr "%s: hi ha múltiples definicions d’ordre a la secció sense nom"
 
-#: locale/programs/ld-collate.c:3286 locale/programs/ld-collate.c:3414
-#: locale/programs/ld-collate.c:3778
+#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537
+#: locale/programs/ld-collate.c:3900
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: manca la paraula clau «order_end»"
 
-#: locale/programs/ld-collate.c:3347
+#: locale/programs/ld-collate.c:3470
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
-msgstr "%s: l'ordre del símbol d'ordenació «%.*s» encara no ha estat definit"
+msgstr "%s: l’ordre del símbol d’ordenació «%.*s» encara no ha estat definit"
 
-#: locale/programs/ld-collate.c:3365
+#: locale/programs/ld-collate.c:3488
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
-msgstr "%s: l'ordre de l'element d'ordenació «%.*s» encara no ha estat definit"
+msgstr "%s: l’ordre de l’element d’ordenació «%.*s» encara no ha estat definit"
 
-#: locale/programs/ld-collate.c:3376
+#: locale/programs/ld-collate.c:3499
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
-msgstr "%s: no s'ha pogut reordenar després de «%.*s»: el símbol no és conegut"
+msgstr "%s: no s’ha pogut reordenar després de «%.*s»: el símbol no és conegut"
 
-#: locale/programs/ld-collate.c:3428 locale/programs/ld-collate.c:3790
+#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: manca la paraula clau «reorder-end»"
 
-#: locale/programs/ld-collate.c:3462 locale/programs/ld-collate.c:3662
+#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: la secció «%.*s» no és coneguda"
 
-#: locale/programs/ld-collate.c:3527
+#: locale/programs/ld-collate.c:3650
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: el símbol <%.*s> no és vàlid"
 
-#: locale/programs/ld-collate.c:3725
+#: locale/programs/ld-collate.c:3846
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
-msgstr "%s: «%s» no es pot trobar al final d'un rang amb eŀlipsi"
+msgstr "%s: «%s» no es pot trobar al final d’un rang amb eŀlipsi"
 
-#: locale/programs/ld-collate.c:3774
+#: locale/programs/ld-collate.c:3896
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: no es permet una descripció buida de la categoria"
 
-#: locale/programs/ld-collate.c:3793
+#: locale/programs/ld-collate.c:3915
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: manca la paraula clau «reorder-sections-end»"
 
-#: locale/programs/ld-ctype.c:440
+#: locale/programs/ld-collate.c:4077
+#, c-format
+msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: s’ha trobat un «%s» sense el corresponent «ifdef» o «ifndef»"
+
+#: locale/programs/ld-collate.c:4095
+#, c-format
+msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: s’ha trobat un «endif» sense el corresponent «ifdef» o «ifndef»"
+
+#: locale/programs/ld-ctype.c:439
+#, c-format
 msgid "No character set name specified in charmap"
-msgstr "no s'ha indicat cap nom de joc de caràcters en el mapa de caràcters"
+msgstr "no s’ha indicat cap nom de joc de caràcters al mapa de caràcters"
 
-#: locale/programs/ld-ctype.c:469
+#: locale/programs/ld-ctype.c:468
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
-msgstr "el caràcter L«\\u%0*x» de la classe «%s» ha de ser en la classe «%s»"
+msgstr "el caràcter L«\\u%0*x» de la classe «%s» ha de ser a la classe «%s»"
 
-#: locale/programs/ld-ctype.c:484
+#: locale/programs/ld-ctype.c:483
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
-msgstr "el caràcter L«\\u%0*x» de la classe «%s» no ha de ser en la classe «%s»"
+msgstr "el caràcter L«\\u%0*x» de la classe «%s» no ha de ser a la classe «%s»"
 
-#: locale/programs/ld-ctype.c:498 locale/programs/ld-ctype.c:556
+#: locale/programs/ld-ctype.c:497 locale/programs/ld-ctype.c:555
 #, c-format
 msgid "internal error in %s, line %u"
-msgstr "error intern en «%s», línia %u"
+msgstr "error intern a «%s», línia %u"
 
-#: locale/programs/ld-ctype.c:527
+#: locale/programs/ld-ctype.c:526
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
-msgstr "el caràcter «%s» de la classe «%s» ha de ser en la classe «%s»"
+msgstr "el caràcter «%s» de la classe «%s» ha de ser a la classe «%s»"
 
-#: locale/programs/ld-ctype.c:543
+#: locale/programs/ld-ctype.c:542
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
-msgstr "el caràcter «%s» de la classe «%s» no ha de ser en la classe «%s»"
+msgstr "el caràcter «%s» de la classe «%s» no ha de ser a la classe «%s»"
 
-#: locale/programs/ld-ctype.c:573 locale/programs/ld-ctype.c:611
+#: locale/programs/ld-ctype.c:572 locale/programs/ld-ctype.c:610
 #, c-format
 msgid "<SP> character not in class `%s'"
-msgstr "el caràcter <SP> no és en la classe «%s»"
+msgstr "el caràcter <SP> no és a la classe «%s»"
 
-#: locale/programs/ld-ctype.c:585 locale/programs/ld-ctype.c:622
+#: locale/programs/ld-ctype.c:584 locale/programs/ld-ctype.c:621
 #, c-format
 msgid "<SP> character must not be in class `%s'"
-msgstr "el caràcter <SP> no ha de ser en la classe «%s»"
+msgstr "el caràcter <SP> no ha de ser a la classe «%s»"
 
-#: locale/programs/ld-ctype.c:600
+#: locale/programs/ld-ctype.c:599
+#, c-format
 msgid "character <SP> not defined in character map"
-msgstr "el caràcter <SP> no ha estat definit en la taula de caràcters"
+msgstr "el caràcter <SP> no ha estat definit a la taula de caràcters"
 
 #: locale/programs/ld-ctype.c:714
+#, c-format
 msgid "`digit' category has not entries in groups of ten"
 msgstr "les entrades de la categoria «digit» no estan agrupades de deu en deu"
 
 #: locale/programs/ld-ctype.c:763
+#, c-format
 msgid "no input digits defined and none of the standard names in the charmap"
-msgstr "no s'han definit dígits d'entrada i cap dels noms estàndard es troba en el mapa de caràcters"
+msgstr "no s’han definit dígits d’entrada i cap dels noms estàndard es troba al mapa de caràcters"
 
 #: locale/programs/ld-ctype.c:828
+#, c-format
 msgid "not all characters used in `outdigit' are available in the charmap"
-msgstr "no tots els caràcters usats en «outdigit» es troben en el mapa de caràcters"
+msgstr "no tots els caràcters emprats a «outdigit» es troben al mapa de caràcters"
 
 #: locale/programs/ld-ctype.c:845
+#, c-format
 msgid "not all characters used in `outdigit' are available in the repertoire"
-msgstr "no tots els caràcters usats en «outdigit» es troben en el repertori"
+msgstr "no tots els caràcters emprats a «outdigit» es troben al repertori"
 
-#: locale/programs/ld-ctype.c:1244
+#: locale/programs/ld-ctype.c:1245
 #, c-format
 msgid "character class `%s' already defined"
 msgstr "la classe de caràcters «%s» ja ha estat definida"
 
-#: locale/programs/ld-ctype.c:1250
+#: locale/programs/ld-ctype.c:1251
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
-msgstr "límit d'implementació: no es permeten més de %Zd classes de caràcters"
+msgstr "límit d’implementació: no es permeten més de %Zd classes de caràcters"
 
-#: locale/programs/ld-ctype.c:1276
+#: locale/programs/ld-ctype.c:1277
 #, c-format
 msgid "character map `%s' already defined"
 msgstr "el mapa de caràcters «%s» ja ha estat definit"
 
-#: locale/programs/ld-ctype.c:1282
+#: locale/programs/ld-ctype.c:1283
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
-msgstr "límit d'implementació: no es permeten més de %d taules de caràcters"
+msgstr "límit d’implementació: no es permeten més de %d taules de caràcters"
 
-#: 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:1548 locale/programs/ld-ctype.c:1673
+#: locale/programs/ld-ctype.c:1779 locale/programs/ld-ctype.c:2471
+#: locale/programs/ld-ctype.c:3467
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr "%s: el camp «%s» no conté deu entrades exactament"
 
-#: locale/programs/ld-ctype.c:1575 locale/programs/ld-ctype.c:2146
+#: locale/programs/ld-ctype.c:1576 locale/programs/ld-ctype.c:2150
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
-msgstr "el valor final <U%0*X> del rang és menor que l'inicial <U%0*X>"
+msgstr "el valor final <U%0*X> del rang és menor que l’inicial <U%0*X>"
 
-#: locale/programs/ld-ctype.c:1702
+#: locale/programs/ld-ctype.c:1703
 msgid "start and end character sequence of range must have the same length"
 msgstr "les seqüències de caràcters inicial i final del rang han de tenir la mateixa longitud"
 
-#: locale/programs/ld-ctype.c:1709
+#: locale/programs/ld-ctype.c:1710
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr "la seqüència de caràcters final és menor que la seqüència inicial"
 
-#: locale/programs/ld-ctype.c:2066 locale/programs/ld-ctype.c:2117
+#: locale/programs/ld-ctype.c:2070 locale/programs/ld-ctype.c:2121
 msgid "premature end of `translit_ignore' definition"
 msgstr "fi prematura de la definició «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:2076 locale/programs/ld-ctype.c:2127
+#: locale/programs/ld-ctype.c:2169
 msgid "syntax error"
 msgstr "error de sintaxi"
 
-#: locale/programs/ld-ctype.c:2296
+#: locale/programs/ld-ctype.c:2303
 #, c-format
 msgid "%s: syntax error in definition of new character class"
-msgstr "%s: error de sintaxi en la definició de nova classe de caràcters"
+msgstr "%s: error de sintaxi a la definició de nova classe de caràcters"
 
-#: locale/programs/ld-ctype.c:2311
+#: locale/programs/ld-ctype.c:2318
 #, c-format
 msgid "%s: syntax error in definition of new character map"
-msgstr "%s: error de sintaxi en la definició de nou mapa de caràcters"
+msgstr "%s: error de sintaxi a la definició de nou mapa de caràcters"
 
-#: locale/programs/ld-ctype.c:2486
+#: locale/programs/ld-ctype.c:2493
 msgid "ellipsis range must be marked by two operands of same type"
-msgstr "el rang amb eŀlipsi ha d'estar marcat per dos operands del mateix tipus"
+msgstr "el rang amb eŀlipsi ha d’estar marcat per dos operands del mateix tipus"
 
-#: locale/programs/ld-ctype.c:2495
+#: locale/programs/ld-ctype.c:2502
 msgid "with symbolic name range values the absolute ellipsis `...' must not be used"
-msgstr "no s'ha d'usar l'eŀlipsi absoluta «...» amb els valors de rang de noms simbòlics"
+msgstr "no s’ha d’emprar l’eŀlipsi absoluta «...» amb els valors de rang de noms simbòlics"
 
-#: locale/programs/ld-ctype.c:2510
+#: locale/programs/ld-ctype.c:2517
 msgid "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
-msgstr "cal usar l'eŀlipsi simbòlica hexadecimal «..» amb els valors de rang UCS"
+msgstr "cal emprar l’eŀlipsi simbòlica hexadecimal «..» amb els valors de rang UCS"
 
-#: locale/programs/ld-ctype.c:2524
+#: locale/programs/ld-ctype.c:2531
 msgid "with character code range values one must use the absolute ellipsis `...'"
-msgstr "cal usar l'eŀlispi absoluta «...» amb els valors de rang de codis de caràcters"
+msgstr "cal emprar l’eŀlispi absoluta «...» amb els valors de rang de codis de caràcters"
 
-#: locale/programs/ld-ctype.c:2675
+#: locale/programs/ld-ctype.c:2682
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr "la definició del mapa «%s» és duplicada"
 
-#: locale/programs/ld-ctype.c:2761 locale/programs/ld-ctype.c:2905
+#: locale/programs/ld-ctype.c:2768 locale/programs/ld-ctype.c:2912
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
-msgstr "%s: la secció «translit_start» no termina amb «translit_end»"
+msgstr "%s: la secció «translit_start» no acaba amb «translit_end»"
 
-#: locale/programs/ld-ctype.c:2856
+#: locale/programs/ld-ctype.c:2863
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr "%s: la definició de «default_missing» és duplicada"
 
-#: locale/programs/ld-ctype.c:2861
+#: locale/programs/ld-ctype.c:2868
 msgid "previous definition was here"
 msgstr "la definició prèvia es troba ací"
 
-#: locale/programs/ld-ctype.c:2883
+#: locale/programs/ld-ctype.c:2890
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
-msgstr "%s: no s'ha trobat cap definició representable de «default_missing»"
-
-#: locale/programs/ld-ctype.c:3036
-#, c-format
-msgid "%s: character `%s' not defined in charmap while needed as default value"
-msgstr "%s: el caràcter «%s», necessari com a valor per defecte, no ha estat definit en el mapa de caràcters"
+msgstr "%s: no s’ha trobat cap definició representable de «default_missing»"
 
-#: 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
-#, c-format
-msgid "%s: character `%s' in charmap not representable with one byte"
-msgstr "%s: el caràcter «%s» del mapa de caràcters no es pot representar amb un sol octet"
-
-#: 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: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
+#: locale/programs/ld-ctype.c:3401 locale/programs/ld-ctype.c:3426
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr "%s: el caràcter «%s», necessari com a valor per defecte, no ha estat definit"
 
-#: locale/programs/ld-ctype.c:3161
+#: locale/programs/ld-ctype.c:3048 locale/programs/ld-ctype.c:3132
+#: locale/programs/ld-ctype.c:3152 locale/programs/ld-ctype.c:3173
+#: locale/programs/ld-ctype.c:3194 locale/programs/ld-ctype.c:3215
+#: locale/programs/ld-ctype.c:3236 locale/programs/ld-ctype.c:3276
+#: locale/programs/ld-ctype.c:3297 locale/programs/ld-ctype.c:3364
 #, c-format
-msgid "character `%s' not defined while needed as default value"
-msgstr "el caràcter «%s», necessari com a valor per defecte, no ha estat definit"
+msgid "%s: character `%s' in charmap not representable with one byte"
+msgstr "%s: el caràcter «%s» del mapa de caràcters no es pot representar amb un sol octet"
 
-#: locale/programs/ld-ctype.c:3401 locale/programs/ld-ctype.c:3426
+#: locale/programs/ld-ctype.c:3408 locale/programs/ld-ctype.c:3433
 #, c-format
 msgid "%s: character `%s' needed as default value not representable with one byte"
 msgstr "%s: el caràcter «%s», necessari com a valor per defecte, no es pot representar amb un sol octet"
 
-#: locale/programs/ld-ctype.c:3481
+#: locale/programs/ld-ctype.c:3489
+#, c-format
 msgid "no output digits defined and none of the standard names in the charmap"
-msgstr "no s'han definit dígits d'eixida i cap del noms estàndard es troba en el mapa de caràcters"
+msgstr "no s’han definit dígits d’eixida i cap del noms estàndard es troba al mapa de caràcters"
 
-#: locale/programs/ld-ctype.c:3772
+#: locale/programs/ld-ctype.c:3780
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr "%s: les dades de transliteració del locale «%s» no es troben disponibles"
 
-#: locale/programs/ld-ctype.c:3868
+#: locale/programs/ld-ctype.c:3881
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes\n"
 msgstr "%s: taula de la classe «%s»: %lu octets\n"
 
-#: locale/programs/ld-ctype.c:3937
+#: locale/programs/ld-ctype.c:3950
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes\n"
 msgstr "%s: taula del mapa «%s»: %lu octets\n"
 
-#: locale/programs/ld-ctype.c:4070
+#: locale/programs/ld-ctype.c:4083
 #, c-format
 msgid "%s: table for width: %lu bytes\n"
-msgstr "%s: taula d'amplada: %lu bytes\n"
+msgstr "%s: taula d’amplada: %lu bytes\n"
 
-#: locale/programs/ld-identification.c:171
+#: locale/programs/ld-identification.c:170
 #, c-format
 msgid "%s: no identification for category `%s'"
 msgstr "%s: no hi ha cap identificació per a la categoria «%s»"
 
-#: locale/programs/ld-identification.c:436
+#: locale/programs/ld-identification.c:435
 #, c-format
 msgid "%s: duplicate category version definition"
 msgstr "%s: la definició de versió de categoria és duplicada"
 
-#: locale/programs/ld-measurement.c:114
+#: locale/programs/ld-measurement.c:113
 #, c-format
 msgid "%s: invalid value for field `%s'"
 msgstr "%s: el valor del camp «%s» no és vàlid"
 
-#: locale/programs/ld-messages.c:115 locale/programs/ld-messages.c:149
+#: locale/programs/ld-messages.c:114 locale/programs/ld-messages.c:148
 #, c-format
 msgid "%s: field `%s' undefined"
-msgstr "%s: no s'ha definit el camp «%s»"
+msgstr "%s: no s’ha definit el camp «%s»"
 
-#: locale/programs/ld-messages.c:122 locale/programs/ld-messages.c:156
+#: locale/programs/ld-messages.c:121 locale/programs/ld-messages.c:155
+#: locale/programs/ld-monetary.c:256 locale/programs/ld-numeric.c:118
 #, c-format
 msgid "%s: value for field `%s' must not be an empty string"
 msgstr "%s: el valor del camp «%s» no ha de ser la cadena buida"
 
-#: locale/programs/ld-messages.c:138 locale/programs/ld-messages.c:172
+#: locale/programs/ld-messages.c:137 locale/programs/ld-messages.c:171
 #, c-format
 msgid "%s: no correct regular expression for field `%s': %s"
 msgstr "%s: no hi ha cap expressió regular correcta per al camp «%s»: %s"
@@ -1164,210 +2322,204 @@ msgstr "%s: el valor del camp «int_curr_symbol» té una longitud incorrecta"
 #: locale/programs/ld-monetary.c:237
 #, c-format
 msgid "%s: value of field `int_curr_symbol' does not correspond to a valid name in ISO 4217"
-msgstr "%s: el valor del camp «int_curr_symbol» no és un nom vàlid de l'estàndard ISO 4217"
+msgstr "%s: el valor del camp «int_curr_symbol» no és un nom vàlid de l’estàndard ISO 4217"
 
-#: locale/programs/ld-monetary.c:256 locale/programs/ld-numeric.c:119
-#, c-format
-msgid "%s: value for field `%s' must not be the empty string"
-msgstr "%s: el valor del camp «%s» no ha de ser la cadena buida"
-
-#: locale/programs/ld-monetary.c:284 locale/programs/ld-monetary.c:314
+#: locale/programs/ld-monetary.c:285 locale/programs/ld-monetary.c:315
 #, c-format
 msgid "%s: value for field `%s' must be in range %d...%d"
-msgstr "%s: el valor del camp «%s» ha d'estar en el rang %d...%d"
+msgstr "%s: el valor del camp «%s» ha d’estar dins el rang %d...%d"
 
-#: locale/programs/ld-monetary.c:746 locale/programs/ld-numeric.c:275
+#: locale/programs/ld-monetary.c:747 locale/programs/ld-numeric.c:274
 #, c-format
 msgid "%s: value for field `%s' must be a single character"
 msgstr "%s: el valor del camp «%s» ha de ser un sol caràcter"
 
-#: locale/programs/ld-monetary.c:843 locale/programs/ld-numeric.c:319
+#: locale/programs/ld-monetary.c:844 locale/programs/ld-numeric.c:318
 #, c-format
 msgid "%s: `-1' must be last entry in `%s' field"
-msgstr "%s: «-1» ha de ser l'última entrada del camp «%s»"
+msgstr "%s: «-1» ha de ser la darrera entrada del camp «%s»"
 
-#: locale/programs/ld-monetary.c:865 locale/programs/ld-numeric.c:340
+#: locale/programs/ld-monetary.c:866 locale/programs/ld-numeric.c:335
 #, c-format
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr "%s: els valors del camp «%s» han de ser menors que 127"
 
-#: locale/programs/ld-monetary.c:908
+#: locale/programs/ld-monetary.c:909
 msgid "conversion rate value cannot be zero"
 msgstr "el valor de la taxa de conversió no pot ser zero"
 
-#: locale/programs/ld-name.c:130 locale/programs/ld-telephone.c:127
-#: locale/programs/ld-telephone.c:150
+#: locale/programs/ld-name.c:129 locale/programs/ld-telephone.c:126
+#: locale/programs/ld-telephone.c:149
 #, c-format
 msgid "%s: invalid escape sequence in field `%s'"
-msgstr "%s: la seqüència d'escapada del camp «%s» no és vàlida"
+msgstr "%s: la seqüència d’escapada del camp «%s» no és vàlida"
 
-#: locale/programs/ld-time.c:248
+#: locale/programs/ld-time.c:247
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'"
 msgstr "%s: el senyalador de direcció de la cadena %Zd del camp «era» no és ni «+» ni «-»"
 
-#: locale/programs/ld-time.c:259
+#: locale/programs/ld-time.c:258
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not a single character"
 msgstr "%s: el senyalador de direcció de la cadena %Zd del camp «era» no és un sol caràcter"
 
-#: locale/programs/ld-time.c:272
+#: locale/programs/ld-time.c:271
 #, c-format
 msgid "%s: invalid number for offset in string %Zd in `era' field"
 msgstr "%s: el número de desplaçament de la cadena %Zd del camp «era» no és vàlid"
 
-#: locale/programs/ld-time.c:280
+#: locale/programs/ld-time.c:279
 #, c-format
 msgid "%s: garbage at end of offset value in string %Zd in `era' field"
-msgstr "%s: fem al final del valor de desplaçament de la cadena %Zd del camp «era»"
+msgstr "%s: brossa al final del valor de desplaçament de la cadena %Zd del camp «era»"
 
-#: locale/programs/ld-time.c:331
+#: locale/programs/ld-time.c:330
 #, c-format
 msgid "%s: invalid starting date in string %Zd in `era' field"
 msgstr "%s: la data de començament de la cadena %Zd del camp «era» no és vàlida"
 
-#: locale/programs/ld-time.c:340
+#: locale/programs/ld-time.c:339
 #, c-format
 msgid "%s: garbage at end of starting date in string %Zd in `era' field "
-msgstr "%s: fem al final de la data de començament de la cadena %Zd del camp «era» "
+msgstr "%s: brossa al final de la data de començament de la cadena %Zd del camp «era» "
 
-#: locale/programs/ld-time.c:359
+#: locale/programs/ld-time.c:358
 #, c-format
 msgid "%s: starting date is invalid in string %Zd in `era' field"
 msgstr "%s: la data de començament de la cadena %Zd del camp «era» no és vàlida"
 
-#: locale/programs/ld-time.c:408
+#: locale/programs/ld-time.c:407
 #, c-format
 msgid "%s: invalid stopping date in string %Zd in `era' field"
-msgstr "%s: la data d'acabament de la cadena %Zd del camp «era» no és vàlida"
+msgstr "%s: la data d’acabament de la cadena %Zd del camp «era» no és vàlida"
 
-#: locale/programs/ld-time.c:417
+#: locale/programs/ld-time.c:416
 #, c-format
 msgid "%s: garbage at end of stopping date in string %Zd in `era' field"
-msgstr "%s: fem al final de la data d'acabament de la cadena %Zd del camp «era»"
+msgstr "%s: brossa al final de la data d’acabament de la cadena %Zd del camp «era»"
 
-#: locale/programs/ld-time.c:436
+#: locale/programs/ld-time.c:435
 #, c-format
 msgid "%s: stopping date is invalid in string %Zd in `era' field"
-msgstr "%s: la data d'acabament de la cadena %Zd del camp «era» no és vàlida"
+msgstr "%s: la data d’acabament de la cadena %Zd del camp «era» no és vàlida"
 
-#: locale/programs/ld-time.c:445
+#: locale/programs/ld-time.c:444
 #, c-format
 msgid "%s: missing era name in string %Zd in `era' field"
-msgstr "%s: manca el nom de l'era en la cadena %Zd del camp «era»"
+msgstr "%s: manca el nom de l’era a la cadena %Zd del camp «era»"
 
-#: locale/programs/ld-time.c:457
+#: locale/programs/ld-time.c:456
 #, c-format
 msgid "%s: missing era format in string %Zd in `era' field"
-msgstr "%s: manca el format de l'era en la cadena %Zd del camp «era»"
+msgstr "%s: manca el format de l’era a la cadena %Zd del camp «era»"
 
-#: locale/programs/ld-time.c:486
+#: locale/programs/ld-time.c:497
 #, c-format
 msgid "%s: third operand for value of field `%s' must not be larger than %d"
 msgstr "%s: el tercer operand del valor del camp «%s» no ha de ser major que %d"
 
-#: locale/programs/ld-time.c:494 locale/programs/ld-time.c:502
-#, c-format
-msgid "%s: values of field `%s' must not be larger than %d"
-msgstr "%s: els valors del camp «%s» no han de ser majors que %d"
-
-#: locale/programs/ld-time.c:510
+#: locale/programs/ld-time.c:505 locale/programs/ld-time.c:513
+#: locale/programs/ld-time.c:521
 #, c-format
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr "%s: els valors del camp «%s» no han de ser majors que %d"
 
-#: locale/programs/ld-time.c:986
+#: locale/programs/ld-time.c:1004
 #, c-format
 msgid "%s: too few values for field `%s'"
-msgstr "%s: manquen valors en el camp «%s»"
+msgstr "%s: manquen valors al camp «%s»"
 
-#: locale/programs/ld-time.c:1031
+#: locale/programs/ld-time.c:1049
 msgid "extra trailing semicolon"
 msgstr "hi ha un punt i coma sobrant al final"
 
-#: locale/programs/ld-time.c:1034
+#: locale/programs/ld-time.c:1052
 #, c-format
 msgid "%s: too many values for field `%s'"
-msgstr "%s: sobren valors en el camp «%s»"
+msgstr "%s: sobren valors al camp «%s»"
 
 #: locale/programs/linereader.c:130
 msgid "trailing garbage at end of line"
-msgstr "fem al final de la línia"
+msgstr "brossa al final de la línia"
 
-#: locale/programs/linereader.c:304
+#: locale/programs/linereader.c:298
 msgid "garbage at end of number"
-msgstr "fem al final del número"
+msgstr "brossa al final del número"
 
-#: locale/programs/linereader.c:416
+#: locale/programs/linereader.c:410
 msgid "garbage at end of character code specification"
-msgstr "fem al final de l'especificació de codi de caràcter"
+msgstr "brossa al final de l’especificació de codi de caràcter"
 
-#: locale/programs/linereader.c:502
+#: locale/programs/linereader.c:496
 msgid "unterminated symbolic name"
-msgstr "el nom simbòlic no és terminat"
-
-#: locale/programs/linereader.c:566 catgets/gencat.c:1195
-msgid "invalid escape sequence"
-msgstr "la seqüència d'escapada no és vàlida"
+msgstr "el nom simbòlic no està acabat"
 
-#: locale/programs/linereader.c:629
+#: locale/programs/linereader.c:623
 msgid "illegal escape sequence at end of string"
-msgstr "hi ha una seqüència d'escapada no permesa al final de la cadena"
+msgstr "hi ha una seqüència d’escapada no permesa al final de la cadena"
 
-#: locale/programs/linereader.c:633 locale/programs/linereader.c:861
+#: locale/programs/linereader.c:627 locale/programs/linereader.c:855
 msgid "unterminated string"
-msgstr "la cadena no és terminada"
+msgstr "la cadena no està acabada"
 
-#: locale/programs/linereader.c:675
+#: locale/programs/linereader.c:669
 msgid "non-symbolic character value should not be used"
-msgstr "no s'han d'usar valors de caràcters no-simbòlics"
+msgstr "no s’han d’emprar valors de caràcters no simbòlics"
 
-#: locale/programs/linereader.c:822
+#: locale/programs/linereader.c:816
 #, c-format
 msgid "symbol `%.*s' not in charmap"
-msgstr "el símbol «%.*s» no es troba en el mapa de caràcters"
+msgstr "el símbol «%.*s» no es troba al mapa de caràcters"
 
-#: locale/programs/linereader.c:843
+#: locale/programs/linereader.c:837
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
-msgstr "el símbol «%.*s» no es troba en el mapa de repertori"
+msgstr "el símbol «%.*s» no es troba al mapa de repertori"
 
-#: locale/programs/locale.c:75
+#: locale/programs/locale.c:74
 msgid "System information:"
 msgstr "Informació del sistema:"
 
 # Més ajudes.  ivb
-#: locale/programs/locale.c:77
+#: locale/programs/locale.c:76
 msgid "Write names of available locales"
 msgstr "Mostra els noms dels locales disponibles."
 
-#: locale/programs/locale.c:79
+#: locale/programs/locale.c:78
 msgid "Write names of available charmaps"
 msgstr "Mostra els noms dels mapes de caràcters disponibles."
 
 # ivb (2001/10/30)
 # ivb  Aquesta línia dóna pas a un conjunt d'opcions que modif. l'eixida.
-#: locale/programs/locale.c:80
+#: locale/programs/locale.c:79
 msgid "Modify output format:"
-msgstr "Modificadors del format de l'eixida:"
+msgstr "Modificadors del format de l’eixida:"
 
-#: locale/programs/locale.c:81
+#: locale/programs/locale.c:80
 msgid "Write names of selected categories"
 msgstr "Mostra els noms de les categories seleccionades."
 
-#: locale/programs/locale.c:82
+#: locale/programs/locale.c:81
 msgid "Write names of selected keywords"
 msgstr "Mostra els noms de les paraules clau seleccionades."
 
-#: locale/programs/locale.c:83
+#: locale/programs/locale.c:82
 msgid "Print more information"
 msgstr "Mostra més informació."
 
-#: locale/programs/locale.c:88
-msgid "Get locale-specific information."
-msgstr "Obté la informació específica d'un locale."
+# FIXME: Don't use \v.
+#: locale/programs/locale.c:87
+msgid ""
+"Get locale-specific information.\vFor bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+"Obté informació específica del locale.\n"
+"\n"
+"Per a obtenir instruccions sobre com informar d’un error, vegeu\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
 
-#: locale/programs/locale.c:91
+#: locale/programs/locale.c:92
 msgid ""
 "NAME\n"
 "[-a|-m]"
@@ -1375,135 +2527,142 @@ msgstr ""
 "NOM\n"
 "[-a | -m]"
 
-#: locale/programs/locale.c:195
+#: locale/programs/locale.c:193
+#, c-format
 msgid "Cannot set LC_CTYPE to default locale"
-msgstr "no s'ha pogut establir LC_CTYPE al locale per defecte"
+msgstr "no s’ha pogut establir LC_CTYPE al locale per defecte"
 
-#: locale/programs/locale.c:197
+#: locale/programs/locale.c:195
+#, c-format
 msgid "Cannot set LC_MESSAGES to default locale"
-msgstr "no s'ha pogut establir LC_MESSAGES al locale per defecte"
+msgstr "no s’ha pogut establir LC_MESSAGES al locale per defecte"
 
-#: locale/programs/locale.c:210
+#: locale/programs/locale.c:208
+#, c-format
 msgid "Cannot set LC_COLLATE to default locale"
-msgstr "no s'ha pogut establir LC_COLLATE al locale per defecte"
+msgstr "no s’ha pogut establir LC_COLLATE al locale per defecte"
 
-#: locale/programs/locale.c:226
+#: locale/programs/locale.c:224
+#, c-format
 msgid "Cannot set LC_ALL to default locale"
-msgstr "no s'ha pogut establir LC_ALL al locale per defecte"
+msgstr "no s’ha pogut establir LC_ALL al locale per defecte"
 
-#: locale/programs/locale.c:517
+#: locale/programs/locale.c:500
+#, c-format
 msgid "while preparing output"
-msgstr "en preparar l'eixida"
+msgstr "en preparar l’eixida"
 
 # Més ajudes.  ivb
-#: locale/programs/localedef.c:121
+#: locale/programs/localedef.c:120
 msgid "Input Files:"
-msgstr "Fitxers d'entrada:"
+msgstr "Fitxers d’entrada:"
 
-#: locale/programs/localedef.c:123
+#: locale/programs/localedef.c:122
 msgid "Symbolic character names defined in FILE"
-msgstr "Els noms simbòlics dels caràcters es defineixen en el FITXER."
+msgstr "Els noms simbòlics dels caràcters es defineixen al FITXER."
 
-#: locale/programs/localedef.c:124
+#: locale/programs/localedef.c:123
 msgid "Source definitions are found in FILE"
-msgstr "Les definicions font es troben en el FITXER."
+msgstr "Les definicions font es troben al FITXER."
 
-#: locale/programs/localedef.c:126
+#: locale/programs/localedef.c:125
 msgid "FILE contains mapping from symbolic names to UCS4 values"
 msgstr "El FITXER conté un mapa de noms simbòlics a valors UCS4."
 
-#: locale/programs/localedef.c:130
+#: locale/programs/localedef.c:129
 msgid "Create output even if warning messages were issued"
-msgstr "Crea fitxers d'eixida encara que s'hagen emés missatges d'avís."
+msgstr "Crea fitxers d’eixida encara que s’hagen emès missatges d’avís."
 
-#: locale/programs/localedef.c:131
+#: locale/programs/localedef.c:130
 msgid "Create old-style tables"
-msgstr "Crea taules de l'estil antic."
+msgstr "Crea taules de l’estil antic."
 
 # ivb (2001/10/28)
 # ivb  Localedef crea diversos fitxers en un directori: és plural.
 # ivb  Però, el prefix és un prefix d'un camí, com «/usr/local» en
 # ivb  «/usr/local/share/doc».
-#: locale/programs/localedef.c:132
+#: locale/programs/localedef.c:131
 msgid "Optional output file prefix"
-msgstr "Prefix opcional dels fitxers d'eixida."
+msgstr "Prefix opcional dels fitxers d’eixida."
 
-#: locale/programs/localedef.c:133
+#: locale/programs/localedef.c:132
 msgid "Be strictly POSIX conform"
-msgstr "S'ajusta estrictament a POSIX."
+msgstr "S’ajusta estrictament a POSIX."
 
-#: locale/programs/localedef.c:135
+#: locale/programs/localedef.c:134
 msgid "Suppress warnings and information messages"
 msgstr "Descarta els avisos i els missatges informatius."
 
-#: locale/programs/localedef.c:136
+#: locale/programs/localedef.c:135
 msgid "Print more messages"
 msgstr "Mostra més missatges."
 
-#: locale/programs/localedef.c:137
+#: locale/programs/localedef.c:136
 msgid "Archive control:"
-msgstr "Control d'arxius:"
+msgstr "Control d’arxius:"
 
-#: locale/programs/localedef.c:139
+#: locale/programs/localedef.c:138
 msgid "Don't add new data to archive"
-msgstr "No afig dades noves a l'arxiu."
+msgstr "No afegeix dades noves a l’arxiu."
 
-#: locale/programs/localedef.c:141
+#: locale/programs/localedef.c:140
 msgid "Add locales named by parameters to archive"
-msgstr "Afig a l'arxiu els locales esmentats pels paràmetres."
+msgstr "Afegeix a l’arxiu els locales esmentats pels paràmetres."
 
-#: locale/programs/localedef.c:142
+#: locale/programs/localedef.c:141
 msgid "Replace existing archive content"
-msgstr "Reemplaça el contingut existent en l'arxiu."
+msgstr "Reemplaça el contingut existent a l’arxiu."
 
-#: locale/programs/localedef.c:144
+#: locale/programs/localedef.c:143
 msgid "Remove locales named by parameters from archive"
-msgstr "Elimina de l'arxiu els locales esmentats pels paràmetres."
+msgstr "Elimina de l’arxiu els locales esmentats pels paràmetres."
 
-#: locale/programs/localedef.c:145
+#: locale/programs/localedef.c:144
 msgid "List content of archive"
-msgstr "Llista el contingut de l'arxiu."
+msgstr "Llista el contingut de l’arxiu."
 
-#: locale/programs/localedef.c:147
+#: locale/programs/localedef.c:146
 msgid "locale.alias file to consult when making archive"
-msgstr "Fitxer «locale.alias» a consultar en crear l'arxiu."
+msgstr "Fitxer «locale.alias» a consultar en crear l’arxiu."
 
 # ivb (2001/10/28)
 # ivb  Pose el punt final pq és la descripció curta de l'ordre.
-#: locale/programs/localedef.c:152
+#: locale/programs/localedef.c:151
 msgid "Compile locale specification"
 msgstr "Compiŀla una especificació de locale."
 
-#: locale/programs/localedef.c:155
+#: locale/programs/localedef.c:154
 msgid ""
 "NAME\n"
 "[--add-to-archive|--delete-from-archive] FILE...\n"
 "--list-archive [FILE]"
 msgstr ""
 "NOM\n"
-"[--add-to-archive | --delete-from-archive] FITXER...\n"
+"[--add-to-archive | --delete-from-archive] FITXER…\n"
 "--list-archive [FITXER]"
 
-#: locale/programs/localedef.c:233
+#: locale/programs/localedef.c:232
+#, c-format
 msgid "cannot create directory for output files"
-msgstr "no s'ha pogut crear el directori per als fitxers d'eixida"
+msgstr "no s’ha pogut crear el directori per als fitxers d’eixida"
 
-#: locale/programs/localedef.c:244
+#: locale/programs/localedef.c:243
+#, c-format
 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
 msgstr "FATAL: el sistema no defineix «_POSIX2_LOCALEDEF»"
 
-#: locale/programs/localedef.c:258 locale/programs/localedef.c:274
+#: locale/programs/localedef.c:257 locale/programs/localedef.c:273
 #: locale/programs/localedef.c:599 locale/programs/localedef.c:619
 #, c-format
 msgid "cannot open locale definition file `%s'"
-msgstr "no s'ha pogut obrir el fitxer «%s» de definició del locale"
+msgstr "no s’ha pogut obrir el fitxer «%s» de definició del locale"
 
-#: locale/programs/localedef.c:286
+#: locale/programs/localedef.c:285
 #, c-format
 msgid "cannot write output files to `%s'"
-msgstr "no s'han pogut escriure els fitxers d'eixida en «%s»"
+msgstr "no s’han pogut escriure els fitxers d’eixida a «%s»"
 
-#: locale/programs/localedef.c:367
+#: locale/programs/localedef.c:366
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
@@ -1517,6 +2676,7 @@ msgstr ""
 "%s"
 
 #: locale/programs/localedef.c:567
+#, c-format
 msgid "circular dependencies between locale definitions"
 msgstr "hi ha dependències circulars entre les definicions dels locales"
 
@@ -1525,2279 +2685,1956 @@ msgstr "hi ha dependències circulars entre les definicions dels locales"
 msgid "cannot add already read locale `%s' a second time"
 msgstr "no es pot afegir una altra volta el locale ja llegit «%s»"
 
-#: locale/programs/locarchive.c:89 locale/programs/locarchive.c:259
+#: locale/programs/locarchive.c:88 locale/programs/locarchive.c:261
+#, c-format
 msgid "cannot create temporary file"
-msgstr "no s'ha pogut crear un fitxer temporal"
+msgstr "no s’ha pogut crear un fitxer temporal"
 
-#: locale/programs/locarchive.c:118 locale/programs/locarchive.c:305
+#: locale/programs/locarchive.c:118 locale/programs/locarchive.c:307
+#, c-format
 msgid "cannot initialize archive file"
-msgstr "no s'ha pogut iniciar el fitxer arxiu"
+msgstr "no s’ha pogut iniciar el fitxer arxiu"
 
-#: locale/programs/locarchive.c:125 locale/programs/locarchive.c:312
+#: locale/programs/locarchive.c:125 locale/programs/locarchive.c:314
+#, c-format
 msgid "cannot resize archive file"
-msgstr "no s'ha pogut redimensionar el fitxer arxiu"
+msgstr "no s’ha pogut redimensionar el fitxer arxiu"
 
-#: locale/programs/locarchive.c:134 locale/programs/locarchive.c:321
-#: locale/programs/locarchive.c:511
+#: locale/programs/locarchive.c:134 locale/programs/locarchive.c:323
+#: locale/programs/locarchive.c:527
+#, c-format
 msgid "cannot map archive header"
-msgstr "no s'ha pogut mapar la capçalera de l'arxiu"
+msgstr "no s’ha pogut mapar la capçalera de l’arxiu"
 
 # ivb (2002/10/21)
 # ivb  Un «locale archive» conté diversos locales -> «arxiu de locales».
 #: locale/programs/locarchive.c:156
+#, c-format
 msgid "failed to create new locale archive"
-msgstr "no s'ha pogut crear el nou arxiu de locales"
+msgstr "no s’ha pogut crear el nou arxiu de locales"
 
 #: locale/programs/locarchive.c:168
+#, c-format
 msgid "cannot change mode of new locale archive"
-msgstr "no s'ha pogut canviar el mode del nou arxiu de locales"
+msgstr "no s’ha pogut canviar el mode del nou arxiu de locales"
 
-#: locale/programs/locarchive.c:253
+#: locale/programs/locarchive.c:255
+#, c-format
 msgid "cannot map locale archive file"
-msgstr "no s'ha pogut mapar el fitxer arxiu de locales"
+msgstr "no s’ha pogut mapar el fitxer arxiu de locales"
 
-#: locale/programs/locarchive.c:329
+#: locale/programs/locarchive.c:331
+#, c-format
 msgid "cannot lock new archive"
-msgstr "no s'ha pogut blocar el nou arxiu"
+msgstr "no s’ha pogut blocar el nou arxiu"
 
-#: locale/programs/locarchive.c:380
+#: locale/programs/locarchive.c:396
+#, c-format
 msgid "cannot extend locale archive file"
-msgstr "no s'ha pogut estendre el fitxer arxiu de locales"
+msgstr "no s’ha pogut estendre el fitxer arxiu de locales"
 
-#: locale/programs/locarchive.c:389
+#: locale/programs/locarchive.c:405
+#, c-format
 msgid "cannot change mode of resized locale archive"
-msgstr "no s'ha pogut canviar el mode de l'arxiu de locales redimensionat"
+msgstr "no s’ha pogut canviar el mode de l’arxiu de locales redimensionat"
 
-#: locale/programs/locarchive.c:397
+#: locale/programs/locarchive.c:413
+#, c-format
 msgid "cannot rename new archive"
-msgstr "no s'ha pogut reanomenar el nou arxiu"
+msgstr "no s’ha pogut reanomenar el nou arxiu"
 
-#: locale/programs/locarchive.c:450
+#: locale/programs/locarchive.c:466
 #, c-format
 msgid "cannot open locale archive \"%s\""
-msgstr "no s'ha pogut obrir l'arxiu «%s» de locales"
+msgstr "no s’ha pogut obrir l’arxiu «%s» de locales"
 
-#: locale/programs/locarchive.c:455
+#: locale/programs/locarchive.c:471
 #, c-format
 msgid "cannot stat locale archive \"%s\""
-msgstr "ha fallat stat() sobre l'arxiu «%s» de locales"
+msgstr "ha fallat stat() sobre l’arxiu «%s» de locales"
 
-#: locale/programs/locarchive.c:474
+#: locale/programs/locarchive.c:490
 #, c-format
 msgid "cannot lock locale archive \"%s\""
-msgstr "no s'ha pogut blocar l'arxiu «%s» de locales"
+msgstr "no s’ha pogut blocar l’arxiu «%s» de locales"
 
-#: locale/programs/locarchive.c:497
+#: locale/programs/locarchive.c:513
+#, c-format
 msgid "cannot read archive header"
-msgstr "no s'ha pogut llegir la capçalera de l'arxiu"
+msgstr "no s’ha pogut llegir la capçalera de l’arxiu"
 
-#: locale/programs/locarchive.c:557
+#: locale/programs/locarchive.c:573
 #, c-format
 msgid "locale '%s' already exists"
 msgstr "el locale «%s» ja existeix"
 
-#: locale/programs/locarchive.c:788 locale/programs/locarchive.c:803
-#: locale/programs/locarchive.c:815 locale/programs/locarchive.c:827
-#: locale/programs/locfile.c:343
+#: locale/programs/locarchive.c:804 locale/programs/locarchive.c:819
+#: locale/programs/locarchive.c:831 locale/programs/locarchive.c:843
+#: locale/programs/locfile.c:344
+#, c-format
 msgid "cannot add to locale archive"
-msgstr "no s'ha pogut afegir a l'arxiu de locales"
+msgstr "no s’ha pogut afegir a l’arxiu de locales"
 
 # ivb (2002/10/21)
 # ivb  El fitxer conté àlies de diversos locales (locale.alias).
-#: locale/programs/locarchive.c:982
+#: locale/programs/locarchive.c:998
 #, c-format
 msgid "locale alias file `%s' not found"
-msgstr "no s'ha trobat el fitxer «%s» d'àlies de locales"
+msgstr "no s’ha trobat el fitxer «%s» d’àlies de locales"
 
 # ivb (2002/10/21)
 # ivb  És un missatge, no un error.
-#: locale/programs/locarchive.c:1126
+#: locale/programs/locarchive.c:1142
 #, c-format
 msgid "Adding %s\n"
-msgstr "S'està afegint «%s»\n"
+msgstr "S’està afegint «%s»\n"
 
-#: locale/programs/locarchive.c:1132
+#: locale/programs/locarchive.c:1148
 #, c-format
 msgid "stat of \"%s\" failed: %s: ignored"
 msgstr "ha fallat stat() sobre «%s»: %s: es descarta"
 
-#: locale/programs/locarchive.c:1138
+#: locale/programs/locarchive.c:1154
 #, c-format
 msgid "\"%s\" is no directory; ignored"
 msgstr "«%s» no és un directori: es descarta"
 
-#: locale/programs/locarchive.c:1145
+#: locale/programs/locarchive.c:1161
 #, c-format
 msgid "cannot open directory \"%s\": %s: ignored"
-msgstr "no s'ha pogut obrir el directori «%s»: %s: es descarta"
+msgstr "no s’ha pogut obrir el directori «%s»: %s: es descarta"
 
-#: locale/programs/locarchive.c:1217
+#: locale/programs/locarchive.c:1233
 #, c-format
 msgid "incomplete set of locale files in \"%s\""
-msgstr "el joc de fitxers de locale en «%s» no és complet"
+msgstr "el joc de fitxers de locale a «%s» no és complet"
 
-#: locale/programs/locarchive.c:1281
+#: locale/programs/locarchive.c:1297
 #, c-format
 msgid "cannot read all files in \"%s\": ignored"
-msgstr "no s'han pogut llegir tots els fitxers de «%s»: es descarta"
+msgstr "no s’han pogut llegir tots els fitxers de «%s»: es descarta"
 
-#: locale/programs/locarchive.c:1351
+#: locale/programs/locarchive.c:1367
 #, c-format
 msgid "locale \"%s\" not in archive"
-msgstr "el locale «%s» no es troba en l'arxiu"
+msgstr "el locale «%s» no es troba a l’arxiu"
 
 #: locale/programs/locfile.c:132
 #, c-format
 msgid "argument to `%s' must be a single character"
-msgstr "l'argument de «%s» ha de ser un sol caràcter"
+msgstr "l’argument de «%s» ha de ser un sol caràcter"
 
-#: locale/programs/locfile.c:251
+#: locale/programs/locfile.c:252
 msgid "syntax error: not inside a locale definition section"
-msgstr "error de sintaxi: no és a dins d'una secció de definició de locale"
+msgstr "error de sintaxi: no és a dins d’una secció de definició de locale"
 
-#: locale/programs/locfile.c:625
+#: locale/programs/locfile.c:626
 #, c-format
 msgid "cannot open output file `%s' for category `%s'"
-msgstr "no s'ha pogut obrir el fitxer d'eixida «%s» de la categoria «%s»"
+msgstr "no s’ha pogut obrir el fitxer d’eixida «%s» de la categoria «%s»"
 
-#: locale/programs/locfile.c:649
+#: locale/programs/locfile.c:650
 #, c-format
 msgid "failure while writing data for category `%s'"
-msgstr "no s'han pogut escriure les dades de la categoria «%s»"
+msgstr "no s’han pogut escriure les dades de la categoria «%s»"
 
-#: locale/programs/locfile.c:745
+#: locale/programs/locfile.c:746
 #, c-format
 msgid "cannot create output file `%s' for category `%s'"
-msgstr "no s'ha pogut crear el fitxer d'eixida «%s» de la categoria «%s»"
+msgstr "no s’ha pogut crear el fitxer d’eixida «%s» de la categoria «%s»"
 
-#: locale/programs/locfile.c:781
+#: locale/programs/locfile.c:782
 msgid "expect string argument for `copy'"
 msgstr "cal una cadena com a argument de «copy»"
 
-#: locale/programs/locfile.c:785
+#: locale/programs/locfile.c:786
 msgid "locale name should consist only of portable characters"
 msgstr "el nom del locale només ha de contenir caràcters portables"
 
-#: locale/programs/locfile.c:804
+#: locale/programs/locfile.c:805
 msgid "no other keyword shall be specified when `copy' is used"
-msgstr "no s'ha d'indicar cap altra paraula clau quan s'use «copy»"
+msgstr "no s’ha d’indicar cap altra paraula clau quan s’empre «copy»"
+
+#: locale/programs/locfile.c:819
+#, c-format
+msgid "`%1$s' definition does not end with `END %1$s'"
+msgstr "la definició «%1$s» no acaba en «END %1$s»"
 
-#: 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 "error de sintaxi en la definició del mapa de repertori: %s"
+msgstr "error de sintaxi a la definició del mapa de repertori: %s"
 
-#: locale/programs/repertoire.c:272
+#: locale/programs/repertoire.c:271
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
-msgstr "no s'ha especificat un valor <Uxxxx> o <Uxxxxxxxx>"
+msgstr "no s’ha especificat un valor <Uxxxx> o <Uxxxxxxxx>"
 
 # ivb (2001/11/05)
 # ivb  Apareix quan no es troba el repertori en un arbre de repertoris.
-#: locale/programs/repertoire.c:332
+#: locale/programs/repertoire.c:331
+#, c-format
 msgid "cannot save new repertoire map"
-msgstr "no s'ha pogut afegir el nou mapa de repertori"
+msgstr "no s’ha pogut afegir el nou mapa de repertori"
 
-#: locale/programs/repertoire.c:343
+#: locale/programs/repertoire.c:342
 #, c-format
 msgid "repertoire map file `%s' not found"
-msgstr "no s'ha trobat el fitxer «%s» de mapa de repertori"
+msgstr "no s’ha trobat el fitxer «%s» de mapa de repertori"
 
-#: locale/programs/repertoire.c:450
+#: login/programs/pt_chown.c:74
 #, c-format
-msgid "<%s> and <%s> are invalid names for range"
-msgstr "<%s> i <%s> no són noms de rang vàlids"
-
-#: locale/programs/repertoire.c:457
-msgid "upper limit in range is not smaller then lower limit"
-msgstr "el límit superior del rang no és menor que l'inferior"
+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 "Estableix el propietari, grup i permissos d’accés del pseudoâ€terminal esclau corresponent al pseudoâ€terminal mestre passat en el descriptor de fitxer %d.  Aquest és el programa auxiliar per a la funció grantpt(), i no està pensat per a ser executat directament des de la línia d’ordres.\n"
 
-#: locale/programs/xmalloc.c:70 malloc/obstack.c:505 malloc/obstack.c:508
-#: posix/getconf.c:1007
-msgid "memory exhausted"
-msgstr "la memòria s'ha exhaurit"
+#: login/programs/pt_chown.c:84
+#, c-format
+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 ""
+"S’estableix el propietari a l’usuari actual, el grup a «%s» i els permissos d’accés a %o.\n"
+"\n"
+"%s"
 
-#: assert/assert-perr.c:57
+#: login/programs/pt_chown.c:161
 #, c-format
-msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
-msgstr "%s%s%s:%u: %s%sError inesperat: %s.\n"
+msgid "too many arguments"
+msgstr "sobren arguments"
 
-#: assert/assert.c:56
+#: login/programs/pt_chown.c:169
 #, c-format
-msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
-msgstr "%s%s%s:%u: %s%sL'asserció «%s» ha fallat.\n"
+msgid "needs to be installed setuid `root'"
+msgstr "ha d’estar instaŀlat amb setuid a «root»"
 
-#: intl/tst-codeset.c:40 intl/tst-codeset.c:50
-msgid "cheese"
-msgstr "formatge"
+#: malloc/mcheck.c:330
+msgid "memory is consistent, library is buggy\n"
+msgstr "la memòria és consistent; la biblioteca té errors\n"
 
-#: intl/tst-gettext2.c:37
-msgid "First string for testing."
-msgstr "Primera cadena de prova."
+#: malloc/mcheck.c:333
+msgid "memory clobbered before allocated block\n"
+msgstr "s’ha sobreescrit la memòria d’abans del bloc reservat\n"
 
-#: intl/tst-gettext2.c:38
-msgid "Another string for testing."
-msgstr "Una altra cadena de prova."
+#: malloc/mcheck.c:336
+msgid "memory clobbered past end of allocated block\n"
+msgstr "s’ha sobreescrit la memòria de després del bloc reservat\n"
 
-#: catgets/gencat.c:111 catgets/gencat.c:115 nscd/nscd.c:88
-msgid "NAME"
-msgstr "NOM"
+#: malloc/mcheck.c:339
+msgid "block freed twice\n"
+msgstr "s’ha alliberat el bloc dues voltes\n"
 
-# Més ajudes.  ivb
-#: catgets/gencat.c:112
-msgid "Create C header file NAME containing symbol definitions"
-msgstr "Crea el fitxer capçalera C NOM contindrà les definicions de símbols."
+#: malloc/mcheck.c:342
+msgid "bogus mcheck_status, library is buggy\n"
+msgstr "el valor d’«mcheck_status» és estrany; la biblioteca té errors\n"
 
-#: catgets/gencat.c:114
-msgid "Do not use existing catalog, force new output file"
-msgstr "No usa el catàleg existent, i crea un nou fitxer d'eixida."
+#: malloc/memusage.sh:27
+msgid "Try \\`memusage --help' for more information."
+msgstr "Proveu «memusage --help» per a obtenir més informació."
 
-#: catgets/gencat.c:115
-msgid "Write output to file NAME"
-msgstr "Escriu l'eixida en el fitxer NOM."
+#: malloc/memusage.sh:33
+msgid "memusage: option \\`$1' requires an argument"
+msgstr "memusage: l’opció «$1» necessita un argument"
 
-#: catgets/gencat.c:120
+#: 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 through 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 ""
-"Genera un catàleg de missatges.Si FITXER_ENTRADA és «-», l'entrada es llegirà de l'entrada estàndard.\n"
-"Si FITXER_EIXIDA és «-», l'eixida s'escriurà en l'eixida estàndard.\n"
+"Forma d’ús: memusage [OPCIÓ]… PROGRAMA [OPCIÓ_DE_PROGRAMA]…\n"
+"Fa un perfilat de l’ús de memòria del PROGRAMA.\n"
+"\n"
+"  -n, --progname=NOM    Nom del fitxer del programa a perfilar.\n"
+"  -p, --png=FITXER     Genera un FITXER amb un gràfic PNG.\n"
+"  -d, --data=FITXER    Genera un FITXER de dades binàries.\n"
+"  -u, --unbuffered     No empra memòria intermèdia per a l’eixida.\n"
+"  -b, --buffer=N       Acumula N entrades abans d’escriureâ€les.\n"
+"      --no-timer       No recull informació addicional del temporitzador.\n"
+"  -m, --mmap           També traça mmap() i companyia.\n"
+"\n"
+"  -?, --help           Mostra aquesta ajuda i ix.\n"
+"      --usage          Mostra un missatge breu amb la forma d’ús.\n"
+"  -V, --version        Mostra informació sobre la versió i ix.\n"
+"\n"
+"Les opcions següents només es tenen en compte en generar un gràfic d’eixida:\n"
+"  -t, --time-based     Genera un gràfic lineal en el temps.\n"
+"  -T, --total          Inclou un gràfic de l’ús total de memòria.\n"
+"      --title=CADENA    Empra la CADENA com a títol del gràfic.\n"
+"  -x, --x-size=AMPLADA    Genera un gràfic de l’AMPLADA indicada (en píxels).\n"
+"  -y, --y-size=ALTURA    Genera un gràfic de l’ALTURA indicada (en píxels).\n"
+"\n"
+"Els arguments obligatoris per a les opcions llargues també ho són per a les\n"
+"opcions curtes corresponents.\n"
+"\n"
+"Per a obtenir instruccions sobre com informar d’un error, vegeu\n"
+"<http://www.gnu.org/software/libc/bugs.html>."
 
-#: catgets/gencat.c:125
+# Resumit com la resta.  ivb
+#: malloc/memusage.sh:99
 msgid ""
-"-o OUTPUT-FILE [INPUT-FILE]...\n"
-"[OUTPUT-FILE [INPUT-FILE]...]"
-msgstr ""
-"-o FITXER_EIXIDA [FITXER_ENTRADA]...\n"
-"[FITXER_EIXIDA [FITXER_ENTRADA]...]"
+"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 "Sintaxi: memusage [OPCIÓ]… PROGRAMA [OPCIÓ_DE_PROGRAMA]…"
 
-#: catgets/gencat.c:282
-msgid "*standard input*"
-msgstr "*entrada estàndard*"
+#: malloc/memusage.sh:191
+msgid "memusage: option \\`${1##*=}' is ambiguous"
+msgstr "memusage: l’opció «${1##*=}» és ambígua"
 
-#: catgets/gencat.c:417 catgets/gencat.c:494
-msgid "illegal set number"
-msgstr "el número de joc de missatges no és vàlid"
+#: malloc/memusage.sh:200
+msgid "memusage: unrecognized option \\`$1'"
+msgstr "memusage: l’opció «$1» no és reconeguda"
 
-#: catgets/gencat.c:444
-msgid "duplicate set definition"
-msgstr "la definició del joc de missatges és duplicada"
+#: malloc/memusage.sh:213
+msgid "No program name given"
+msgstr "No s’ha indicat un nom de programa"
 
-#: catgets/gencat.c:446 catgets/gencat.c:623 catgets/gencat.c:677
-msgid "this is the first definition"
-msgstr "aquesta és la primera definició"
-
-#: catgets/gencat.c:522
-#, c-format
-msgid "unknown set `%s'"
-msgstr "el joc de missatges «%s» no és conegut"
-
-#: catgets/gencat.c:563
-msgid "invalid quote character"
-msgstr "el caràcter de citació no és vàlid"
-
-#: catgets/gencat.c:576
-#, c-format
-msgid "unknown directive `%s': line ignored"
-msgstr "la directiva «%s» no és coneguda: es descarta la línia"
-
-#: catgets/gencat.c:621
-msgid "duplicated message number"
-msgstr "el número de missatge és duplicat"
-
-#: catgets/gencat.c:674
-msgid "duplicated message identifier"
-msgstr "l'identificador de missatge és duplicat"
+# Més ajudes.  ivb
+#: malloc/memusagestat.c:54
+msgid "Name output file"
+msgstr "Especifica el fitxer d’eixida."
 
-#: catgets/gencat.c:731
-msgid "invalid character: message ignored"
-msgstr "el caràcter no és vàlid: es descarta el missatge"
+#: malloc/memusagestat.c:55
+msgid "Title string used in output graphic"
+msgstr "Cadena amb el títol a emprar al gràfic d’eixida."
 
-#: catgets/gencat.c:774
-msgid "invalid line"
-msgstr "la línia no és vàlida"
+#: malloc/memusagestat.c:56
+msgid "Generate output linear to time (default is linear to number of function calls)"
+msgstr "Genera una eixida lineal respecte el temps (per defecte és lineal respecte el nombre de crides a funció)."
 
-#: catgets/gencat.c:828
-msgid "malformed line ignored"
-msgstr "es descarta la línia malmesa"
+#: malloc/memusagestat.c:58
+msgid "Also draw graph for total memory consumption"
+msgstr "També mostra un gràfic del consum total de memòria."
 
-#: catgets/gencat.c:992 catgets/gencat.c:1033
-#, c-format
-msgid "cannot open output file `%s'"
-msgstr "no s'ha pogut obrir el fitxer d'eixida «%s»"
+#: malloc/memusagestat.c:59
+msgid "Make output graphic VALUE pixels wide"
+msgstr "Fa el gràfic d’eixida de VALOR píxels d’amplada."
 
-#: catgets/gencat.c:1217
-msgid "unterminated message"
-msgstr "el missatge no es troba terminat"
+#: malloc/memusagestat.c:60
+msgid "Make output graphic VALUE pixels high"
+msgstr "Fa el gràfic d’eixida de VALOR píxels d’altura."
 
-#: catgets/gencat.c:1241
-msgid "while opening old catalog file"
-msgstr "en obrir el fitxer antic de catàleg"
+#: malloc/memusagestat.c:65
+msgid "Generate graphic from memory profiling data"
+msgstr "Genera un gràfic amb les dades de perfilat de memòria."
 
-#: catgets/gencat.c:1332
-msgid "conversion modules not available"
-msgstr "els mòduls de conversió no es troben disponibles"
+#: malloc/memusagestat.c:68
+msgid "DATAFILE [OUTFILE]"
+msgstr "FITXER_DADES [FITXER_EIXIDA]"
 
-#: catgets/gencat.c:1358
-msgid "cannot determine escape character"
-msgstr "no s'ha pogut determinar el caràcter d'escapada"
+#: misc/error.c:118 timezone/zic.c:417
+msgid "Unknown system error"
+msgstr "error desconegut del sistema"
 
-#: 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: no es poden tractar més de 8 arguments\n"
+#: nis/nis_callback.c:189
+msgid "unable to free arguments"
+msgstr "no s’han pogut alliberar els arguments"
 
-#: 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 "Èxit"
 
-#. 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 "L'operació no és permesa"
-
-#. 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 "El fitxer o directori no existeix"
-
-#. 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 "El procés no existeix"
-
-#. 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 "La crida al sistema ha estat interrompuda"
+#: nis/nis_error.h:2
+msgid "Probable success"
+msgstr "Èxit probable"
 
-#. TRANS Input/output error; usually used for physical read or write errors.
-#: stdio-common/../sysdeps/gnu/errlist.c:61
-msgid "Input/output error"
-msgstr "Error d'Entrada/Sortida"
+#: nis/nis_error.h:3
+msgid "Not found"
+msgstr "No s’ha trobat"
 
-#. 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 "El dispositiu o adreça no existeix"
+#: nis/nis_error.h:4
+msgid "Probably not found"
+msgstr "Probablement no s’ha trobat"
 
-#. 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 "La llista d'arguments és massa llarga"
+#: nis/nis_error.h:5
+msgid "Cache expired"
+msgstr "La memòria cau ha expirat"
 
-#. 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 "L'executable té un format erroni"
+#: nis/nis_error.h:6
+msgid "NIS+ servers unreachable"
+msgstr "Els servidors NIS+ són inabastables"
 
-#. 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 "El descriptor de fitxer no és vàlid"
+#: nis/nis_error.h:7
+msgid "Unknown object"
+msgstr "L’objecte no és conegut"
 
-#. 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 "No hi ha cap procés fill"
+#: nis/nis_error.h:8
+msgid "Server busy, try again"
+msgstr "El servidor es troba ocupat, torneu a provar"
 
-#. 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 "S'ha evitat un interbloqueig amb el recurs"
+#: nis/nis_error.h:9
+msgid "Generic system error"
+msgstr "Error genèric del sistema"
 
-#. 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 "No s'ha pogut reservar memòria"
+#: nis/nis_error.h:10
+msgid "First/next chain broken"
+msgstr "S’ha trencat la cadena de primer/següent"
 
 #. 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 "S'ha denegat el permís"
-
-#. 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 "L'adreça no és vàlida"
-
-#. 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 "Cal un dispositiu de blocs"
-
-#. 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 "El dispositiu o recurs es troba ocupat"
+msgstr "S’ha denegat el permís"
 
-#. 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 "El fitxer ja existeix"
+#: nis/nis_error.h:12
+msgid "Not owner"
+msgstr "No n’és propietari"
 
-#. 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 "No es pot crear un enllaç entre dispositius"
+#: nis/nis_error.h:13
+msgid "Name not served by this server"
+msgstr "El nom no és servit per aquest servidor"
 
-#. 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 "El dispositiu no és vàlid"
+#: nis/nis_error.h:14
+msgid "Server out of memory"
+msgstr "S’ha exhaurit la memòria del servidor"
 
-#. 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 "No és un directori"
+#: nis/nis_error.h:15
+msgid "Object with same name exists"
+msgstr "Ja existeix un objecte amb el mateix nom"
 
-#. 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 "És un directori"
+#: nis/nis_error.h:16
+msgid "Not master server for this domain"
+msgstr "No és el servidor mestre d’aquest domini"
 
-#. 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 "L'argument passat no és vàlid"
+#: nis/nis_error.h:17
+msgid "Invalid object for operation"
+msgstr "L’objecte emprat a l’operació no és vàlid"
 
-#. 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 "El procés té massa fitxers oberts"
+#: nis/nis_error.h:18
+msgid "Malformed name, or illegal name"
+msgstr "El nom està en mal estat o no està permès"
 
-#. 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 "El sistema té massa fitxers oberts"
+#: nis/nis_error.h:19
+msgid "Unable to create callback"
+msgstr "No s’ha pogut crear el procés de crida de retorn"
 
-#. 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 "L'operació ioctl() no s'adequa al dispositiu"
+#: nis/nis_error.h:20
+msgid "Results sent to callback proc"
+msgstr "S’han enviat els resultats al procés de crida de retorn"
 
-#. 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 "El fitxer de text es troba ocupat"
+#: nis/nis_error.h:21
+msgid "Not found, no such name"
+msgstr "No s’ha trobat, el nom no existeix"
 
-#. 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 "El fitxer és massa gran"
+#: nis/nis_error.h:22
+msgid "Name/entry isn't unique"
+msgstr "El nom/entrada no és única"
 
-#. 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 "No resta espai en el dispositiu"
+#: nis/nis_error.h:23
+msgid "Modification failed"
+msgstr "La modificació ha fallat"
 
-#. 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 "No es pot moure el punter de fitxer"
+#: nis/nis_error.h:24
+msgid "Database for table does not exist"
+msgstr "La base de dades de la taula no existeix"
 
-#. 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 "El sistema de fitxers és només de lectura"
+#: nis/nis_error.h:25
+msgid "Entry/table type mismatch"
+msgstr "Els tipus d’entrada i taula no concorden"
 
-#. 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 "El fitxer té massa enllaços"
+#: nis/nis_error.h:26
+msgid "Link points to illegal name"
+msgstr "L’enllaç apunta a un nom no permès"
 
-#. 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 "L'argument numèric és fora del domini"
+#: nis/nis_error.h:27
+msgid "Partial success"
+msgstr "Èxit parcial"
 
-#. 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 "El resultat numèric és fora de rang"
+#: nis/nis_error.h:28
+msgid "Too many attributes"
+msgstr "Sobren atributs"
 
-#. 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 "El recurs no es troba disponible temporalment"
+#: nis/nis_error.h:29
+msgid "Error in RPC subsystem"
+msgstr "Error al subsistema RPC"
 
-#. 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 "L'operació quedaria blocada"
+#: nis/nis_error.h:30
+msgid "Missing or malformed attribute"
+msgstr "L’atribut manca o està en mal estat"
 
-#. 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 "L'operació està en marxa"
+#: nis/nis_error.h:31
+msgid "Named object is not searchable"
+msgstr "L’objecte anomenat no és cercable"
 
-#. 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 "L'operació ja estava en marxa"
+# ivb (2001/11/07)
+# ivb  Si no he entés malament, «proc» és el programa «ypxfr» -> procés
+#: nis/nis_error.h:32
+msgid "Error while talking to callback proc"
+msgstr "Error en parlar amb el procés de crida de retorn"
 
-#. 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 "Operació de connector sobre un fitxer no-connector"
+#: nis/nis_error.h:33
+msgid "Non NIS+ namespace encountered"
+msgstr "S’ha trobat un espai de noms noâ€NIS+"
 
-#. 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 "El missatge és massa llarg"
+#: nis/nis_error.h:34
+msgid "Illegal object type for operation"
+msgstr "El tipus d’objecte emprat a l’operació no és permès"
 
-#. 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 "El connector no suporta aquest protocol"
+#: nis/nis_error.h:35
+msgid "Passed object is not the same object on server"
+msgstr "L’objecte passat no és el mateix objecte al servidor"
 
-#. 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 "El protocol no es troba disponible"
+#: nis/nis_error.h:36
+msgid "Modify operation failed"
+msgstr "L’operació de modificació ha fallat"
 
-#. 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 "No es suporta el protocol"
+#: nis/nis_error.h:37
+msgid "Query illegal for named table"
+msgstr "La consulta no és permesa per a la taula anomenada"
 
-#. 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 "No es suporta el tipus de connector"
+#: nis/nis_error.h:38
+msgid "Attempt to remove a non-empty table"
+msgstr "S’ha intentat eliminar una taula no buida"
 
-#. 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 "No es suporta l'operació"
+#: nis/nis_error.h:39
+msgid "Error in accessing NIS+ cold start file.  Is NIS+ installed?"
+msgstr "Error en accedir al fitxer d’arrencada en fred de NIS+.  Heu instaŀlat NIS+?"
 
-#. 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 "No es suporta la família de protocols"
+#: nis/nis_error.h:40
+msgid "Full resync required for directory"
+msgstr "Cal resincronitzar completament el directori"
 
-#. 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 "El protocol no suporta aquesta família d'adreces"
+#: nis/nis_error.h:41
+msgid "NIS+ operation failed"
+msgstr "L’operació NIS+ ha fallat"
 
-#. 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 "L'adreça ja és en ús"
+#: nis/nis_error.h:42
+msgid "NIS+ service is unavailable or not installed"
+msgstr "El servei NIS+ no es troba disponible o no està instaŀlat"
 
-#. 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 "No s'ha pogut assignar l'adreça soŀlicitada"
+# ivb (2001/10/20)
+# ivb  I de l'Univers i de Tot. ;)
+#: nis/nis_error.h:43
+msgid "Yes, 42 is the meaning of life"
+msgstr "Sí, 42 és el Significat de la Vida"
 
-#. 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 "La xarxa no és activa"
+#: nis/nis_error.h:44
+msgid "Unable to authenticate NIS+ server"
+msgstr "No s’ha pogut autenticar el servidor NIS+"
 
-#. 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 "La xarxa és inabastable"
+#: nis/nis_error.h:45
+msgid "Unable to authenticate NIS+ client"
+msgstr "No s’ha pogut autenticar el client NIS+"
 
-#. 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 "La xarxa ha tallat la connexió per un reinici"
+#: nis/nis_error.h:46
+msgid "No file space on server"
+msgstr "No resta espai per a fitxers al servidor"
 
-#. 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 "El programari ha tallat la conexió"
+#: nis/nis_error.h:47
+msgid "Unable to create process on server"
+msgstr "No s’ha pogut crear un procés al servidor"
 
-#. 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 "La màquina remota ha reiniciat la connexió"
+#: nis/nis_error.h:48
+msgid "Master server busy, full dump rescheduled."
+msgstr "El servidor mestre es troba ocupat, es replanifica el bolcat complet"
 
-#. 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 "No hi ha memòria intermèdia disponible"
+#: nis/nis_local_names.c:122
+#, c-format
+msgid "LOCAL entry for UID %d in directory %s not unique\n"
+msgstr "L’entrada LOCAL de l’UID %d al directori «%s» no és única\n"
 
-#. 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 "L'extrem de transport ja és connectat"
+# ivb (2001/10/30)
+# ivb  Crec que es refereix a un tipus de servei de noms -> masculí.
+#: nis/nis_print.c:51
+msgid "UNKNOWN"
+msgstr "DESCONEGUT"
 
-#. 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 "L'extrem de transport no és connectat"
+# ivb (2001/11/01)
+# ivb  D'acord amb «nis/rpcsvc/nis_object.x».
+#: nis/nis_print.c:109
+msgid "BOGUS OBJECT\n"
+msgstr "OBJECTE NO INICIAT\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}.
-#: stdio-common/../sysdeps/gnu/errlist.c:650
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:126
-msgid "Destination address required"
-msgstr "Cal una adreça de destinació"
+#: nis/nis_print.c:112
+msgid "NO OBJECT\n"
+msgstr "CAP OBJECTE\n"
 
-#. TRANS The socket has already been shut down.
-#: stdio-common/../sysdeps/gnu/errlist.c:659
-msgid "Cannot send after transport endpoint shutdown"
-msgstr "No es pot enviar després de tancar l'extrem de transport"
+#: nis/nis_print.c:115
+msgid "DIRECTORY\n"
+msgstr "DIRECTORI\n"
 
-#. 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 "Hi ha massa referències: no es poden enllaçar"
+#: nis/nis_print.c:118
+msgid "GROUP\n"
+msgstr "GRUP\n"
 
-#. 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 "La connexió ha expirat"
+#: nis/nis_print.c:121
+msgid "TABLE\n"
+msgstr "TAULA\n"
 
-#. 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 "S'ha refusat la connexió"
+#: nis/nis_print.c:124
+msgid "ENTRY\n"
+msgstr "ENTRADA\n"
 
-#. 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 "Hi ha massa nivells d'enllaços simbòlics"
+#: nis/nis_print.c:127
+msgid "LINK\n"
+msgstr "ENLLAÇ\n"
 
-#. 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 "El nom de fitxer és massa llarg"
+#: nis/nis_print.c:130
+msgid "PRIVATE\n"
+msgstr "PRIVAT\n"
 
-#. 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 "L'estació no està operativa"
+#: nis/nis_print.c:133
+msgid "(Unknown object)\n"
+msgstr "(Objecte desconegut)\n"
 
-#. 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 "No hi ha cap camí cap a l'estació"
+#: nis/nis_print.c:167
+#, c-format
+msgid "Name : `%s'\n"
+msgstr "Nom   : «%s»\n"
 
-#. 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 "El directori no és buit"
+#: nis/nis_print.c:168
+#, c-format
+msgid "Type : %s\n"
+msgstr "Tipus : %s\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.
-#: stdio-common/../sysdeps/gnu/errlist.c:748
-msgid "Too many processes"
-msgstr "L'usuari té massa processos"
+#: nis/nis_print.c:173
+msgid "Master Server :\n"
+msgstr "Servidor mestre :\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.
-#: stdio-common/../sysdeps/gnu/errlist.c:758
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:124
-msgid "Too many users"
-msgstr "Hi ha massa usuaris"
+# ivb (2001/10/28)
+# ivb  Es refereix a un servidor rèplica, no a replicar.
+#: nis/nis_print.c:175
+msgid "Replicate :\n"
+msgstr "Rèplica :\n"
 
-#. TRANS The user's disk quota was exceeded.
-#: stdio-common/../sysdeps/gnu/errlist.c:767
-msgid "Disk quota exceeded"
-msgstr "S'ha excedit la quota de disc"
+#: nis/nis_print.c:176
+#, c-format
+msgid "\tName       : %s\n"
+msgstr "\tNom         : %s\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.
-#: stdio-common/../sysdeps/gnu/errlist.c:779
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:181
-msgid "Stale NFS file handle"
-msgstr "L'indicador del fitxer NFS és obsolet"
+#: nis/nis_print.c:177
+msgid "\tPublic Key : "
+msgstr "\tClau pública: "
 
-#. 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 "L'objecte és remot"
+#: nis/nis_print.c:181
+msgid "None.\n"
+msgstr "Cap.\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:800
-msgid "RPC struct is bad"
-msgstr "L'estructura RPC és feta malbé"
+# ivb (2001/10/28)
+# ivb  Xicoteta diferència-Home de l'infern ;)
+#: nis/nis_print.c:184
+#, c-format
+msgid "Diffie-Hellmann (%d bits)\n"
+msgstr "Diffieâ€Hellmann (%d bits)\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:809
-msgid "RPC version wrong"
-msgstr "La versió d'RPC no és correcta"
+#: nis/nis_print.c:189
+#, c-format
+msgid "RSA (%d bits)\n"
+msgstr "RSA (%d bits)\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:818
-msgid "RPC program not available"
-msgstr "El programa RPC no es troba disponible"
+#: nis/nis_print.c:192
+msgid "Kerberos.\n"
+msgstr "Kerberos.\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:827
-msgid "RPC program version wrong"
-msgstr "La versió del programa RPC no és correcta"
+# ivb (2001/10/30)
+# ivb  Es refereix a una clau pública -> femení.
+#: nis/nis_print.c:195
+#, c-format
+msgid "Unknown (type = %d, bits = %d)\n"
+msgstr "Desconeguda (tipus = %d, bits = %d)\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:836
-msgid "RPC bad procedure for program"
-msgstr "El procediment RPC no és vàlid per al programa"
+#: nis/nis_print.c:206
+#, c-format
+msgid "\tUniversal addresses (%u)\n"
+msgstr "\tAdreces universals (%u)\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 "No hi ha blocatges disponibles"
+#: nis/nis_print.c:228
+msgid "Time to live : "
+msgstr "Temps de vida : "
 
-#. 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 "El format o tipus de fitxer no és l'apropiat"
+#: nis/nis_print.c:230
+msgid "Default Access rights :\n"
+msgstr "Drets d’accés per defecte :\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:870
-msgid "Authentication error"
-msgstr "Error d'autenticació"
+#: nis/nis_print.c:239
+#, c-format
+msgid "\tType         : %s\n"
+msgstr "\tTipus        : %s\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:879
-msgid "Need authenticator"
-msgstr "Cal un autenticador"
+#: nis/nis_print.c:240
+msgid "\tAccess rights: "
+msgstr "\tDrets d’accés: "
 
-#. 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 "La funció no és implementada"
+#: nis/nis_print.c:254
+msgid "Group Flags :"
+msgstr "Senyaladors del grup :"
 
-#. 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 "No es suporta"
+#: nis/nis_print.c:257
+msgid ""
+"\n"
+"Group Members :\n"
+msgstr ""
+"\n"
+"Membres del grup :\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 "El caràcter estés o multioctet no és vàlid o complet"
+#: nis/nis_print.c:269
+#, c-format
+msgid "Table Type          : %s\n"
+msgstr "Tipus de taula      : %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 "L'operació no és adequada per a un procés de fons"
+#: nis/nis_print.c:270
+#, c-format
+msgid "Number of Columns   : %d\n"
+msgstr "Nombre de columnes  : %d\n"
 
 # ivb (2000/10/28)
-# ivb  Doncs que conste que jo no he sigut!
-#. 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 "El traductor ha mort"
-
-#. 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 "?"
-
-#. TRANS You did @strong{what}?
-#: stdio-common/../sysdeps/gnu/errlist.c:967
-msgid "You really blew it this time"
-msgstr "Ara sí que te l'has carregat"
-
-# ivb (2001/11/05)
-# ivb  Ací qualsevol posa el que li dóna la gana, sembla!
-#. 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 "El tio Pep se'n va a Murooo, tio Peeep"
-
-#. TRANS This error code has no purpose.
-#: stdio-common/../sysdeps/gnu/errlist.c:985
-msgid "Gratuitous error"
-msgstr "Error injustificat"
-
-#: stdio-common/../sysdeps/gnu/errlist.c:993
-msgid "Bad message"
-msgstr "El missatge no és vàlid"
-
-#: stdio-common/../sysdeps/gnu/errlist.c:1001
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:66
-msgid "Identifier removed"
-msgstr "L'identificador ha estat eliminat"
-
-#: stdio-common/../sysdeps/gnu/errlist.c:1009
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:104
-msgid "Multihop attempted"
-msgstr "S'ha intentat un salt múltiple"
-
-#: stdio-common/../sysdeps/gnu/errlist.c:1017
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:91
-msgid "No data available"
-msgstr "No hi ha dades disponibles"
-
-#: stdio-common/../sysdeps/gnu/errlist.c:1025
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:97
-msgid "Link has been severed"
-msgstr "S'ha tallat l'enllaç"
-
-#: 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 "No hi ha missatges del tipus desitjat"
-
-#: stdio-common/../sysdeps/gnu/errlist.c:1041
-msgid "Out of streams resources"
-msgstr "No resten recursos del tipus flux"
-
-#: stdio-common/../sysdeps/gnu/errlist.c:1049
-msgid "Device not a stream"
-msgstr "El dispositiu no és un flux"
-
-#: 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 "El valor és massa gran per al tipus de dada definit"
-
-#: stdio-common/../sysdeps/gnu/errlist.c:1065
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:101
-msgid "Protocol error"
-msgstr "Error de protocol"
+# ivb  Açò és correcte segons nis/rpcsvc/nis_object.x, és «caràcter
+# ivb  separador» i no «separador de caràcters».
+#: nis/nis_print.c:271
+#, c-format
+msgid "Character Separator : %c\n"
+msgstr "Caràcter separador  : %c\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1073
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:92
-msgid "Timer expired"
-msgstr "El temporitzador ha expirat"
+#: nis/nis_print.c:272
+#, c-format
+msgid "Search Path         : %s\n"
+msgstr "Camí de cerca       : %s\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 "L'operació ha estat canceŀlada"
+#: nis/nis_print.c:273
+msgid "Columns             :\n"
+msgstr "Columnes            :\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1093
-msgid "Interrupted system call should be restarted"
-msgstr "Caldria reiniciar la crida al sistema interrompuda"
+#: nis/nis_print.c:276
+#, c-format
+msgid "\t[%d]\tName          : %s\n"
+msgstr "\t[%d]\tNom           : %s\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 "El número de canal és fora de rang"
+#: nis/nis_print.c:278
+msgid "\t\tAttributes    : "
+msgstr "\t\tAtributs      : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1109
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:68
-msgid "Level 2 not synchronized"
-msgstr "El nivell 2 no està sincronitzat"
+#: nis/nis_print.c:280
+msgid "\t\tAccess Rights : "
+msgstr "\t\tDrets d’accés : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1117
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:69
-msgid "Level 3 halted"
-msgstr "S'ha parat el nivell 3"
+#: nis/nis_print.c:290
+msgid "Linked Object Type : "
+msgstr "Tipus de l’objecte enllaçat : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1125
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:70
-msgid "Level 3 reset"
-msgstr "S'ha reiniciat el nivell 3"
+#: nis/nis_print.c:292
+#, c-format
+msgid "Linked to : %s\n"
+msgstr "Enllaçat amb : %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 "El nombre d'enllaços és fora de rang"
+#: nis/nis_print.c:302
+#, c-format
+msgid "\tEntry data of type %s\n"
+msgstr "\tDades de l’entrada de tipus «%s»\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1141
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:72
-msgid "Protocol driver not attached"
-msgstr "No hi ha programa de control associat al protocol"
+#: nis/nis_print.c:305
+#, c-format
+msgid "\t[%u] - [%u bytes] "
+msgstr "\t[%u] — [%u octets] "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1149
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:73
-msgid "No CSI structure available"
-msgstr "No hi ha estructures CSI disponibles"
+#: nis/nis_print.c:308
+msgid "Encrypted data\n"
+msgstr "Dades xifrades\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1157
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:74
-msgid "Level 2 halted"
-msgstr "S'ha parat el nivell 2"
+#: nis/nis_print.c:310
+msgid "Binary data\n"
+msgstr "Dades binàries\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1165
-msgid "Invalid exchange"
-msgstr "L'intercanvi no és vàlid"
+#: nis/nis_print.c:326
+#, c-format
+msgid "Object Name   : %s\n"
+msgstr "Nom de l’objecte : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1173
-msgid "Invalid request descriptor"
-msgstr "El descriptor de petició no és vàlid"
+#: nis/nis_print.c:327
+#, c-format
+msgid "Directory     : %s\n"
+msgstr "Directori        : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1181
-msgid "Exchange full"
-msgstr "L'intercanvi és ple"
+#: nis/nis_print.c:328
+#, c-format
+msgid "Owner         : %s\n"
+msgstr "Propietari       : %s\n"
 
-# Algun sistema de fitxers té nodes-a a banda de nodes-i.  ivb
-#: stdio-common/../sysdeps/gnu/errlist.c:1189
-msgid "No anode"
-msgstr "No hi ha node-a"
+#: nis/nis_print.c:329
+#, c-format
+msgid "Group         : %s\n"
+msgstr "Grup             : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1197
-msgid "Invalid request code"
-msgstr "El codi de petició no és vàlid"
+#: nis/nis_print.c:330
+msgid "Access Rights : "
+msgstr "Drets d’accés    : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1205
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:85
-msgid "Invalid slot"
-msgstr "La ranura no és vàlida"
+#: nis/nis_print.c:332
+#, c-format
+msgid ""
+"\n"
+"Time to Live  : "
+msgstr ""
+"\n"
+"Temps de vida    : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1213
-msgid "File locking deadlock error"
-msgstr "Interbloqueig pel blocatge d'un fitxer"
+#: nis/nis_print.c:335
+#, c-format
+msgid "Creation Time : %s"
+msgstr "Data de creació   : %s"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1221
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:87
-msgid "Bad font file format"
-msgstr "El fitxer de font no té un format vàlid"
+#: nis/nis_print.c:337
+#, c-format
+msgid "Mod. Time     : %s"
+msgstr "Data modificació : %s"
 
-#: 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 "La màquina no es troba en la xarxa"
+#: nis/nis_print.c:338
+msgid "Object Type   : "
+msgstr "Tipus d’objecte  : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1237
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:95
-msgid "Package not installed"
-msgstr "El paquet no es troba instaŀlat"
+#: nis/nis_print.c:358
+#, c-format
+msgid "    Data Length = %u\n"
+msgstr "    Longitud de les dades = %u\n"
 
-# ivb (2001/11/08)
-# ivb  Segons la _meravellosa_ pàgina de manual intro(2) de Solaris2
-# ivb  es pot entendre «advertise» com el fet d'exportar recurs pel
-# ivb  seu ús en un sistema de fitxers remot.  Gràcies als amics del
-# ivb  de.po!!
-#: stdio-common/../sysdeps/gnu/errlist.c:1245
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:98
-msgid "Advertise error"
-msgstr "Error d'exportació"
+#: nis/nis_print.c:372
+#, c-format
+msgid "Status            : %s\n"
+msgstr "Estat             : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1253
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:99
-msgid "Srmount error"
-msgstr "Error en «srmount»"
+#: nis/nis_print.c:373
+#, c-format
+msgid "Number of objects : %u\n"
+msgstr "Nombre d’objectes : %u\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1261
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:100
-msgid "Communication error on send"
-msgstr "Error de comunicacions en l'enviament"
+#: nis/nis_print.c:377
+#, c-format
+msgid "Object #%d:\n"
+msgstr "Objecte #%d:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1269
-msgid "RFS specific error"
-msgstr "Error específic d'RFS"
+#: nis/nis_print_group_entry.c:117
+#, c-format
+msgid "Group entry for \"%s.%s\" group:\n"
+msgstr "Entrada de grup per al grup «%s.%s»:\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 "El nom no és únic en la xarxa"
+#: nis/nis_print_group_entry.c:125
+msgid "    Explicit members:\n"
+msgstr "    Membres explícits:\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 "El descriptor de fitxer és fet malbé"
+#: nis/nis_print_group_entry.c:130
+msgid "    No explicit members\n"
+msgstr "    No hi ha membres explícits.\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1293
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:112
-msgid "Remote address changed"
-msgstr "L'adreça remota ha canviat"
+#: nis/nis_print_group_entry.c:133
+msgid "    Implicit members:\n"
+msgstr "    Membres implícits:\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 "No s'ha pogut accedir a una biblioteca compartida necessària"
+#: nis/nis_print_group_entry.c:138
+msgid "    No implicit members\n"
+msgstr "    No hi ha membres implícits.\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 "Accés una biblioteca compartida corrupta"
+#: nis/nis_print_group_entry.c:141
+msgid "    Recursive members:\n"
+msgstr "    Membres recursius:\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 "La secció «.lib» de l'a.out és corrupta"
+#: nis/nis_print_group_entry.c:146
+msgid "    No recursive members\n"
+msgstr "    No hi ha membres recursius.\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1325
-msgid "Attempting to link in too many shared libraries"
-msgstr "S'ha intentat enllaçar massa biblioteques compartides"
+#: nis/nis_print_group_entry.c:149
+msgid "    Explicit nonmembers:\n"
+msgstr "    Noâ€membres explícits:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1333
-msgid "Cannot exec a shared library directly"
-msgstr "No es pot executar directament una biblioteca compartida"
+#: nis/nis_print_group_entry.c:154
+msgid "    No explicit nonmembers\n"
+msgstr "    No hi ha noâ€membres explícits.\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1341
-msgid "Streams pipe error"
-msgstr "Error en la canonada entre fluxs"
+#: nis/nis_print_group_entry.c:157
+msgid "    Implicit nonmembers:\n"
+msgstr "    Noâ€membres implícits:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1349
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:165
-msgid "Structure needs cleaning"
-msgstr "L'estructura necessita una neteja"
+#: nis/nis_print_group_entry.c:162
+msgid "    No implicit nonmembers\n"
+msgstr "    No hi ha noâ€membres implícits.\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1357
-msgid "Not a XENIX named type file"
-msgstr "El fitxer no és d'un tipus XENIX amb nom"
+#: nis/nis_print_group_entry.c:165
+msgid "    Recursive nonmembers:\n"
+msgstr "    Noâ€membres recursius:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1365
-msgid "No XENIX semaphores available"
-msgstr "No hi ha semàfors XENIX disponibles"
+#: nis/nis_print_group_entry.c:170
+msgid "    No recursive nonmembers\n"
+msgstr "    No hi ha noâ€membres recursius.\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1373
-msgid "Is a named type file"
-msgstr "El fitxer és d'un tipus amb nom"
+#: 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 "l’entrada DES per al nom de xarxa «%s» no és única\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 "Error en una E/S remota"
+#: nis/nss_nisplus/nisplus-publickey.c:220
+#, c-format
+msgid "netname2user: missing group id list in `%s'"
+msgstr "netname2user: manca la llista d’identificadors de grup a «%s»."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1389
-msgid "No medium found"
-msgstr "No s'ha trobat el mitjà"
+#: 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: (cerca nis+): %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1397
-msgid "Wrong medium type"
-msgstr "El tipus de mitjà no és vàlid"
+#: nis/nss_nisplus/nisplus-publickey.c:321
+#, c-format
+msgid "netname2user: DES entry for %s in directory %s not unique"
+msgstr "netname2user: l’entrada DES de «%s» al directori «%s» no és única"
 
-#: stdio-common/../sysdeps/unix/siglist.c:26
-msgid "Signal 0"
-msgstr "Senyal 0"
+#: nis/nss_nisplus/nisplus-publickey.c:339
+#, c-format
+msgid "netname2user: principal name `%s' too long"
+msgstr "netname2user: el nom principal «%s» és massa llarg"
 
-#: stdio-common/../sysdeps/unix/siglist.c:32
-msgid "IOT trap"
-msgstr "Trampa IOT"
+#: nis/nss_nisplus/nisplus-publickey.c:395
+#, c-format
+msgid "netname2user: LOCAL entry for %s in directory %s not unique"
+msgstr "netname2user: l’entrada LOCAL de «%s» al directori «%s» no és única"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:30
-msgid "Error 0"
-msgstr "Error 0"
+#: nis/nss_nisplus/nisplus-publickey.c:402
+msgid "netname2user: should not have uid 0"
+msgstr "netname2user: no ha de tenir l’UID 0"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:31
-#: nis/nis_error.c:40
-msgid "Not owner"
-msgstr "No n'és propietari o propietària"
+#: nis/ypclnt.c:825
+msgid "Request arguments bad"
+msgstr "Els arguments de la petició són incorrectes"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:35
-msgid "I/O error"
-msgstr "Error d'E/S"
+#: nis/ypclnt.c:828
+msgid "RPC failure on NIS operation"
+msgstr "El procediment RPC ha fallat en una operació NIS"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:37
-msgid "Arg list too long"
-msgstr "La llista d'arguments és massa llarga"
+#: nis/ypclnt.c:831
+msgid "Can't bind to server which serves this domain"
+msgstr "No s’ha pogut enllaçar amb el servidor d’aquest domini"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:39
-msgid "Bad file number"
-msgstr "El número de fitxer no és vàlid"
+#: nis/ypclnt.c:834
+msgid "No such map in server's domain"
+msgstr "El mapa no és al domini del servidor"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:42
-msgid "Not enough space"
-msgstr "No hi ha espai suficient"
+#: nis/ypclnt.c:837
+msgid "No such key in map"
+msgstr "La clau no és al mapa"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:46
-msgid "Device busy"
-msgstr "El dispositiu es troba ocupat"
+#: nis/ypclnt.c:840
+msgid "Internal NIS error"
+msgstr "Error intern de NIS"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:48
-msgid "Cross-device link"
-msgstr "No es pot crear un enllaç entre dispositius"
+#: nis/ypclnt.c:843
+msgid "Local resource allocation failure"
+msgstr "No s’ha pogut assignar un recurs local"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:53
-msgid "File table overflow"
-msgstr "Desbordament de la taula de fitxers"
+#: nis/ypclnt.c:846
+msgid "No more records in map database"
+msgstr "No hi ha més registres a la base de dades del mapa"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:63
-msgid "Argument out of domain"
-msgstr "L'argument és fora del domini"
+#: nis/ypclnt.c:849
+msgid "Can't communicate with portmapper"
+msgstr "No s’ha pogut comunicar amb el mapador de ports"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:64
-msgid "Result too large"
-msgstr "El resultat és massa gran"
+#: nis/ypclnt.c:852
+msgid "Can't communicate with ypbind"
+msgstr "No s’ha pogut comunicar amb «ypbind»"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:75
-msgid "Deadlock situation detected/avoided"
-msgstr "S'ha detectat i evitat un interbloqueig"
+#: nis/ypclnt.c:855
+msgid "Can't communicate with ypserv"
+msgstr "No s’ha pogut comunicar amb «ypserv»"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:76
-msgid "No record locks available"
-msgstr "No hi ha blocatges de registre disponibles"
+#: nis/ypclnt.c:858
+msgid "Local domain name not set"
+msgstr "No s’ha establert nom del domini local"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:79
-msgid "Disc quota exceeded"
-msgstr "S'ha excedit la quota de disc"
+#: nis/ypclnt.c:861
+msgid "NIS map database is bad"
+msgstr "La base de dades de mapes NIS és feta malbé"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:80
-msgid "Bad exchange descriptor"
-msgstr "El descriptor de l'intercanvi no és vàlid"
+#: nis/ypclnt.c:864
+msgid "NIS client/server version mismatch - can't supply service"
+msgstr "Les versions de client i servidor NIS difereixen; no es pot donar servei"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:81
-msgid "Bad request descriptor"
-msgstr "El descriptor de petició no és vàlid"
+#: nis/ypclnt.c:870
+msgid "Database is busy"
+msgstr "La base de dades es troba ocupada"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:82
-msgid "Message tables full"
-msgstr "Les taules de missatges són plenes"
+#: nis/ypclnt.c:873
+msgid "Unknown NIS error code"
+msgstr "Codi d’error desconegut de NIS"
 
-# ivb (2001/11/07)
-# ivb  Pareix que un node-a «anode» és semblant a un node-i «inode» en
-# ivb  determinats sistemes de fitxers, i.e. l'amigados en *BSD (adosfs).
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:83
-msgid "Anode table overflow"
-msgstr "Desbordament de la taula de nodes-a"
-
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:84
-msgid "Bad request code"
-msgstr "El codi de petició no és vàlid"
+#: nis/ypclnt.c:913
+msgid "Internal ypbind error"
+msgstr "Error intern d’«ypbind»"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:86
-msgid "File locking deadlock"
-msgstr "Interbloqueig pel blocatge d'un fitxer"
+#: nis/ypclnt.c:916
+msgid "Domain not bound"
+msgstr "El domini no és vinculat"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:88
-msgid "Error 58"
-msgstr "Error 58"
+#: nis/ypclnt.c:919
+msgid "System resource allocation failure"
+msgstr "No s’han pogut assignar recursos del sistema"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:89
-msgid "Error 59"
-msgstr "Error 59"
+#: nis/ypclnt.c:922
+msgid "Unknown ypbind error"
+msgstr "Error desconegut d’«ypbind»"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:90
-msgid "Not a stream device"
-msgstr "No és un dispositiu de flux"
+#: nis/ypclnt.c:963
+msgid "yp_update: cannot convert host to netname\n"
+msgstr "yp_update: no s’ha pogut convertir el nom d’estació a nom de xarxa\n"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:93
-msgid "Out of stream resources"
-msgstr "No resten recursos del tipus flux"
+#: nis/ypclnt.c:981
+msgid "yp_update: cannot get server address\n"
+msgstr "yp_update: no s’ha pogut obtenir l’adreça del servidor\n"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:102
-msgid "Error 72"
-msgstr "Error 72"
+# El nom de la base de dades s’usa més a sovint que la descripció.  ivb
+#: nscd/aicache.c:77 nscd/hstcache.c:468
+#, c-format
+msgid "Haven't found \"%s\" in hosts cache!"
+msgstr "no s’ha trobat «%s» a la memòria cau de «hosts»"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:103
-msgid "Error 73"
-msgstr "Error 73"
+# El nom de la base de dades s’usa més a sovint que la descripció.  ivb
+#: nscd/aicache.c:79 nscd/hstcache.c:470
+#, c-format
+msgid "Reloading \"%s\" in hosts cache!"
+msgstr "es torna a carregar «%s» a la memòria cau de «hosts»"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:105
-msgid "Error 75"
-msgstr "Error 75"
+# La 2a. és de l’estil de «GETPWBYNAME», la 3a. com «passwd».  ivb
+# Al darrere pot anar « (first)» o no.  ivb
+#: nscd/cache.c:146
+#, c-format
+msgid "add new entry \"%s\" of type %s for %s to cache%s"
+msgstr "s’afegeix una nova entrada «%s» de tipus %s a la memòria cau de «%s»%s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:106
-msgid "Error 76"
-msgstr "Error 76"
+# FIXME: language-dependent construct  ivb
+# Supose que vol dir «abans».  ivb
+#: nscd/cache.c:148
+msgid " (first)"
+msgstr " (primer)"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:107
-msgid "Not a data message"
-msgstr "No és un missatge de dades"
+#: nscd/cache.c:256 nscd/connections.c:810
+#, c-format
+msgid "cannot stat() file `%s': %s"
+msgstr "ha fallat stat() sobre el fitxer «%s»: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:116
-msgid "Attempting to link in more shared libraries than system limit"
-msgstr "S'ha intentat enllaçar més biblioteques compartides que les permeses pel sistema"
+#: nscd/cache.c:285
+#, c-format
+msgid "pruning %s cache; time %ld"
+msgstr "neteja de la memòria cau de «%s», hora %ld"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:117
-msgid "Can not exec a shared library directly"
-msgstr "No es pot executar directament una biblioteca compartida"
+# La 2a. és de l’estil de «GETPWBYNAME».  ivb
+#: nscd/cache.c:312
+#, c-format
+msgid "considering %s entry \"%s\", timeout %<PRIu64>"
+msgstr "es considera l’entrada %s «%s», expiració %<PRIu64>"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:118
-msgid "Illegal byte sequence"
-msgstr "La seqüència d'octets no és permesa"
+#: nscd/connections.c:521 nscd/connections.c:533 nscd/connections.c:545
+#: nscd/connections.c:564
+#, c-format
+msgid "invalid persistent database file \"%s\": %s"
+msgstr "el fitxer de base de dades persistent «%s» no és vàlid: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:119
-msgid "Operation not applicable"
-msgstr "L'operació no és aplicable"
+#: nscd/connections.c:535
+msgid "header size does not match"
+msgstr "la mida de la capçalera no concorda"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:120
-msgid "Number of symbolic links encountered during path name traversal exceeds MAXSYMLINKS"
-msgstr "El nombre d'enllaços simbòlics trobats en recórrer el nom del camí excedeix MAXSYMLINKS"
+#: nscd/connections.c:547
+msgid "file size does not match"
+msgstr "la mida del fitxer no concorda"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:121
-msgid "Error 91"
-msgstr "Error 91"
+#: nscd/connections.c:566
+msgid "verification failed"
+msgstr "la verificació ha fallat"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:122
-msgid "Error 92"
-msgstr "Error 92"
+#: nscd/connections.c:580
+#, c-format
+msgid "suggested size of table for database %s larger than the persistent database's table"
+msgstr "la mida de taula suggerida per a la base de dades «%s» és major que la de la base de dades persistent"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:129
-msgid "Option not supported by protocol"
-msgstr "El protocol no suporta l'operació"
+#: nscd/connections.c:591 nscd/connections.c:673
+#, c-format
+msgid "cannot create read-only descriptor for \"%s\"; no mmap"
+msgstr "no s’ha pogut crear un descriptor de només lectura per a «%s»; no s’emprarà mmap()"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:130
-msgid "Error 100"
-msgstr "Error 100"
+#: nscd/connections.c:652
+#, c-format
+msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
+msgstr "la base de dades de «%s» està corrupta o sent emprada concurrentment; elimineu «%s» manualment si cal i reinicieu"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:131
-msgid "Error 101"
-msgstr "Error 101"
+#: nscd/connections.c:659
+#, c-format
+msgid "cannot create %s; no persistent database used"
+msgstr "no s’ha pogut crear «%s»; no s’emprarà una base de dades persistent"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:132
-msgid "Error 102"
-msgstr "Error 102"
+#: nscd/connections.c:662
+#, c-format
+msgid "cannot create %s; no sharing possible"
+msgstr "no s’ha pogut crear «%s»; no es podrà compartir"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:133
-msgid "Error 103"
-msgstr "Error 103"
+#: nscd/connections.c:733
+#, c-format
+msgid "cannot write to database file %s: %s"
+msgstr "no s’ha pogut escriure al fitxer de base de dades «%s»: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:134
-msgid "Error 104"
-msgstr "Error 104"
+#: nscd/connections.c:772
+#, c-format
+msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
+msgstr "no s’ha pogut indicar que el connector es tanque en fer exec(): %s; s’inhabilita el mode paranoic"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:135
-msgid "Error 105"
-msgstr "Error 105"
+#: nscd/connections.c:823
+#, c-format
+msgid "cannot open socket: %s"
+msgstr "no s’ha pogut obrir el connector: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:136
-msgid "Error 106"
-msgstr "Error 106"
+#: nscd/connections.c:840
+#, c-format
+msgid "cannot change socket to nonblocking mode: %s"
+msgstr "no s’ha pogut canviar el connector al mode no blocador: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:137
-msgid "Error 107"
-msgstr "Error 107"
+#: nscd/connections.c:848
+#, c-format
+msgid "cannot set socket to close on exec: %s"
+msgstr "no s’ha pogut indicar que el connector es tanque en fer exec(): %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:138
-msgid "Error 108"
-msgstr "Error 108"
+#: nscd/connections.c:859
+#, c-format
+msgid "cannot enable socket to accept connections: %s"
+msgstr "no s’ha pogut habilitar el connector per a acceptar connexions: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:139
-msgid "Error 109"
-msgstr "Error 109"
+#: nscd/connections.c:955
+#, c-format
+msgid "provide access to FD %d, for %s"
+msgstr "es proporciona accés al descriptor de fitxer %d, per a «%s»"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:140
-msgid "Error 110"
-msgstr "Error 110"
+#: nscd/connections.c:967
+#, c-format
+msgid "cannot handle old request version %d; current version is %d"
+msgstr "no s’ha pogut atendre la petició amb versió antiga %d; la versió actual és %d"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:141
-msgid "Error 111"
-msgstr "Error 111"
+#: nscd/connections.c:1009 nscd/connections.c:1062
+#, c-format
+msgid "cannot write result: %s"
+msgstr "no s’ha pogut escriure el resultat: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:142
-msgid "Error 112"
-msgstr "Error 112"
+# ivb (2001/11/07)
+# ivb  El «caller» és el programa «nscd» que prova de contactar amb el
+# ivb  dimoni «nscd» per consultar la memòria cau o invalidar-la.  Per
+# ivb  això faig servir «programa de control» (com «ndc» amb «named» o
+# ivb  «chronyc» amb «chronyd»).
+#: nscd/connections.c:1145
+#, c-format
+msgid "error getting caller's id: %s"
+msgstr "error en obtenir l’identificador del programa de control: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:143
-msgid "Error 113"
-msgstr "Error 113"
+#: nscd/connections.c:1204
+#, c-format
+msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
+msgstr "no s’ha pogut obrir «/proc/self/cmdline»: %s; s’inhabilita el mode paranoic"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:144
-msgid "Error 114"
-msgstr "Error 114"
+#: nscd/connections.c:1218
+#, c-format
+msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
+msgstr "no s’ha pogut llegir «/proc/self/cmdline»: %s; s’inhabilita el mode paranoic"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:145
-msgid "Error 115"
-msgstr "Error 115"
+#: nscd/connections.c:1258
+#, c-format
+msgid "cannot change to old UID: %s; disabling paranoia mode"
+msgstr "no s’ha pogut tornar a l’UID vell: %s; s’inhabilita el mode paranoic"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:146
-msgid "Error 116"
-msgstr "Error 116"
+#: nscd/connections.c:1268
+#, c-format
+msgid "cannot change to old GID: %s; disabling paranoia mode"
+msgstr "no s’ha pogut tornar al GID vell: %s; s’inhabilita el mode paranoic"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:147
-msgid "Error 117"
-msgstr "Error 117"
+#: nscd/connections.c:1281
+#, c-format
+msgid "cannot change to old working directory: %s; disabling paranoia mode"
+msgstr "no s’ha pogut tornar al directori vell de treball: %s; s’inhabilita el mode paranoic"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:148
-msgid "Error 118"
-msgstr "Error 118"
+#: nscd/connections.c:1310
+#, c-format
+msgid "re-exec failed: %s; disabling paranoia mode"
+msgstr "ha fallat la reexecució: %s; s’inhabilita el mode paranoic"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:149
-msgid "Error 119"
-msgstr "Error 119"
+#: nscd/connections.c:1319
+#, c-format
+msgid "cannot change current working directory to \"/\": %s"
+msgstr "no s’ha pogut canviar el directori de treball a «/»: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:152
-msgid "Operation not supported on transport endpoint"
-msgstr "L'extrem de transport no suporta l'operació"
+#: nscd/connections.c:1437
+#, c-format
+msgid "short read while reading request: %s"
+msgstr "lectura incompleta en llegir la petició: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:154
-msgid "Address family not supported by protocol family"
-msgstr "La família de protocols no suporta aquesta família d'adreces"
+#: nscd/connections.c:1468
+#, c-format
+msgid "key length in request too long: %d"
+msgstr "la longitud de la clau de la petició és massa gran: %d"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:159
-msgid "Network dropped connection because of reset"
-msgstr "La xarxa ha tallat la connexió per un reinici"
+#: nscd/connections.c:1481
+#, c-format
+msgid "short read while reading request key: %s"
+msgstr "lectura incompleta en llegir la clau de la petició: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:166
-msgid "Error 136"
-msgstr "Error 136"
+#: nscd/connections.c:1490
+#, c-format
+msgid "handle_request: request received (Version = %d) from PID %ld"
+msgstr "handle_request: s’ha rebut una petició (amb versió %d) del PID %ld"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:167
-msgid "Not a name file"
-msgstr "El fitxer no és d'un tipus amb nom"
+#: nscd/connections.c:1495
+#, c-format
+msgid "handle_request: request received (Version = %d)"
+msgstr "handle_request: s’ha rebut una petició (amb versió %d)"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:168
-msgid "Not available"
-msgstr "No es troba disponible"
+#: nscd/connections.c:1856
+#, c-format
+msgid "could only start %d threads; terminating"
+msgstr "no s’han pogut iniciar %d fils d’execució; s’està finalitzant"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:169
-msgid "Is a name file"
-msgstr "El fitxer és d'un tipus amb nom"
+#: nscd/connections.c:1904 nscd/connections.c:1905 nscd/connections.c:1922
+#: nscd/connections.c:1931 nscd/connections.c:1949 nscd/connections.c:1960
+#: nscd/connections.c:1971
+#, c-format
+msgid "Failed to run nscd as user '%s'"
+msgstr "no s’ha pogut executar «nscd» com a l’usuari «%s»"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:171
-msgid "Reserved for future use"
-msgstr "Reservat per a usos futurs"
+#: nscd/connections.c:1923
+#, c-format
+msgid "initial getgrouplist failed"
+msgstr "ha fallat getgrouplist() inicial"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:172
-msgid "Error 142"
-msgstr "Error 142"
+#: nscd/connections.c:1932
+#, c-format
+msgid "getgrouplist failed"
+msgstr "ha fallat getgrouplist()"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:173
-msgid "Cannot send after socket shutdown"
-msgstr "No es pot enviar després de tancar el connector"
+#: nscd/connections.c:1950
+#, c-format
+msgid "setgroups failed"
+msgstr "ha fallat setgroups()"
 
-#: stdio-common/psignal.c:63
+#: nscd/grpcache.c:402 nscd/hstcache.c:418 nscd/initgrcache.c:412
+#: nscd/pwdcache.c:397 nscd/servicescache.c:343
 #, c-format
-msgid "%s%sUnknown signal %d\n"
-msgstr "%s%sSenyal desconegut %d\n"
+msgid "short write in %s: %s"
+msgstr "escriptura incompleta a «%s»: %s"
 
-#: dlfcn/dlinfo.c:51
-msgid "RTLD_SELF used in code not dynamically loaded"
-msgstr "S'ha usat RTLD_SELF en un codi no carregat dinàmicament"
+# El nom de la base de dades s’usa més a sovint que la descripció.  ivb
+#: nscd/grpcache.c:445 nscd/initgrcache.c:78
+#, c-format
+msgid "Haven't found \"%s\" in group cache!"
+msgstr "no s’ha trobat «%s» a la memòria cau de «group»"
 
-#: dlfcn/dlinfo.c:61
-msgid "unsupported dlinfo request"
-msgstr "no es suporta aquesta petició a dlinfo()"
+# El nom de la base de dades s’usa més a sovint que la descripció.  ivb
+#: nscd/grpcache.c:447 nscd/initgrcache.c:80
+#, c-format
+msgid "Reloading \"%s\" in group cache!"
+msgstr "es torna a carregar «%s» a la memòria cau de «group»"
 
-#: malloc/mcheck.c:346
-msgid "memory is consistent, library is buggy\n"
-msgstr "la memòria és consistent; la biblioteca té errors\n"
+#: nscd/grpcache.c:524
+#, c-format
+msgid "Invalid numeric gid \"%s\"!"
+msgstr "«%s» no és un identificador numèric de grup vàlid"
 
-#: malloc/mcheck.c:349
-msgid "memory clobbered before allocated block\n"
-msgstr "s'ha sobreescrit la memòria d'abans del bloc reservat\n"
+#: nscd/mem.c:383
+#, c-format
+msgid "freed %zu bytes in %s cache"
+msgstr "s’han alliberat %zu octets de la memòria cau de «%s»"
 
-#: malloc/mcheck.c:352
-msgid "memory clobbered past end of allocated block\n"
-msgstr "s'ha sobreescrit la memòria de després del bloc reservat\n"
+#: nscd/mem.c:512
+#, c-format
+msgid "no more memory for database '%s'"
+msgstr "no resta memòria per a la base de dades «%s»"
 
-#: malloc/mcheck.c:355
-msgid "block freed twice\n"
-msgstr "s'ha alliberat el bloc dues voltes\n"
+# Més ajudes.  ivb
+#: nscd/nscd.c:98
+msgid "Read configuration data from NAME"
+msgstr "Llegeix les dades de configuració de NOM."
 
-#: malloc/mcheck.c:358
-msgid "bogus mcheck_status, library is buggy\n"
-msgstr "el valor d'«mcheck_status» és estrany; la biblioteca té errors\n"
+#: nscd/nscd.c:100
+msgid "Do not fork and display messages on the current tty"
+msgstr "No fa fork() i mostra els missatges al terminal actual."
 
-# Més ajudes.  ivb
-#: malloc/memusagestat.c:53
-msgid "Name output file"
-msgstr "Especifica el fitxer d'eixida."
+# ivb (2001/10/30)
+# ivb  Es refereix al _nombre_ de fils a llançar.
+#: nscd/nscd.c:101
+msgid "NUMBER"
+msgstr "NOMBRE"
 
-#: malloc/memusagestat.c:54
-msgid "Title string used in output graphic"
-msgstr "Cadena amb el títol a usar en el gràfic d'eixida."
+#: nscd/nscd.c:101
+msgid "Start NUMBER threads"
+msgstr "Llança NOMBRE fils d’exeució."
 
-#: malloc/memusagestat.c:55
-msgid "Generate output linear to time (default is linear to number of function calls)"
-msgstr "Genera una eixida lineal respecte el temps (per defecte és lineal respecte el nombre de crides a funció)."
+#: nscd/nscd.c:102
+msgid "Shut the server down"
+msgstr "Finalitza el servidor."
 
-#: malloc/memusagestat.c:57
-msgid "Also draw graph for total memory consumption"
-msgstr "També mostra un gràfic del consum total de memòria."
+#: nscd/nscd.c:103
+msgid "Print current configuration statistic"
+msgstr "Mostra estadístiques de la configuració actual."
 
-#: malloc/memusagestat.c:58
-msgid "make output graphic VALUE pixel wide"
-msgstr "Fa el gràfic d'eixida de VALOR píxels d'amplada."
+#: nscd/nscd.c:104
+msgid "TABLE"
+msgstr "TAULA"
 
-#: malloc/memusagestat.c:59
-msgid "make output graphic VALUE pixel high"
-msgstr "Fa el gràfic d'eixida de VALOR píxels d'altura."
+#: nscd/nscd.c:105
+msgid "Invalidate the specified cache"
+msgstr "Invalida la memòria cau especificada."
 
-#: malloc/memusagestat.c:64
-msgid "Generate graphic from memory profiling data"
-msgstr "Genera un gràfic amb les dades de perfilat de memòria."
+#: nscd/nscd.c:106
+msgid "TABLE,yes"
+msgstr "TAULA,yes"
 
-#: malloc/memusagestat.c:67
-msgid "DATAFILE [OUTFILE]"
-msgstr "FITXER_DADES [FITXER_EIXIDA]"
+#: nscd/nscd.c:107
+msgid "Use separate cache for each user"
+msgstr "Empra una memòria cau diferent per a cada usuari."
 
-#: string/strerror.c:43 posix/../sysdeps/posix/gai_strerror.c:57
-msgid "Unknown error"
-msgstr "Error desconegut"
+#: nscd/nscd.c:112
+msgid "Name Service Cache Daemon."
+msgstr "Dimoni de memòria cau del servei de noms."
 
-#: string/strsignal.c:69
+#: nscd/nscd.c:144 nss/getent.c:858 nss/makedb.c:123
 #, c-format
-msgid "Real-time signal %d"
-msgstr "Senyal de temps real %d"
+msgid "wrong number of arguments"
+msgstr "el nombre d’arguments és incorrecte"
 
-#: string/strsignal.c:73
+#: nscd/nscd.c:154
 #, c-format
-msgid "Unknown signal %d"
-msgstr "Senyal desconegut %d"
+msgid "failure while reading configuration file; this is fatal"
+msgstr "error en llegir el fitxer de configuració; açò és fatal"
 
-# ivb (2001/10/28)
-# ivb  Segons el codi, «cutoff» és un any de tall (de no-sé-què).
-#: timezone/zdump.c:176
+#: nscd/nscd.c:163
 #, c-format
-msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
-msgstr "%s: la forma d'ús és %s [--version] [-v] [-c ANY_DE_TALL] NOM_DE_ZONA...\n"
+msgid "already running"
+msgstr "ja es troba en marxa"
 
-#: timezone/zdump.c:269
-msgid "Error writing to standard output"
-msgstr "error en escriure en l'eixida estàndard"
+#: nscd/nscd.c:178 nscd/nscd.c:233
+#, c-format
+msgid "cannot fork"
+msgstr "ha fallat fork()"
 
-#: timezone/zic.c:361
+#: nscd/nscd.c:241
 #, c-format
-msgid "%s: Memory exhausted: %s\n"
-msgstr "%s: la memòria s'ha exhaurit: %s\n"
+msgid "cannot change current working directory to \"/\""
+msgstr "no s’ha pogut canviar el directori de treball a «/»"
 
-#: timezone/zic.c:386 misc/error.c:129 misc/error.c:157
-msgid "Unknown system error"
-msgstr "error desconegut del sistema"
+#: nscd/nscd.c:249
+msgid "Could not create log file"
+msgstr "no s’ha pogut crear el fitxer de registre"
 
-#: timezone/zic.c:420
+#: nscd/nscd.c:302 nscd/nscd.c:327 nscd/nscd_stat.c:172
 #, c-format
-msgid "\"%s\", line %d: %s"
-msgstr "«%s», línia %d: %s"
+msgid "Only root is allowed to use this option!"
+msgstr "només root pot emprar aquesta opció"
 
-#: timezone/zic.c:423
+#: nscd/nscd.c:364 nscd/nscd_stat.c:191
 #, c-format
-msgid " (rule from \"%s\", line %d)"
-msgstr " (regla de «%s», línia %d)"
-
-#: timezone/zic.c:435
-msgid "warning: "
-msgstr "avís: "
+msgid "write incomplete"
+msgstr "escriptura incompleta"
 
-# ivb (2001/10/28)
-# ivb  Deixe algunes paraules per traduir perquè es refereixen a paraules
-# ivb  reservades dels fitxers amb què treballa zic.
-# ivb (2001/10/28)
-# ivb  Sembla que la barra al final de la línia és a propòsit.
-#: timezone/zic.c:445
+#: nscd/nscd.c:375
 #, 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: la forma d'ús és %s [--version] [-s] [-v] [-l localtime] [-p posixrules] \\\n"
-"\t[-d DIRECTORI] [-L FITXER_SEGONS_INTERCALARS] [-y yearistype] \\\n"
-"\t[FITXER...]\n"
+msgid "cannot read invalidate ACK"
+msgstr "no s’ha pogut llegir l’ACK d’invalidació"
 
-#: timezone/zic.c:492
+#: nscd/nscd.c:381
 #, c-format
-msgid "%s: More than one -d option specified\n"
-msgstr "%s: s'ha indicat l'opció «-d» més d'una volta\n"
+msgid "invalidation failed"
+msgstr "la invalidació ha fallat"
 
-#: timezone/zic.c:502
+#: nscd/nscd.c:391
 #, c-format
-msgid "%s: More than one -l option specified\n"
-msgstr "%s: s'ha indicat l'opció «-l» més d'una volta\n"
+msgid "secure services not implemented anymore"
+msgstr "ja no s’implementen els serveis segurs"
 
-#: timezone/zic.c:512
+#: nscd/nscd_conf.c:57
 #, c-format
-msgid "%s: More than one -p option specified\n"
-msgstr "%s: s'ha indicat l'opció «-p» més d'una volta\n"
+msgid "database %s is not supported"
+msgstr "la base de dades «%s» no s’accepta"
 
-#: timezone/zic.c:522
+#: nscd/nscd_conf.c:108
 #, c-format
-msgid "%s: More than one -y option specified\n"
-msgstr "%s: s'ha indicat l'opció «-y» més d'una volta\n"
+msgid "Parse error: %s"
+msgstr "error d’anàlisi: %s"
 
-#: timezone/zic.c:532
+#: nscd/nscd_conf.c:193
 #, c-format
-msgid "%s: More than one -L option specified\n"
-msgstr "%s: s'ha indicat l'opció «-L» més d'una volta\n"
+msgid "Must specify user name for server-user option"
+msgstr "cal especificar un nom d’usuari per a l’opció «server-user»"
 
-#: timezone/zic.c:639
+#: nscd/nscd_conf.c:200
 #, c-format
-msgid "%s: Can't unlink  %s: %s\n"
-msgstr "%s: no s'ha pogut desenllaçar «%s»: %s\n"
-
-#: timezone/zic.c:646
-msgid "hard link failed, symbolic link used"
-msgstr "no s'ha pogut crear un enllaç fort, se n'ha usat un de simbòlic"
+msgid "Must specify user name for stat-user option"
+msgstr "cal especificar un nom d’usuari per a l’opció «stat-user»"
 
-#: timezone/zic.c:654
+#: nscd/nscd_conf.c:244
 #, c-format
-msgid "%s: Can't link from %s to %s: %s\n"
-msgstr "%s: no s'ha pogut crear un enllaç des de «%s» cap a «%s»: %s\n"
+msgid "invalid value for 'reload-count': %u"
+msgstr "el valor de «reload-count» no és vàlid: %u"
 
-#: timezone/zic.c:752 timezone/zic.c:754
-msgid "same rule name in multiple files"
-msgstr "el mateix nom de regla és repetit en diversos fitxers"
+#: nscd/nscd_conf.c:259
+#, c-format
+msgid "Must specify value for restart-interval option"
+msgstr "cal especificar un valor per a l’opció «restart-interval»"
 
-#: timezone/zic.c:795
-msgid "unruly zone"
-msgstr "la zona no té regles"
+#: nscd/nscd_conf.c:273
+#, c-format
+msgid "Unknown option: %s %s %s"
+msgstr "l’opció no és coneguda: %s %s %s"
 
-#: timezone/zic.c:802
+#: nscd/nscd_conf.c:286
 #, c-format
-msgid "%s in ruleless zone"
-msgstr "«%s» en una zona sense regles"
+msgid "cannot get current working directory: %s; disabling paranoia mode"
+msgstr "no s’ha pogut obtenir el directori de treball actual: %s; s’inhabilita el mode paranoic"
 
-#: timezone/zic.c:823
-msgid "standard input"
-msgstr "entrada estàndard"
+#: nscd/nscd_conf.c:306
+#, c-format
+msgid "maximum file size for %s database too small"
+msgstr "la mida màxima de fitxer per a la base de dades «%s» és massa menuda"
 
-#: timezone/zic.c:828
+#: nscd/nscd_stat.c:141
 #, c-format
-msgid "%s: Can't open %s: %s\n"
-msgstr "%s: no s'ha pogut obrir «%s»: %s\n"
+msgid "cannot write statistics: %s"
+msgstr "no s’han pogut escriure les estadístiques: %s"
 
-#: timezone/zic.c:839
-msgid "line too long"
-msgstr "la línia és massa llarga"
+#: nscd/nscd_stat.c:156
+msgid "yes"
+msgstr "sí"
 
-#: timezone/zic.c:859
-msgid "input line of unknown type"
-msgstr "la línia introduïda pertany a un tipus desconegut"
+#: nscd/nscd_stat.c:157
+msgid "no"
+msgstr "no"
 
-#: timezone/zic.c:875
+#: nscd/nscd_stat.c:168
 #, c-format
-msgid "%s: Leap line in non leap seconds file %s\n"
-msgstr "%s: línia «Leap» en fitxer no de segons intercalars «%s»\n"
+msgid "Only root or %s is allowed to use this option!"
+msgstr "només root o %s pot emprar aquesta opció"
 
-#: 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: pànic: el valor esquerre %d no és vàlid\n"
+msgid "nscd not running!\n"
+msgstr "nscd no està en marxa\n"
 
-#: timezone/zic.c:890
+#: nscd/nscd_stat.c:203
 #, c-format
-msgid "%s: Error reading %s\n"
-msgstr "%s: error en llegir «%s»\n"
+msgid "cannot read statistics data"
+msgstr "no s’han pogut llegir les dades estadístiques"
 
-#: timezone/zic.c:897
+#: nscd/nscd_stat.c:206
 #, c-format
-msgid "%s: Error closing %s: %s\n"
-msgstr "%s: error en tancar «%s»: %s\n"
-
-#: timezone/zic.c:902
-msgid "expected continuation line not found"
-msgstr "cal una línia de continuació, però no es troba"
-
-#: timezone/zic.c:958
-msgid "wrong number of fields on Rule line"
-msgstr "el nombre de camps de la línia «Rule» és incorrecte"
-
-#: timezone/zic.c:962
-msgid "nameless rule"
-msgstr "la regla no té nom"
-
-#: timezone/zic.c:967
-msgid "invalid saved time"
-msgstr "el temps estalviat no és vàlid"
-
-#: timezone/zic.c:986
-msgid "wrong number of fields on Zone line"
-msgstr "el nombre de camps de la línia «Zone» no és correcte"
+msgid ""
+"nscd configuration:\n"
+"\n"
+"%15d  server debug level\n"
+msgstr ""
+"Configuració d’nscd:\n"
+"\n"
+"%15d  nivell de depuració del servidor\n"
 
-#: timezone/zic.c:992
+#: nscd/nscd_stat.c:230
 #, c-format
-msgid "\"Zone %s\" line and -l option are mutually exclusive"
-msgstr "la línia «Zone %s» i l'opció «-l» són mútuament excloents"
+msgid "%3ud %2uh %2um %2lus  server runtime\n"
+msgstr "%3ud %2uh %2um %2lus  de funcionament del servidor\n"
 
-#: timezone/zic.c:1000
+#: nscd/nscd_stat.c:233
 #, c-format
-msgid "\"Zone %s\" line and -p option are mutually exclusive"
-msgstr "la línia «Zone %s» i l'opció «-p» són mútuament excloents"
+msgid "    %2uh %2um %2lus  server runtime\n"
+msgstr "    %2uh %2um %2lus  de funcionament del servidor\n"
 
-#: timezone/zic.c:1012
+#: nscd/nscd_stat.c:235
 #, c-format
-msgid "duplicate zone name %s (file \"%s\", line %d)"
-msgstr "el nom de zona «%s» (fitxer «%s», línia %d) és duplicat"
-
-#: timezone/zic.c:1028
-msgid "wrong number of fields on Zone continuation line"
-msgstr "el nombre de camps de la línia de continuació de «Zone» no és correcte"
-
-#: timezone/zic.c:1068
-msgid "invalid UTC offset"
-msgstr "el desplaçament d'UTC no és vàlid"
-
-#: timezone/zic.c:1071
-msgid "invalid abbreviation format"
-msgstr "el format de l'abreviatura no és vàlid"
-
-#: timezone/zic.c:1097
-msgid "Zone continuation line end time is not after end time of previous line"
-msgstr "el temps final de la línia de continuació de «Zone» no ve darrere del temps final de la línia anterior"
-
-#: timezone/zic.c:1124
-msgid "wrong number of fields on Leap line"
-msgstr "el nombre de camps de la línia «Leap» no és correcte"
-
-#: timezone/zic.c:1133
-msgid "invalid leaping year"
-msgstr "l'any bixest no és vàlid"
-
-#: timezone/zic.c:1148 timezone/zic.c:1252
-msgid "invalid month name"
-msgstr "el nom del mes no és vàlid"
-
-#: timezone/zic.c:1161 timezone/zic.c:1374 timezone/zic.c:1388
-msgid "invalid day of month"
-msgstr "el dia del mes no és vàlid"
-
-#: timezone/zic.c:1166
-msgid "time before zero"
-msgstr "l'hora és anterior a zero"
-
-#: timezone/zic.c:1170
-msgid "time too small"
-msgstr "l'hora és massa menuda"
-
-#: timezone/zic.c:1174
-msgid "time too large"
-msgstr "l'hora és massa gran"
+msgid "        %2um %2lus  server runtime\n"
+msgstr "        %2um %2lus  de funcionament del servidor\n"
 
-#: timezone/zic.c:1178 timezone/zic.c:1281
-msgid "invalid time of day"
-msgstr "l'hora del dia no és vàlida"
+#: nscd/nscd_stat.c:237
+#, c-format
+msgid "            %2lus  server runtime\n"
+msgstr "            %2lus  de funcionament del servidor\n"
 
-#: timezone/zic.c:1197
-msgid "illegal CORRECTION field on Leap line"
-msgstr "el camp de correcció de la línia de «Leap» no és vàlid"
+# FIXME: interval, not internal.  ivb
+#: 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  nombre actual de fils d’execució\n"
+"%15d  nombre màxim de fils d’execució\n"
+"%15lu  voltes que algun client ha hagut d’esperar\n"
+"%15s  s’ha habilitat el mode paranoic?\n"
+"%15lu  interval entre reinicis\n"
 
-#: timezone/zic.c:1201
-msgid "illegal Rolling/Stationary field on Leap line"
-msgstr "el camp «Rolling/Stationary» de la línia «Leap» no és vàlid"
+# El primer camp és passwd, group, shadow...  ivb
+#: 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"
+"Memòria cau de «%s»:\n"
+"\n"
+"%15s  n’és habilitada la memòria cau?\n"
+"%15s  n’és persistent la memòria cau?\n"
+"%15s  n’és compartida la memòria cau?\n"
+"%15zu  mida suggerida\n"
+"%15zu  mida total de l’àrea de dades\n"
+"%15zu  mida en ús de l’àrea de dades\n"
+"%15lu  temps de vida en segons per a entrades positives\n"
+"%15lu  temps de vida en segons per a entrades negatives\n"
+"%15<PRIuMAX>  encerts de memòria cau per a entrades positives\n"
+"%15<PRIuMAX>  encerts de memòria cau per a entrades negatives\n"
+"%15<PRIuMAX>  fallades de memòria cau per a entrades positives\n"
+"%15<PRIuMAX>  fallades de memòria cau per a entrades negatives\n"
+"%15lu%% ràtio d’encerts de memòria cau\n"
+"%15zu  nombre actual de valors a la memòria cau\n"
+"%15zu  nombre màxim de valors a la memòria cau\n"
+"%15zu  màxima longitud cercada de cadena\n"
+"%15<PRIuMAX>  nombre de retards pel blocatge de lectura\n"
+"%15<PRIuMAX>  nombre de retards pel blocatge d’escriptura\n"
+"%15<PRIuMAX>  reserves de memòria fallades\n"
+"%15s  comprovar «/etc/%s» per si hi ha hagut canvis?\n"
 
-#: timezone/zic.c:1216
-msgid "wrong number of fields on Link line"
-msgstr "el nombre de camps de la línia «Link» no és correcte"
+# El nom de la base de dades s’usa més a sovint que la descripció.  ivb
+#: nscd/pwdcache.c:440
+#, c-format
+msgid "Haven't found \"%s\" in password cache!"
+msgstr "no s’ha trobat «%s» a la memòria cau de «passwd»"
 
-# El nom del camp no és una paraula clau del fitxer.  ivb
-#: timezone/zic.c:1220
-msgid "blank FROM field on Link line"
-msgstr "el camp d'inici de la línia «Link» és buit"
+# El nom de la base de dades s’usa més a sovint que la descripció.  ivb
+#: nscd/pwdcache.c:442
+#, c-format
+msgid "Reloading \"%s\" in password cache!"
+msgstr "es torna a carregar «%s» a la memòria cau de «passwd»"
 
-# El nom del camp no és una paraula clau del fitxer.  ivb
-#: timezone/zic.c:1224
-msgid "blank TO field on Link line"
-msgstr "el camp d'acabamentde la línia «Link» és buit"
+#: nscd/pwdcache.c:520
+#, c-format
+msgid "Invalid numeric uid \"%s\"!"
+msgstr "«%s» no és un identificador numèric d’usuari vàlid"
 
-#: timezone/zic.c:1301
-msgid "invalid starting year"
-msgstr "l'any de començament no és vàlid"
+#: nscd/selinux.c:156
+#, c-format
+msgid "Failed opening connection to the audit subsystem: %m"
+msgstr "no s’ha pogut obrir una connexió amb el subâ€sistema d’auditoria: %m"
 
-#: timezone/zic.c:1305
-msgid "starting year too low to be represented"
-msgstr "l'any de començament és massa baix per a ser representat"
+#: nscd/selinux.c:177
+msgid "Failed to set keep-capabilities"
+msgstr "no s’han pogut establir les capacitats a mantenir"
 
-#: timezone/zic.c:1307
-msgid "starting year too high to be represented"
-msgstr "l'any de començament és massa alt per a ser representat"
+#: nscd/selinux.c:178 nscd/selinux.c:241
+#, c-format
+msgid "prctl(KEEPCAPS) failed"
+msgstr "ha fallat prctl(KEEPCAPS)"
 
-#: timezone/zic.c:1326
-msgid "invalid ending year"
-msgstr "l'any d'acabament no és vàlid"
+#: nscd/selinux.c:192
+msgid "Failed to initialize drop of capabilities"
+msgstr "no s’ha pogut començar a renunciar a capacitats"
 
-#: timezone/zic.c:1330
-msgid "ending year too low to be represented"
-msgstr "l'any d'acabament és massa baix per a ser representat"
+#: nscd/selinux.c:193
+#, c-format
+msgid "cap_init failed"
+msgstr "ha fallat cap_init()"
 
-#: timezone/zic.c:1332
-msgid "ending year too high to be represented"
-msgstr "l'any d'acabament és massa alt per a ser representat"
+#: nscd/selinux.c:214 nscd/selinux.c:231
+msgid "Failed to drop capabilities"
+msgstr "no s’ha pogunt renunciar a les capacitats"
 
-#: timezone/zic.c:1335
-msgid "starting year greater than ending year"
-msgstr "l'any de començament és major que el d'acabament"
+#: nscd/selinux.c:215 nscd/selinux.c:232
+#, c-format
+msgid "cap_set_proc failed"
+msgstr "ha fallat cap_set_proc()"
 
-#: timezone/zic.c:1342
-msgid "typed single year"
-msgstr "s'ha especificat un sol any"
+#: nscd/selinux.c:240
+msgid "Failed to unset keep-capabilities"
+msgstr "no s’han pogut desestablir les capacitats a mantenir"
 
-#: timezone/zic.c:1379
-msgid "invalid weekday name"
-msgstr "el nom del dia de la setmana no és vàlid"
+#: nscd/selinux.c:256
+msgid "Failed to determine if kernel supports SELinux"
+msgstr "no s’ha pogut determinar si el nucli accepta SELinux"
 
-#: timezone/zic.c:1494
+#: nscd/selinux.c:271
 #, c-format
-msgid "%s: Can't remove %s: %s\n"
-msgstr "%s: no s'ha pogut eliminar «%s»: %s\n"
+msgid "Failed to start AVC thread"
+msgstr "no s’ha pogut iniciar el fil d’execució de l’AVC"
 
-#: timezone/zic.c:1504
+#: nscd/selinux.c:293
 #, c-format
-msgid "%s: Can't create %s: %s\n"
-msgstr "%s: no s'ha pogut crear «%s»: %s\n"
+msgid "Failed to create AVC lock"
+msgstr "no s’ha pogut crear el blocatge de l’AVC"
 
-#: timezone/zic.c:1570
+#: nscd/selinux.c:333
 #, c-format
-msgid "%s: Error writing %s\n"
-msgstr "%s: error en escriure «%s»\n"
-
-#: timezone/zic.c:1760
-msgid "can't determine time zone abbreviation to use just after until time"
-msgstr "no s'ha pogut determinar l'abreviatura de zona horària a usar just després de la data límit (until)"
-
-#: timezone/zic.c:1803
-msgid "too many transitions?!"
-msgstr "hi ha massa transicions?!"
+msgid "Failed to start AVC"
+msgstr "no s’ha pogut iniciar l’AVC"
 
-#: timezone/zic.c:1822
-msgid "internal error - addtype called with bad isdst"
-msgstr "error intern - s'ha cridat addtype() amb un valor erroni per a «isdst»"
+#: nscd/selinux.c:335
+msgid "Access Vector Cache (AVC) started"
+msgstr "s’ha iniciat la memòria cau de vectors d’accés (AVC)"
 
-#: timezone/zic.c:1826
-msgid "internal error - addtype called with bad ttisstd"
-msgstr "error intern - s'ha cridat addtype() amb un valor erroni per a «ttisstd»"
+#: nscd/selinux.c:356
+msgid "Error getting context of socket peer"
+msgstr "error en obtenir el context de l’extrem remot del connector"
 
-#: timezone/zic.c:1830
-msgid "internal error - addtype called with bad ttisgmt"
-msgstr "error intern - s'ha cridat addtype() amb un valor erroni per a «ttisgmt»"
+#: nscd/selinux.c:361
+msgid "Error getting context of nscd"
+msgstr "error en obtenir el context d’«nscd»"
 
-#: timezone/zic.c:1849
-msgid "too many local time types"
-msgstr "hi ha massa tipus d'hora local"
+#: nscd/selinux.c:367
+msgid "Error getting sid from context"
+msgstr "error en obtenir el SID del context"
 
-#: timezone/zic.c:1877
-msgid "too many leap seconds"
-msgstr "hi ha massa segons intercalars"
-
-#: timezone/zic.c:1883
-msgid "repeated leap second moment"
-msgstr "el moment de segon intercalar és repetit"
-
-#: timezone/zic.c:1935
-msgid "Wild result from command execution"
-msgstr "l'execució de l'ordre ha donat un resultat estrany"
-
-#: timezone/zic.c:1936
+#: nscd/selinux.c:399
 #, c-format
-msgid "%s: command was '%s', result was %d\n"
-msgstr "%s: l'ordre ha estat «%s», el resultat ha estat %d\n"
+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"
+"Estadístiques de l’AVC de SELinux:\n"
+"\n"
+"%15u  cerques d’entrades\n"
+"%15u  encerts d’entrades\n"
+"%15u  fallades d’entrades\n"
+"%15u  descarts d’entrades\n"
+"%15u  cerques de CAV\n"
+"%15u  encerts de CAV\n"
+"%15u  sondejos de CAV\n"
+"%15u  fallades de CAV\n"
 
-# ivb (2001/10/30)
-# ivb  Es refereix a les cometes dobles «"».
-#: timezone/zic.c:2031
-msgid "Odd number of quotation marks"
-msgstr "el nombre de cometes és senar"
+# El nom de la base de dades s’usa més a sovint que la descripció.  ivb
+#: nscd/servicescache.c:390
+#, c-format
+msgid "Haven't found \"%s\" in services cache!"
+msgstr "no s’ha trobat «%s» a la memòria cau de «services»"
 
-#: timezone/zic.c:2051 timezone/zic.c:2070
-msgid "time overflow"
-msgstr "desbordament de l'hora"
+# El nom de la base de dades s’usa més a sovint que la descripció.  ivb
+#: nscd/servicescache.c:392
+#, c-format
+msgid "Reloading \"%s\" in services cache!"
+msgstr "es torna a carregar «%s» a la memòria cau de «services»"
 
-#: timezone/zic.c:2117
-msgid "use of 2/29 in non leap-year"
-msgstr "s'ha usat el dia 29 de febrer en un any no-bixest"
+#: nss/getent.c:52
+msgid "database [key ...]"
+msgstr "BASE_DE_DADES [CLAU…]"
 
-#: timezone/zic.c:2151
-msgid "no day in month matches rule"
-msgstr "cap dia del mes acompleix la regla"
+# Més ajudes.  ivb
+#: nss/getent.c:57
+msgid "Service configuration to be used"
+msgstr "Configuració a emprar del servei."
 
-#: timezone/zic.c:2175
-msgid "too many, or too long, time zone abbreviations"
-msgstr "hi ha massa abreviatures de zona horària (o són massa llargues)"
+# FIXME: Don't use \v.
+#: nss/getent.c:62
+msgid ""
+"Get entries from administrative database.\vFor bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+"Obté entrades de les bases de dades d’administració.\n"
+"\n"
+"Per a obtenir instruccions sobre com informar d’un error, vegeu\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: no s'ha pogut crear el directori «%s»: %s\n"
+msgid "Enumeration not supported on %s\n"
+msgstr "no es permet l’enumeració sobre «%s»\n"
 
-# ivb (2001/10/28)
-# ivb  Resulta d'assignar un «int» a un «long».
-#: timezone/zic.c:2238
+#: nss/getent.c:782
 #, c-format
-msgid "%s: %d did not sign extend correctly\n"
-msgstr "%s: el signe de %d no s'ha estés correctament\n"
+msgid "Unknown database name"
+msgstr "el nom de la base de dades no és conegut"
 
-#: posix/../sysdeps/generic/wordexp.c:1797
-msgid "parameter null or not set"
-msgstr "el paràmetre és nul o no s'ha establert"
+#: nss/getent.c:808
+msgid "Supported databases:\n"
+msgstr "Bases de dades acceptades:\n"
 
-#: posix/../sysdeps/posix/gai_strerror.c:31
-msgid "Address family for hostname not supported"
-msgstr "No es suporta la família d'adreces del nom d'estació"
-
-#: posix/../sysdeps/posix/gai_strerror.c:32
-msgid "Temporary failure in name resolution"
-msgstr "Fallada temporal en la resolució de noms"
-
-#: posix/../sysdeps/posix/gai_strerror.c:33
-msgid "Bad value for ai_flags"
-msgstr "El valor d'«ai_flags» no és vàlid"
-
-#: posix/../sysdeps/posix/gai_strerror.c:34
-msgid "Non-recoverable failure in name resolution"
-msgstr "Fallada irrecuperable en la resolució de noms"
+#: nss/getent.c:868
+#, c-format
+msgid "Unknown database: %s\n"
+msgstr "la base de dades no és coneguda: %s\n"
 
-#: posix/../sysdeps/posix/gai_strerror.c:35
-msgid "ai_family not supported"
-msgstr "No es suporta el valor d'«ai_family»"
+#: nss/makedb.c:60
+msgid "Convert key to lower case"
+msgstr "Converteix la clau a minúscules."
 
-#: posix/../sysdeps/posix/gai_strerror.c:36
-msgid "Memory allocation failure"
-msgstr "No s'ha pogut reservar memòria"
+#: nss/makedb.c:63
+msgid "Do not print messages while building database"
+msgstr "No mostra cap missatge mentre es crea la base de dades."
 
-#: posix/../sysdeps/posix/gai_strerror.c:37
-msgid "No address associated with hostname"
-msgstr "No hi ha cap adreça associada amb el nom d'estació"
+#: nss/makedb.c:65
+msgid "Print content of database file, one entry a line"
+msgstr "Mostra el contingut del fitxer de base de dades, a entrada per línia."
 
-#: posix/../sysdeps/posix/gai_strerror.c:38
-msgid "Name or service not known"
-msgstr "El nom o servei no és conegut"
+#: nss/makedb.c:70
+msgid "Create simple DB database from textual input."
+msgstr "Crea una base de dades DB simple partint de l’entrada textual."
 
-# ivb (2001/11/05)
-# ivb  Potser una traducció més concisa estaria millor.
-#: posix/../sysdeps/posix/gai_strerror.c:39
-msgid "Servname not supported for ai_socktype"
-msgstr "No es suporta el servei per a aquest valor d'«ai_socktype»"
+#: nss/makedb.c:73
+msgid ""
+"INPUT-FILE OUTPUT-FILE\n"
+"-o OUTPUT-FILE INPUT-FILE\n"
+"-u INPUT-FILE"
+msgstr ""
+"FITXER_ENTRADA FITXER_EIXIDA\n"
+"-o FITXER_EIXIDA FITXER_ENTRADA\n"
+"-u FITXER_ENTRADA"
 
-#: posix/../sysdeps/posix/gai_strerror.c:40
-msgid "ai_socktype not supported"
-msgstr "No es suporta el valor d'«ai_socktype»"
+#: nss/makedb.c:142
+#, c-format
+msgid "No usable database library found."
+msgstr "no s’ha trobat cap biblioteca usable de base de dades"
 
-#: posix/../sysdeps/posix/gai_strerror.c:41
-msgid "System error"
-msgstr "Error del sistema"
+#: nss/makedb.c:149
+#, c-format
+msgid "cannot open database file `%s': %s"
+msgstr "no s’ha pogut obrir el fitxer de base de dades «%s»: %s"
 
-#: posix/../sysdeps/posix/gai_strerror.c:42
-msgid "Processing request in progress"
-msgstr "S'està processant la petició"
+#: nss/makedb.c:151
+msgid "incorrectly formatted file"
+msgstr "el fitxer no té un format vàlid"
 
-#: posix/../sysdeps/posix/gai_strerror.c:43
-msgid "Request canceled"
-msgstr "La petició ha estat canceŀlada"
+#: nss/makedb.c:331
+msgid "duplicate key"
+msgstr "la clau és duplicada"
 
-#: posix/../sysdeps/posix/gai_strerror.c:44
-msgid "Request not canceled"
-msgstr "La petició no ha estat canceŀlada"
+#: nss/makedb.c:337
+#, c-format
+msgid "while writing database file"
+msgstr "en escriure el fitxer de base dades"
 
-#: posix/../sysdeps/posix/gai_strerror.c:45
-msgid "All requests done"
-msgstr "S'han completat totes les peticions"
+#: nss/makedb.c:348
+#, c-format
+msgid "problems while reading `%s'"
+msgstr "problemes en llegir «%s»"
 
-#: posix/../sysdeps/posix/gai_strerror.c:46
-msgid "Interrupted by a signal"
-msgstr "Interromput per un senyal"
+#: nss/makedb.c:368 nss/makedb.c:385
+#, c-format
+msgid "while reading database"
+msgstr "en llegir la base de dades"
 
-#: posix/getconf.c:892
+#: posix/getconf.c:945
 #, c-format
 msgid "Usage: %s [-v specification] variable_name [pathname]\n"
-msgstr "Forma d'ús: %s [-v ESPECIFICACIÓ] NOM_DE_VARIABLE [CAMÃ]\n"
+msgstr "Forma d’ús: %s [-v ESPECIFICACIÓ] NOM_DE_VARIABLE [CAMÃ]\n"
+
+# S’alinea amb el nom de programa de dalt.  ivb
+#: posix/getconf.c:948
+#, c-format
+msgid "       %s -a [pathname]\n"
+msgstr "            %s -a [CAMÃ]\n"
 
-#: posix/getconf.c:950
+#: posix/getconf.c:1067
 #, c-format
 msgid "unknown specification \"%s\""
-msgstr "l'especificació «%s» no és coneguda"
+msgstr "l’especificació «%s» no és coneguda"
+
+#: posix/getconf.c:1095
+#, c-format
+msgid "Couldn't execute %s"
+msgstr "no s’ha pogut executar «%s»"
 
 # ivb (2001/11/01)
 # ivb  Es refereix a variables de configuració -> femení.
-#: posix/getconf.c:979 posix/getconf.c:995
+#: posix/getconf.c:1135 posix/getconf.c:1151
 msgid "undefined"
 msgstr "indefinida"
 
-#: posix/getconf.c:1017
+#: posix/getconf.c:1173
 #, c-format
 msgid "Unrecognized variable `%s'"
 msgstr "la variable «%s» no és reconeguda"
 
-#: 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: l'opció «%s» és ambígua\n"
+msgstr "%s: l’opció «%s» és ambígua\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: l'opció «--%s» no admet arguments\n"
+msgstr "%s: l’opció «--%s» no admet arguments\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: l'opció «%c%s» no admet arguments\n"
+msgstr "%s: l’opció «%c%s» no admet arguments\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: l'opció «%s» necessita un argument\n"
+msgstr "%s: l’opció «%s» necessita un 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: l'opció «--%s» no és reconeguda\n"
+msgstr "%s: l’opció «--%s» no és reconeguda\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: l'opció «%c%s» no és reconeguda\n"
+msgstr "%s: l’opció «%c%s» no és reconeguda\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: no es permet l'opció «%c»\n"
+msgstr "%s: no es permet l’opció «%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: l'opció «%c» no és vàlida\n"
+msgstr "%s: l’opció «%c» no és vàlida\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: l'opció «%c» necessita un argument\n"
+msgstr "%s: l’opció «%c» necessita un argument\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: l'opció «-W %s» és ambígua\n"
+msgstr "%s: l’opció «-W %s» és ambígua\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: l'opció «-W %s» no admet arguments\n"
+msgstr "%s: l’opció «-W %s» no admet arguments\n"
 
-#: posix/regcomp.c:150
+#: posix/regcomp.c:135
 msgid "No match"
 msgstr "No hi ha cap coincidència"
 
-#: posix/regcomp.c:153
+#: posix/regcomp.c:138
 msgid "Invalid regular expression"
-msgstr "L'expressió regular no és vàlida"
+msgstr "L’expressió regular no és vàlida"
 
-#: posix/regcomp.c:156
+#: posix/regcomp.c:141
 msgid "Invalid collation character"
-msgstr "El caràcter d'ordenació no és vàlid"
+msgstr "El caràcter d’ordenació no és vàlid"
 
-#: posix/regcomp.c:159
+#: posix/regcomp.c:144
 msgid "Invalid character class name"
 msgstr "El nom de la classe de caràcters no és vàlid"
 
-#: posix/regcomp.c:162
+#: posix/regcomp.c:147
 msgid "Trailing backslash"
 msgstr "Hi ha una barra invertida sobrant al final"
 
-#: posix/regcomp.c:165
+#: posix/regcomp.c:150
 msgid "Invalid back reference"
 msgstr "La referència cap enrere no és vàlida"
 
-#: posix/regcomp.c:168
+#: posix/regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "«[» o «[^» desaparellat"
 
-#: posix/regcomp.c:171
+#: posix/regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "«(» o «\\(» desaparellat"
 
-#: posix/regcomp.c:174
+#: posix/regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "«\\{» desaparellat"
 
-#: posix/regcomp.c:177
+#: posix/regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "El contingut de «\\{\\}» no és vàlid"
 
-#: posix/regcomp.c:180
+#: posix/regcomp.c:165
 msgid "Invalid range end"
 msgstr "El final del rang no és vàlid"
 
-#: posix/regcomp.c:183
+#: posix/regcomp.c:168
 msgid "Memory exhausted"
-msgstr "La memòria s'ha exhaurit"
+msgstr "La memòria s’ha exhaurit"
 
-#: posix/regcomp.c:186
+#: posix/regcomp.c:171
 msgid "Invalid preceding regular expression"
-msgstr "L'expressió regular precedent és incorrecta"
+msgstr "L’expressió regular precedent és incorrecta"
 
-#: posix/regcomp.c:189
+#: posix/regcomp.c:174
 msgid "Premature end of regular expression"
-msgstr "Fi prematura de l'expressió regular"
+msgstr "Fi prematura de l’expressió regular"
 
-#: posix/regcomp.c:192
+#: posix/regcomp.c:177
 msgid "Regular expression too big"
-msgstr "L'expressió regular és massa llarga"
+msgstr "L’expressió regular és massa llarga"
 
-#: posix/regcomp.c:195
+#: posix/regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr "«)» o «\\)» desaparellat"
 
-#: posix/regcomp.c:661
+#: posix/regcomp.c:660
 msgid "No previous regular expression"
 msgstr "No hi ha expressió regular prèvia"
 
-#: argp/argp-help.c:224
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr "%.*s: el paràmetre ARGP_HELP_FMT necessita un valor"
-
-#: argp/argp-help.c:233
-#, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr "%.*s: el paràmetre d'ARGP_HELP_FMT no és conegut"
-
-#: argp/argp-help.c:245
-#, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr "fem en 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 "Els arguments obligatoris o opcionals per a les opcions llargues també ho són per a les opcions curtes corresponents."
-
-#: argp/argp-help.c:1592
-msgid "Usage:"
-msgstr "Forma d'ús:"
-
-#: argp/argp-help.c:1596
-msgid "  or: "
-msgstr "      o bé: "
-
-#: argp/argp-help.c:1608
-msgid " [OPTION...]"
-msgstr " [OPCIÓ...]"
-
-#: argp/argp-help.c:1635
-#, c-format
-msgid "Try `%s --help' or `%s --usage' for more information.\n"
-msgstr "Proveu «%s --help» o «%s --usage» per a obtenir més informació.\n"
-
-#: argp/argp-help.c:1663
-#, c-format
-msgid "Report bugs to %s.\n"
-msgstr "Informeu dels errors a %s.\n"
-
-# Més ajudes.  ivb
-#: argp/argp-parse.c:115
-msgid "Give this help list"
-msgstr "Mostra aquest llistat d'ajuda."
-
-#: argp/argp-parse.c:116
-msgid "Give a short usage message"
-msgstr "Mostra un missatge breu amb la forma d'ús."
-
-#: argp/argp-parse.c:117
-msgid "Set the program name"
-msgstr "Estableix el nom del programa."
-
-# ivb (2002/10/21)
-# ivb  La cadena «SECS» no està traduïda en l'estructura d'opcions.
-#: argp/argp-parse.c:119
-msgid "Hang for SECS seconds (default 3600)"
-msgstr "Espera per un nombre de segons (3600 per defecte)."
-
-#: argp/argp-parse.c:180
-msgid "Print program version"
-msgstr "Mostra la versió del programa."
-
-#: argp/argp-parse.c:196
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr "(ERROR DEL PROGRAMA) No es coneix cap versió!?"
-
-#: argp/argp-parse.c:672
-#, c-format
-msgid "%s: Too many arguments\n"
-msgstr "%s: Sobren arguments\n"
-
-#: argp/argp-parse.c:813
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr "(ERROR DEL PROGRAMA) L'opció hauria d'haver estat reconeguda!?"
+#: posix/wordexp.c:1798
+msgid "parameter null or not set"
+msgstr "el paràmetre és nul o no s’ha establert"
 
 #: resolv/herror.c:68
 msgid "Resolver Error 0 (no error)"
-msgstr "Error 0 en el sistema de resolució (cap error)"
+msgstr "Error 0 al sistema de resolució (cap error)"
 
 #: resolv/herror.c:69
 msgid "Unknown host"
-msgstr "L'estació no és coneguda"
+msgstr "L’estació no és coneguda"
 
 #: resolv/herror.c:70
 msgid "Host name lookup failure"
-msgstr "La recerca del nom de l'estació ha fallat"
+msgstr "La cerca del nom de l’estació ha fallat"
 
 #: resolv/herror.c:71
 msgid "Unknown server error"
@@ -3807,217 +4644,77 @@ msgstr "Error desconegut del servidor"
 msgid "No address associated with name"
 msgstr "No hi ha cap adreça associada amb el nom"
 
-#: resolv/herror.c:108
+#: resolv/herror.c:107
 msgid "Resolver internal error"
 msgstr "Error intern del sistema de resolució"
 
-#: resolv/herror.c:111
+#: resolv/herror.c:110
 msgid "Unknown resolver error"
 msgstr "Error desconegut del sistema de resolució"
 
-#: resolv/res_hconf.c:147
-#, c-format
-msgid "%s: line %d: expected service, found `%s'\n"
-msgstr "%s: línia %d: cal un servei, però s'ha trobat «%s»\n"
-
-#: resolv/res_hconf.c:165
-#, c-format
-msgid "%s: line %d: cannot specify more than %d services"
-msgstr "%s: línia %d: no es poden especificar més de %d serveis"
-
-#: resolv/res_hconf.c:191
-#, c-format
-msgid "%s: line %d: list delimiter not followed by keyword"
-msgstr "%s: línia %d: cal una paraula clau a continuació del delimitador de llista"
-
 # ivb (2002/02/08)
 # ivb  En realitat es refereic a la paraula clau d'«/etc/host.conf» «trim»,
 # ivb  però crec que així queda més clar.
-#: resolv/res_hconf.c:231
+#: resolv/res_hconf.c:124
 #, c-format
 msgid "%s: line %d: cannot specify more than %d trim domains"
 msgstr "%s: línia %d: no es poden especificar més de %d dominis a retallar"
 
-#: resolv/res_hconf.c:256
+#: resolv/res_hconf.c:145
 #, c-format
 msgid "%s: line %d: list delimiter not followed by domain"
 msgstr "%s: línia %d: cal un domini a continuació del delimitador de llista"
 
-#: 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: línia %d: cal «on» o «off», però s'ha trobat «%s»\n"
+msgstr "%s: línia %d: cal «on» o «off», però s’ha trobat «%s»\n"
 
-#: resolv/res_hconf.c:366
+#: resolv/res_hconf.c:247
 #, c-format
 msgid "%s: line %d: bad command `%s'\n"
-msgstr "%s: línia %d: l'ordre «%s» no és vàlida\n"
+msgstr "%s: línia %d: l’ordre «%s» no és vàlida\n"
 
-#: resolv/res_hconf.c:395
+#: resolv/res_hconf.c:282
 #, c-format
 msgid "%s: line %d: ignoring trailing garbage `%s'\n"
-msgstr "%s: línia %d: es descarta el fem «%s» al final de la línia\n"
+msgstr "%s: línia %d: es descarta la brossa «%s» al final de la línia\n"
 
-#: nss/getent.c:51
-msgid "database [key ...]"
-msgstr "BASE_DE_DADES [ CLAU... ]"
-
-# Més ajudes.  ivb
-#: nss/getent.c:56
-msgid "Service configuration to be used"
-msgstr "Configuració a usar del servei."
-
-#: nss/getent.c:136 nss/getent.c:375
+#: stdio-common/psignal.c:51
 #, c-format
-msgid "Enumeration not supported on %s\n"
-msgstr "no es suporta l'enumeració sobre «%s»\n"
-
-#: nss/getent.c:800
-msgid "getent - get entries from administrative database."
-msgstr "Obté les entrades de les bases de dades d'administració."
-
-#: nss/getent.c:801
-msgid "Supported databases:"
-msgstr "Bases de dades suportades:"
-
-#: nss/getent.c:858 nscd/nscd.c:131 nscd/nscd_nischeck.c:64
-msgid "wrong number of arguments"
-msgstr "el nombre d'arguments és incorrecte"
-
-#: nss/getent.c:868
-#, c-format
-msgid "Unknown database: %s\n"
-msgstr "la base de dades no és coneguda: %s\n"
-
-# Més ajudes.  ivb
-#: debug/pcprofiledump.c:52
-msgid "Don't buffer output"
-msgstr "No usa memòria intermèdia per a l'eixida."
-
-# ivb (2001/11/06)
-# ivb  És possible que en comptes de
-# ivb    PC = Program Counter (comptador de programa)
-# ivb  es referira a
-# ivb    PC = Procedure Call (crides a procediment)
-# ivb  tot i que el codi del programa cada volta que fa referència a «pc»
-# ivb  o «PC» parla del «lowpc» i del «highpc», sempre en referència al
-# ivb  segment de text (codi) del programa.
-#: debug/pcprofiledump.c:57
-msgid "Dump information generated by PC profiling."
-msgstr "Bolca la informació generada en perfilar el comptador de programa."
-
-#: debug/pcprofiledump.c:60
-msgid "[FILE]"
-msgstr "[FITXER]"
-
-#: debug/pcprofiledump.c:100
-msgid "cannot open input file"
-msgstr "no s'ha pogut obrir el fitxer d'entrada"
-
-#: debug/pcprofiledump.c:106
-msgid "cannot read header"
-msgstr "no s'ha pogut llegir la capçalera"
-
-#: debug/pcprofiledump.c:170
-msgid "invalid pointer size"
-msgstr "la mida del punter no és vàlida"
-
-#: inet/rcmd.c:163 inet/rcmd.c:166
-msgid "rcmd: Cannot allocate memory\n"
-msgstr "rcmd: no s'ha pogut reservar memòria\n"
-
-#: inet/rcmd.c:185 inet/rcmd.c:188
-msgid "rcmd: socket: All ports in use\n"
-msgstr "rcmd: socket: tots els ports estan sent usats\n"
-
-#: inet/rcmd.c:222
-#, c-format
-msgid "connect to address %s: "
-msgstr "connexió amb l'adreça «%s»: "
-
-#: inet/rcmd.c:240
-#, c-format
-msgid "Trying %s...\n"
-msgstr "S'està provant amb «%s»...\n"
+msgid "%s%sUnknown signal %d\n"
+msgstr "%s%sSenyal desconegut %d\n"
 
-#: inet/rcmd.c:289
-#, c-format
-msgid "rcmd: write (setting up stderr): %m\n"
-msgstr "rcmd: write (en preparar l'eixida estàndard d'errors): %m\n"
+#: stdio-common/psignal.c:52
+msgid "Unknown signal"
+msgstr "Senyal desconegut"
 
-#: inet/rcmd.c:310
-#, c-format
-msgid "rcmd: poll (setting up stderr): %m\n"
-msgstr "rcmd: poll (en preparar l'exida estàndard d'errors): %m\n"
-
-#: inet/rcmd.c:313
-msgid "poll: protocol failure in circuit setup\n"
-msgstr "poll: fallada del protocol en configurar el circuit\n"
+#: string/_strerror.c:45 sysdeps/mach/_strerror.c:87
+msgid "Unknown error "
+msgstr "Error desconegut "
 
-#: inet/rcmd.c:358
-msgid "socket: protocol failure in circuit setup\n"
-msgstr "socket: fallada del protocol en configurar el circuit\n"
+#: string/strerror.c:43
+msgid "Unknown error"
+msgstr "Error desconegut"
 
-#: inet/rcmd.c:387
+#: string/strsignal.c:65
 #, c-format
-msgid "rcmd: %s: short read"
-msgstr "rcmd: %s: lectura incompleta"
-
-#: inet/rcmd.c:549
-msgid "lstat failed"
-msgstr "ha fallat lstat()"
-
-# ivb (2001/10/31)
-# ivb  Cal tenir en compte que «ordinary» a l'anglés és cosa pler diferent ;)
-#: inet/rcmd.c:551
-msgid "not regular file"
-msgstr "no és un fitxer ordinari"
-
-#: inet/rcmd.c:556
-msgid "cannot open"
-msgstr "no s'ha pogut obrir"
-
-#: inet/rcmd.c:558
-msgid "fstat failed"
-msgstr "ha fallat fstat()"
-
-#: inet/rcmd.c:560
-msgid "bad owner"
-msgstr "el propietari no és vàlid"
-
-#: inet/rcmd.c:562
-msgid "writeable by other than owner"
-msgstr "és modificable per altres que no en són el propietari"
-
-#: inet/rcmd.c:564
-msgid "hard linked somewhere"
-msgstr "té un enllaç fort en altre lloc"
-
-#: inet/ruserpass.c:170 inet/ruserpass.c:193
-msgid "out of memory"
-msgstr "no resta memòria"
-
-#: inet/ruserpass.c:184
-msgid "Error: .netrc file is readable by others."
-msgstr "Error: el fitxer «.netrc» és llegible per altres que no en són el propietari."
-
-#: inet/ruserpass.c:185
-msgid "Remove password or make file unreadable by others."
-msgstr "Elimineu la contrasenya o feu iŀlegible el fitxer per a altres."
+msgid "Real-time signal %d"
+msgstr "Senyal de temps real %d"
 
-#: inet/ruserpass.c:277
+#: string/strsignal.c:69
 #, c-format
-msgid "Unknown .netrc keyword %s"
-msgstr "la paraula clau «%s» de «.netrc» no és coneguda"
+msgid "Unknown signal %d"
+msgstr "Senyal desconegut %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: no resta memòria\n"
 
 # ivb (2001/11/01)
 # ivb  D'acord amb un comentari del propi fitxer.
-#: sunrpc/auth_unix.c:318
-msgid "auth_none.c - Fatal marshalling problem"
+#: sunrpc/auth_unix.c:350
+msgid "auth_unix.c: Fatal marshalling problem"
 msgstr "auth_none.c: error fatal de preserialització"
 
 #: sunrpc/clnt_perr.c:118 sunrpc/clnt_perr.c:139
@@ -4032,310 +4729,294 @@ msgstr "; causa = "
 #: sunrpc/clnt_perr.c:132
 #, c-format
 msgid "(unknown authentication error - %d)"
-msgstr "(error desconegut d'autenticació - %d)"
+msgstr "(error desconegut d’autenticació: %d)"
 
-#: sunrpc/clnt_perr.c:177
+#: sunrpc/clnt_perr.c:172
 msgid "RPC: Success"
 msgstr "RPC: Èxit"
 
-#: sunrpc/clnt_perr.c:180
+#: sunrpc/clnt_perr.c:175
 msgid "RPC: Can't encode arguments"
-msgstr "RPC: No s'han pogut codificar els arguments"
+msgstr "RPC: No s’han pogut codificar els arguments"
 
-#: sunrpc/clnt_perr.c:184
+#: sunrpc/clnt_perr.c:179
 msgid "RPC: Can't decode result"
-msgstr "RPC: No s'ha pogut descodificar el resultat"
+msgstr "RPC: No s’ha pogut descodificar el resultat"
 
-#: sunrpc/clnt_perr.c:188
+#: sunrpc/clnt_perr.c:183
 msgid "RPC: Unable to send"
-msgstr "RPC: No s'ha pogut fer l'enviament"
+msgstr "RPC: No s’ha pogut fer l’enviament"
 
-#: sunrpc/clnt_perr.c:192
+#: sunrpc/clnt_perr.c:187
 msgid "RPC: Unable to receive"
-msgstr "RPC: No s'ha pogut rebre"
+msgstr "RPC: No s’ha pogut rebre"
 
-#: sunrpc/clnt_perr.c:196
+#: sunrpc/clnt_perr.c:191
 msgid "RPC: Timed out"
-msgstr "RPC: S'ha excedit el temps"
+msgstr "RPC: S’ha excedit el temps"
 
-#: sunrpc/clnt_perr.c:200
+#: sunrpc/clnt_perr.c:195
 msgid "RPC: Incompatible versions of RPC"
-msgstr "RPC: Les versions d'RPC són incompatibles"
+msgstr "RPC: Les versions d’RPC són incompatibles"
 
-#: sunrpc/clnt_perr.c:204
+#: sunrpc/clnt_perr.c:199
 msgid "RPC: Authentication error"
-msgstr "RPC: Error d'autenticació"
+msgstr "RPC: Error d’autenticació"
 
-#: sunrpc/clnt_perr.c:208
+#: sunrpc/clnt_perr.c:203
 msgid "RPC: Program unavailable"
 msgstr "RPC: El programa no es troba disponible"
 
-#: sunrpc/clnt_perr.c:212
+#: sunrpc/clnt_perr.c:207
 msgid "RPC: Program/version mismatch"
 msgstr "RPC: No hi ha coincidència programa/versió"
 
-#: sunrpc/clnt_perr.c:216
+#: sunrpc/clnt_perr.c:211
 msgid "RPC: Procedure unavailable"
 msgstr "RPC: El procediment no es troba disponible"
 
-#: sunrpc/clnt_perr.c:220
+#: sunrpc/clnt_perr.c:215
 msgid "RPC: Server can't decode arguments"
 msgstr "RPC: El servidor no ha pogut descodificar els arguments"
 
-#: sunrpc/clnt_perr.c:224
+#: sunrpc/clnt_perr.c:219
 msgid "RPC: Remote system error"
-msgstr "RPC: Error en el sistema remot"
+msgstr "RPC: Error al sistema remot"
 
-#: sunrpc/clnt_perr.c:228
+#: sunrpc/clnt_perr.c:223
 msgid "RPC: Unknown host"
-msgstr "RPC: L'estació no és coneguda"
+msgstr "RPC: L’estació no és coneguda"
 
-#: sunrpc/clnt_perr.c:232
+#: sunrpc/clnt_perr.c:227
 msgid "RPC: Unknown protocol"
 msgstr "RPC: El protocol no és conegut"
 
-#: sunrpc/clnt_perr.c:236
+#: sunrpc/clnt_perr.c:231
 msgid "RPC: Port mapper failure"
 msgstr "RPC: Fallada del mapador de ports"
 
-#: sunrpc/clnt_perr.c:240
+#: sunrpc/clnt_perr.c:235
 msgid "RPC: Program not registered"
-msgstr "RPC: El programa no s'ha donat d'alta"
+msgstr "RPC: El programa no s’ha donat d’alta"
 
-#: sunrpc/clnt_perr.c:244
+#: sunrpc/clnt_perr.c:239
 msgid "RPC: Failed (unspecified error)"
 msgstr "RPC: Ha fallat (error no especificat)"
 
-#: sunrpc/clnt_perr.c:285
+#: sunrpc/clnt_perr.c:280
 msgid "RPC: (unknown error code)"
-msgstr "RPC: (codi d'error desconegut)"
+msgstr "RPC: (codi d’error desconegut)"
 
-#: sunrpc/clnt_perr.c:357
+#: sunrpc/clnt_perr.c:342
 msgid "Authentication OK"
-msgstr "L'autenticació és vàlida"
+msgstr "L’autenticació és vàlida"
 
-#: sunrpc/clnt_perr.c:360
+#: sunrpc/clnt_perr.c:345
 msgid "Invalid client credential"
 msgstr "La credencial donada pel client no és vàlida"
 
-#: sunrpc/clnt_perr.c:364
+#: sunrpc/clnt_perr.c:349
 msgid "Server rejected credential"
 msgstr "El servidor ha rebutjat la credencial"
 
-#: sunrpc/clnt_perr.c:368
+#: sunrpc/clnt_perr.c:353
 msgid "Invalid client verifier"
 msgstr "El verificador del client no és vàlid"
 
-#: sunrpc/clnt_perr.c:372
+#: sunrpc/clnt_perr.c:357
 msgid "Server rejected verifier"
 msgstr "El servidor ha rebutjat el verificador"
 
-#: sunrpc/clnt_perr.c:376
+#: sunrpc/clnt_perr.c:361
 msgid "Client credential too weak"
 msgstr "La credencial del client és massa fluixa"
 
-#: sunrpc/clnt_perr.c:380
+#: sunrpc/clnt_perr.c:365
 msgid "Invalid server verifier"
 msgstr "El verificador del servidor no és vàlid"
 
-#: sunrpc/clnt_perr.c:384
+#: sunrpc/clnt_perr.c:369
 msgid "Failed (unspecified error)"
-msgstr "Ha fallat (no s'especifica l'error)"
+msgstr "Ha fallat (no s’especifica l’error)"
 
 #: sunrpc/clnt_raw.c:117
-msgid "clnt_raw.c - Fatal header serialization error."
+msgid "clnt_raw.c: fatal header serialization error"
 msgstr "clnt_raw.c: error fatal de serialització de capçaleres"
 
-#: 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: no resta memòria\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: no resta memòria\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: no resta memòria\n"
 
-#: sunrpc/get_myaddr.c:78
-msgid "get_myaddress: ioctl (get interface configuration)"
-msgstr "get_myaddress: ioctl (obtenir configuració de la interfície)"
-
-#: sunrpc/pm_getmaps.c:74
-msgid "pmap_getmaps rpc problem"
-msgstr "problema d'RPC en pmap_getmaps"
+#: sunrpc/pm_getmaps.c:83
+msgid "pmap_getmaps.c: rpc problem"
+msgstr "pmap_getmaps.c: problema d’RPC"
 
-#: sunrpc/pmap_clnt.c:72
-msgid "__get_myaddress: ioctl (get interface configuration)"
-msgstr "__get_myaddress: ioctl (obtenir configuració de la interfície)"
-
-#: sunrpc/pmap_clnt.c:137
+#: sunrpc/pmap_clnt.c:129
 msgid "Cannot register service"
-msgstr "no s'ha pogut donar d'alta el servei"
-
-#: sunrpc/pmap_rmt.c:190
-msgid "broadcast: ioctl (get interface configuration)"
-msgstr "broadcast: ioctl (obtenir configuració de la interfície)"
+msgstr "no s’ha pogut donar d’alta el servei"
 
-#: sunrpc/pmap_rmt.c:199
-msgid "broadcast: ioctl (get interface flags)"
-msgstr "broadcast: ioctl (obtenir senyaladors de la interfície)"
-
-#: sunrpc/pmap_rmt.c:269
+#: sunrpc/pmap_rmt.c:248
 msgid "Cannot create socket for broadcast rpc"
-msgstr "no s'ha pogut crear el connector per a la crida RPC de difusió"
+msgstr "no s’ha pogut crear el connector per a la crida RPC de difusió"
 
-#: sunrpc/pmap_rmt.c:276
+#: sunrpc/pmap_rmt.c:255
 msgid "Cannot set socket option SO_BROADCAST"
-msgstr "no s'ha pogut establir l'opció SO_BROADCAST per al connector"
+msgstr "no s’ha pogut establir l’opció SO_BROADCAST per al connector"
 
-#: sunrpc/pmap_rmt.c:328
+#: sunrpc/pmap_rmt.c:307
 msgid "Cannot send broadcast packet"
-msgstr "no s'ha pogut enviar el paquet de difusió"
+msgstr "no s’ha pogut enviar el paquet de difusió"
 
 # ivb (2000/10/28)
 # ivb  Això és que fa una difusió pura i dura enviant paquets a cada
 # ivb  destinació i fa __poll() per veure si algú ha respost.  Si __poll
 # ivb  falla, mostra aquest missatge.
-#: sunrpc/pmap_rmt.c:353
+#: sunrpc/pmap_rmt.c:332
 msgid "Broadcast poll problem"
 msgstr "problema amb el sondeig de la difusió"
 
-#: sunrpc/pmap_rmt.c:366
+#: sunrpc/pmap_rmt.c:345
 msgid "Cannot receive reply to broadcast"
-msgstr "no s'ha pogut rebre una resposta a la difusió"
+msgstr "no s’ha pogut rebre una resposta a la difusió"
 
-#: sunrpc/rpc_main.c:288
+#: sunrpc/rpc_main.c:286
 #, c-format
 msgid "%s: output would overwrite %s\n"
-msgstr "%s: l'eixida sobreescriuria «%s»\n"
+msgstr "%s: l’eixida sobreescriuria «%s»\n"
 
-#: sunrpc/rpc_main.c:295
+#: sunrpc/rpc_main.c:293
 #, c-format
 msgid "%s: unable to open %s: %m\n"
-msgstr "%s: no s'ha pogut obrir «%s»: %m\n"
+msgstr "%s: no s’ha pogut obrir «%s»: %m\n"
 
-#: sunrpc/rpc_main.c:307
+#: sunrpc/rpc_main.c:305
 #, c-format
 msgid "%s: while writing output %s: %m"
-msgstr "%s: en escriure en l'eixida «%s»: %m"
+msgstr "%s: en escriure a l’eixida «%s»: %m"
 
-#: sunrpc/rpc_main.c:342
+#: sunrpc/rpc_main.c:340
 #, c-format
 msgid "cannot find C preprocessor: %s \n"
-msgstr "no s'ha pogut trobar el preprocessador de C: %s\n"
+msgstr "no s’ha pogut trobar el preprocessador de C: %s\n"
 
-#: sunrpc/rpc_main.c:350
+#: sunrpc/rpc_main.c:348
 msgid "cannot find any C preprocessor (cpp)\n"
-msgstr "no s'ha pogut trobar cap preprocessador de C (cpp)\n"
+msgstr "no s’ha pogut trobar cap preprocessador de C (cpp)\n"
 
-#: sunrpc/rpc_main.c:419
+#: sunrpc/rpc_main.c:417
 #, c-format
 msgid "%s: C preprocessor failed with signal %d\n"
 msgstr "%s: el preprocessador de C ha fallat amb el senyal %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: el preprocessador de C ha fallat amb el codi d'eixida %d\n"
+msgstr "%s: el preprocessador de C ha fallat amb el codi d’eixida %d\n"
 
-#: sunrpc/rpc_main.c:462
+#: sunrpc/rpc_main.c:460
 #, c-format
-msgid "illegal nettype :`%s'\n"
-msgstr "el tipus de xarxa no és permés: «%s»\n"
+msgid "illegal nettype: `%s'\n"
+msgstr "el tipus de xarxa no és permès: «%s»\n"
 
-#: sunrpc/rpc_main.c:1104
+#: sunrpc/rpc_main.c:1122
 #, c-format
 msgid "rpcgen: too many defines\n"
 msgstr "rpcgen: hi ha massa definicions\n"
 
-#: sunrpc/rpc_main.c:1116
+#: sunrpc/rpc_main.c:1134
 #, c-format
 msgid "rpcgen: arglist coding error\n"
 msgstr "rpcgen: error en codificar els arguments\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 "el fitxer «%s» ja existeix i podria ser sobreescrit\n"
 
-#: sunrpc/rpc_main.c:1194
+#: sunrpc/rpc_main.c:1212
 #, c-format
 msgid "Cannot specify more than one input file!\n"
-msgstr "no es pot especificar més d'un fitxer d'entrada\n"
+msgstr "no es pot especificar més d’un fitxer d’entrada\n"
 
-#: sunrpc/rpc_main.c:1364
+#: sunrpc/rpc_main.c:1382
 msgid "This implementation doesn't support newstyle or MT-safe code!\n"
-msgstr "aquesta implementació no suporta l'estil nou ni el codi compatible amb MT\n"
+msgstr "aquesta implementació no accepta l’estil nou ni el codi compatible amb MT\n"
 
-#: sunrpc/rpc_main.c:1373
+#: sunrpc/rpc_main.c:1391
 #, c-format
 msgid "Cannot use netid flag with inetd flag!\n"
-msgstr "no es pot usar l'opció IDXARXA («-n») amb l'opció d'inetd («-I»)\n"
+msgstr "no es pot emprar l’opció IDXARXA («-n») amb l’opció d’inetd («-I»)\n"
 
-#: sunrpc/rpc_main.c:1385
+#: sunrpc/rpc_main.c:1403
 msgid "Cannot use netid flag without TIRPC!\n"
-msgstr "no es pot usar l'opció IDXARXA («-n») sense TIRPC\n"
+msgstr "no es pot emprar l’opció IDXARXA («-n») sense TIRPC\n"
 
-#: sunrpc/rpc_main.c:1392
+#: sunrpc/rpc_main.c:1410
 msgid "Cannot use table flags with newstyle!\n"
-msgstr "no es poden usar opcions de taula amb l'estil nou («-N»)\n"
+msgstr "no es poden emprar opcions de taula amb l’estil nou («-N»)\n"
 
-#: sunrpc/rpc_main.c:1411
+#: sunrpc/rpc_main.c:1429
 #, c-format
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr "cal FITXER_ENTRADA per als senyaladors de generació de plantilles\n"
 
-#: sunrpc/rpc_main.c:1416
+#: sunrpc/rpc_main.c:1434
 #, c-format
 msgid "Cannot have more than one file generation flag!\n"
-msgstr "no es pot tenir més d'un senyalador de generació de fitxers\n"
+msgstr "no es pot tenir més d’un senyalador de generació de fitxers\n"
 
-#: sunrpc/rpc_main.c:1425
+#: sunrpc/rpc_main.c:1443
 #, c-format
 msgid "usage: %s infile\n"
-msgstr "Forma d'ús: %s FITXER_ENTRADA\n"
+msgstr "Forma d’ús: %s FITXER_ENTRADA\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][-D NOM[=VALOR]] [-i MIDA] [-I [-K SEGONS]] [-Y CAMÃ] FITXER_ENTRADA\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 FITXER_EIXIDA] [FITXER_ENTRADA]\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 TIPUS_DE_XARXA]... [-o FITXER_EIXIDA] [FITXER_ENTRADA]\n"
+msgstr "\t%s [-s TIPUS_DE_XARXA]… [-o FITXER_EIXIDA] [FITXER_ENTRADA]\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 IDXARXA]... [-o FITXER_EIXIDA] [FITXER_ENTRADA]\n"
+msgstr "\t%s [-n IDXARXA]… [-o FITXER_EIXIDA] [FITXER_ENTRADA]\n"
 
-#: sunrpc/rpc_scan.c:116
+#: sunrpc/rpc_scan.c:114
 msgid "constant or identifier expected"
 msgstr "cal una constant o un identificador"
 
-#: sunrpc/rpc_scan.c:312
+#: sunrpc/rpc_scan.c:310
 msgid "illegal character in file: "
-msgstr "hi ha un caràcter no permés en el fitxer: "
+msgstr "hi ha un caràcter no permès al fitxer: "
 
-#: 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 "la constant cadena no és terminada"
+msgstr "la constant cadena no està acabada"
 
-#: sunrpc/rpc_scan.c:383
+#: sunrpc/rpc_scan.c:381
 msgid "empty char string"
 msgstr "la cadena de caràcters és buida"
 
-#: sunrpc/rpc_scan.c:525 sunrpc/rpc_scan.c:535
+#: sunrpc/rpc_scan.c:523 sunrpc/rpc_scan.c:533
 msgid "preprocessor error"
 msgstr "error del preprocessador"
 
@@ -4358,11 +5039,11 @@ msgstr "el programa %lu, versió %lu, es troba llest i esperant\n"
 
 #: sunrpc/rpcinfo.c:556 sunrpc/rpcinfo.c:563
 msgid "rpcinfo: can't contact portmapper"
-msgstr "rpcinfo: no s'ha pogut contactar amb el mapador de ports"
+msgstr "rpcinfo: no s’ha pogut contactar amb el mapador de ports"
 
 #: sunrpc/rpcinfo.c:570
 msgid "No remote programs registered.\n"
-msgstr "no hi ha cap programa remot donat d'alta\n"
+msgstr "no hi ha cap programa remot donat d’alta\n"
 
 #: sunrpc/rpcinfo.c:574
 msgid "   program vers proto   port\n"
@@ -4386,11 +5067,11 @@ msgstr "ho sent, no sou root\n"
 #: sunrpc/rpcinfo.c:665
 #, c-format
 msgid "rpcinfo: Could not delete registration for prog %s version %s\n"
-msgstr "rpcinfo: no s'ha pogut donar de baixa el programa «%s», versió %s\n"
+msgstr "rpcinfo: no s’ha pogut donar de baixa el programa «%s», versió %s\n"
 
 #: sunrpc/rpcinfo.c:674
 msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
-msgstr "Forma d'ús: rpcinfo [-n NÚMPORT] -u ESTACIÓ NÚMPROGRAMA [NÚMVERSIÓ]\n"
+msgstr "Forma d’ús: rpcinfo [-n NÚMPORT] -u ESTACIÓ NÚMPROGRAMA [NÚMVERSIÓ]\n"
 
 #: sunrpc/rpcinfo.c:676
 msgid "       rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n"
@@ -4416,41 +5097,45 @@ msgstr "rpcinfo: el servei «%s» no és conegut\n"
 #: sunrpc/rpcinfo.c:732
 #, c-format
 msgid "rpcinfo: %s is unknown host\n"
-msgstr "rpcinfo: l'estació «%s» no és coneguda\n"
+msgstr "rpcinfo: l’estació «%s» no és coneguda\n"
+
+#: sunrpc/svc_run.c:70
+msgid "svc_run: - out of memory"
+msgstr "svc_run: no resta memòria"
 
 # ivb (2001/10/28)
 # ivb  «-» no es refereix a l'entrada estàndard.
-#: sunrpc/svc_run.c:76
+#: sunrpc/svc_run.c:90
 msgid "svc_run: - poll failed"
 msgstr "svc_run: ha fallat poll()"
 
 #: sunrpc/svc_simple.c:87
 #, c-format
 msgid "can't reassign procedure number %ld\n"
-msgstr "no s'ha pogut reassignar el procediment número %ld\n"
+msgstr "no s’ha pogut reassignar el procediment número %ld\n"
 
-#: sunrpc/svc_simple.c:96
+#: sunrpc/svc_simple.c:97
 msgid "couldn't create an rpc server\n"
-msgstr "no s'ha pogut crear un servidor RPC\n"
+msgstr "no s’ha pogut crear un servidor RPC\n"
 
-#: sunrpc/svc_simple.c:104
+#: sunrpc/svc_simple.c:105
 #, c-format
 msgid "couldn't register prog %ld vers %ld\n"
-msgstr "no s'ha pogut donar d'alta el programa %ld amb versió %ld\n"
+msgstr "no s’ha pogut donar d’alta el programa %ld amb versió %ld\n"
 
-#: sunrpc/svc_simple.c:111
+#: sunrpc/svc_simple.c:113
 msgid "registerrpc: out of memory\n"
 msgstr "registerrpc: no resta memòria\n"
 
-#: sunrpc/svc_simple.c:175
+#: sunrpc/svc_simple.c:173
 #, c-format
 msgid "trouble replying to prog %d\n"
-msgstr "no s'ha pogut respondre al programa %d\n"
+msgstr "no s’ha pogut respondre al programa %d\n"
 
-#: sunrpc/svc_simple.c:183
+#: sunrpc/svc_simple.c:182
 #, c-format
 msgid "never registered prog %d\n"
-msgstr "el programa %d mai no s'ha donat d'alta\n"
+msgstr "el programa %d mai no s’ha donat d’alta\n"
 
 #: sunrpc/svc_tcp.c:155
 msgid "svc_tcp.c - tcp socket creation problem"
@@ -4460,11 +5145,11 @@ msgstr "svc_tcp.c: problemes en crear un connector TCP"
 msgid "svc_tcp.c - cannot getsockname or listen"
 msgstr "svc_tcp.c: ha fallat getsockname() o listen()"
 
-#: 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: no resta memòria\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: no resta memòria\n"
 
@@ -4476,41 +5161,41 @@ msgstr "svcudp_create: problemes en crear un connector"
 msgid "svcudp_create - cannot getsockname"
 msgstr "svcudp_create: ha fallat getsockname()"
 
-#: 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: no resta memòria\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» és massa menut per a IP_PKTINFO\n"
 
-#: sunrpc/svc_udp.c:493
+#: sunrpc/svc_udp.c:474
 msgid "enablecache: cache already enabled"
 msgstr "enablecache: la memòria cau ja està habilitada"
 
-#: sunrpc/svc_udp.c:499
+#: sunrpc/svc_udp.c:480
 msgid "enablecache: could not allocate cache"
-msgstr "enablecache: no s'ha pogut reservar espai per a la memòria cau"
+msgstr "enablecache: no s’ha pogut reservar espai per a la memòria cau"
 
-#: sunrpc/svc_udp.c:507
+#: sunrpc/svc_udp.c:489
 msgid "enablecache: could not allocate cache data"
-msgstr "enablecache: no s'ha pogut reservar espai per a les dades de la memòria cau"
+msgstr "enablecache: no s’ha pogut reservar espai per a les dades de la memòria cau"
 
-#: sunrpc/svc_udp.c:514
+#: sunrpc/svc_udp.c:497
 msgid "enablecache: could not allocate cache fifo"
-msgstr "enablecache: no s'ha pogut reservar la cua FIFO de la memòria cau"
+msgstr "enablecache: no s’ha pogut reservar la cua FIFO de la memòria cau"
 
-#: sunrpc/svc_udp.c:550
+#: sunrpc/svc_udp.c:532
 msgid "cache_set: victim not found"
-msgstr "cache_set: no s'ha trobat la víctima"
+msgstr "cache_set: no s’ha trobat la víctima"
 
-#: sunrpc/svc_udp.c:561
+#: sunrpc/svc_udp.c:543
 msgid "cache_set: victim alloc failed"
-msgstr "cache_set: no s'ha pogut reservar la víctima"
+msgstr "cache_set: no s’ha pogut reservar la víctima"
 
-#: sunrpc/svc_udp.c:567
+#: sunrpc/svc_udp.c:550
 msgid "cache_set: could not allocate new rpc_buffer"
-msgstr "cache_set: no s'ha pogut reservar un nou «rpc_buffer»"
+msgstr "cache_set: no s’ha pogut reservar un nou «rpc_buffer»"
 
 #: sunrpc/svc_unix.c:150
 msgid "svc_unix.c - AF_UNIX socket creation problem"
@@ -4520,1639 +5205,1533 @@ msgstr "svc_unix.c: problemes en crear un connector AF_UNIX"
 msgid "svc_unix.c - cannot getsockname or listen"
 msgstr "svc_unix.c: ha fallat getsockname() o listen()"
 
-#: 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: no resta memòria\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: no resta memòria\n"
 
-#: sunrpc/xdr.c:570 sunrpc/xdr.c:573
+#: sunrpc/xdr.c:566
 msgid "xdr_bytes: out of memory\n"
 msgstr "xdr_bytes: no resta memòria\n"
 
-#: sunrpc/xdr.c:728 sunrpc/xdr.c:731
+#: sunrpc/xdr.c:718
 msgid "xdr_string: out of memory\n"
 msgstr "xdr_string: no resta memòria\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: no resta memòria\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: no resta memòria\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: no resta memòria\n"
 
-#: nis/nis_callback.c:189
-msgid "unable to free arguments"
-msgstr "no s'han pogut alliberar els arguments"
+#: sysdeps/generic/siglist.h:29 sysdeps/unix/siglist.c:27
+msgid "Hangup"
+msgstr "Penjat"
 
-#: nis/nis_error.c:30
-msgid "Probable success"
-msgstr "Èxit probable"
+#: sysdeps/generic/siglist.h:30 sysdeps/unix/siglist.c:28
+msgid "Interrupt"
+msgstr "Interromput"
 
-#: nis/nis_error.c:31
-msgid "Not found"
-msgstr "No s'ha trobat"
+#: sysdeps/generic/siglist.h:31 sysdeps/unix/siglist.c:29
+msgid "Quit"
+msgstr "Eixit"
 
-#: nis/nis_error.c:32
-msgid "Probably not found"
-msgstr "Probablement no s'ha trobat"
+#: sysdeps/generic/siglist.h:32 sysdeps/unix/siglist.c:30
+msgid "Illegal instruction"
+msgstr "La instrucció no és permesa"
 
-#: nis/nis_error.c:33
-msgid "Cache expired"
-msgstr "La memòria cau ha expirat"
+#: sysdeps/generic/siglist.h:33 sysdeps/unix/siglist.c:31
+msgid "Trace/breakpoint trap"
+msgstr "Trampa de traçat/punt d’aturada"
 
-#: nis/nis_error.c:34
-msgid "NIS+ servers unreachable"
-msgstr "Els servidors NIS+ són inabastables"
+#: sysdeps/generic/siglist.h:34
+msgid "Aborted"
+msgstr "Avortat"
 
-#: nis/nis_error.c:35
-msgid "Unknown object"
-msgstr "L'objecte no és conegut"
+#: sysdeps/generic/siglist.h:35 sysdeps/unix/siglist.c:34
+msgid "Floating point exception"
+msgstr "Excepció de coma flotant"
 
-#: nis/nis_error.c:36
-msgid "Server busy, try again"
-msgstr "El servidor es troba ocupat, torneu a provar"
+#: sysdeps/generic/siglist.h:36 sysdeps/unix/siglist.c:35
+msgid "Killed"
+msgstr "Matat"
 
-#: nis/nis_error.c:37
-msgid "Generic system error"
-msgstr "Error genèric del sistema"
+#: sysdeps/generic/siglist.h:37 sysdeps/unix/siglist.c:36
+msgid "Bus error"
+msgstr "Error de bus"
 
-#: nis/nis_error.c:38
-msgid "First/next chain broken"
-msgstr "S'ha trencat la cadena de primer/següent"
+#: sysdeps/generic/siglist.h:38 sysdeps/unix/siglist.c:37
+msgid "Segmentation fault"
+msgstr "Violació de segment"
 
-#: nis/nis_error.c:41
-msgid "Name not served by this server"
-msgstr "El nom no és servit per aquest servidor"
+#. 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 "La canonada s’ha trencat"
 
-#: nis/nis_error.c:42
-msgid "Server out of memory"
-msgstr "S'ha exhaurit la memòria del servidor"
+#: sysdeps/generic/siglist.h:40 sysdeps/unix/siglist.c:40
+msgid "Alarm clock"
+msgstr "Temporitzador"
 
-#: nis/nis_error.c:43
-msgid "Object with same name exists"
-msgstr "Ja existeix un objecte amb el mateix nom"
+#: sysdeps/generic/siglist.h:41 sysdeps/unix/siglist.c:41
+msgid "Terminated"
+msgstr "Terminat"
 
-#: nis/nis_error.c:44
-msgid "Not master server for this domain"
-msgstr "No és el servidor mestre d'aquest domini"
+#: sysdeps/generic/siglist.h:42 sysdeps/unix/siglist.c:42
+msgid "Urgent I/O condition"
+msgstr "Condició urgent d’E/S"
 
-#: nis/nis_error.c:45
-msgid "Invalid object for operation"
-msgstr "L'objecte usat en l'operació no és vàlid"
+#: sysdeps/generic/siglist.h:43 sysdeps/unix/siglist.c:43
+msgid "Stopped (signal)"
+msgstr "Aturat (senyal)"
 
-#: nis/nis_error.c:46
-msgid "Malformed name, or illegal name"
-msgstr "El nom és malmés o no permés"
+#: sysdeps/generic/siglist.h:44 sysdeps/unix/siglist.c:44
+msgid "Stopped"
+msgstr "Aturat"
 
-#: nis/nis_error.c:47
-msgid "Unable to create callback"
-msgstr "No s'ha pogut crear el procés de crida de retorn"
+#: sysdeps/generic/siglist.h:45 sysdeps/unix/siglist.c:45
+msgid "Continued"
+msgstr "Continuat"
 
-#: nis/nis_error.c:48
-msgid "Results sent to callback proc"
-msgstr "S'han enviat els resultats al procés de crida de retorn"
+#: sysdeps/generic/siglist.h:46 sysdeps/unix/siglist.c:46
+msgid "Child exited"
+msgstr "Un fill ha eixit"
 
-#: nis/nis_error.c:49
-msgid "Not found, no such name"
-msgstr "No s'ha trobat, el nom no existeix"
+#: sysdeps/generic/siglist.h:47 sysdeps/unix/siglist.c:47
+msgid "Stopped (tty input)"
+msgstr "Aturat (esperant entrada del terminal)"
 
-#: nis/nis_error.c:50
-msgid "Name/entry isn't unique"
-msgstr "El nom/entrada no és única"
+#: sysdeps/generic/siglist.h:48 sysdeps/unix/siglist.c:48
+msgid "Stopped (tty output)"
+msgstr "Aturat (esperant escriure al terminal)"
 
-#: nis/nis_error.c:51
-msgid "Modification failed"
-msgstr "La modificació ha fallat"
+# ivb (2000/10/28)
+# ivb  És clar, E/S significa «Entrada/Sortida», perquè «Entrada/Eixida»
+# ivb  queda ambigu (d'açò es diu discriminació objectiva %-P ).
+#: sysdeps/generic/siglist.h:49 sysdeps/unix/siglist.c:49
+msgid "I/O possible"
+msgstr "L’operació d’E/S és possible"
 
-#: nis/nis_error.c:52
-msgid "Database for table does not exist"
-msgstr "La base de dades de la taula no existeix"
+#: sysdeps/generic/siglist.h:50 sysdeps/unix/siglist.c:50
+msgid "CPU time limit exceeded"
+msgstr "S’ha excedit el temps límit de CPU"
 
-#: nis/nis_error.c:53
-msgid "Entry/table type mismatch"
-msgstr "Els tipus d'entrada i taula no concorden"
+#: sysdeps/generic/siglist.h:51 sysdeps/unix/siglist.c:51
+msgid "File size limit exceeded"
+msgstr "S’ha excedit la mida màxima de fitxer"
 
-#: nis/nis_error.c:54
-msgid "Link points to illegal name"
-msgstr "L'enllaç apunta a un nom no permés"
+#: sysdeps/generic/siglist.h:52 sysdeps/unix/siglist.c:52
+msgid "Virtual timer expired"
+msgstr "Ha expirat el temporitzador virtual"
 
-#: nis/nis_error.c:55
-msgid "Partial success"
-msgstr "Èxit parcial"
+#: sysdeps/generic/siglist.h:53 sysdeps/unix/siglist.c:53
+msgid "Profiling timer expired"
+msgstr "El temps de perfilat ha expirat"
 
-#: nis/nis_error.c:56
-msgid "Too many attributes"
-msgstr "Sobren atributs"
+#: sysdeps/generic/siglist.h:54 sysdeps/unix/siglist.c:54
+msgid "Window changed"
+msgstr "Ha canviat la mida de la finestra"
 
-#: nis/nis_error.c:57
-msgid "Error in RPC subsystem"
-msgstr "Error en el subsistema RPC"
+#: sysdeps/generic/siglist.h:55 sysdeps/unix/siglist.c:56
+msgid "User defined signal 1"
+msgstr "Senyal 1 definit per l’usuari"
 
-#: nis/nis_error.c:58
-msgid "Missing or malformed attribute"
-msgstr "L'atribut manca o és malmés"
+#: sysdeps/generic/siglist.h:56 sysdeps/unix/siglist.c:57
+msgid "User defined signal 2"
+msgstr "Senyal 2 definit per l’usuari"
 
-#: nis/nis_error.c:59
-msgid "Named object is not searchable"
-msgstr "L'objecte anomenat no és cercable"
+#: sysdeps/generic/siglist.h:60 sysdeps/unix/siglist.c:33
+msgid "EMT trap"
+msgstr "Trampa EMT"
 
-# ivb (2001/11/07)
-# ivb  Si no he entés malament, «proc» és el programa «ypxfr» -> procés
-#: nis/nis_error.c:60
-msgid "Error while talking to callback proc"
-msgstr "Error en parlar amb el procés de crida de retorn"
+#: sysdeps/generic/siglist.h:63 sysdeps/unix/siglist.c:38
+msgid "Bad system call"
+msgstr "La crida al sistema no és vàlida"
 
-#: nis/nis_error.c:61
-msgid "Non NIS+ namespace encountered"
-msgstr "S'ha trobat un espai de noms no-NIS+"
+#: sysdeps/generic/siglist.h:66
+msgid "Stack fault"
+msgstr "Fallada de pila"
 
-#: nis/nis_error.c:62
-msgid "Illegal object type for operation"
-msgstr "El tipus de l'objecte usat en l'operació no és permés"
+#: sysdeps/generic/siglist.h:69
+msgid "Information request"
+msgstr "Petició d’informació"
 
-#: nis/nis_error.c:63
-msgid "Passed object is not the same object on server"
-msgstr "L'objecte passat no és el mateix objecte en el servidor"
+#: sysdeps/generic/siglist.h:71
+msgid "Power failure"
+msgstr "Fallada d’alimentació"
 
-#: nis/nis_error.c:64
-msgid "Modify operation failed"
-msgstr "L'operació de modificació ha fallat"
+# ivb (2000/10/28)
+# ivb  Sona més a llenguatge jurídic que a altra cosa...
+#: sysdeps/generic/siglist.h:74 sysdeps/unix/siglist.c:55
+msgid "Resource lost"
+msgstr "S’ha perdut el recurs"
 
-#: nis/nis_error.c:65
-msgid "Query illegal for named table"
-msgstr "La consulta no és permesa per a la taula anomenada"
+#. 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 "L’operació no és permesa"
 
-#: nis/nis_error.c:66
-msgid "Attempt to remove a non-empty table"
-msgstr "S'ha intentat eliminar una taula no-buida"
+#. TRANS No process matches the specified process ID.
+#: sysdeps/gnu/errlist.c:45
+msgid "No such process"
+msgstr "El procés no existeix"
 
-#: nis/nis_error.c:67
-msgid "Error in accessing NIS+ cold start file.  Is NIS+ installed?"
-msgstr "Error en accedir al fitxer d'arrencada en fred de NIS+.  Heu instaŀlat NIS+?"
+#. 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 "La crida al sistema ha estat interrompuda"
 
-#: nis/nis_error.c:68
-msgid "Full resync required for directory"
-msgstr "Cal resincronitzar completament el directori"
+#. TRANS Input/output error; usually used for physical read or write errors.
+#: sysdeps/gnu/errlist.c:69
+msgid "Input/output error"
+msgstr "Error d’Entrada/Sortida"
 
-#: nis/nis_error.c:69
-msgid "NIS+ operation failed"
-msgstr "L'operació NIS+ ha fallat"
+#. 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 "El dispositiu o adreça no existeix"
 
-#: nis/nis_error.c:70
-msgid "NIS+ service is unavailable or not installed"
-msgstr "El servei NIS+ no es troba disponible o no està instaŀlat"
+#. 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 "La llista d’arguments és massa llarga"
 
-# ivb (2001/10/20)
-# ivb  I de l'Univers i de Tot. ;)
-#: nis/nis_error.c:71
-msgid "Yes, 42 is the meaning of life"
-msgstr "Sí, 42 és el Significat de la Vida"
+#. 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 "L’executable té un format erroni"
 
-#: nis/nis_error.c:72
-msgid "Unable to authenticate NIS+ server"
-msgstr "No s'ha pogut autenticar el servidor NIS+"
+#. 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 "El descriptor de fitxer no és vàlid"
 
-#: nis/nis_error.c:73
-msgid "Unable to authenticate NIS+ client"
-msgstr "No s'ha pogut autenticar el client NIS+"
+#. 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 "No hi ha cap procés fill"
 
-#: nis/nis_error.c:74
-msgid "No file space on server"
-msgstr "No resta espai per a fitxers en el servidor"
+#. 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 "S’ha evitat un interbloqueig amb el recurs"
 
-#: nis/nis_error.c:75
-msgid "Unable to create process on server"
-msgstr "No s'ha pogut crear un procés en el servidor"
+#. 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 "No s’ha pogut reservar memòria"
 
-#: nis/nis_error.c:76
-msgid "Master server busy, full dump rescheduled."
-msgstr "El servidor mestre es troba ocupat, es replanifica el bolcat complet"
+#. 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 "L’adreça no és vàlida"
 
-#: nis/nis_local_names.c:126
-#, c-format
-msgid "LOCAL entry for UID %d in directory %s not unique\n"
-msgstr "L'entrada LOCAL de l'UID %d en el directori «%s» no és única\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 "Cal un dispositiu de blocs"
 
-# ivb (2001/10/30)
-# ivb  Crec que es refereix a un tipus de servei de noms -> masculí.
-#: nis/nis_print.c:51
-msgid "UNKNOWN"
-msgstr "DESCONEGUT"
+#. 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 "El dispositiu o recurs es troba ocupat"
 
-# ivb (2001/11/01)
-# ivb  D'acord amb «nis/rpcsvc/nis_object.x».
-#: nis/nis_print.c:109
-msgid "BOGUS OBJECT\n"
-msgstr "OBJECTE NO INICIAT\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 "El fitxer ja existeix"
 
-#: nis/nis_print.c:112
-msgid "NO OBJECT\n"
-msgstr "CAP OBJECTE\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 "No es pot crear un enllaç entre dispositius"
 
-#: nis/nis_print.c:115
-msgid "DIRECTORY\n"
-msgstr "DIRECTORI\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 "El dispositiu no és vàlid"
 
-#: nis/nis_print.c:118
-msgid "GROUP\n"
-msgstr "GRUP\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 "No és un directori"
 
-#: nis/nis_print.c:121
-msgid "TABLE\n"
-msgstr "TAULA\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 "És un directori"
 
-#: nis/nis_print.c:124
-msgid "ENTRY\n"
-msgstr "ENTRADA\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 "L’argument passat no és vàlid"
 
-#: nis/nis_print.c:127
-msgid "LINK\n"
-msgstr "ENLLAÇ\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 "El procés té massa fitxers oberts"
 
-#: nis/nis_print.c:130
-msgid "PRIVATE\n"
-msgstr "PRIVAT\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 "El sistema té massa fitxers oberts"
 
-#: nis/nis_print.c:133
-msgid "(Unknown object)\n"
-msgstr "(Objecte desconegut)\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 "L’operació ioctl() no s’adequa al dispositiu"
 
-#: nis/nis_print.c:166
-#, c-format
-msgid "Name : `%s'\n"
-msgstr "Nom   : «%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 "El fitxer de text es troba ocupat"
 
-#: nis/nis_print.c:167
-#, c-format
-msgid "Type : %s\n"
-msgstr "Tipus : %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 "El fitxer és massa gran"
 
-#: nis/nis_print.c:172
-msgid "Master Server :\n"
-msgstr "Servidor mestre :\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 "No resta espai al dispositiu"
 
-# ivb (2001/10/28)
-# ivb  Es refereix a un servidor rèplica, no a replicar.
-#: nis/nis_print.c:174
-msgid "Replicate :\n"
-msgstr "Rèplica :\n"
+#. TRANS Invalid seek operation (such as on a pipe).
+#: sysdeps/gnu/errlist.c:326
+msgid "Illegal seek"
+msgstr "No es pot moure el punter de fitxer"
 
-#: nis/nis_print.c:175
-#, c-format
-msgid "\tName       : %s\n"
-msgstr "\tNom         : %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 "El sistema de fitxers és només de lectura"
 
-#: nis/nis_print.c:176
-msgid "\tPublic Key : "
-msgstr "\tClau pública: "
+#. 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 "El fitxer té massa enllaços"
 
-#: nis/nis_print.c:180
-msgid "None.\n"
-msgstr "Cap.\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 "L’argument numèric és fora del domini"
 
-# ivb (2001/10/28)
-# ivb  Xicoteta diferència-Home de l'infern ;)
-#: 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 "El resultat numèric és fora de rang"
 
-#: 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 "El recurs no es troba disponible temporalment"
 
-#: 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 "L’operació quedaria blocada"
 
-# ivb (2001/10/30)
-# ivb  Es refereix a una clau pública -> femení.
-#: nis/nis_print.c:194
-#, c-format
-msgid "Unknown (type = %d, bits = %d)\n"
-msgstr "Desconeguda (tipus = %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 "L’operació està en marxa"
 
-#: nis/nis_print.c:205
-#, c-format
-msgid "\tUniversal addresses (%u)\n"
-msgstr "\tAdreces universals (%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 "L’operació ja estava en marxa"
 
-#: nis/nis_print.c:227
-msgid "Time to live : "
-msgstr "Temps de vida : "
+#. 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 "Operació de connector sobre un fitxer noâ€connector"
 
-#: nis/nis_print.c:229
-msgid "Default Access rights :\n"
-msgstr "Drets d'accés per defecte :\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 "El missatge és massa llarg"
 
-#: nis/nis_print.c:238
-#, c-format
-msgid "\tType         : %s\n"
-msgstr "\tTipus        : %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 "El connector no permet aquest protocol"
 
-#: nis/nis_print.c:239
-msgid "\tAccess rights: "
-msgstr "\tDrets d'accés: "
+#. 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 "El protocol no es troba disponible"
 
-#: nis/nis_print.c:252
-msgid "Group Flags :"
-msgstr "Senyaladors del grup :"
+#. 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 "No es permet l’ús del protocol"
 
-#: nis/nis_print.c:255
-msgid ""
-"\n"
-"Group Members :\n"
-msgstr ""
-"\n"
-"Membres del grup :\n"
+#. TRANS The socket type is not supported.
+#: sysdeps/gnu/errlist.c:513
+msgid "Socket type not supported"
+msgstr "No es permet l’ús del tipus de connector"
 
-#: nis/nis_print.c:266
-#, c-format
-msgid "Table Type          : %s\n"
-msgstr "Tipus de taula      : %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 "No es permet l’ús de l’operació"
 
-#: nis/nis_print.c:267
-#, c-format
-msgid "Number of Columns   : %d\n"
-msgstr "Nombre de columnes  : %d\n"
+#. TRANS The socket communications protocol family you requested is not supported.
+#: sysdeps/gnu/errlist.c:536
+msgid "Protocol family not supported"
+msgstr "No es permet l’ús de la família de protocols"
 
-# ivb (2000/10/28)
-# ivb  Açò és correcte segons nis/rpcsvc/nis_object.x, és «caràcter
-# ivb  separador» i no «separador de caràcters».
-#: nis/nis_print.c:268
-#, c-format
-msgid "Character Separator : %c\n"
-msgstr "Caràcter separador  : %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 "El protocol no permet l’ús d’aquesta família d’adreces"
 
-#: nis/nis_print.c:269
-#, c-format
-msgid "Search Path         : %s\n"
-msgstr "Camí de recerca     : %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 "L’adreça ja és en ús"
 
-#: nis/nis_print.c:270
-msgid "Columns             :\n"
-msgstr "Columnes            :\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 "No s’ha pogut assignar l’adreça soŀlicitada"
 
-#: nis/nis_print.c:273
-#, c-format
-msgid "\t[%d]\tName          : %s\n"
-msgstr "\t[%d]\tNom           : %s\n"
+#. TRANS A socket operation failed because the network was down.
+#: sysdeps/gnu/errlist.c:575
+msgid "Network is down"
+msgstr "La xarxa no és activa"
 
-#: nis/nis_print.c:275
-msgid "\t\tAttributes    : "
-msgstr "\t\tAtributs      : "
+#. 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 "La xarxa és inabastable"
 
-#: nis/nis_print.c:277
-msgid "\t\tAccess Rights : "
-msgstr "\t\tDrets d'accés : "
+#. TRANS A network connection was reset because the remote host crashed.
+#: sysdeps/gnu/errlist.c:594
+msgid "Network dropped connection on reset"
+msgstr "La xarxa ha tallat la connexió per un reinici"
 
-#: nis/nis_print.c:286
-msgid "Linked Object Type : "
-msgstr "Tipus de l'objecte enllaçat : "
+#. TRANS A network connection was aborted locally.
+#: sysdeps/gnu/errlist.c:603
+msgid "Software caused connection abort"
+msgstr "El programari ha tallat la conexió"
 
-#: nis/nis_print.c:288
-#, c-format
-msgid "Linked to : %s\n"
-msgstr "Enllaçat amb : %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 "La màquina remota ha reiniciat la connexió"
 
-#: nis/nis_print.c:297
-#, c-format
-msgid "\tEntry data of type %s\n"
-msgstr "\tDades de l'entrada de tipus «%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 "No hi ha memòria intermèdia disponible"
 
-#: nis/nis_print.c:300
-#, c-format
-msgid "\t[%u] - [%u bytes] "
-msgstr "\t[%u] - [%u octets] "
+#. 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 "L’extrem de transport ja és connectat"
 
-#: nis/nis_print.c:303
-msgid "Encrypted data\n"
-msgstr "Dades xifrades\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 "L’extrem de transport no és connectat"
 
-#: nis/nis_print.c:305
-msgid "Binary data\n"
-msgstr "Dades binàries\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 "Cal una adreça de destinació"
 
-#: nis/nis_print.c:320
-#, c-format
-msgid "Object Name   : %s\n"
-msgstr "Nom de l'objecte : %s\n"
+#. TRANS The socket has already been shut down.
+#: sysdeps/gnu/errlist.c:667
+msgid "Cannot send after transport endpoint shutdown"
+msgstr "No es pot enviar després de tancar l’extrem de transport"
 
-#: nis/nis_print.c:321
-#, c-format
-msgid "Directory     : %s\n"
-msgstr "Directori        : %s\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:676
+msgid "Too many references: cannot splice"
+msgstr "Hi ha massa referències: no es poden enllaçar"
 
-#: nis/nis_print.c:322
-#, c-format
-msgid "Owner         : %s\n"
-msgstr "Propietari       : %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 "La connexió ha expirat"
 
-#: nis/nis_print.c:323
-#, c-format
-msgid "Group         : %s\n"
-msgstr "Grup             : %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 "S’ha refusat la connexió"
 
-#: nis/nis_print.c:324
-msgid "Access Rights : "
-msgstr "Drets d'accés    : "
+#. 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 "Hi ha massa nivells d’enllaços simbòlics"
 
-#: nis/nis_print.c:326
-#, c-format
-msgid ""
-"\n"
-"Time to Live  : "
-msgstr ""
-"\n"
-"Temps de vida    : "
+#. 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 "El nom de fitxer és massa llarg"
 
-#: nis/nis_print.c:329
-#, c-format
-msgid "Creation Time : %s"
-msgstr "Data de creació   : %s"
+#. TRANS The remote host for a requested network connection is down.
+#: sysdeps/gnu/errlist.c:726
+msgid "Host is down"
+msgstr "L’estació no està operativa"
 
-#: nis/nis_print.c:331
-#, c-format
-msgid "Mod. Time     : %s"
-msgstr "Data modificació : %s"
+#. TRANS The remote host for a requested network connection is not reachable.
+#: sysdeps/gnu/errlist.c:735
+msgid "No route to host"
+msgstr "No hi ha cap camí cap a l’estació"
 
-#: nis/nis_print.c:332
-msgid "Object Type   : "
-msgstr "Tipus d'objecte  : "
+#. 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 "El directori no és buit"
 
-#: nis/nis_print.c:352
-#, c-format
-msgid "    Data Length = %u\n"
-msgstr "    Longitud de les dades = %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 "L’usuari té massa processos"
 
-#: nis/nis_print.c:365
-#, c-format
-msgid "Status            : %s\n"
-msgstr "Estat             : %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 "Hi ha massa usuaris"
 
-#: nis/nis_print.c:366
-#, c-format
-msgid "Number of objects : %u\n"
-msgstr "Nombre d'objectes : %u\n"
+#. TRANS The user's disk quota was exceeded.
+#: sysdeps/gnu/errlist.c:775
+msgid "Disk quota exceeded"
+msgstr "S’ha excedit la quota de disc"
 
-#: nis/nis_print.c:370
-#, c-format
-msgid "Object #%d:\n"
-msgstr "Objecte #%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 "L’indicador del fitxer NFS és obsolet"
 
-#: nis/nis_print_group_entry.c:115
-#, c-format
-msgid "Group entry for \"%s.%s\" group:\n"
-msgstr "Entrada de grup per al grup «%s.%s»:\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 "L’objecte és remot"
 
-#: nis/nis_print_group_entry.c:123
-msgid "    Explicit members:\n"
-msgstr "    Membres explícits:\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:808
+msgid "RPC struct is bad"
+msgstr "L’estructura RPC és feta malbé"
 
-#: nis/nis_print_group_entry.c:128
-msgid "    No explicit members\n"
-msgstr "    No hi ha membres explícits.\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:817
+msgid "RPC version wrong"
+msgstr "La versió d’RPC no és correcta"
 
-#: nis/nis_print_group_entry.c:131
-msgid "    Implicit members:\n"
-msgstr "    Membres implícits:\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:826
+msgid "RPC program not available"
+msgstr "El programa RPC no es troba disponible"
 
-#: nis/nis_print_group_entry.c:136
-msgid "    No implicit members\n"
-msgstr "    No hi ha membres implícits.\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:835
+msgid "RPC program version wrong"
+msgstr "La versió del programa RPC no és correcta"
 
-#: nis/nis_print_group_entry.c:139
-msgid "    Recursive members:\n"
-msgstr "    Membres recursius:\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:844
+msgid "RPC bad procedure for program"
+msgstr "El procediment RPC no és vàlid per al programa"
 
-#: nis/nis_print_group_entry.c:144
-msgid "    No recursive members\n"
-msgstr "    No hi ha membres recursius.\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 "No hi ha blocatges disponibles"
 
-#: nis/nis_print_group_entry.c:147 nis/nis_print_group_entry.c:163
-msgid "    Explicit nonmembers:\n"
-msgstr "    No-membres explícits:\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 "El format o tipus de fitxer no és l’apropiat"
 
-#: nis/nis_print_group_entry.c:152
-msgid "    No explicit nonmembers\n"
-msgstr "    No hi ha no-membres explícits.\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:878
+msgid "Authentication error"
+msgstr "Error d’autenticació"
 
-#: nis/nis_print_group_entry.c:155
-msgid "    Implicit nonmembers:\n"
-msgstr "    No-membres implícits:\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:887
+msgid "Need authenticator"
+msgstr "Cal un autenticador"
 
-#: nis/nis_print_group_entry.c:160
-msgid "    No implicit nonmembers\n"
-msgstr "    No hi ha no-membres implícits.\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 "La funció no està implementada"
 
-#: nis/nis_print_group_entry.c:168
-msgid "    No recursive nonmembers\n"
-msgstr "    No hi ha no-membres recursius.\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 "No se’n permet l’ús"
 
-#: 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 "l'entrada DES per al nom de xarxa «%s» no és única\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 "El caràcter estès o multioctet no és vàlid o complet"
 
-#: nis/nss_nisplus/nisplus-publickey.c:218
-#, c-format
-msgid "netname2user: missing group id list in `%s'."
-msgstr "netname2user: manca la llista d'identificadors de grup en «%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 "L’operació no és adequada per a un procés de fons"
 
-#: 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: (recerca nis+): %s\n"
+# ivb (2000/10/28)
+# ivb  Doncs que conste que jo no he sigut!
+#. 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 "El traductor ha mort"
 
-#: nis/nss_nisplus/nisplus-publickey.c:319
-#, c-format
-msgid "netname2user: DES entry for %s in directory %s not unique"
-msgstr "netname2user: l'entrada DES de «%s» en el directori «%s» no és única"
+#. 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: el nom principal «%s» és massa llarg"
+#. TRANS You did @strong{what}?
+#: sysdeps/gnu/errlist.c:975
+msgid "You really blew it this time"
+msgstr "Ara sí que te l’has carregat"
 
-#: nis/nss_nisplus/nisplus-publickey.c:392
-#, c-format
-msgid "netname2user: LOCAL entry for %s in directory %s not unique"
-msgstr "netname2user: l'entrada LOCAL de «%s» en el directori «%s» no és única"
+# ivb (2001/11/05)
+# ivb  Ací qualsevol posa el que li dóna la gana, sembla!
+#. TRANS Go home and have a glass of warm, dairy-fresh milk.
+#: sysdeps/gnu/errlist.c:984
+msgid "Computer bought the farm"
+msgstr "El tio Pep se’n va a Murooo, tio Peeep"
 
-#: nis/nss_nisplus/nisplus-publickey.c:399
-msgid "netname2user: should not have uid 0"
-msgstr "netname2user: no ha de tenir l'UID 0"
+#. TRANS This error code has no purpose.
+#: sysdeps/gnu/errlist.c:993
+msgid "Gratuitous error"
+msgstr "Error injustificat"
 
-#: 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 "El missatge no és vàlid"
 
-#: nis/ypclnt.c:780
-msgid "Request arguments bad"
-msgstr "Els arguments de la petició són incorrectes"
+#: sysdeps/gnu/errlist.c:1009
+msgid "Identifier removed"
+msgstr "L’identificador ha estat eliminat"
 
-#: nis/ypclnt.c:782
-msgid "RPC failure on NIS operation"
-msgstr "El procediment RPC ha fallat en una operació NIS"
+#: sysdeps/gnu/errlist.c:1017
+msgid "Multihop attempted"
+msgstr "S’ha intentat un salt múltiple"
 
-#: nis/ypclnt.c:784
-msgid "Can't bind to server which serves this domain"
-msgstr "No s'ha pogut enllaçar amb el servidor d'aquest domini"
+#: sysdeps/gnu/errlist.c:1025
+msgid "No data available"
+msgstr "No hi ha dades disponibles"
 
-#: nis/ypclnt.c:786
-msgid "No such map in server's domain"
-msgstr "El mapa no és en el domini del servidor"
+#: sysdeps/gnu/errlist.c:1033
+msgid "Link has been severed"
+msgstr "S’ha tallat l’enllaç"
 
-#: nis/ypclnt.c:788
-msgid "No such key in map"
-msgstr "La clau no és en el mapa"
+#: sysdeps/gnu/errlist.c:1041
+msgid "No message of desired type"
+msgstr "No hi ha missatges del tipus desitjat"
 
-#: nis/ypclnt.c:790
-msgid "Internal NIS error"
-msgstr "Error intern de NIS"
+#: sysdeps/gnu/errlist.c:1049
+msgid "Out of streams resources"
+msgstr "No resten recursos del tipus flux"
 
-#: nis/ypclnt.c:792
-msgid "Local resource allocation failure"
-msgstr "No s'ha pogut assignar un recurs local"
+#: sysdeps/gnu/errlist.c:1057
+msgid "Device not a stream"
+msgstr "El dispositiu no és un flux"
 
-#: nis/ypclnt.c:794
-msgid "No more records in map database"
-msgstr "No hi ha més registres en la base de dades del mapa"
+#: sysdeps/gnu/errlist.c:1065
+msgid "Value too large for defined data type"
+msgstr "El valor és massa gran per al tipus de dada definit"
 
-#: nis/ypclnt.c:796
-msgid "Can't communicate with portmapper"
-msgstr "No s'ha pogut comunicar amb el mapador de ports"
+#: sysdeps/gnu/errlist.c:1073
+msgid "Protocol error"
+msgstr "Error de protocol"
 
-#: nis/ypclnt.c:798
-msgid "Can't communicate with ypbind"
-msgstr "No s'ha pogut comunicar amb «ypbind»"
+#: sysdeps/gnu/errlist.c:1081
+msgid "Timer expired"
+msgstr "El temporitzador ha expirat"
 
-#: nis/ypclnt.c:800
-msgid "Can't communicate with ypserv"
-msgstr "No s'ha pogut comunicar amb «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 "L’operació ha estat canceŀlada"
 
-#: nis/ypclnt.c:802
-msgid "Local domain name not set"
-msgstr "No s'ha establert nom del domini local"
+#: sysdeps/gnu/errlist.c:1101
+msgid "Interrupted system call should be restarted"
+msgstr "Caldria reiniciar la crida al sistema interrompuda"
 
-#: nis/ypclnt.c:804
-msgid "NIS map database is bad"
-msgstr "La base de dades de mapes NIS és feta malbé"
+#: sysdeps/gnu/errlist.c:1109
+msgid "Channel number out of range"
+msgstr "El número de canal és fora de rang"
 
-#: nis/ypclnt.c:806
-msgid "NIS client/server version mismatch - can't supply service"
-msgstr "Les versions de client i servidor NIS difereixen - no es pot donar servei"
+#: sysdeps/gnu/errlist.c:1117
+msgid "Level 2 not synchronized"
+msgstr "El nivell 2 no està sincronitzat"
 
-#: nis/ypclnt.c:810
-msgid "Database is busy"
-msgstr "La base de dades es troba ocupada"
+#: sysdeps/gnu/errlist.c:1125
+msgid "Level 3 halted"
+msgstr "S’ha aturat el nivell 3"
 
-#: nis/ypclnt.c:812
-msgid "Unknown NIS error code"
-msgstr "Codi d'error desconegut de NIS"
+#: sysdeps/gnu/errlist.c:1133
+msgid "Level 3 reset"
+msgstr "S’ha reiniciat el nivell 3"
 
-#: nis/ypclnt.c:854
-msgid "Internal ypbind error"
-msgstr "Error intern d'«ypbind»"
+#: sysdeps/gnu/errlist.c:1141
+msgid "Link number out of range"
+msgstr "El nombre d’enllaços és fora de rang"
 
-#: nis/ypclnt.c:856
-msgid "Domain not bound"
-msgstr "El domini no és vinculat"
+#: sysdeps/gnu/errlist.c:1149
+msgid "Protocol driver not attached"
+msgstr "No hi ha programa de control associat al protocol"
 
-#: nis/ypclnt.c:858
-msgid "System resource allocation failure"
-msgstr "No s'han pogut assignar recursos del sistema"
+#: sysdeps/gnu/errlist.c:1157
+msgid "No CSI structure available"
+msgstr "No hi ha estructures CSI disponibles"
 
-#: nis/ypclnt.c:860
-msgid "Unknown ypbind error"
-msgstr "Error desconegut d'«ypbind»"
+#: sysdeps/gnu/errlist.c:1165
+msgid "Level 2 halted"
+msgstr "S’ha aturat el nivell 2"
 
-#: nis/ypclnt.c:899
-msgid "yp_update: cannot convert host to netname\n"
-msgstr "yp_update: no s'ha pogut convertir el nom d'estació a nom de xarxa\n"
+#: sysdeps/gnu/errlist.c:1173
+msgid "Invalid exchange"
+msgstr "L’intercanvi no és vàlid"
 
-#: nis/ypclnt.c:911
-msgid "yp_update: cannot get server address\n"
-msgstr "yp_update: no s'ha pogut obtenir l'adreça del servidor\n"
+#: sysdeps/gnu/errlist.c:1181
+msgid "Invalid request descriptor"
+msgstr "El descriptor de petició no és vàlid"
 
-#: nscd/cache.c:94
-msgid "while allocating hash table entry"
-msgstr "en reservar una entrada en la taula de dispersió"
+#: sysdeps/gnu/errlist.c:1189
+msgid "Exchange full"
+msgstr "L’intercanvi és ple"
 
-#: nscd/cache.c:162 nscd/connections.c:184
-#, c-format
-msgid "cannot stat() file `%s': %s"
-msgstr "ha fallat stat() sobre el fitxer «%s»: %s"
+# Algun sistema de fitxers té nodes-a a banda de nodes-i.  ivb
+#: sysdeps/gnu/errlist.c:1197
+msgid "No anode"
+msgstr "No hi ha nodeâ€a"
 
-#: nscd/connections.c:150
-msgid "Cannot run nscd in secure mode as unprivileged user"
-msgstr "no es pot executar «nscd» en mode segur com a usuari sense privilegis"
+#: sysdeps/gnu/errlist.c:1205
+msgid "Invalid request code"
+msgstr "El codi de petició no és vàlid"
 
-#: nscd/connections.c:172
-#, c-format
-msgid "while allocating cache: %s"
-msgstr "en reservar la memòria cau: %s"
+#: sysdeps/gnu/errlist.c:1213
+msgid "Invalid slot"
+msgstr "La ranura no és vàlida"
 
-#: nscd/connections.c:197
-#, c-format
-msgid "cannot open socket: %s"
-msgstr "no s'ha pogut obrir el connector: %s"
+#: sysdeps/gnu/errlist.c:1221
+msgid "File locking deadlock error"
+msgstr "Interbloqueig pel blocatge d’un fitxer"
 
-#: nscd/connections.c:215
-#, c-format
-msgid "cannot enable socket to accept connections: %s"
-msgstr "no s'ha pogut habilitar el connector per a acceptar connexions: %s"
+#: sysdeps/gnu/errlist.c:1229
+msgid "Bad font file format"
+msgstr "El fitxer de font no té un format vàlid"
 
-#: nscd/connections.c:260
-#, c-format
-msgid "cannot handle old request version %d; current version is %d"
-msgstr "no s'ha pogut atendre la petició amb versió antiga %d; la versió actual és %d"
+#: sysdeps/gnu/errlist.c:1237
+msgid "Machine is not on the network"
+msgstr "La màquina no es troba a la xarxa"
 
-#: nscd/connections.c:298 nscd/connections.c:324
-#, c-format
-msgid "cannot write result: %s"
-msgstr "no s'ha pogut escriure el resultat: %s"
+#: sysdeps/gnu/errlist.c:1245
+msgid "Package not installed"
+msgstr "El paquet no es troba instaŀlat"
 
-# ivb (2001/11/07)
-# ivb  El «caller» és el programa «nscd» que prova de contactar amb el
-# ivb  dimoni «nscd» per consultar la memòria cau o invalidar-la.  Per
-# ivb  això faig servir «programa de control» (com «ndc» amb «named» o
-# ivb  «chronyc» amb «chronyd»).
-#: nscd/connections.c:392 nscd/connections.c:514
-#, c-format
-msgid "error getting caller's id: %s"
-msgstr "error en obtenir l'identificador del programa de control: %s"
+# ivb (2001/11/08)
+# ivb  Segons la _meravellosa_ pàgina de manual intro(2) de Solaris2
+# ivb  es pot entendre «advertise» com el fet d'exportar recurs pel
+# ivb  seu ús en un sistema de fitxers remot.  Gràcies als amics del
+# ivb  de.po!!
+#: sysdeps/gnu/errlist.c:1253
+msgid "Advertise error"
+msgstr "Error d’exportació"
 
-#: nscd/connections.c:485
-#, c-format
-msgid "while accepting connection: %s"
-msgstr "en acceptar la connexió: %s"
+#: sysdeps/gnu/errlist.c:1261
+msgid "Srmount error"
+msgstr "Error a «srmount»"
 
-#: nscd/connections.c:498
-#, c-format
-msgid "short read while reading request: %s"
-msgstr "lectura incompleta en llegir la petició: %s"
+#: sysdeps/gnu/errlist.c:1269
+msgid "Communication error on send"
+msgstr "Error de comunicacions a l’enviament"
 
-#: nscd/connections.c:542
-#, c-format
-msgid "key length in request too long: %d"
-msgstr "la longitud de la clau de la petició és massa gran: %d"
+#: sysdeps/gnu/errlist.c:1277
+msgid "RFS specific error"
+msgstr "Error específic d’RFS"
 
-#: nscd/connections.c:556
-#, c-format
-msgid "short read while reading request key: %s"
-msgstr "lectura incompleta en llegir la clau de la petició: %s"
+#: sysdeps/gnu/errlist.c:1285
+msgid "Name not unique on network"
+msgstr "El nom no és únic a la xarxa"
 
-#: nscd/connections.c:566
-#, c-format
-msgid "handle_request: request received (Version = %d) from PID %ld"
-msgstr "handle_request: s'ha rebut una petició (amb versió %d) del PID %ld"
+#: sysdeps/gnu/errlist.c:1293
+msgid "File descriptor in bad state"
+msgstr "El descriptor de fitxer és fet malbé"
 
-#: nscd/connections.c:571
-#, c-format
-msgid "handle_request: request received (Version = %d)"
-msgstr "handle_request: s'ha rebut una petició (amb versió %d)"
+#: sysdeps/gnu/errlist.c:1301
+msgid "Remote address changed"
+msgstr "L’adreça remota ha canviat"
 
-#: 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 "no s'ha pogut executar «nscd» com a l'usuari «%s»"
+#: sysdeps/gnu/errlist.c:1309
+msgid "Can not access a needed shared library"
+msgstr "No s’ha pogut accedir a una biblioteca compartida necessària"
 
-#: nscd/connections.c:656
-msgid "getgrouplist failed"
-msgstr "ha fallat getgrouplist()"
+#: sysdeps/gnu/errlist.c:1317
+msgid "Accessing a corrupted shared library"
+msgstr "Accés una biblioteca compartida corrupta"
 
-#: nscd/connections.c:669
-msgid "setgroups failed"
-msgstr "ha fallat setgroups()"
+#: sysdeps/gnu/errlist.c:1325
+msgid ".lib section in a.out corrupted"
+msgstr "La secció «.lib» de l’a.out és corrupta"
 
-#: nscd/grpcache.c:103 nscd/hstcache.c:111 nscd/pwdcache.c:109
-msgid "while allocating key copy"
-msgstr "en reservar una còpia de la clau"
+#: sysdeps/gnu/errlist.c:1333
+msgid "Attempting to link in too many shared libraries"
+msgstr "S’ha intentat enllaçar massa biblioteques compartides"
 
-#: nscd/grpcache.c:153 nscd/hstcache.c:168 nscd/pwdcache.c:146
-msgid "while allocating cache entry"
-msgstr "en reservar una entrada en la memòria cau"
+#: sysdeps/gnu/errlist.c:1341
+msgid "Cannot exec a shared library directly"
+msgstr "No es pot executar directament una biblioteca compartida"
 
-#: nscd/grpcache.c:197 nscd/hstcache.c:283 nscd/pwdcache.c:193
-#, c-format
-msgid "short write in %s: %s"
-msgstr "escriptura incompleta en «%s»: %s"
+#: sysdeps/gnu/errlist.c:1349
+msgid "Streams pipe error"
+msgstr "Error a la canonada entre fluxos"
 
-#: nscd/grpcache.c:219
-#, c-format
-msgid "Haven't found \"%s\" in group cache!"
-msgstr "no s'ha trobat «%s» en la memòria cau de grups"
+#: sysdeps/gnu/errlist.c:1357
+msgid "Structure needs cleaning"
+msgstr "L’estructura necessita una neteja"
 
-#: nscd/grpcache.c:285
-#, c-format
-msgid "Invalid numeric gid \"%s\"!"
-msgstr "«%s» no és un identificador numèric de grup vàlid"
+#: sysdeps/gnu/errlist.c:1365
+msgid "Not a XENIX named type file"
+msgstr "El fitxer no és d’un tipus XENIX amb nom"
 
-#: nscd/grpcache.c:292
-#, c-format
-msgid "Haven't found \"%d\" in group cache!"
-msgstr "no s'ha trobat «%d» en la memòria cau de grups"
+#: sysdeps/gnu/errlist.c:1373
+msgid "No XENIX semaphores available"
+msgstr "No hi ha semàfors XENIX disponibles"
 
-#: 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 "no s'ha trobat «%s» en la memòria cau d'estacions"
+#: sysdeps/gnu/errlist.c:1381
+msgid "Is a named type file"
+msgstr "El fitxer és d’un tipus amb nom"
 
-# Més ajudes.  ivb
-#: nscd/nscd.c:89
-msgid "Read configuration data from NAME"
-msgstr "Llig les dades de configuració de NOM."
+#: sysdeps/gnu/errlist.c:1389
+msgid "Remote I/O error"
+msgstr "Error en una E/S remota"
 
-#: nscd/nscd.c:91
-msgid "Do not fork and display messages on the current tty"
-msgstr "No fa fork() i mostra els missatges en el terminal actual."
+#: sysdeps/gnu/errlist.c:1397
+msgid "No medium found"
+msgstr "No s’ha trobat el mitjà"
 
-# ivb (2001/10/30)
-# ivb  Es refereix al _nombre_ de fils a llançar.
-#: nscd/nscd.c:92
-msgid "NUMBER"
-msgstr "NOMBRE"
+#: sysdeps/gnu/errlist.c:1405
+msgid "Wrong medium type"
+msgstr "El tipus de mitjà no és vàlid"
 
-#: nscd/nscd.c:92
-msgid "Start NUMBER threads"
-msgstr "Llança NOMBRE fils d'exeució."
+#: sysdeps/gnu/errlist.c:1413
+msgid "Required key not available"
+msgstr "La clau requerida no es troba disponible"
 
-#: nscd/nscd.c:93
-msgid "Shut the server down"
-msgstr "Termina el servidor."
+#: sysdeps/gnu/errlist.c:1421
+msgid "Key has expired"
+msgstr "La clau ha expirat"
 
-#: nscd/nscd.c:94
-msgid "Print current configuration statistic"
-msgstr "Mostra estadístiques de la configuració actual."
+#: sysdeps/gnu/errlist.c:1429
+msgid "Key has been revoked"
+msgstr "La clau ha estat revocada"
 
-#: nscd/nscd.c:95
-msgid "TABLE"
-msgstr "TAULA"
+#: sysdeps/gnu/errlist.c:1437
+msgid "Key was rejected by service"
+msgstr "El servei ha rebutjat la clau"
 
-#: nscd/nscd.c:96
-msgid "Invalidate the specified cache"
-msgstr "Invalida la memòria cau especificada."
+#: sysdeps/gnu/errlist.c:1445
+msgid "Owner died"
+msgstr "El propietari ha mort"
 
-#: nscd/nscd.c:97
-msgid "TABLE,yes"
-msgstr "TAULA,yes"
+#: sysdeps/gnu/errlist.c:1453
+msgid "State not recoverable"
+msgstr "L’estat no és recuperable"
 
-#: nscd/nscd.c:97
-msgid "Use separate cache for each user"
-msgstr "Usa una memòria cau diferent per a cada usuari."
+# ivb (2001/10/28)
+# ivb  Codi -> sembla que aquesta és la traducció correcta, ja que tracta
+# ivb  d'identificar l'error dins un vector de sistemes d'errors del mach. (?)
+#: sysdeps/mach/_strerror.c:57
+msgid "Error in unknown error system: "
+msgstr "Error en un sistema d’errors desconegut: "
 
-#: nscd/nscd.c:102
-msgid "Name Service Cache Daemon."
-msgstr "Dimoni de memòria cau del servei de noms."
+#: sysdeps/posix/gai_strerror-strs.h:1
+msgid "Address family for hostname not supported"
+msgstr "El nom d’estació no permet l’ús d’aquesta família d’adreces"
 
-#: nscd/nscd.c:141
-msgid "cannot read configuration file; this is fatal"
-msgstr "no s'ha pogut llegir el fitxer de configuració; açò és fatal"
+#: sysdeps/posix/gai_strerror-strs.h:2
+msgid "Temporary failure in name resolution"
+msgstr "Fallada temporal a la resolució de noms"
 
-#: nscd/nscd.c:152
-msgid "already running"
-msgstr "ja es troba en marxa"
+#: sysdeps/posix/gai_strerror-strs.h:3
+msgid "Bad value for ai_flags"
+msgstr "El valor d’«ai_flags» no és vàlid"
 
-#: nscd/nscd.c:270 nscd/nscd.c:294 nscd/nscd_stat.c:132
-msgid "Only root is allowed to use this option!"
-msgstr "només root pot usar aquesta opció"
+#: sysdeps/posix/gai_strerror-strs.h:4
+msgid "Non-recoverable failure in name resolution"
+msgstr "Fallada irrecuperable a la resolució de noms"
 
-#: nscd/nscd_conf.c:88
-#, c-format
-msgid "Parse error: %s"
-msgstr "error d'anàlisi: %s"
+#: sysdeps/posix/gai_strerror-strs.h:5
+msgid "ai_family not supported"
+msgstr "No es permet l’ús d’aquest valor d’«ai_family»"
 
-#: nscd/nscd_conf.c:171
-#, c-format
-msgid "Could not create log file \"%s\""
-msgstr "no s'ha pogut crear el fitxer «%s» de registre"
+#: sysdeps/posix/gai_strerror-strs.h:6
+msgid "Memory allocation failure"
+msgstr "No s’ha pogut reservar memòria"
 
-#: nscd/nscd_conf.c:187
-msgid "Must specify user name for server-user option"
-msgstr "cal especificar un nom d'usuari per a l'opció «server-user»"
+#: sysdeps/posix/gai_strerror-strs.h:7
+msgid "No address associated with hostname"
+msgstr "No hi ha cap adreça associada amb el nom d’estació"
 
-#: nscd/nscd_conf.c:194
-msgid "Must specify user name for stat-user option"
-msgstr "cal especificar un nom d'usuari per a l'opció «stat-user»"
+#: sysdeps/posix/gai_strerror-strs.h:8
+msgid "Name or service not known"
+msgstr "El nom o servei no és conegut"
 
-#: nscd/nscd_conf.c:205
-#, c-format
-msgid "Unknown option: %s %s %s"
-msgstr "l'opció no és coneguda: %s %s %s"
+#: sysdeps/posix/gai_strerror-strs.h:9
+msgid "Servname not supported for ai_socktype"
+msgstr "El valor d’«ai_socktype» no permet l’ús d’aquest servei"
 
-#: nscd/nscd_stat.c:103
-#, c-format
-msgid "cannot write statistics: %s"
-msgstr "no s'han pogut escriure les estadístiques: %s"
+#: sysdeps/posix/gai_strerror-strs.h:10
+msgid "ai_socktype not supported"
+msgstr "El valor d’«ai_socktype» no està permés"
 
-#: nscd/nscd_stat.c:128
-#, c-format
-msgid "Only root or %s is allowed to use this option!"
-msgstr "només root o %s pot usar aquesta opció"
+#: sysdeps/posix/gai_strerror-strs.h:11
+msgid "System error"
+msgstr "Error del sistema"
 
-#: nscd/nscd_stat.c:139
-msgid "nscd not running!\n"
-msgstr "nscd no està en marxa\n"
+#: sysdeps/posix/gai_strerror-strs.h:12
+msgid "Processing request in progress"
+msgstr "S’està processant la petició"
 
-#: nscd/nscd_stat.c:150
-msgid "write incomplete"
-msgstr "escriptura incompleta"
+#: sysdeps/posix/gai_strerror-strs.h:13
+msgid "Request canceled"
+msgstr "La petició ha estat canceŀlada"
 
-#: nscd/nscd_stat.c:162
-msgid "cannot read statistics data"
-msgstr "no s'han pogut llegir les dades estadístiques"
+#: sysdeps/posix/gai_strerror-strs.h:14
+msgid "Request not canceled"
+msgstr "La petició no ha estat canceŀlada"
 
-#: nscd/nscd_stat.c:165
-#, c-format
-msgid ""
-"nscd configuration:\n"
-"\n"
-"%15d  server debug level\n"
-msgstr ""
-"Configuració d'nscd:\n"
-"\n"
-"%15d  nivell de depuració del servidor\n"
+#: sysdeps/posix/gai_strerror-strs.h:15
+msgid "All requests done"
+msgstr "S’han completat totes les peticions"
 
-#: nscd/nscd_stat.c:189
-#, c-format
-msgid "%3ud %2uh %2um %2lus  server runtime\n"
-msgstr "%3ud %2uh %2um %2lus  de funcionament del servidor\n"
+#: sysdeps/posix/gai_strerror-strs.h:16
+msgid "Interrupted by a signal"
+msgstr "Interromput per un senyal"
 
-#: nscd/nscd_stat.c:192
-#, c-format
-msgid "    %2uh %2um %2lus  server runtime\n"
-msgstr "    %2uh %2um %2lus  de funcionament del servidor\n"
+#: sysdeps/posix/gai_strerror-strs.h:17
+msgid "Parameter string not correctly encoded"
+msgstr "La cadena paràmetre no té una codificació vàlida"
 
-#: nscd/nscd_stat.c:194
-#, c-format
-msgid "        %2um %2lus  server runtime\n"
-msgstr "        %2um %2lus  de funcionament del servidor\n"
+#: sysdeps/unix/siglist.c:26
+msgid "Signal 0"
+msgstr "Senyal 0"
 
-#: nscd/nscd_stat.c:196
-#, c-format
-msgid "            %2lus  server runtime\n"
-msgstr "            %2lus  de funcionament del servidor\n"
+#: sysdeps/unix/siglist.c:32
+msgid "IOT trap"
+msgstr "Trampa IOT"
 
-#: 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  nombre d'ocasions en què els clients han hagut d'esperar\n"
-
-#: nscd/nscd_stat.c:213 nscd/nscd_stat.c:215
-msgid "      no"
-msgstr "      no"
-
-#: nscd/nscd_stat.c:213 nscd/nscd_stat.c:215
-msgid "     yes"
-msgstr "     sí"
+msgid "%s is for unknown machine %d.\n"
+msgstr "«%s» és per a la màquina desconeguda %d\n"
 
-# El primer camp és passwd, group, shadow...  ivb
-#: 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"
-"Memòria cau de «%s»:\n"
-"\n"
-"%15s  n'és habilitada la memòria cau?\n"
-"%15Zu  mida suggerida\n"
-"%15lu  temps de vida en segons per a entrades positives\n"
-"%15lu  temps de vida en segons per a entrades negatives\n"
-"%15lu  encerts de memòria cau per a entrades positives\n"
-"%15lu  encerts de memòria cau per a entrades negatives\n"
-"%15lu  fallades de memòria cau per a entrades positives\n"
-"%15lu  fallades de memòria cau per a entrades negatives\n"
-"%15lu%% ràtio d'encerts de memòria cau\n"
-"%15lu  nombre actual de valors en la memòria cau\n"
-"%15lu  nombre màxim de valors en la memòria cau\n"
-"%15lu  màxima longitud cercada de cadena\n"
-"%15lu  nombre de retards pel blocatge de lectura\n"
-"%15lu  nombre de retards pel blocatge d'escriptura\n"
-"%15s  comprovar «/etc/%s» per si hi ha hagut canvis?\n"
+msgid "makecontext: does not know how to handle more than 8 arguments\n"
+msgstr "makecontext: no es poden tractar més de 8 arguments\n"
 
-#: nscd/pwdcache.c:215
+#: sysdeps/unix/sysv/linux/lddlibc4.c:64
 #, c-format
-msgid "Haven't found \"%s\" in password cache!"
-msgstr "no s'ha trobat «%s» en la memòria cau d'usuaris"
+msgid "cannot open `%s'"
+msgstr "no s’ha pogut obrir «%s»"
 
-#: nscd/pwdcache.c:281
+#: sysdeps/unix/sysv/linux/lddlibc4.c:68
 #, c-format
-msgid "Invalid numeric uid \"%s\"!"
-msgstr "«%s» no és un identificador numèric d'usuari vàlid"
+msgid "cannot read header from `%s'"
+msgstr "no s’ha pogut llegir la capçalera de «%s»"
 
-#: nscd/pwdcache.c:288
-#, c-format
-msgid "Haven't found \"%d\" in password cache!"
-msgstr "no s'ha trobat «%d» en la memòria cau d'usuaris"
+#: timezone/zdump.c:211
+msgid "lacks alphabetic at start"
+msgstr "no comença per un caràcter alfabètic"
 
-#: elf/../sysdeps/generic/dl-sysdep.c:422
-msgid "cannot create capability list"
-msgstr "no s'ha pogut crear la llista de capacitats"
+#: timezone/zdump.c:213
+msgid "has fewer than 3 alphabetics"
+msgstr "té menys de 3 caràcters alfabètics"
 
-#: elf/../sysdeps/generic/readelflib.c:35
-#, c-format
-msgid "file %s is truncated\n"
-msgstr "el fitxer «%s» està truncat\n"
+#: timezone/zdump.c:215
+msgid "has more than 6 alphabetics"
+msgstr "té més de 6 caràcters alfabètics"
 
-#: elf/../sysdeps/generic/readelflib.c:67
-#, c-format
-msgid "%s is a 32 bit ELF file.\n"
-msgstr "«%s» és un fitxer ELF de 32 bits\n"
+#: timezone/zdump.c:223
+msgid "differs from POSIX standard"
+msgstr "difereix de l’estàndard POSIX"
 
-#: elf/../sysdeps/generic/readelflib.c:69
+# FIXME: language-dependent
+# La cadena final és una de les anteriors.  ivb
+#: timezone/zdump.c:229
 #, c-format
-msgid "%s is a 64 bit ELF file.\n"
-msgstr "«%s» és un fitxer ELF de 64 bits\n"
+msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"
+msgstr "%1$s: avís: l’abreviatura «%3$s» de la zona «%2$s» %4$s\n"
 
-#: elf/../sysdeps/generic/readelflib.c:71
+#: timezone/zdump.c:280
 #, c-format
-msgid "Unknown ELFCLASS in file %s.\n"
-msgstr "la classe ELF del fitxer «%s» no és coneguda\n"
+msgid "%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"
+msgstr "%s: la forma d’ús és %s [--version] [-v] [-c [ANY_INF,]ANY_SUP] NOM_DE_ZONA…\n"
 
-#: elf/../sysdeps/generic/readelflib.c:78
+#: timezone/zdump.c:297
 #, c-format
-msgid "%s is not a shared object file (Type: %d).\n"
-msgstr "«%s» no és un fitxer objecte compartit (tipus: %d)\n"
+msgid "%s: wild -c argument %s\n"
+msgstr "%s: l’argument de l’opció «-c» no és vàlid: %s\n"
 
-#: elf/../sysdeps/generic/readelflib.c:109
-msgid "more than one dynamic segment\n"
-msgstr "hi ha més d'un segment dinàmic\n"
+#: timezone/zdump.c:388
+msgid "Error writing to standard output"
+msgstr "error en escriure a l’eixida estàndard"
 
-#: elf/../sysdeps/unix/sysv/linux/i386/readelflib.c:49
+#: timezone/zdump.c:411
 #, c-format
-msgid "%s is for unknown machine %d.\n"
-msgstr "«%s» és per a la màquina desconeguda %d\n"
-
-# ivb (2001/11/01)
-# ivb  Es refereix al tipus de la biblioteca (libc{4,5,6}) -> masculí.
-#: elf/cache.c:70
-msgid "unknown"
-msgstr "desconegut"
+msgid "%s: use of -v on system with floating time_t other than float or double\n"
+msgstr "%s: no es pot emprar «-v» ja que «time_t» en aquest sistema és un tipus flotant diferent de «float» i «double»\n"
 
-# ivb (2001/11/06)
-# ivb  Cal mantenir-ho curt...
-#: elf/cache.c:111
-msgid "Unknown OS"
-msgstr "SO desconegut"
-
-# ivb (2001/11/06)
-# ivb  Cal mantenir-ho curt...
-#: elf/cache.c:116
+#: timezone/zic.c:392
 #, c-format
-msgid ", OS ABI: %s %d.%d.%d"
-msgstr ", ABI del SO: %s %d.%d.%d"
+msgid "%s: Memory exhausted: %s\n"
+msgstr "%s: la memòria s’ha exhaurit: %s\n"
 
-#: elf/cache.c:142 elf/ldconfig.c:1078
+#: timezone/zic.c:451
 #, c-format
-msgid "Can't open cache file %s\n"
-msgstr "no s'ha pogut obrir el fitxer «%s» de memòria cau\n"
-
-#: elf/cache.c:154
-msgid "mmap of cache file failed.\n"
-msgstr "ha fallat mmap() sobre el fitxer de memòria cau\n"
-
-#: elf/cache.c:158 elf/cache.c:168
-msgid "File is not a cache file.\n"
-msgstr "el fitxer no és un fitxer de memòria cau\n"
+msgid "\"%s\", line %d: %s"
+msgstr "«%s», línia %d: %s"
 
-# No és un error.  ivb
-#: elf/cache.c:201 elf/cache.c:211
+#: timezone/zic.c:454
 #, c-format
-msgid "%d libs found in cache `%s'\n"
-msgstr "S'han trobat %d biblioteques en la memòria cau «%s».\n"
+msgid " (rule from \"%s\", line %d)"
+msgstr " (regla de «%s», línia %d)"
 
-#: elf/cache.c:410
-#, c-format
-msgid "Can't remove old temporary cache file %s"
-msgstr "no s'ha pogut eliminar el fitxer antic «%s» de memòria cau temporal"
+#: timezone/zic.c:466
+msgid "warning: "
+msgstr "avís: "
 
-#: elf/cache.c:417
+# ivb (2001/10/28)
+# ivb  Deixe algunes paraules per traduir perquè es refereixen a paraules
+# ivb  reservades dels fitxers amb què treballa zic.
+# Sembla que la barra al final de la línia no pinta res.  ivb
+#: timezone/zic.c:476
 #, c-format
-msgid "Can't create temporary cache file %s"
-msgstr "no s'ha pogut crear el fitxer temporal de memòria cau «%s»"
-
-#: elf/cache.c:425 elf/cache.c:434 elf/cache.c:438
-msgid "Writing of cache data failed"
-msgstr "no s'han pogut escriure les dades de la memòria cau"
+msgid ""
+"%s: usage is %s [ --version ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+"\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+msgstr ""
+"%s: forma d’ús: %s [--version] [-s] [-v] [-l localtime] [-p posixrules]\n"
+"\t[-d DIRECTORI] [-L FITXER_SEGONS_INTERCALARS] [-y yearistype]\n"
+"\t[FITXER…]\n"
 
-#: elf/cache.c:442
-msgid "Writing of cache data failed."
-msgstr "no s'han pogut escriure les dades de la memòria cau"
+#: timezone/zic.c:511
+msgid "wild compilation-time specification of zic_t"
+msgstr "l’especificació de «zic_t» en temps de compiŀlació no és vàlida"
 
-#: elf/cache.c:449
+#: timezone/zic.c:528
 #, c-format
-msgid "Changing access rights of %s to %#o failed"
-msgstr "no s'ha pogut canviar els drets d'accés de «%s» a %#o"
+msgid "%s: More than one -d option specified\n"
+msgstr "%s: s’ha indicat l’opció «-d» més d’una volta\n"
 
-#: elf/cache.c:454
+#: timezone/zic.c:538
 #, c-format
-msgid "Renaming of %s to %s failed"
-msgstr "no s'ha pogut reanomenar «%s» a «%s»"
-
-#: elf/dl-close.c:128
-msgid "shared object not open"
-msgstr "l'objecte compartit no és obert"
-
-# ivb (2002/10/29)
-# ivb  TLS = Thread Local Storage
-#: elf/dl-close.c:531 elf/dl-open.c:454
-msgid "TLS generation counter wrapped!  Please send report with the 'glibcbug' script."
-msgstr "El comptador de generació de TLS s'ha esgotat!  Per favor, envieu un informe amb el guió «glibcbug»."
-
-# ivb (2001/11/05)
-# ivb  DST = Dynamic String Token (component cadena dinàmica)
-#: elf/dl-deps.c:111 elf/dl-open.c:183
-msgid "DST not allowed in SUID/SGID programs"
-msgstr "no es permeten components cadena dinàmica (DST) en programes SUID/SGID"
-
-#: elf/dl-deps.c:124
-msgid "empty dynamics string token substitution"
-msgstr "la substitució del component cadena dinàmica és buida"
+msgid "%s: More than one -l option specified\n"
+msgstr "%s: s’ha indicat l’opció «-l» més d’una volta\n"
 
-# ivb (2002/10/21)
-# ivb  Es refereix a _objectes_ auxiliars, segons el codi.
-#: elf/dl-deps.c:130
+#: timezone/zic.c:548
 #, c-format
-msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
-msgstr "no s'ha pogut carregar l'objecte auxiliar «%s» perquè la substitució del component cadena dinàmica és buida\n"
-
-#: elf/dl-deps.c:461
-msgid "cannot allocate dependency list"
-msgstr "no s'ha pogut reservar la llista de dependències"
-
-#: elf/dl-deps.c:494 elf/dl-deps.c:549
-msgid "cannot allocate symbol search list"
-msgstr "no s'ha pogut reservar la llista de recerca de símbols"
-
-# ivb (2002/10/21)
-# ivb  LD_TRACE_PRELINKING és una variable d'entorn, no és part del filtre.
-#: elf/dl-deps.c:534
-msgid "Filters not supported with LD_TRACE_PRELINKING"
-msgstr "amb LD_TRACE_PRELINKING no es suporten els filtres"
-
-#: elf/dl-error.c:75
-msgid "DYNAMIC LINKER BUG!!!"
-msgstr "ERROR EN L'ENLLAÇADOR DINÀMIC!!!"
-
-#: elf/dl-error.c:108
-msgid "error while loading shared libraries"
-msgstr "error en carregar les biblioteques dinàmiques"
-
-#: elf/dl-load.c:347
-msgid "cannot allocate name record"
-msgstr "no s'ha pogut reservar el registre de nom"
-
-#: 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 "no s'ha pogut crear la memòria cau dels camins de recerca"
-
-#: elf/dl-load.c:551
-msgid "cannot create RUNPATH/RPATH copy"
-msgstr "no s'ha pogut crear una còpia de RUNPATH o RPATH"
-
-#: elf/dl-load.c:634
-msgid "cannot create search path array"
-msgstr "no s'ha pogut crear el vector de camins de recerca"
-
-#: elf/dl-load.c:830
-msgid "cannot stat shared object"
-msgstr "ha fallat stat() sobre l'objecte compartit"
-
-# ivb (2001/10/28)
-# ivb  Es refereix a /dev/zero .
-#: elf/dl-load.c:874
-msgid "cannot open zero fill device"
-msgstr "no s'ha pogut obrir el dispositiu de zeros"
-
-#: elf/dl-load.c:883 elf/dl-load.c:1929
-msgid "cannot create shared object descriptor"
-msgstr "no s'ha pogut crear el descriptor d'objecte compartit"
-
-#: elf/dl-load.c:902 elf/dl-load.c:1470 elf/dl-load.c:1553
-msgid "cannot read file data"
-msgstr "no s'han pogut llegir les dades del fitxer"
-
-#: elf/dl-load.c:946
-msgid "ELF load command alignment not page-aligned"
-msgstr "l'alineament de l'ordre ELF de càrrega no està alineada amb la pàgina"
-
-#: elf/dl-load.c:953
-msgid "ELF load command address/offset not properly aligned"
-msgstr "l'adreça o desplaçament de l'ordre ELF de càrrega no està correctament alineada"
-
-#: elf/dl-load.c:1037
-msgid "cannot allocate TLS data structures for initial thread"
-msgstr "no s'han pogut reservar les estructures de dades TLS per al fil inicial"
-
-#: elf/dl-load.c:1061
-msgid "cannot handle TLS data"
-msgstr "no es pot tractar amb dades TLS"
-
-#: elf/dl-load.c:1075
-msgid "object file has no loadable segments"
-msgstr "el fitxer objecte no té segments carregables"
-
-#: elf/dl-load.c:1110
-msgid "failed to map segment from shared object"
-msgstr "no s'ha pogut mapar un segment de l'objecte compartit"
-
-#: elf/dl-load.c:1135
-msgid "cannot dynamically load executable"
-msgstr "no s'ha pogut carregar dinàmicament l'executable"
-
-#: elf/dl-load.c:1191
-msgid "cannot change memory protections"
-msgstr "no s'han pogut canviar les proteccions de memòria"
-
-#: elf/dl-load.c:1210
-msgid "cannot map zero-fill pages"
-msgstr "no s'han pogut mapar les pàgines plenes de zeros"
-
-#: elf/dl-load.c:1228
-msgid "cannot allocate memory for program header"
-msgstr "no s'ha pogut reservar memòria per a la capçalera del programa"
-
-#: elf/dl-load.c:1259
-msgid "object file has no dynamic section"
-msgstr "el fitxer objecte no té secció dinàmica"
-
-#: elf/dl-load.c:1299
-msgid "shared object cannot be dlopen()ed"
-msgstr "ha fallat dlopen() sobre l'objecte compartit"
-
-#: elf/dl-load.c:1322
-msgid "cannot create searchlist"
-msgstr "no s'ha pogut crear la llista de recerca"
-
-#: elf/dl-load.c:1352
-msgid "cannot enable executable stack as shared object requires"
-msgstr "no s'ha pogut habilitar la pila executable a requeriment de l'objecte compartit"
-
-#: elf/dl-load.c:1470
-msgid "file too short"
-msgstr "el fitxer és massa curt"
-
-#: elf/dl-load.c:1493
-msgid "invalid ELF header"
-msgstr "la capçalera ELF no és vàlida"
-
-#: elf/dl-load.c:1502
-msgid "ELF file data encoding not big-endian"
-msgstr "la codificació de les dades del fitxer ELF no és big-endian"
-
-#: elf/dl-load.c:1504
-msgid "ELF file data encoding not little-endian"
-msgstr "la codificació de les dades del fitxer ELF no és little-endian"
-
-#: elf/dl-load.c:1508
-msgid "ELF file version ident does not match current one"
-msgstr "la identificació de la versió del fitxer ELF no concorda amb l'actual"
-
-# ivb (2001/11(06)
-# ivb  ABI = Application Binary Interface (interfície binària d'aplicació)
-#: elf/dl-load.c:1512
-msgid "ELF file OS ABI invalid"
-msgstr "l'ABI de sistema operatiu del fitxer ELF no és vàlida"
-
-#: elf/dl-load.c:1514
-msgid "ELF file ABI version invalid"
-msgstr "la versió de l'ABI del fitxer ELF no és vàlida"
-
-#: elf/dl-load.c:1517
-msgid "internal error"
-msgstr "error intern"
+msgid "%s: More than one -p option specified\n"
+msgstr "%s: s’ha indicat l’opció «-p» més d’una volta\n"
 
-#: elf/dl-load.c:1524
-msgid "ELF file version does not match current one"
-msgstr "la versió del fitxer ELF no concorda amb l'actual"
+#: timezone/zic.c:558
+#, c-format
+msgid "%s: More than one -y option specified\n"
+msgstr "%s: s’ha indicat l’opció «-y» més d’una volta\n"
 
-# ivb (2001/11/01)
-# ivb  La traducció completa de «phentsize» vindria a ser: mida d'entrada
-# ivb  de taula de la capçalera de programa.
-#: elf/dl-load.c:1532
-msgid "ELF file's phentsize not the expected size"
-msgstr "el valor de «phentsize» del fitxer ELF no és l'esperat"
+#: timezone/zic.c:568
+#, c-format
+msgid "%s: More than one -L option specified\n"
+msgstr "%s: s’ha indicat l’opció «-L» més d’una volta\n"
 
-#: elf/dl-load.c:1538
-msgid "only ET_DYN and ET_EXEC can be loaded"
-msgstr "només es poden carregar els tipus ET_DYN i ET_EXEC"
+#: timezone/zic.c:617
+msgid "link to link"
+msgstr "enllaç a un altre enllaç"
 
-#: elf/dl-load.c:1944
-msgid "cannot open shared object file"
-msgstr "no s'ha pogut obrir el fitxer objecte compartit"
+#: timezone/zic.c:682
+msgid "hard link failed, symbolic link used"
+msgstr "no s’ha pogut crear un enllaç fort, se n’ha emprat un de simbòlic"
 
-#: elf/dl-lookup.c:265 elf/dl-lookup.c:443
-msgid "relocation error"
-msgstr "error de reubicació"
+#: timezone/zic.c:690
+#, c-format
+msgid "%s: Can't link from %s to %s: %s\n"
+msgstr "%s: no s’ha pogut crear un enllaç des de «%s» cap a «%s»: %s\n"
 
-#: elf/dl-open.c:111
-msgid "cannot extend global scope"
-msgstr "no s'ha pogut estendre l'àmbit global"
+#: timezone/zic.c:762 timezone/zic.c:764
+msgid "same rule name in multiple files"
+msgstr "el mateix nom de regla és repetit a diversos fitxers"
 
-#: elf/dl-open.c:214
-msgid "empty dynamic string token substitution"
-msgstr "la substitució del component cadena dinàmica és buida"
+#: timezone/zic.c:805
+msgid "unruly zone"
+msgstr "la zona no té regles"
 
-#: elf/dl-open.c:361 elf/dl-open.c:372
-msgid "cannot create scope list"
-msgstr "no s'ha pogut crear la llista d'àmbits"
+#: timezone/zic.c:812
+#, c-format
+msgid "%s in ruleless zone"
+msgstr "«%s» en una zona sense regles"
 
-#: elf/dl-open.c:434
-msgid "cannot create TLS data structures"
-msgstr "no s'han pogut crear les estructures de dades TLS"
+#: timezone/zic.c:833
+msgid "standard input"
+msgstr "entrada estàndard"
 
-#: elf/dl-open.c:496
-msgid "invalid mode for dlopen()"
-msgstr "el mode de dlopen() no és vàlid"
+#: timezone/zic.c:838
+#, c-format
+msgid "%s: Can't open %s: %s\n"
+msgstr "%s: no s’ha pogut obrir «%s»: %s\n"
 
-#: elf/dl-reloc.c:57
-msgid "cannot allocate memory in static TLS block"
-msgstr "no s'ha pogut reservar memòria en el bloc TLS estàtic"
+#: timezone/zic.c:849
+msgid "line too long"
+msgstr "la línia és massa llarga"
 
-#: elf/dl-reloc.c:176
-msgid "cannot make segment writable for relocation"
-msgstr "no s'ha pogut fer escrivible el segment per a reubicar-lo"
+#: timezone/zic.c:869
+msgid "input line of unknown type"
+msgstr "la línia introduïda pertany a un tipus desconegut"
 
-# ivb (2002/10/21)
-# ivb  PLT = Procedure Linkage Table, Taula d'Enllaçat de Procediments
-# ivb  PLTREL = tipus de reubicació usada per la PLT
-#: elf/dl-reloc.c:277
+#: timezone/zic.c:885
 #, c-format
-msgid "%s: profiler found no PLTREL in object %s\n"
-msgstr "%s: el perfilador no ha trobat el PLTREL de l'objecte «%s»\n"
+msgid "%s: Leap line in non leap seconds file %s\n"
+msgstr "%s: línia «Leap» en fitxer no de segons intercalars «%s»\n"
 
-# ivb (2002/10/29)
-# ivb  Açò és un cacau, però pense que ací hauria de posar PLT i no PLTREL.
-# ivb  Total, qui ho va a llegir?
-#: elf/dl-reloc.c:289
+#: timezone/zic.c:892 timezone/zic.c:1329 timezone/zic.c:1351
 #, c-format
-msgid "%s: profiler out of memory shadowing PLTREL of %s\n"
-msgstr "%s: el perfilador ha exhaurit la memòria en calcular el PLTREL de «%s»\n"
-
-#: elf/dl-reloc.c:304
-msgid "cannot restore segment prot after reloc"
-msgstr "no s'ha pogut restaurar la protecció del segment després de reubicar-lo"
-
-#: elf/dl-sym.c:74 elf/dl-sym.c:145
-msgid "RTLD_NEXT used in code not dynamically loaded"
-msgstr "s'ha usat RTLD_NEXT en un codi no carregat dinàmicament"
-
-#: elf/dl-version.c:303
-msgid "cannot allocate version reference table"
-msgstr "no s'ha pogut reservar la taula de referències de versions"
-
-# Més ajudes.  ivb
-#: elf/ldconfig.c:122
-msgid "Print cache"
-msgstr "Mostra la memòria cau."
-
-#: elf/ldconfig.c:123
-msgid "Generate verbose messages"
-msgstr "Genera missatges detallats."
+msgid "%s: panic: Invalid l_value %d\n"
+msgstr "%s: pànic: el valor esquerre %d no és vàlid\n"
 
-#: elf/ldconfig.c:124
-msgid "Don't build cache"
-msgstr "No construeix la memòria cau."
+#: timezone/zic.c:900
+#, c-format
+msgid "%s: Error reading %s\n"
+msgstr "%s: error en llegir «%s»\n"
 
-#: elf/ldconfig.c:125
-msgid "Don't generate links"
-msgstr "No genera enllaços."
+#: timezone/zic.c:907
+#, c-format
+msgid "%s: Error closing %s: %s\n"
+msgstr "%s: error en tancar «%s»: %s\n"
 
-#: elf/ldconfig.c:126
-msgid "Change to and use ROOT as root directory"
-msgstr "Canvia a i usa ARREL com a directori arrel."
+#: timezone/zic.c:912
+msgid "expected continuation line not found"
+msgstr "cal una línia de continuació, però se’n troba cap"
 
-#: elf/ldconfig.c:127
-msgid "Use CACHE as cache file"
-msgstr "Usa CACHE com a fitxer de memòria cau."
+#: timezone/zic.c:956 timezone/zic.c:2489 timezone/zic.c:2508
+msgid "time overflow"
+msgstr "desbordament de l’hora"
 
-#: elf/ldconfig.c:128
-msgid "Use CONF as configuration file"
-msgstr "Usa CONF com a fitxer de configuració."
+#: timezone/zic.c:960
+msgid "24:00 not handled by pre-1998 versions of zic"
+msgstr "les versions de «zic» anteriors a 1998 no admeten «24:00»"
 
-#: elf/ldconfig.c:129
-msgid "Only process directories specified on the command line.  Don't build cache."
-msgstr "Només processa els directoris especificats en la línia d'ordres.  No construeix la memòria cau."
+#: timezone/zic.c:963
+msgid "values over 24 hours not handled by pre-2007 versions of zic"
+msgstr "les versions de «zic» anteriors a 2007 no admeten valors majors que 24 hores"
 
-#: elf/ldconfig.c:130
-msgid "Manually link individual libraries."
-msgstr "Per a enllaçar les biblioteques manualment."
+#: timezone/zic.c:976
+msgid "wrong number of fields on Rule line"
+msgstr "el nombre de camps de la línia «Rule» és incorrecte"
 
-#: elf/ldconfig.c:131
-msgid "Format to use: new, old or compat (default)"
-msgstr "Format a usar: «new» (nou), «old» (antic) o «compat» (compatible, per defecte)."
+#: timezone/zic.c:980
+msgid "nameless rule"
+msgstr "la regla no té nom"
 
-#: elf/ldconfig.c:139
-msgid "Configure Dynamic Linker Run Time Bindings."
-msgstr "Configura els vincles en temps d'execució de l'enllaçador dinàmic."
+#: timezone/zic.c:985
+msgid "invalid saved time"
+msgstr "el temps estalviat no és vàlid"
 
-#: elf/ldconfig.c:297
-#, c-format
-msgid "Path `%s' given more than once"
-msgstr "s'ha indicat el camí «%s» més d'una volta"
+#: timezone/zic.c:1006
+msgid "wrong number of fields on Zone line"
+msgstr "el nombre de camps de la línia «Zone» no és correcte"
 
-#: elf/ldconfig.c:341
+#: timezone/zic.c:1012
 #, c-format
-msgid "%s is not a known library type"
-msgstr "«%s» no és un tipus conegut de biblioteca"
+msgid "\"Zone %s\" line and -l option are mutually exclusive"
+msgstr "la línia «Zone %s» i l’opció «-l» són mútuament excloents"
 
-#: elf/ldconfig.c:361
+#: timezone/zic.c:1020
 #, c-format
-msgid "Can't stat %s"
-msgstr "ha fallat stat() sobre «%s»"
+msgid "\"Zone %s\" line and -p option are mutually exclusive"
+msgstr "la línia «Zone %s» i l’opció «-p» són mútuament excloents"
 
-#: elf/ldconfig.c:431
+#: timezone/zic.c:1032
 #, c-format
-msgid "Can't stat %s\n"
-msgstr "ha fallat stat() sobre «%s»\n"
+msgid "duplicate zone name %s (file \"%s\", line %d)"
+msgstr "el nom de zona «%s» (fitxer «%s», línia %d) és duplicat"
 
-#: elf/ldconfig.c:441
-#, c-format
-msgid "%s is not a symbolic link\n"
-msgstr "«%s» no és un enllaç simbòlic\n"
+#: timezone/zic.c:1048
+msgid "wrong number of fields on Zone continuation line"
+msgstr "el nombre de camps de la línia de continuació de «Zone» no és correcte"
 
-#: elf/ldconfig.c:460
-#, c-format
-msgid "Can't unlink %s"
-msgstr "no s'ha pogut desenllaçar «%s»"
+#: timezone/zic.c:1088
+msgid "invalid UTC offset"
+msgstr "el desplaçament d’UTC no és vàlid"
 
-#: elf/ldconfig.c:466
-#, c-format
-msgid "Can't link %s to %s"
-msgstr "no s'ha pogut crear un enllaç des de «%s» cap a «%s»"
+#: timezone/zic.c:1091
+msgid "invalid abbreviation format"
+msgstr "el format de l’abreviatura no és vàlid"
 
-# ivb (2001/10/28)
-# ivb  Es refereix a un enllaç -> masculí.
-#: elf/ldconfig.c:472
-msgid " (changed)\n"
-msgstr " (canviat)\n"
+#: timezone/zic.c:1120
+msgid "Zone continuation line end time is not after end time of previous line"
+msgstr "el temps final de la línia de continuació de «Zone» no ve darrere del temps final de la línia anterior"
 
-# ivb (2001/10/28)
-# ivb  Es refereix a fer o no l'enllaç, no importa el gènere.
-#: elf/ldconfig.c:474
-msgid " (SKIPPED)\n"
-msgstr " (SALTAT)\n"
+#: timezone/zic.c:1148
+msgid "wrong number of fields on Leap line"
+msgstr "el nombre de camps de la línia «Leap» no és correcte"
 
-#: elf/ldconfig.c:529
-#, c-format
-msgid "Can't find %s"
-msgstr "no s'ha pogut trobar «%s»"
+#: timezone/zic.c:1157
+msgid "invalid leaping year"
+msgstr "l’any bixest no és vàlid"
 
-#: elf/ldconfig.c:545
-#, c-format
-msgid "Can't lstat %s"
-msgstr "ha fallat lstat() sobre «%s»"
+#: timezone/zic.c:1177 timezone/zic.c:1283
+msgid "invalid month name"
+msgstr "el nom del mes no és vàlid"
 
-#: elf/ldconfig.c:552
-#, c-format
-msgid "Ignored file %s since it is not a regular file."
-msgstr "es descarta el fitxer «%s» que no és un fitxer ordinari"
+#: timezone/zic.c:1190 timezone/zic.c:1396 timezone/zic.c:1410
+msgid "invalid day of month"
+msgstr "el dia del mes no és vàlid"
 
-#: elf/ldconfig.c:560
-#, c-format
-msgid "No link created since soname could not be found for %s"
-msgstr "no s'ha creat l'enllaç perquè no s'ha trobat el nom d'objecte compartit de «%s»"
+#: timezone/zic.c:1195
+msgid "time before zero"
+msgstr "l’hora és anterior a zero"
 
-#: elf/ldconfig.c:651
-#, c-format
-msgid "Can't open directory %s"
-msgstr "no s'ha pogut obrir el directori «%s»"
+#: timezone/zic.c:1199
+msgid "time too small"
+msgstr "l’hora és massa menuda"
 
-#: elf/ldconfig.c:706 elf/ldconfig.c:753
-#, c-format
-msgid "Cannot lstat %s"
-msgstr "ha fallat lstat() sobre «%s»"
+#: timezone/zic.c:1203
+msgid "time too large"
+msgstr "l’hora és massa gran"
 
-#: elf/ldconfig.c:718
-#, c-format
-msgid "Cannot stat %s"
-msgstr "ha fallat stat() sobre «%s»"
+#: timezone/zic.c:1207 timezone/zic.c:1312
+msgid "invalid time of day"
+msgstr "l’hora del dia no és vàlida"
 
-#: elf/ldconfig.c:775 elf/readlib.c:92
-#, c-format
-msgid "Input file %s not found.\n"
-msgstr "no s'ha trobat el fitxer d'entrada «%s»\n"
+#: timezone/zic.c:1226
+msgid "illegal CORRECTION field on Leap line"
+msgstr "el camp de correcció de la línia de «Leap» no és vàlid"
 
-#: elf/ldconfig.c:826
-#, c-format
-msgid "libc5 library %s in wrong directory"
-msgstr "la biblioteca «%s» per a libc5 es troba en un directori incorrecte"
+#: timezone/zic.c:1231
+msgid "illegal Rolling/Stationary field on Leap line"
+msgstr "el camp «Rolling/Stationary» de la línia «Leap» no és vàlid"
 
-#: elf/ldconfig.c:829
-#, c-format
-msgid "libc6 library %s in wrong directory"
-msgstr "la biblioteca «%s» per a libc6 es troba en un directori incorrecte"
+#: timezone/zic.c:1247
+msgid "wrong number of fields on Link line"
+msgstr "el nombre de camps de la línia «Link» no és correcte"
 
-#: elf/ldconfig.c:832
-#, c-format
-msgid "libc4 library %s in wrong directory"
-msgstr "la biblioteca «%s» per a libc4 es troba en un directori incorrecte"
+# El nom del camp no és una paraula clau del fitxer.  ivb
+#: timezone/zic.c:1251
+msgid "blank FROM field on Link line"
+msgstr "el camp d’inici de la línia «Link» és buit"
 
-#: elf/ldconfig.c:859
-#, c-format
-msgid "libraries %s and %s in directory %s have same soname but different type."
-msgstr "les biblioteques «%s» i «%s» del directori «%s» tenen el mateix nom d'objecte compartit però diferent tipus."
+# El nom del camp no és una paraula clau del fitxer.  ivb
+#: timezone/zic.c:1255
+msgid "blank TO field on Link line"
+msgstr "el camp d’acabament de la línia «Link» és buit"
 
-#: elf/ldconfig.c:962
-#, c-format
-msgid "Can't open configuration file %s"
-msgstr "no s'ha pogut obrir el fitxer «%s» de configuració"
+#: timezone/zic.c:1333
+msgid "invalid starting year"
+msgstr "l’any de començament no és vàlid"
 
-#: elf/ldconfig.c:1033
-#, c-format
-msgid "relative path `%s' used to build cache"
-msgstr "s'ha indicat el camí relatiu «%s» per a construir la memòria cau"
+#: timezone/zic.c:1355
+msgid "invalid ending year"
+msgstr "l’any d’acabament no és vàlid"
 
-#: elf/ldconfig.c:1057
-msgid "Can't chdir to /"
-msgstr "no s'ha pogut canviar al directori arrel"
+#: timezone/zic.c:1359
+msgid "starting year greater than ending year"
+msgstr "l’any de començament és major que el d’acabament"
 
-#: elf/ldconfig.c:1099
-#, c-format
-msgid "Can't open cache file directory %s\n"
-msgstr "no s'ha pogut obrir el directori «%s» de fitxers de memòria cau\n"
+#: timezone/zic.c:1366
+msgid "typed single year"
+msgstr "s’ha especificat un sol any"
 
-#: elf/readlib.c:98
-#, c-format
-msgid "Cannot fstat file %s.\n"
-msgstr "ha fallat fstat() sobre el fitxer «%s»\n"
+#: timezone/zic.c:1401
+msgid "invalid weekday name"
+msgstr "el nom del dia de la setmana no és vàlid"
 
-#: elf/readlib.c:108
+#: timezone/zic.c:1579
 #, c-format
-msgid "File %s is too small, not checked."
-msgstr "el fitxer «%s» és massa menut, no es comprova"
+msgid "%s: Can't remove %s: %s\n"
+msgstr "%s: no s’ha pogut eliminar «%s»: %s\n"
 
-#: elf/readlib.c:117
+#: timezone/zic.c:1589
 #, c-format
-msgid "Cannot mmap file %s.\n"
-msgstr "ha fallat mmap() sobre el fitxer «%s»\n"
+msgid "%s: Can't create %s: %s\n"
+msgstr "%s: no s’ha pogut crear «%s»: %s\n"
 
-#: elf/readlib.c:155
+#: timezone/zic.c:1739
 #, c-format
-msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
-msgstr "«%s» no és un fitxer ELF - els octets màgics del començament no són correctes\n"
+msgid "%s: Error writing %s\n"
+msgstr "%s: error en escriure «%s»\n"
 
-# Més ajudes.  ivb
-#: elf/sprof.c:72
-msgid "Output selection:"
-msgstr "Selecció de l'eixida:"
+#: timezone/zic.c:2031
+msgid "no POSIX environment variable for zone"
+msgstr "no s’ha establert una variable d’entorn POSIX per a la zona"
 
-#: elf/sprof.c:74
-msgid "print list of count paths and their number of use"
-msgstr "Mostra una llista de camins de recompte i les voltes que han estat usats."
+#: timezone/zic.c:2185
+msgid "can't determine time zone abbreviation to use just after until time"
+msgstr "no s’ha pogut determinar l’abreviatura de zona horària a emprar just després de la data límit (until)"
 
-#: elf/sprof.c:76
-msgid "generate flat profile with counts and ticks"
-msgstr "Genera un perfil pla amb recomptes i unitats de temps."
+#: timezone/zic.c:2231
+msgid "too many transitions?!"
+msgstr "hi ha massa transicions?!"
 
-#: elf/sprof.c:77
-msgid "generate call graph"
-msgstr "Genera un gràfic de crides."
+#: timezone/zic.c:2250
+msgid "internal error - addtype called with bad isdst"
+msgstr "error intern: s’ha cridat addtype() amb un valor erroni per a «isdst»"
 
-#: elf/sprof.c:84
-msgid "Read and display shared object profiling data"
-msgstr "Llig i mostra les dades de perfilat d'un objecte compartit."
+#: timezone/zic.c:2254
+msgid "internal error - addtype called with bad ttisstd"
+msgstr "error intern: s’ha cridat addtype() amb un valor erroni per a «ttisstd»"
 
-#: elf/sprof.c:87
-msgid "SHOBJ [PROFDATA]"
-msgstr "OBJECTE_COMPARTIT [DADES_PERFILAT]"
+#: timezone/zic.c:2258
+msgid "internal error - addtype called with bad ttisgmt"
+msgstr "error intern: s’ha cridat addtype() amb un valor erroni per a «ttisgmt»"
 
-#: elf/sprof.c:398
-#, c-format
-msgid "failed to load shared object `%s'"
-msgstr "no s'ha pogut carregar l'objecte compartit «%s»"
+#: timezone/zic.c:2277
+msgid "too many local time types"
+msgstr "hi ha massa tipus d’hora local"
 
-#: elf/sprof.c:407
-msgid "cannot create internal descriptors"
-msgstr "no s'han pogut crear els descriptors interns"
+#: timezone/zic.c:2281
+msgid "UTC offset out of range"
+msgstr "el desplaçament respecte UTC és fora de rang"
 
-#: elf/sprof.c:526
-#, c-format
-msgid "Reopening shared object `%s' failed"
-msgstr "no s'ha pogut reobrir l'objecte compartit «%s»"
+#: timezone/zic.c:2309
+msgid "too many leap seconds"
+msgstr "hi ha massa segons intercalars"
 
-#: elf/sprof.c:534
-msgid "mapping of section headers failed"
-msgstr "no s'han pogut mapar les capçaleres de secció"
+#: timezone/zic.c:2315
+msgid "repeated leap second moment"
+msgstr "el moment de segon intercalar és repetit"
 
-#: elf/sprof.c:544
-msgid "mapping of section header string table failed"
-msgstr "no s'ha pogut mapar la taula de cadenes de capçalera de secció"
+#: timezone/zic.c:2367
+msgid "Wild result from command execution"
+msgstr "l’execució de l’ordre ha donat un resultat estrany"
 
-#: elf/sprof.c:564
+#: timezone/zic.c:2368
 #, c-format
-msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
-msgstr "*** El fitxer «%s» no conté símbols: no és possible l'anàlisi detallada\n"
+msgid "%s: command was '%s', result was %d\n"
+msgstr "%s: l’ordre ha estat «%s», el resultat ha estat %d\n"
 
-#: elf/sprof.c:594
-msgid "failed to load symbol data"
-msgstr "no s'han pogut carregar les dades simbòliques"
+# ivb (2001/10/30)
+# ivb  Es refereix a les cometes dobles «"».
+#: timezone/zic.c:2466
+msgid "Odd number of quotation marks"
+msgstr "el nombre de cometes és senar"
 
-#: elf/sprof.c:664
-msgid "cannot load profiling data"
-msgstr "no s'han pogut carregar les dades de perfilat"
+#: timezone/zic.c:2555
+msgid "use of 2/29 in non leap-year"
+msgstr "s’ha emprat el dia 29 de febrer en un any no bixest"
 
-#: elf/sprof.c:673
-msgid "while stat'ing profiling data file"
-msgstr "en cridar stat() sobre el fitxer de dades de perfilat"
+#: timezone/zic.c:2590
+msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic"
+msgstr "la regla va més enllà de l’inici o fi del mes; no funcionarà en les versions de «zic» anteriors a 2004"
 
-#: elf/sprof.c:681
-#, c-format
-msgid "profiling data file `%s' does not match shared object `%s'"
-msgstr "el fitxer «%s» de dades de perfilat no correspon a l'objecte compartit «%s»"
+#: timezone/zic.c:2622
+msgid "time zone abbreviation lacks alphabetic at start"
+msgstr "l’abreviatura de la zona horària no comença per un caràcter alfabètic"
 
-#: elf/sprof.c:692
-msgid "failed to mmap the profiling data file"
-msgstr "ha fallat mmap() sobre el fitxer de dades de perfilat"
+#: timezone/zic.c:2624
+msgid "time zone abbreviation has more than 3 alphabetics"
+msgstr "l’abreviatura de la zona horària té més de 3 caràcters alfabètics"
 
-#: elf/sprof.c:700
-msgid "error while closing the profiling data file"
-msgstr "error en tancar el fitxer de dades de perfilat"
+#: timezone/zic.c:2626
+msgid "time zone abbreviation has too many alphabetics"
+msgstr "l’abreviatura de la zona horària té massa caràcters alfabètics"
 
-#: elf/sprof.c:709 elf/sprof.c:779
-msgid "cannot create internal descriptor"
-msgstr "no s'ha pogut crear un descriptor intern"
+#: timezone/zic.c:2636
+msgid "time zone abbreviation differs from POSIX standard"
+msgstr "l’abreviatura de la zona horària difereix de l’estàndard POSIX"
 
-#: elf/sprof.c:755
+#: timezone/zic.c:2648
+msgid "too many, or too long, time zone abbreviations"
+msgstr "hi ha massa abreviatures de zona horària (o són massa llargues)"
+
+#: timezone/zic.c:2689
 #, c-format
-msgid "`%s' is no correct profile data file for `%s'"
-msgstr "«%s» no és un fitxer vàlid de perfilat de «%s»"
+msgid "%s: Can't create directory %s: %s\n"
+msgstr "%s: no s’ha pogut crear el directori «%s»: %s\n"
 
-#: elf/sprof.c:936 elf/sprof.c:988
-msgid "cannot allocate symbol data"
-msgstr "no s'han pogut reservar les dades de símbols"
+# ivb (2001/10/28)
+# ivb  Resulta d'assignar un «int» a un «long».
+#: timezone/zic.c:2711
+#, c-format
+msgid "%s: %d did not sign extend correctly\n"
+msgstr "%s: el signe de %d no s’ha estès correctament\n"
diff --git a/po/cs.po b/po/cs.po
index c75e0b3f45..cd34a0349b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,9 +21,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.6.1\n"
-"POT-Creation-Date: 2007-08-04 11:37+0200\n"
-"PO-Revision-Date: 2007-08-29 22:15+0200\n"
+"Project-Id-Version: libc 2.7\n"
+"POT-Creation-Date: 2007-10-15 21:18-0700\n"
+"PO-Revision-Date: 2007-11-13 21:35+0100\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -152,7 +152,7 @@ msgstr ""
 "-o VÃSTUPNÃ_SOUBOR [VSTUPNÃ_SOUBOR]…\n"
 "[ VÃSTUPNÃ_SOUBOR [VSTUPNÃ_SOUBOR]…]"
 
-#: catgets/gencat.c:232 debug/pcprofiledump.c:199 iconv/iconv_prog.c:411
+#: catgets/gencat.c:232 debug/pcprofiledump.c:204 iconv/iconv_prog.c:411
 #: iconv/iconvconfig.c:380 locale/programs/localedef.c:371
 #: login/programs/pt_chown.c:88 malloc/memusagestat.c:526 nss/makedb.c:231
 msgid ""
@@ -162,7 +162,7 @@ msgstr ""
 "Rady, jak nahlásit chybu, naleznete na:\n"
 "<http://www.gnu.org/software/libc/bugs.html>.\n"
 
-#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:287
+#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:296
 #: elf/ldd.bash.in:39 elf/sprof.c:355 iconv/iconv_prog.c:426
 #: iconv/iconvconfig.c:395 locale/programs/locale.c:275
 #: locale/programs/localedef.c:387 login/programs/pt_chown.c:59
@@ -179,7 +179,7 @@ msgstr ""
 "naleznete ve zdrojových textech. Toto programové vybavení je zcela BEZ ZÃRUKY,\n"
 "a to i bez záruky PRODEJNOSTI nebo VHODNOSTI PRO NĚJAKà KONKRÉTNà ÚČEL.\n"
 
-#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:292 elf/sprof.c:361
+#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:301 elf/sprof.c:361
 #: iconv/iconv_prog.c:431 iconv/iconvconfig.c:400 locale/programs/locale.c:280
 #: locale/programs/localedef.c:392 malloc/memusage.sh:75 nscd/nscd.c:411
 #: nss/getent.c:88 nss/makedb.c:250 posix/getconf.c:1017
@@ -271,29 +271,29 @@ msgstr "převodní modul není dostupný"
 msgid "cannot determine escape character"
 msgstr "nelze urÄit escapovací znak"
 
-#: debug/pcprofiledump.c:52
+#: debug/pcprofiledump.c:53
 msgid "Don't buffer output"
 msgstr "Nebufferovat výstup"
 
-#: debug/pcprofiledump.c:57
+#: debug/pcprofiledump.c:58
 msgid "Dump information generated by PC profiling."
 msgstr "Vypíše informace získané při profilování přes PC."
 
-#: debug/pcprofiledump.c:60
+#: debug/pcprofiledump.c:61
 msgid "[FILE]"
 msgstr "[SOUBOR]"
 
-#: debug/pcprofiledump.c:100
+#: debug/pcprofiledump.c:104
 #, c-format
 msgid "cannot open input file"
 msgstr "vstupní soubor nelze otevřít"
 
-#: debug/pcprofiledump.c:106
+#: debug/pcprofiledump.c:111
 #, c-format
 msgid "cannot read header"
 msgstr "hlaviÄku nelze pÅ™eÄíst"
 
-#: debug/pcprofiledump.c:170
+#: debug/pcprofiledump.c:175
 #, c-format
 msgid "invalid pointer size"
 msgstr "neplatná velikost ukazatele"
@@ -379,60 +379,55 @@ msgstr "neplatný režim"
 msgid "invalid mode parameter"
 msgstr "neplatný parametr režimu"
 
-#: elf/cache.c:68
+#: elf/cache.c:69
 msgid "unknown"
 msgstr "neznámý"
 
-#: elf/cache.c:111
+#: elf/cache.c:112
 msgid "Unknown OS"
 msgstr "Neznámý OS"
 
-#: elf/cache.c:116
+#: elf/cache.c:117
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", ABI OS: %s %d.%d.%d"
 
-#: elf/cache.c:142 elf/ldconfig.c:1236
+#: elf/cache.c:134 elf/ldconfig.c:1270
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "Soubor s keší %s nelze otevřít\n"
 
-#: elf/cache.c:154
+#: elf/cache.c:148
 #, c-format
 msgid "mmap of cache file failed.\n"
 msgstr "mmap na souboru s keší selhala.\n"
 
-#: elf/cache.c:158 elf/cache.c:168
+#: elf/cache.c:152 elf/cache.c:166
 #, c-format
 msgid "File is not a cache file.\n"
 msgstr "Soubor neobsahuje keš.\n"
 
-#: elf/cache.c:201 elf/cache.c:211
+#: elf/cache.c:199 elf/cache.c:209
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "V keši „%2$s“ nalezeno knihoven: %1$d\n"
 
-#: elf/cache.c:410
-#, c-format
-msgid "Can't remove old temporary cache file %s"
-msgstr "Starý doÄasný soubor s keší „%s“ nelze odstranit"
-
-#: elf/cache.c:417
+#: elf/cache.c:403
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "Nelze vytvoÅ™it doÄasný soubor s keší %s"
 
-#: elf/cache.c:425 elf/cache.c:435 elf/cache.c:439 elf/cache.c:443
+#: elf/cache.c:411 elf/cache.c:421 elf/cache.c:425 elf/cache.c:430
 #, c-format
 msgid "Writing of cache data failed"
 msgstr "Zápis kešovaných dat selhal"
 
-#: elf/cache.c:450
+#: elf/cache.c:435
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "Změna přístupových práv k %s na %#o se nezdařila"
 
-#: elf/cache.c:455
+#: elf/cache.c:440
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "Přejmenování z %s na %s selhalo"
@@ -445,28 +440,28 @@ msgstr "seznam rozsahů nelze vytvořit"
 msgid "shared object not open"
 msgstr "sdílený objekt není otevřen"
 
-#: elf/dl-deps.c:112
+#: elf/dl-deps.c:114
 msgid "DST not allowed in SUID/SGID programs"
 msgstr "V SUID/SGID programech není DST povoleno"
 
-#: elf/dl-deps.c:125 elf/dl-open.c:282
+#: elf/dl-deps.c:127 elf/dl-open.c:282
 msgid "empty dynamic string token substitution"
 msgstr "prázdné nahrazená dynamického řetězcového dílku (DST)"
 
-#: elf/dl-deps.c:131
+#: elf/dl-deps.c:133
 #, c-format
 msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
 msgstr "pomocnou „%s“ nelze naÄíst kvůli prázdnému nahrazení dynamických Å™etÄ›zcových dílků\n"
 
-#: elf/dl-deps.c:472
+#: elf/dl-deps.c:474
 msgid "cannot allocate dependency list"
 msgstr "dynamický seznam nelze alokovat"
 
-#: elf/dl-deps.c:505 elf/dl-deps.c:560
+#: elf/dl-deps.c:510 elf/dl-deps.c:565
 msgid "cannot allocate symbol search list"
 msgstr "seznam pro vyhledávání symbolů nelze alokovat"
 
-#: elf/dl-deps.c:545
+#: elf/dl-deps.c:550
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr "Filtry s LD_TRACE_PRELINKING nejsou podporovány"
 
@@ -643,11 +638,11 @@ msgstr "chybná třída ELF: ELFCLASS32"
 msgid "cannot open shared object file"
 msgstr "sdílený objektový soubor nelze otevřít"
 
-#: elf/dl-lookup.c:261
+#: elf/dl-lookup.c:356
 msgid "relocation error"
 msgstr "chyba při přemisťování"
 
-#: elf/dl-lookup.c:289
+#: elf/dl-lookup.c:384
 msgid "symbol lookup error"
 msgstr "chyba při vyhledávání symbolu"
 
@@ -697,11 +692,11 @@ msgstr "segment prot nelze po reloc obnovit"
 msgid "cannot apply additional memory protection after relocation"
 msgstr "po pÅ™emístÄ›ní nelze nelze uplatnit dodateÄnou ochranu pamÄ›ti"
 
-#: elf/dl-sym.c:161
+#: elf/dl-sym.c:162
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "RTLD_NEXT je použito pro kód, který není dynamicky zaveden"
 
-#: elf/dl-sysdep.c:474 elf/dl-sysdep.c:486
+#: elf/dl-sysdep.c:469 elf/dl-sysdep.c:481
 msgid "cannot create capability list"
 msgstr "nelze vytvořit seznam kvalifikací"
 
@@ -713,216 +708,220 @@ msgstr "datové struktury TLS nelze vytvořit"
 msgid "cannot allocate version reference table"
 msgstr "tabulku odkazů na verze nelze alokovat"
 
-#: elf/ldconfig.c:135
+#: elf/ldconfig.c:138
 msgid "Print cache"
 msgstr "Vypsat keš"
 
-#: elf/ldconfig.c:136
+#: elf/ldconfig.c:139
 msgid "Generate verbose messages"
 msgstr "Vypisuje podrobné zprávy"
 
-#: elf/ldconfig.c:137
+#: elf/ldconfig.c:140
 msgid "Don't build cache"
 msgstr "Nevybuduje keš"
 
-#: elf/ldconfig.c:138
+#: elf/ldconfig.c:141
 msgid "Don't generate links"
 msgstr "Nevygeneruje odkazy"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "Change to and use ROOT as root directory"
 msgstr "Přepne se do a použije KOŘEN jako kořenový adresář"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "ROOT"
 msgstr "KOŘEN"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "CACHE"
 msgstr "KEÅ "
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "Use CACHE as cache file"
 msgstr "Použije KEŠ jako soubor s keší"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "CONF"
 msgstr "KONFIG"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "Use CONF as configuration file"
 msgstr "Použije KONFIG jako konfiguraÄní soubor"
 
-#: elf/ldconfig.c:142
+#: elf/ldconfig.c:145
 msgid "Only process directories specified on the command line.  Don't build cache."
 msgstr "Zpracuje jen adresáře uvedené na příkazovém řádku. Nevybuduje keš."
 
-#: elf/ldconfig.c:143
+#: elf/ldconfig.c:146
 msgid "Manually link individual libraries."
 msgstr "RuÄnÄ› odkazuje jednotlivé knihovny."
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "FORMAT"
 msgstr "FORMÃT"
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "Format to use: new, old or compat (default)"
 msgstr "Který formát použije: „new“ (nový), „old“ (starý) nebo „compat“ (kompatibilní)"
 
-#: elf/ldconfig.c:152
+#: elf/ldconfig.c:148
+msgid "Ignore auxiliary cache file"
+msgstr "Ignoruje pomocné soubory s keší"
+
+#: elf/ldconfig.c:156
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr "Nastaví vazby dynamického linkeru pro dobu běhu"
 
-#: elf/ldconfig.c:310
+#: elf/ldconfig.c:319
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "Cesta „%s“ zadána více krát"
 
-#: elf/ldconfig.c:350
+#: elf/ldconfig.c:359
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s není knihovna známého typu"
 
-#: elf/ldconfig.c:375
+#: elf/ldconfig.c:384
 #, c-format
 msgid "Can't stat %s"
 msgstr "Nelze získat informace o %s"
 
-#: elf/ldconfig.c:449
+#: elf/ldconfig.c:458
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "Nelze získat informace o %s\n"
 
-#: elf/ldconfig.c:459
+#: elf/ldconfig.c:468
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s není symbolický odkaz\n"
 
-#: elf/ldconfig.c:478
+#: elf/ldconfig.c:487
 #, c-format
 msgid "Can't unlink %s"
 msgstr "Nelze smazat odkaz na %s"
 
-#: elf/ldconfig.c:484
+#: elf/ldconfig.c:493
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "Odkaz na %2$s z %1$s nelze vytvořit"
 
-#: elf/ldconfig.c:490
+#: elf/ldconfig.c:499
 msgid " (changed)\n"
 msgstr " (změněno)\n"
 
-#: elf/ldconfig.c:492
+#: elf/ldconfig.c:501
 msgid " (SKIPPED)\n"
 msgstr " (PŘESKOČENO)\n"
 
-#: elf/ldconfig.c:547
+#: elf/ldconfig.c:556
 #, c-format
 msgid "Can't find %s"
 msgstr "%s nezle nalézt"
 
-#: elf/ldconfig.c:563 elf/ldconfig.c:737 elf/ldconfig.c:784
+#: elf/ldconfig.c:572 elf/ldconfig.c:745 elf/ldconfig.c:793 elf/ldconfig.c:827
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "Informace o symbolickém odkazu %s nelze získat"
 
-#: elf/ldconfig.c:570
+#: elf/ldconfig.c:579
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "Soubor %s ignorován, neb se nejedná o obyÄejný soubor."
 
-#: elf/ldconfig.c:578
+#: elf/ldconfig.c:588
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "Protože nebyl nalezen název sdílené knihovny (soname) %s, žádný odkaz nebyl vytvořeni."
 
-#: elf/ldconfig.c:669
+#: elf/ldconfig.c:671
 #, c-format
 msgid "Can't open directory %s"
 msgstr "Adresář %s nelze otevřít"
 
-#: elf/ldconfig.c:749
+#: elf/ldconfig.c:759
 #, c-format
 msgid "Cannot stat %s"
 msgstr "Informace o %s nelze získat"
 
-#: elf/ldconfig.c:806 elf/readlib.c:91
+#: elf/ldconfig.c:814 elf/readlib.c:91
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "Vstupní soubor %s nebyl nalezen.\n"
 
-#: elf/ldconfig.c:857
+#: elf/ldconfig.c:888
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5 knihovna %s je ve špatném adresáři"
 
-#: elf/ldconfig.c:860
+#: elf/ldconfig.c:891
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc6 knihovna %s je ve špatném adresáři"
 
-#: elf/ldconfig.c:863
+#: elf/ldconfig.c:894
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4 knihovna %s je ve špatném adresáři"
 
-#: elf/ldconfig.c:890
+#: elf/ldconfig.c:922
 #, c-format
 msgid "libraries %s and %s in directory %s have same soname but different type."
 msgstr "knihovny %s a %s z adresáře %s mají stejný název (soname), ale rozdílný typ."
 
-#: elf/ldconfig.c:997
+#: elf/ldconfig.c:1031
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr "KonfiguraÄní soubor %s nelze otevřít"
 
-#: elf/ldconfig.c:1061
+#: elf/ldconfig.c:1095
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr "%s:%u: chybná syntaxe na řádku hwcap"
 
-#: elf/ldconfig.c:1067
+#: elf/ldconfig.c:1101
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
 msgstr "%s:%u: index hwcap %lu přesáhl maximum %u"
 
-#: elf/ldconfig.c:1074 elf/ldconfig.c:1082
+#: elf/ldconfig.c:1108 elf/ldconfig.c:1116
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
 msgstr "%s:%u: index hwcap %lu již definován jako %s"
 
-#: elf/ldconfig.c:1085
+#: elf/ldconfig.c:1119
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
 msgstr "%s:%u: duplicitní hwcap %lu %s"
 
-#: elf/ldconfig.c:1107
+#: elf/ldconfig.c:1141
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr "PÅ™i použití -r je tÅ™eba zadat absolutní jméno konfiguraÄního souboru"
 
-#: elf/ldconfig.c:1114 locale/programs/xmalloc.c:70 malloc/obstack.c:434
+#: elf/ldconfig.c:1148 locale/programs/xmalloc.c:70 malloc/obstack.c:434
 #: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1163
 #, c-format
 msgid "memory exhausted"
 msgstr "paměť vyÄerpána"
 
-#: elf/ldconfig.c:1144
+#: elf/ldconfig.c:1178
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr "%s:%u: adresář %s nelze naÄíst"
 
-#: elf/ldconfig.c:1189
+#: elf/ldconfig.c:1223
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr "pro vybudování keše byla použita relativní cesta „%s“"
 
-#: elf/ldconfig.c:1215
+#: elf/ldconfig.c:1249
 #, c-format
 msgid "Can't chdir to /"
 msgstr "Nelze se přepnout do adresáře /"
 
-#: elf/ldconfig.c:1257
+#: elf/ldconfig.c:1291
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "Adresář %s se soubory keší nelze otevřít\n"
@@ -1446,7 +1445,7 @@ msgstr "Neznámé klíÄové slovo v .netrc: %s"
 msgid "Character out of range for UTF-8"
 msgstr "Znak mimo povolený rozsah UTF-8"
 
-#: locale/programs/charmap-dir.c:58
+#: locale/programs/charmap-dir.c:59
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "adresář „%s“ znakových sad nelze naÄíst"
@@ -1472,7 +1471,7 @@ msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max> musí být větší než <mb_cur_min>\n"
 
 #: locale/programs/charmap.c:357 locale/programs/charmap.c:374
-#: locale/programs/repertoire.c:175
+#: locale/programs/repertoire.c:174
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "syntaktická chyba v prologu: %s"
@@ -1482,7 +1481,7 @@ msgid "invalid definition"
 msgstr "chybná definice"
 
 #: locale/programs/charmap.c:375 locale/programs/locfile.c:126
-#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
+#: locale/programs/locfile.c:153 locale/programs/repertoire.c:175
 msgid "bad argument"
 msgstr "chybný argument"
 
@@ -1501,7 +1500,7 @@ msgstr "hodnota pro <%s> musí být 1 nebo větší"
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "hodnota <%s> musí být větší nebo rovna hodnotě <%s>"
 
-#: locale/programs/charmap.c:445 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "argument pro <%s> musí být jednoznakový"
@@ -1519,7 +1518,7 @@ msgid "syntax error in %s definition: %s"
 msgstr "syntaktická chyba v definici %s: %s"
 
 #: locale/programs/charmap.c:499 locale/programs/charmap.c:679
-#: locale/programs/charmap.c:775 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
 msgid "no symbolic name given"
 msgstr "žádné symbolické jméno nebylo zadáno"
 
@@ -1536,19 +1535,19 @@ msgid "too many bytes in character encoding"
 msgstr "v kódu znaku je příliš mnoho bajtů"
 
 #: locale/programs/charmap.c:586 locale/programs/charmap.c:734
-#: locale/programs/charmap.c:817 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296
 msgid "no symbolic name given for end of range"
 msgstr "žádné symbolické jméno nebylo pro konec rozsahu zadáno"
 
 #: locale/programs/charmap.c:610 locale/programs/ld-address.c:600
-#: locale/programs/ld-collate.c:2677 locale/programs/ld-collate.c:3828
+#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3924
 #: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984
 #: locale/programs/ld-identification.c:452
 #: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
 #: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307
 #: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241
 #: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221
-#: 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: definice nekonÄí na „END %1$s“"
@@ -1568,14 +1567,14 @@ msgid "%s: error in state machine"
 msgstr "%s: chyba ve stavovém automatu"
 
 #: locale/programs/charmap.c:850 locale/programs/ld-address.c:616
-#: locale/programs/ld-collate.c:2674 locale/programs/ld-collate.c:3844
+#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4115
 #: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001
 #: locale/programs/ld-identification.c:468
 #: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
 #: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323
 #: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257
 #: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237
-#: locale/programs/locfile.c:826 locale/programs/repertoire.c:325
+#: locale/programs/locfile.c:826 locale/programs/repertoire.c:324
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s: pÅ™edÄasný konec souboru"
@@ -1590,21 +1589,21 @@ msgstr "neznámý znak „%s“"
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
 msgstr "poÄet bajtů sekvence pro poÄátek a konec rozsahu není stejný: %d vs. %d"
 
-#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:2957
-#: locale/programs/repertoire.c:420
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3047
+#: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr "nepovolené názvy pro rozsah znaků"
 
-#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
 msgid "hexadecimal range format should use only capital characters"
 msgstr "šestnáctkový formát rozsahu by měl používat jen velká písmena"
 
-#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:450
+#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
 msgstr "<%s> a <%s> nejsou platné názvy pro rozsah"
 
-#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:457
+#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456
 msgid "upper limit in range is smaller than lower limit"
 msgstr "horní mez rozsahu je menší než dolní mez"
 
@@ -1612,7 +1611,7 @@ msgstr "horní mez rozsahu je menší než dolní mez"
 msgid "resulting bytes for range not representable."
 msgstr "výsledné bajty rozsahu nejsou reprezentovatelné."
 
-#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1536
+#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1556
 #: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133
 #: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
@@ -1699,7 +1698,7 @@ msgstr "%s: položka „%s“ deklarována více krát"
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: neznámý znak v položce „%s“"
 
-#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3826
+#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3922
 #: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449
 #: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305
@@ -1709,12 +1708,13 @@ msgstr "%s: neznámý znak v položce „%s“"
 msgid "%s: incomplete `END' line"
 msgstr "%s: neúplný řádek „END“"
 
-#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:522
-#: locale/programs/ld-collate.c:574 locale/programs/ld-collate.c:870
-#: locale/programs/ld-collate.c:883 locale/programs/ld-collate.c:2664
-#: locale/programs/ld-collate.c:3835 locale/programs/ld-ctype.c:1960
-#: locale/programs/ld-ctype.c:2219 locale/programs/ld-ctype.c:2806
-#: locale/programs/ld-ctype.c:2992 locale/programs/ld-identification.c:459
+#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:542
+#: locale/programs/ld-collate.c:594 locale/programs/ld-collate.c:890
+#: locale/programs/ld-collate.c:903 locale/programs/ld-collate.c:2733
+#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4105
+#: locale/programs/ld-ctype.c:1960 locale/programs/ld-ctype.c:2219
+#: locale/programs/ld-ctype.c:2806 locale/programs/ld-ctype.c:2992
+#: locale/programs/ld-identification.c:459
 #: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314
 #: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248
@@ -1723,248 +1723,268 @@ msgstr "%s: neúplný řádek „END“"
 msgid "%s: syntax error"
 msgstr "%s: chyba syntaxe"
 
-#: locale/programs/ld-collate.c:397
+#: locale/programs/ld-collate.c:417
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "„%.*s“ již definováno v mapě znaků"
 
-#: locale/programs/ld-collate.c:406
+#: locale/programs/ld-collate.c:426
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "„%.*s“ již definováno v repertoáru"
 
-#: locale/programs/ld-collate.c:413
+#: locale/programs/ld-collate.c:433
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "„%.*s“ již definovaná jako řadicí symbol"
 
-#: locale/programs/ld-collate.c:420
+#: locale/programs/ld-collate.c:440
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "„%.*s“ již definováno jako řadicí prvek"
 
-#: locale/programs/ld-collate.c:451 locale/programs/ld-collate.c:477
+#: locale/programs/ld-collate.c:471 locale/programs/ld-collate.c:497
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: poÅ™adí Å™azení „forward“ (dopÅ™edné) a „backward“ (zpÄ›tné) se navzájem vyluÄují"
 
-#: locale/programs/ld-collate.c:461 locale/programs/ld-collate.c:487
-#: locale/programs/ld-collate.c:503
+#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507
+#: locale/programs/ld-collate.c:523
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: “%s“ zmíněno v definici o váze %d více krát"
 
-#: locale/programs/ld-collate.c:559
+#: locale/programs/ld-collate.c:579
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: příliš mnoho pravidel, jen první položka jich má %d"
 
-#: locale/programs/ld-collate.c:595
+#: locale/programs/ld-collate.c:615
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: nedostatek řadicích pravidel"
 
 # prázdné jméno váhy - řádek ignorován
-#: locale/programs/ld-collate.c:760
+#: locale/programs/ld-collate.c:780
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: řetězec s prázdnou váhou není povolen"
 
-#: locale/programs/ld-collate.c:855
+#: locale/programs/ld-collate.c:875
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: váhy musí používat stejný symbol výpustky jako jméno"
 
-#: locale/programs/ld-collate.c:911
+#: locale/programs/ld-collate.c:931
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: příliš mnoho hodnot"
 
-#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
+#: locale/programs/ld-collate.c:1051 locale/programs/ld-collate.c:1226
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "pořadí „%.*s“ již definováno v %s:%Zu"
 
-#: locale/programs/ld-collate.c:1081
+#: locale/programs/ld-collate.c:1101
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: poÄáteÄní a koncový symbol rozsahu musí být znakem"
 
-#: locale/programs/ld-collate.c:1108
+#: locale/programs/ld-collate.c:1128
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: sekvence bajtů prvního a posledního znaku musí mít stejnou délku"
 
-#: locale/programs/ld-collate.c:1150
+#: locale/programs/ld-collate.c:1170
 #, c-format
 msgid "%s: byte sequence of first character of range is not lower than that of the last character"
 msgstr "%s: sekvence bajtů prvního znaku z rozsahu není menší než sekvence posledního znaku"
 
-#: locale/programs/ld-collate.c:1275
+#: locale/programs/ld-collate.c:1295
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: výpustky symbolického rozsahu nesmí následovat hned za „order_start“"
 
-#: locale/programs/ld-collate.c:1279
+#: locale/programs/ld-collate.c:1299
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr "%s: výpustky symbolického rozsahu nesmí být přímo následovány „order_end“"
 
-#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1477
+#: locale/programs/ld-collate.c:1319 locale/programs/ld-ctype.c:1477
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "„%s“ a „%.*s“ nejsou platné názvy pro symbolický rozsah"
 
-#: locale/programs/ld-collate.c:1349 locale/programs/ld-collate.c:3763
+#: locale/programs/ld-collate.c:1369 locale/programs/ld-collate.c:3858
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: pořadí pro „%.*s“ již definováno v %s:%Zu"
 
-#: locale/programs/ld-collate.c:1358
+#: locale/programs/ld-collate.c:1378
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: „%s“ musí být znak"
 
-#: locale/programs/ld-collate.c:1552
+#: locale/programs/ld-collate.c:1573
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: „position“ (pozice) musí být použita pro urÄitou úrovÄ›n ve vÅ¡ech sekcích, nebo v žádných"
 
-#: locale/programs/ld-collate.c:1577
+#: locale/programs/ld-collate.c:1598
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "symbol „%s“ nedefinován"
 
-#: locale/programs/ld-collate.c:1653 locale/programs/ld-collate.c:1759
+#: locale/programs/ld-collate.c:1674 locale/programs/ld-collate.c:1780
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "symbol „%s“ má stejné kódování jako"
 
-#: locale/programs/ld-collate.c:1657 locale/programs/ld-collate.c:1763
+#: locale/programs/ld-collate.c:1678 locale/programs/ld-collate.c:1784
 #, c-format
 msgid "symbol `%s'"
 msgstr "symbol „%s“"
 
-#: locale/programs/ld-collate.c:1805
+#: locale/programs/ld-collate.c:1826
 #, c-format
 msgid "no definition of `UNDEFINED'"
 msgstr "chybí definice symbolu „UNDEFINED“"
 
-#: locale/programs/ld-collate.c:1834
+#: locale/programs/ld-collate.c:1855
 #, c-format
 msgid "too many errors; giving up"
 msgstr "příliš mnoho chyb, vzdávám to"
 
-#: locale/programs/ld-collate.c:2762
+#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4044
+#, c-format
+msgid "%s: nested conditionals not supported"
+msgstr "%s: vnořené podmínky nejsou podporovány"
+
+#: locale/programs/ld-collate.c:2677
+#, c-format
+msgid "%s: more then one 'else'"
+msgstr "%s: více jak jeden „else“"
+
+#: locale/programs/ld-collate.c:2852
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: duplicitní definice „%s“"
 
-#: locale/programs/ld-collate.c:2798
+#: locale/programs/ld-collate.c:2888
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: duplicitní deklarace sekce „%s“"
 
-#: locale/programs/ld-collate.c:2937
+#: locale/programs/ld-collate.c:3027
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: neznámý znak v názvu řadicího symbolu"
 
-#: locale/programs/ld-collate.c:3069
+#: locale/programs/ld-collate.c:3159
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: neznámý znak ve jméně definice rovnocennosti"
 
-#: locale/programs/ld-collate.c:3082
+#: locale/programs/ld-collate.c:3172
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: neznámý znak v hodnotě definice rovnocennosti"
 
-#: locale/programs/ld-collate.c:3092
+#: locale/programs/ld-collate.c:3182
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: neznámý symbol „%s“ v definici rovnocennosti"
 
-#: locale/programs/ld-collate.c:3101
+#: locale/programs/ld-collate.c:3191
 msgid "error while adding equivalent collating symbol"
 msgstr "chyba při přidávání rovnocenného řadicího symbolu"
 
-#: locale/programs/ld-collate.c:3131
+#: locale/programs/ld-collate.c:3221
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "duplicitní definice skriptu „%s“"
 
-#: locale/programs/ld-collate.c:3179
+#: locale/programs/ld-collate.c:3269
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr "%s: jméno sekce „%.*s“ není známo"
 
-#: locale/programs/ld-collate.c:3208
+#: locale/programs/ld-collate.c:3298
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: násobná definice pořadí pro sekci „%s“"
 
-#: locale/programs/ld-collate.c:3233
+#: locale/programs/ld-collate.c:3326
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: neplatné Äíslo Å™adicího pravidla"
 
-#: locale/programs/ld-collate.c:3260
+#: locale/programs/ld-collate.c:3353
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: násobná definice pořadí pro nepojmenovanou sekci"
 
-#: locale/programs/ld-collate.c:3314 locale/programs/ld-collate.c:3442
-#: locale/programs/ld-collate.c:3804
+#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537
+#: locale/programs/ld-collate.c:3900
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: chybí klíÄové slovo „order_end“"
 
-#: locale/programs/ld-collate.c:3375
+#: locale/programs/ld-collate.c:3470
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: pořadí pro řadicí symbol %.*s nebylo ještě definováno"
 
-#: locale/programs/ld-collate.c:3393
+#: locale/programs/ld-collate.c:3488
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: pořadí pro řadicí prvek %.*s nebylo ještě definováno"
 
-#: locale/programs/ld-collate.c:3404
+#: locale/programs/ld-collate.c:3499
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: po %.*s nelze změnit pořadí: symbol není znám"
 
-#: locale/programs/ld-collate.c:3456 locale/programs/ld-collate.c:3816
+#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: chybí klíÄové slovo „reorder-end“"
 
-#: locale/programs/ld-collate.c:3490 locale/programs/ld-collate.c:3688
+#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: sekce „%.*s“ není známa"
 
-#: locale/programs/ld-collate.c:3555
+#: locale/programs/ld-collate.c:3650
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: chybný symbol <%.*s>"
 
-#: locale/programs/ld-collate.c:3751
+#: locale/programs/ld-collate.c:3846
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: nemohu mít „%s“ jako konec výpustkového rozsahu"
 
-#: locale/programs/ld-collate.c:3800
+#: locale/programs/ld-collate.c:3896
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: prázdný popis kategorie není dovolen"
 
-#: locale/programs/ld-collate.c:3819
+#: locale/programs/ld-collate.c:3915
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: chybí klíÄové slovo „reorder-sections-end“"
 
+#: locale/programs/ld-collate.c:4077
+#, c-format
+msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: „%s“ bez odpovídajícího „ifdef“ nebo „ifndef“"
+
+#: locale/programs/ld-collate.c:4095
+#, c-format
+msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: „endif“ bez odpovídajícího „ifdef“ nebo „ifndef“"
+
 #: locale/programs/ld-ctype.c:439
 #, c-format
 msgid "No character set name specified in charmap"
@@ -2737,22 +2757,22 @@ msgstr "pÅ™i použití „copy“ není dovoleno použít žádné jiné klíÄo
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "Definice „%1$s“ nekonÄí „END %1$s“"
 
-#: 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 "syntaktická chyba v definici repertoáru znaků: %s"
 
-#: locale/programs/repertoire.c:272
+#: locale/programs/repertoire.c:271
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "hodnota <Uxxxx> nebo <Uxxxxxxxx> nebyla zadána"
 
-#: locale/programs/repertoire.c:332
+#: locale/programs/repertoire.c:331
 #, c-format
 msgid "cannot save new repertoire map"
 msgstr "nový repertoár znaků nelze uložit"
 
-#: locale/programs/repertoire.c:343
+#: locale/programs/repertoire.c:342
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr "soubor „%s“ repertoáru znaků nebyl nalezen"
@@ -3575,12 +3595,12 @@ msgstr "yp_update: název poÄítaÄe nelze konvertovat na síťový název\n"
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: adresu serveru nelze zjistit\n"
 
-#: nscd/aicache.c:77 nscd/hstcache.c:462
+#: nscd/aicache.c:77 nscd/hstcache.c:468
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "„%s“ nebylo v cache pamÄ›ti pro poÄítaÄe nalezeno!"
 
-#: nscd/aicache.c:79 nscd/hstcache.c:464
+#: nscd/aicache.c:79 nscd/hstcache.c:470
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr "Znovu naÄítám „%s“ do keÅ¡e pro jména poÄítaÄů!"
@@ -3594,7 +3614,7 @@ msgstr "přidat novou položku „%s“ typu %s pro %s fo keše%s"
 msgid " (first)"
 msgstr " (první)"
 
-#: nscd/cache.c:256 nscd/connections.c:786
+#: nscd/cache.c:256 nscd/connections.c:810
 #, c-format
 msgid "cannot stat() file `%s': %s"
 msgstr "na soubor „%s“ nelze vykonat stat(): %s"
@@ -3609,188 +3629,188 @@ msgstr "Äistím keÅ¡ %s, Äas %ld"
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr "zvažuji %s-položku „%s“, životnost %<PRIu64>"
 
-#: nscd/connections.c:505 nscd/connections.c:517 nscd/connections.c:529
-#: nscd/connections.c:548
+#: nscd/connections.c:521 nscd/connections.c:533 nscd/connections.c:545
+#: nscd/connections.c:564
 #, c-format
 msgid "invalid persistent database file \"%s\": %s"
 msgstr "chybný soubor „%s“ s trvalou databází: %s"
 
-#: nscd/connections.c:519
+#: nscd/connections.c:535
 msgid "header size does not match"
 msgstr "velikost hlaviÄky nesouhlasí"
 
-#: nscd/connections.c:531
+#: nscd/connections.c:547
 msgid "file size does not match"
 msgstr "velikost souboru nesouhlasí"
 
-#: nscd/connections.c:550
+#: nscd/connections.c:566
 msgid "verification failed"
 msgstr "ověření selhalo"
 
-#: nscd/connections.c:564
+#: nscd/connections.c:580
 #, c-format
 msgid "suggested size of table for database %s larger than the persistent database's table"
 msgstr "navrhovaná velikost tabulky pro databázi %s je větší než tabulka trvalých databází"
 
-#: nscd/connections.c:574 nscd/connections.c:655
+#: nscd/connections.c:591 nscd/connections.c:673
 #, c-format
 msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr "deskriptor jen-pro-Ätení „%s“ nelze vytvoÅ™it: žádný mmap"
 
-#: nscd/connections.c:634
+#: nscd/connections.c:652
 #, c-format
 msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
 msgstr "Databáze pro %s je poÅ¡kozena nebo vícenásobnÄ› používána. Je-li tÅ™eba, ruÄnÄ› odstraňte %s a restartuje."
 
-#: nscd/connections.c:641
+#: nscd/connections.c:659
 #, c-format
 msgid "cannot create %s; no persistent database used"
 msgstr "%s nelze vytvořit, žádná trvalá databáze nebude použita"
 
-#: nscd/connections.c:644
+#: nscd/connections.c:662
 #, c-format
 msgid "cannot create %s; no sharing possible"
 msgstr "%s nelze vytvořit, sdílení není možno"
 
-#: nscd/connections.c:715
+#: nscd/connections.c:733
 #, c-format
 msgid "cannot write to database file %s: %s"
 msgstr "do databázového soubor %s nelze zapsat: %s"
 
-#: nscd/connections.c:749
+#: nscd/connections.c:772
 #, c-format
 msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
 msgstr "soket nelze nastavit na uzavření při spuštění, %s, vypínám paranoidní režim"
 
-#: nscd/connections.c:799
+#: nscd/connections.c:823
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "soket nelze otevřít: %s"
 
-#: nscd/connections.c:816
+#: nscd/connections.c:840
 #, c-format
 msgid "cannot change socket to nonblocking mode: %s"
 msgstr "soket nelze přepnout do neblokujícího režimu: %s"
 
-#: nscd/connections.c:824
+#: nscd/connections.c:848
 #, c-format
 msgid "cannot set socket to close on exec: %s"
 msgstr "soket nelze nastavit na uzavření při spuštění, %s"
 
-#: nscd/connections.c:835
+#: nscd/connections.c:859
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "soket nemůže přijímat spojení: %s"
 
-#: nscd/connections.c:926
+#: nscd/connections.c:955
 #, c-format
 msgid "provide access to FD %d, for %s"
 msgstr "poskytnout přístup na deskriptor souboru %d pro %s"
 
-#: nscd/connections.c:938
+#: nscd/connections.c:967
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "žádost staré verze (%d) nelze zpracovat; aktuální verze je %d"
 
-#: nscd/connections.c:980 nscd/connections.c:1033
+#: nscd/connections.c:1009 nscd/connections.c:1062
 #, c-format
 msgid "cannot write result: %s"
 msgstr "výsledek nelze zapsat: %s"
 
-#: nscd/connections.c:1116
+#: nscd/connections.c:1145
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr "chyba při zjišťování id volajícího: %s"
 
-#: nscd/connections.c:1175
+#: nscd/connections.c:1204
 #, c-format
 msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "/proc/self/cmdline nelze otevřít: %s, vypínám paranoidní režim"
 
-#: nscd/connections.c:1189
+#: nscd/connections.c:1218
 #, c-format
 msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "/proc/self/cmdline nelze naÄíst: %s, vypínám paranoidní režim"
 
-#: nscd/connections.c:1229
+#: nscd/connections.c:1258
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr "nelze se přepnout do starého UID: %s. vypínám paranoidní režim"
 
-#: nscd/connections.c:1239
+#: nscd/connections.c:1268
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr "nelze se přepnout do starého GID: %s, vypínám paranoidní režim"
 
-#: nscd/connections.c:1252
+#: nscd/connections.c:1281
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr "nelze se přepnout do starého pracovního adresáře: %s. vypínám paranoidní režim"
 
-#: nscd/connections.c:1280
+#: nscd/connections.c:1310
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr "znovuspuštění selhalo: %s, vypínám paranoidní režim"
 
-#: nscd/connections.c:1289
+#: nscd/connections.c:1319
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr "souÄasný pracovní adresář nelze zmÄ›nit na „/“: %s"
 
-#: nscd/connections.c:1407
+#: nscd/connections.c:1437
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "neúplné Ätení žádosti: „%s“"
 
-#: nscd/connections.c:1438
+#: nscd/connections.c:1468
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "délka klíÄe v žádosti je příliÅ¡ dlouhá: %d"
 
-#: nscd/connections.c:1451
+#: nscd/connections.c:1481
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "neúplné Ätení klíÄe žádosti: %s"
 
-#: nscd/connections.c:1460
+#: nscd/connections.c:1490
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr "handle_request: žádost přijata (verze = %d) od PID %ld"
 
-#: nscd/connections.c:1465
+#: nscd/connections.c:1495
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request: žádost přijata (verze = %d)"
 
-#: nscd/connections.c:1826
+#: nscd/connections.c:1856
 #, c-format
 msgid "could only start %d threads; terminating"
 msgstr "spustit mohu jen %d vláken, konÄím"
 
-#: nscd/connections.c:1874 nscd/connections.c:1875 nscd/connections.c:1892
-#: nscd/connections.c:1901 nscd/connections.c:1919 nscd/connections.c:1930
-#: nscd/connections.c:1941
+#: nscd/connections.c:1904 nscd/connections.c:1905 nscd/connections.c:1922
+#: nscd/connections.c:1931 nscd/connections.c:1949 nscd/connections.c:1960
+#: nscd/connections.c:1971
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "Spuštění nscd pod uživatelem „%s“ selhalo"
 
-#: nscd/connections.c:1893
+#: nscd/connections.c:1923
 #, c-format
 msgid "initial getgrouplist failed"
 msgstr "prvotní získání seznamu skupin (getgrouplist) selhalo"
 
-#: nscd/connections.c:1902
+#: nscd/connections.c:1932
 #, c-format
 msgid "getgrouplist failed"
 msgstr "getgrouplist (získej seznam skupin) selhalo"
 
-#: nscd/connections.c:1920
+#: nscd/connections.c:1950
 #, c-format
 msgid "setgroups failed"
 msgstr "funkce setgroups() selhala"
 
-#: nscd/grpcache.c:402 nscd/hstcache.c:412 nscd/initgrcache.c:412
-#: nscd/pwdcache.c:397 nscd/servicescache.c:342
+#: nscd/grpcache.c:402 nscd/hstcache.c:418 nscd/initgrcache.c:412
+#: nscd/pwdcache.c:397 nscd/servicescache.c:343
 #, c-format
 msgid "short write in %s: %s"
 msgstr "neúplný zápis v %s(): %s"
@@ -4203,12 +4223,12 @@ msgstr ""
 "%15u  zkoušených CAV\n"
 "%15u  neúspěšných CAV\n"
 
-#: nscd/servicescache.c:389
+#: nscd/servicescache.c:390
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
 msgstr "„%s“ nebylo v keši pro služby nalezeno!"
 
-#: nscd/servicescache.c:391
+#: nscd/servicescache.c:392
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
 msgstr "Znovu naÄítám „%s“ do keÅ¡e pro služby!"
@@ -6324,7 +6344,7 @@ msgstr "vstupní řádek neznámého typu"
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: řádek Leap v souboru nepřestupných sekund %s\n"
 
-#: timezone/zic.c:892 timezone/zic.c:1323 timezone/zic.c:1345
+#: timezone/zic.c:892 timezone/zic.c:1329 timezone/zic.c:1351
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: fatální chyba: Nepřípustná l_hodnota %d\n"
@@ -6343,235 +6363,246 @@ msgstr "%s: Chyba při uzavírání %s: %s\n"
 msgid "expected continuation line not found"
 msgstr "oÄekávaný pokraÄovací řádek nebyl nalezen"
 
-#: timezone/zic.c:956
+#: timezone/zic.c:956 timezone/zic.c:2489 timezone/zic.c:2508
+msgid "time overflow"
+msgstr "pÅ™eteÄení Äasu"
+
+#: timezone/zic.c:960
 msgid "24:00 not handled by pre-1998 versions of zic"
 msgstr "verze zicu před rokem 1998 nepodporovaly 24:00"
 
-#: timezone/zic.c:970
+#: timezone/zic.c:963
+msgid "values over 24 hours not handled by pre-2007 versions of zic"
+msgstr "verze zicu před rokem 2007 nepodporovaly hodnoty nad 24 hodin"
+
+#: timezone/zic.c:976
 msgid "wrong number of fields on Rule line"
 msgstr "Å¡patný poÄet položek v řádku Rule"
 
-#: timezone/zic.c:974
+#: timezone/zic.c:980
 msgid "nameless rule"
 msgstr "bezejmenné pravidlo"
 
-#: timezone/zic.c:979
+#: timezone/zic.c:985
 msgid "invalid saved time"
 msgstr "neplatný uložený Äas"
 
-#: timezone/zic.c:1000
+#: timezone/zic.c:1006
 msgid "wrong number of fields on Zone line"
 msgstr "Å¡patný poÄet položek v řádku Zone"
 
-#: timezone/zic.c:1006
+#: timezone/zic.c:1012
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "Řádek „Zone %s“ a volba -l se navzájem vyluÄují"
 
-#: timezone/zic.c:1014
+#: timezone/zic.c:1020
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "Řádek „Zone %s“ a volba -p se navzájem vyluÄují"
 
-#: timezone/zic.c:1026
+#: timezone/zic.c:1032
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "duplicitní oznaÄení Äasového pásma %s (soubor „%s“, řádek %d)"
 
-#: timezone/zic.c:1042
+#: timezone/zic.c:1048
 msgid "wrong number of fields on Zone continuation line"
 msgstr "Å¡patný poÄet položek v pokraÄovacím řádku Zone"
 
-#: timezone/zic.c:1082
+#: timezone/zic.c:1088
 msgid "invalid UTC offset"
 msgstr "neplatné posunutí vůÄi UTC"
 
-#: timezone/zic.c:1085
+#: timezone/zic.c:1091
 msgid "invalid abbreviation format"
 msgstr "neplatný formát zkratky"
 
-#: timezone/zic.c:1114
+#: timezone/zic.c:1120
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr "Koncový Äas pokraÄovacího řádku Zone není vÄ›tší než koncový Äas pÅ™edcházejícího řádku"
 
-#: timezone/zic.c:1142
+#: timezone/zic.c:1148
 msgid "wrong number of fields on Leap line"
 msgstr "Å¡patný poÄet položek v řádku Leap"
 
-#: timezone/zic.c:1151
+#: timezone/zic.c:1157
 msgid "invalid leaping year"
 msgstr "neplatný přestupný rok"
 
-#: timezone/zic.c:1171 timezone/zic.c:1277
+#: timezone/zic.c:1177 timezone/zic.c:1283
 msgid "invalid month name"
 msgstr "neplatný název měsíce"
 
-#: timezone/zic.c:1184 timezone/zic.c:1390 timezone/zic.c:1404
+#: timezone/zic.c:1190 timezone/zic.c:1396 timezone/zic.c:1410
 msgid "invalid day of month"
 msgstr "neplatný den měsíce"
 
-#: timezone/zic.c:1189
+#: timezone/zic.c:1195
 msgid "time before zero"
 msgstr "Äas menší než nula"
 
-#: timezone/zic.c:1193
+#: timezone/zic.c:1199
 msgid "time too small"
 msgstr "Äas je příliÅ¡ malý"
 
-#: timezone/zic.c:1197
+#: timezone/zic.c:1203
 msgid "time too large"
 msgstr "Äas je příliÅ¡ velký"
 
-#: timezone/zic.c:1201 timezone/zic.c:1306
+#: timezone/zic.c:1207 timezone/zic.c:1312
 msgid "invalid time of day"
 msgstr "neplatný denní Äas"
 
-#: timezone/zic.c:1220
+#: timezone/zic.c:1226
 msgid "illegal CORRECTION field on Leap line"
 msgstr "chybná položka KOREKCE na řádku Leap"
 
-#: timezone/zic.c:1225
+#: timezone/zic.c:1231
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "chybná položka Rolling/Stationary na řádku Leap"
 
-#: timezone/zic.c:1241
+#: timezone/zic.c:1247
 msgid "wrong number of fields on Link line"
 msgstr "Å¡patný poÄet položek v řádku Link"
 
-#: timezone/zic.c:1245
+#: timezone/zic.c:1251
 msgid "blank FROM field on Link line"
 msgstr "prázdná položka OD v řádku Link"
 
-#: timezone/zic.c:1249
+#: timezone/zic.c:1255
 msgid "blank TO field on Link line"
 msgstr "prázdná položka DO v řádku Link"
 
-#: timezone/zic.c:1327
+#: timezone/zic.c:1333
 msgid "invalid starting year"
 msgstr "neplatný poÄáteÄní rok"
 
-#: timezone/zic.c:1349
+#: timezone/zic.c:1355
 msgid "invalid ending year"
 msgstr "neplatný koncový rok"
 
-#: timezone/zic.c:1353
+#: timezone/zic.c:1359
 msgid "starting year greater than ending year"
 msgstr "poÄáteÄní rok vÄ›tší než koncový"
 
-#: timezone/zic.c:1360
+#: timezone/zic.c:1366
 msgid "typed single year"
 msgstr "zadán jeden rok"
 
-#: timezone/zic.c:1395
+#: timezone/zic.c:1401
 msgid "invalid weekday name"
 msgstr "neplatný název dne"
 
-#: timezone/zic.c:1573
+#: timezone/zic.c:1579
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s: %s nelze smazat: %s\n"
 
-#: timezone/zic.c:1583
+#: timezone/zic.c:1589
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: %s nelze vytvořit: %s\n"
 
-#: timezone/zic.c:1733
+#: timezone/zic.c:1739
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: Chyba při zápisu %s\n"
 
-#: timezone/zic.c:2025
+#: timezone/zic.c:2031
 msgid "no POSIX environment variable for zone"
 msgstr "žádná proměnná prostředí pro zónu podle POSIXU"
 
-#: timezone/zic.c:2179
+#: timezone/zic.c:2185
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr "zkratku Äasového pásma pro použití ihned po Äasovém údaji nelze nelézt"
 
-#: timezone/zic.c:2225
+#: timezone/zic.c:2231
 msgid "too many transitions?!"
 msgstr "příliš mnoho přechodů?!"
 
-#: timezone/zic.c:2244
+#: timezone/zic.c:2250
 msgid "internal error - addtype called with bad isdst"
 msgstr "vnitřní chyba – addtype volán s chybným isdst"
 
-#: timezone/zic.c:2248
+#: timezone/zic.c:2254
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "vnitřní chyba – addtype volán s chybným ttisstd"
 
-#: timezone/zic.c:2252
+#: timezone/zic.c:2258
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "vnitřní chyba – addtype volán s chybným ttisgmt"
 
-#: timezone/zic.c:2271
+#: timezone/zic.c:2277
 msgid "too many local time types"
 msgstr "příliÅ¡ mnoho lokálních Äasových typů"
 
-#: timezone/zic.c:2299
+#: timezone/zic.c:2281
+msgid "UTC offset out of range"
+msgstr "posun od UTC mimo povolený rozsah"
+
+#: timezone/zic.c:2309
 msgid "too many leap seconds"
 msgstr "příliš mnoho přestupných sekund"
 
-#: timezone/zic.c:2305
+#: timezone/zic.c:2315
 msgid "repeated leap second moment"
 msgstr "přestupná sekunda opakována"
 
-#: timezone/zic.c:2357
+#: timezone/zic.c:2367
 msgid "Wild result from command execution"
 msgstr "Vykonaný příkaz dal podivný výsledek"
 
-#: timezone/zic.c:2358
+#: timezone/zic.c:2368
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: příkaz byl „%s“, a jeho výsledek byl %d\n"
 
-#: timezone/zic.c:2456
+#: timezone/zic.c:2466
 msgid "Odd number of quotation marks"
 msgstr "Lichý poÄet uvozovek"
 
-#: timezone/zic.c:2479 timezone/zic.c:2498
-msgid "time overflow"
-msgstr "pÅ™eteÄení Äasu"
-
-#: timezone/zic.c:2545
+#: timezone/zic.c:2555
 msgid "use of 2/29 in non leap-year"
 msgstr "použití 29. února v nepřestupném roce"
 
-#: timezone/zic.c:2580
+#: timezone/zic.c:2590
 msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic"
 msgstr "pravidlo zasahuje za zaÄátek/konec mÄ›síce – verze zicu pÅ™ed rokem 2004 nebudou fungovat"
 
-#: timezone/zic.c:2612
+#: timezone/zic.c:2622
 msgid "time zone abbreviation lacks alphabetic at start"
 msgstr "zkratka Äasové zóny nezaÄíná písmenem"
 
-#: timezone/zic.c:2614
+#: timezone/zic.c:2624
 msgid "time zone abbreviation has more than 3 alphabetics"
 msgstr "zkratka Äasové zóny má více než 3 písmena"
 
-#: timezone/zic.c:2616
+#: timezone/zic.c:2626
 msgid "time zone abbreviation has too many alphabetics"
 msgstr "zkratka Äasové zóny má příliÅ¡ mnoho písmen"
 
-#: timezone/zic.c:2626
+#: timezone/zic.c:2636
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr "zkratka Äasové zóny nesouhlasí se standardem POSIX"
 
-#: timezone/zic.c:2638
+#: timezone/zic.c:2648
 msgid "too many, or too long, time zone abbreviations"
 msgstr "příliÅ¡ mnoho nebo příliÅ¡ dlouhé zkratky Äasového pásma"
 
-#: timezone/zic.c:2679
+#: timezone/zic.c:2689
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: Adresář %s nelze vytvořit: %s\n"
 
-#: timezone/zic.c:2701
+#: timezone/zic.c:2711
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: při přetypování %d došlo k chybě znaménka\n"
 
+#~ msgid "Can't remove old temporary cache file %s"
+#~ msgstr "Starý doÄasný soubor s keší „%s“ nelze odstranit"
+
 #~ msgid "Writing of cache data failed."
 #~ msgstr "Zápis kešovaných dat selhal."
 
diff --git a/po/ko.po b/po/ko.po
index bb8ae322df..c3559af028 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,338 +1,1281 @@
 # GNU libcÀÇ Çѱ¹¾î ¸Þ½ÃÁö
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
 # Bang Jun-Young <bangjy@nownuri.net>, 1996-97.
-# Changwoo Ryu <cwryu@debian.org>, 2000-2004.
+# Changwoo Ryu <cwryu@debian.org>, 2000-2004, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU libc 2.3.3\n"
-"POT-Creation-Date: 2004-08-05 09:16+0200\n"
-"PO-Revision-Date: 2004-08-06 08:52+0900\n"
+"Project-Id-Version: GNU libc 2.7\n"
+"POT-Creation-Date: 2007-10-15 21:18-0700\n"
+"PO-Revision-Date: 2007-11-16 00:59+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: sysdeps/generic/siglist.h:29 stdio-common/../sysdeps/unix/siglist.c:27
-msgid "Hangup"
-msgstr "²÷¾îÁü"
+#: argp/argp-help.c:228
+#, c-format
+msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
+msgstr "%.*s: ARGP_HELP_FMT Àμö´Â °ªÀÌ ÇÊ¿äÇÕ´Ï´Ù"
 
-#: sysdeps/generic/siglist.h:30 stdio-common/../sysdeps/unix/siglist.c:28
-msgid "Interrupt"
-msgstr "ÀÎÅÍ·´Æ®"
+#: argp/argp-help.c:238
+#, c-format
+msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
+msgstr "%.*s: ¾Ë ¼ö ¾ø´Â ARGP_HELP_FMT ÀÎÀÚ"
 
-#: sysdeps/generic/siglist.h:31 stdio-common/../sysdeps/unix/siglist.c:29
-msgid "Quit"
-msgstr "Á¾·á"
+#: argp/argp-help.c:251
+#, c-format
+msgid "Garbage in ARGP_HELP_FMT: %s"
+msgstr "ARGP_HELP_FMT¿¡ ¾µ¸ð¾ø´Â °Í: %s"
 
-#: sysdeps/generic/siglist.h:32 stdio-common/../sysdeps/unix/siglist.c:30
-msgid "Illegal instruction"
-msgstr "À߸øµÈ ¸í·É¾î"
+#: argp/argp-help.c:1215
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "±ä ¿É¼Ç¿¡¼­ ´ëÇØ ²À ÇÊ¿äÇϰųª ¼±ÅÃÀûÀÎ ÀÎÀÚ´Â ±× ±ä ¿É¼Ç¿¡ ÇØ´çÇϴ ªÀº ¿É¼Ç¿¡¼­µµ ²À ÇÊ¿äÇϰųª ¼±ÅÃÀûÀÔ´Ï´Ù."
 
-#: sysdeps/generic/siglist.h:33 stdio-common/../sysdeps/unix/siglist.c:31
-msgid "Trace/breakpoint trap"
-msgstr "ÃßÀû/Áß´ÜÁ¡ ÇÔÁ¤"
+#: argp/argp-help.c:1601
+msgid "Usage:"
+msgstr "»ç¿ë¹ý:"
 
-#: sysdeps/generic/siglist.h:34
-msgid "Aborted"
-msgstr "ÁßÁöµÊ"
+#: argp/argp-help.c:1605
+msgid "  or: "
+msgstr "  ȤÀº: "
 
-#: sysdeps/generic/siglist.h:35 stdio-common/../sysdeps/unix/siglist.c:34
-msgid "Floating point exception"
-msgstr "ºÎµ¿ ¼Ò¼öÁ¡ ¿¹¿Ü"
+#: argp/argp-help.c:1617
+msgid " [OPTION...]"
+msgstr "[¿É¼Ç...]"
 
-#: sysdeps/generic/siglist.h:36 stdio-common/../sysdeps/unix/siglist.c:35
-msgid "Killed"
-msgstr "Á×¾úÀ½"
+#: argp/argp-help.c:1644
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ȤÀº `%s --usage' ÇϽʽÿÀ.\n"
 
-#: sysdeps/generic/siglist.h:37 stdio-common/../sysdeps/unix/siglist.c:36
-msgid "Bus error"
-msgstr "¹ö½º ¿À·ù"
+#: argp/argp-help.c:1672
+#, c-format
+msgid "Report bugs to %s.\n"
+msgstr "¹ö±×¸¦ %s ÁÖ¼Ò·Î ¾Ë·ÁÁֽʽÿÀ.\n"
 
-#: sysdeps/generic/siglist.h:38 stdio-common/../sysdeps/unix/siglist.c:37
-msgid "Segmentation fault"
-msgstr "¼¼±×¸àÅ×ÀÌ¼Ç ¿À·ù"
+#: argp/argp-parse.c:102
+msgid "Give this help list"
+msgstr "ÀÌ µµ¿ò¸» ¸®½ºÆ®¸¦ Ç¥½ÃÇÔ"
 
-#. 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 "ÆÄÀÌÇÁ°¡ ±ú¾îÁü"
+#: argp/argp-parse.c:103
+msgid "Give a short usage message"
+msgstr "°£·«ÇÑ »ç¿ë¹ý ¸Þ¼¼Áö¸¦ Ç¥½ÃÇÔ"
 
-#: sysdeps/generic/siglist.h:40 stdio-common/../sysdeps/unix/siglist.c:40
-msgid "Alarm clock"
-msgstr "ÀÚ¸íÁ¾ ½Ã°è"
+#: argp/argp-parse.c:104
+msgid "Set the program name"
+msgstr "ÇÁ·Î±×·¥ À̸§ °áÁ¤"
 
-#: sysdeps/generic/siglist.h:41 stdio-common/../sysdeps/unix/siglist.c:41
-msgid "Terminated"
-msgstr "Á¾·áµÊ"
+#: argp/argp-parse.c:106
+msgid "Hang for SECS seconds (default 3600)"
+msgstr "SECSÃÊ µ¿¾È ¸ØÃã (±âº»°ª 3600)"
 
-#: sysdeps/generic/siglist.h:42 stdio-common/../sysdeps/unix/siglist.c:42
-msgid "Urgent I/O condition"
-msgstr "½Ã±ÞÇÑ ÀÔÃâ·Â »óȲ"
+#: argp/argp-parse.c:167
+msgid "Print program version"
+msgstr "ÇÁ·Î±×·¥ ¹öÀü Ç¥½Ã"
 
-#: sysdeps/generic/siglist.h:43 stdio-common/../sysdeps/unix/siglist.c:43
-msgid "Stopped (signal)"
-msgstr "Á¤ÁöµÊ (½ÅÈ£)"
+#: argp/argp-parse.c:183
+msgid "(PROGRAM ERROR) No version known!?"
+msgstr "(ÇÁ·Î±×·¥ ¿À·ù) ¹öÀüÀ» ¾Ë ¼ö ¾ø½À´Ï´Ù!?"
 
-#: sysdeps/generic/siglist.h:44 stdio-common/../sysdeps/unix/siglist.c:44
-msgid "Stopped"
-msgstr "Á¤ÁöµÊ"
+#: argp/argp-parse.c:623
+#, c-format
+msgid "%s: Too many arguments\n"
+msgstr "%s: ÀÎÀÚ°¡ ³Ê¹« ¸¹À½\n"
 
-#: sysdeps/generic/siglist.h:45 stdio-common/../sysdeps/unix/siglist.c:45
-msgid "Continued"
-msgstr "°è¼ÓµÊ"
+#: argp/argp-parse.c:766
+msgid "(PROGRAM ERROR) Option should have been recognized!?"
+msgstr "(ÇÁ·Î±×·¥ ¿À·ù) ¿É¼ÇÀ» ¾Ë ¼ö ÀÖ¾î¾ß ÇÕ´Ï´Ù!?"
 
-#: sysdeps/generic/siglist.h:46 stdio-common/../sysdeps/unix/siglist.c:46
-msgid "Child exited"
-msgstr "ÇÏÀ§ ÇÁ·Î¼¼½º°¡ ³¡³µÀ½"
+#: assert/assert-perr.c:57
+#, c-format
+msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
+msgstr "%s%s%s:%u: %s%s¿¹±âÄ¡ ¸øÇÑ ¿À·ù: %s.\n"
 
-#: sysdeps/generic/siglist.h:47 stdio-common/../sysdeps/unix/siglist.c:47
-msgid "Stopped (tty input)"
-msgstr "Á¤ÁöµÊ (tty ÀÔ·Â)"
+#: assert/assert.c:57
+#, c-format
+msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
+msgstr "%s%s%s:%u: %s%sassertion `%s' ½ÇÆÐ.\n"
 
-#: sysdeps/generic/siglist.h:48 stdio-common/../sysdeps/unix/siglist.c:48
-msgid "Stopped (tty output)"
-msgstr "Á¤ÁöµÊ (tty Ãâ·Â)"
+#: catgets/gencat.c:110 catgets/gencat.c:114 nscd/nscd.c:97 nss/makedb.c:61
+msgid "NAME"
+msgstr "<À̸§>"
 
-#: sysdeps/generic/siglist.h:49 stdio-common/../sysdeps/unix/siglist.c:49
-msgid "I/O possible"
-msgstr "ÀÔÃâ·Â °¡´É"
+#: catgets/gencat.c:111
+msgid "Create C header file NAME containing symbol definitions"
+msgstr "±âÈ£ Á¤ÀǸ¦ ´ã°í ÀÖ´Â C Çì´õ ÆÄÀÏ NAMEÀ» ¸¸µì´Ï´Ù"
 
-#: sysdeps/generic/siglist.h:50 stdio-common/../sysdeps/unix/siglist.c:50
-msgid "CPU time limit exceeded"
-msgstr "CPU ½Ã°£ Á¦ÇÑ ÃÊ°úÇÔ"
+#: catgets/gencat.c:113
+msgid "Do not use existing catalog, force new output file"
+msgstr "ÀÌ¹Ì ÀÖ´Â ¸ñ·ÏÀ» »ç¿ëÇÏÁö ¾Ê°í, »õ·Î¿î ÆÄÀÏ¿¡ Ãâ·ÂÇÕ´Ï´Ù"
 
-#: sysdeps/generic/siglist.h:51 stdio-common/../sysdeps/unix/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "ÆÄÀÏ Å©±â Á¦ÇÑÀ» ÃÊ°úÇÔ"
+#: catgets/gencat.c:114 nss/makedb.c:61
+msgid "Write output to file NAME"
+msgstr "<À̸§> ÆÄÀÏ·Î Ãâ·ÂÇÕ´Ï´Ù"
 
-#: sysdeps/generic/siglist.h:52 stdio-common/../sysdeps/unix/siglist.c:52
-msgid "Virtual timer expired"
-msgstr "°¡»ó ŸÀÌ¸Ó ½Ã°£ ÃÊ°ú"
+#: catgets/gencat.c:119
+msgid ""
+"Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n"
+"is -, output is written to standard output.\n"
+msgstr ""
+"¸Þ¼¼Áö ¸ñ·ÏÀ» ¸¸µì´Ï´Ù.^K<ÀÔ·Â-ÆÄÀÏ>ÀÌ - À̸é Ç¥ÁØ ÀÔ·ÂÀ» ÀÐ°Ô µË´Ï´Ù.  <Ãâ·Â-ÆÄÀÏ>ÀÌ - À̸é\n"
+"Ç¥ÁØ Ãâ·Â¿¡ Ãâ·ÂÇÕ´Ï´Ù.\n"
 
-#: sysdeps/generic/siglist.h:53 stdio-common/../sysdeps/unix/siglist.c:53
-msgid "Profiling timer expired"
-msgstr "ÇÁ·ÎÆÄÀϸµ ŸÀ̸ÓÀÇ ½Ã°£ÀÌ ÃÊ°úµÊ"
+#: catgets/gencat.c:124
+msgid ""
+"-o OUTPUT-FILE [INPUT-FILE]...\n"
+"[OUTPUT-FILE [INPUT-FILE]...]"
+msgstr ""
+"-o <Ãâ·Â-ÆÄÀÏ> [<ÀÔ·Â-ÆÄÀÏ>]...\n"
+"[<Ãâ·Â-ÆÄÀÏ> [<ÀÔ·Â-ÆÄÀÏ>]...]"
 
-#: sysdeps/generic/siglist.h:54 stdio-common/../sysdeps/unix/siglist.c:54
-msgid "Window changed"
-msgstr "À©µµ¿ì º¯°æµÊ"
+#: catgets/gencat.c:232 debug/pcprofiledump.c:204 iconv/iconv_prog.c:411
+#: iconv/iconvconfig.c:380 locale/programs/localedef.c:371
+#: login/programs/pt_chown.c:88 malloc/memusagestat.c:526 nss/makedb.c:231
+msgid ""
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+"¹ö±×¸¦ º¸°íÇÏ´Â ¹æ¹ýÀº ´ÙÀ½À» Âü°íÇϽʽÿÀ:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
 
-#: sysdeps/generic/siglist.h:55 stdio-common/../sysdeps/unix/siglist.c:56
-msgid "User defined signal 1"
-msgstr "»ç¿ëÀÚ Á¤ÀÇ ½ÅÈ£ 1"
+#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:296
+#: elf/ldd.bash.in:39 elf/sprof.c:355 iconv/iconv_prog.c:426
+#: iconv/iconvconfig.c:395 locale/programs/locale.c:275
+#: locale/programs/localedef.c:387 login/programs/pt_chown.c:59
+#: malloc/memusage.sh:71 nscd/nscd.c:406 nss/getent.c:83 nss/makedb.c:245
+#: posix/getconf.c:1012
+#, 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"
+"ÀÌ ÇÁ·Î±×·¥Àº °ø°³ ¼ÒÇÁÆ®¿þ¾îÀÔ´Ï´Ù; º¹»çÁ¶°ÇÀº ¼Ò½º¸¦ ÂüÁ¶ÇϽʽÿÀ.  »óÇ°¼º\n"
+"À̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿© ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n"
 
-#: sysdeps/generic/siglist.h:56 stdio-common/../sysdeps/unix/siglist.c:57
-msgid "User defined signal 2"
-msgstr "»ç¿ëÀÚ ½ÅÈ£ ½ÅÈ£ 2"
+#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:301 elf/sprof.c:361
+#: iconv/iconv_prog.c:431 iconv/iconvconfig.c:400 locale/programs/locale.c:280
+#: locale/programs/localedef.c:392 malloc/memusage.sh:75 nscd/nscd.c:411
+#: nss/getent.c:88 nss/makedb.c:250 posix/getconf.c:1017
+#, c-format
+msgid "Written by %s.\n"
+msgstr "¸¸µç »ç¶÷: %s.\n"
 
-#: sysdeps/generic/siglist.h:60 stdio-common/../sysdeps/unix/siglist.c:33
-msgid "EMT trap"
-msgstr "EMT Æ®·¦"
+#: catgets/gencat.c:282
+msgid "*standard input*"
+msgstr "*Ç¥ÁØ ÀÔ·Â*"
 
-#: sysdeps/generic/siglist.h:63 stdio-common/../sysdeps/unix/siglist.c:38
-msgid "Bad system call"
-msgstr "À߸øµÈ ½Ã½ºÅÛ È£Ãâ"
+#: catgets/gencat.c:288 iconv/iconv_charmap.c:158 iconv/iconv_prog.c:298
+#: nss/makedb.c:170
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "`%s' ÀÔ·Â ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
 
-#: sysdeps/generic/siglist.h:66
-msgid "Stack fault"
-msgstr "½ºÅà ¿À·ù"
+#: catgets/gencat.c:417 catgets/gencat.c:494
+msgid "illegal set number"
+msgstr "ÁýÇÕ ¹øÈ£°¡ À߸øµÇ¾úÀ½"
 
-#: sysdeps/generic/siglist.h:69
-msgid "Information request"
-msgstr "Á¤º¸ ¿äû"
+#: catgets/gencat.c:444
+msgid "duplicate set definition"
+msgstr "ÁýÇÕ Á¤ÀÇ°¡ Áߺ¹µÇ¾î ÀÖ½À´Ï´Ù"
 
-#: sysdeps/generic/siglist.h:71
-msgid "Power failure"
-msgstr "Àü·ÂÀÌ ²÷¾îÁü"
+#: catgets/gencat.c:446 catgets/gencat.c:623 catgets/gencat.c:677
+msgid "this is the first definition"
+msgstr "ÀÌ°ÍÀº ù¹ø° Á¤ÀÇÀÔ´Ï´Ù"
 
-#: sysdeps/generic/siglist.h:74 stdio-common/../sysdeps/unix/siglist.c:55
-msgid "Resource lost"
-msgstr "ÀÚ¿øÀ» ¼Õ½ÇÇßÀ½"
+#: catgets/gencat.c:522
+#, c-format
+msgid "unknown set `%s'"
+msgstr "¾Ë ¼ö ¾ø´Â ¼³Á¤ `%s'"
 
-#: sysdeps/mach/hurd/mips/dl-machine.c:68
-#: string/../sysdeps/mach/_strerror.c:57
-msgid "Error in unknown error system: "
-msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù ½Ã½ºÅÛ¿¡ ¿À·ù: "
+#: catgets/gencat.c:563
+msgid "invalid quote character"
+msgstr "À߸øµÈ ÀÎ¿ë ¹®ÀÚ"
 
-#: sysdeps/mach/hurd/mips/dl-machine.c:83
-#: string/../sysdeps/generic/_strerror.c:44
-#: string/../sysdeps/mach/_strerror.c:87
-msgid "Unknown error "
-msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù"
+#: catgets/gencat.c:576
+#, c-format
+msgid "unknown directive `%s': line ignored"
+msgstr "¾Ë ¼ö ¾ø´Â Áö½ÃÀÚ `%s': Çà ¹«½ÃµÊ"
 
-#: sysdeps/unix/sysv/linux/lddlibc4.c:64
+#: catgets/gencat.c:621
+msgid "duplicated message number"
+msgstr "Áߺ¹µÈ ¸Þ½ÃÁö ¹øÈ£"
+
+#: catgets/gencat.c:674
+msgid "duplicated message identifier"
+msgstr "Áߺ¹µÈ ¸Þ½ÃÁö ½Äº°ÀÚ"
+
+#: catgets/gencat.c:731
+msgid "invalid character: message ignored"
+msgstr "À߸øµÈ ¹®ÀÚ: ¸Þ¼¼Áö´Â ¹«½ÃÇÕ´Ï´Ù"
+
+#: catgets/gencat.c:774
+msgid "invalid line"
+msgstr "ºÎÀûÀýÇÑ ÁÙ"
+
+#: catgets/gencat.c:828
+msgid "malformed line ignored"
+msgstr "À߸øµÈ ÇüÅÂÀÇ ÇàÀ» ¹«½Ã"
+
+#: catgets/gencat.c:992 catgets/gencat.c:1033 nss/makedb.c:183
 #, c-format
-msgid "cannot open `%s'"
-msgstr "`%s'À»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù"
+msgid "cannot open output file `%s'"
+msgstr "Ãâ·Â ÆÄÀÏ `%s' ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
 
-#: sysdeps/unix/sysv/linux/lddlibc4.c:68
+#: catgets/gencat.c:1195 locale/programs/linereader.c:560
+msgid "invalid escape sequence"
+msgstr "À߸øµÈ À̽ºÄÉÀÌÇÁ ¼ø¼­¿­"
+
+#: catgets/gencat.c:1217
+msgid "unterminated message"
+msgstr "Á¾·áÇÏÁö ¾ÊÀº ¸Þ½ÃÁö"
+
+#: catgets/gencat.c:1241
 #, c-format
-msgid "cannot read header from `%s'"
-msgstr "`%s'¿¡¼­ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
+msgid "while opening old catalog file"
+msgstr "¿À·¡µÈ ¸ñ·Ï ÆÄÀÏÀ» ¿©´Â µ¿¾È"
 
-#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:295 catgets/gencat.c:288
+#: catgets/gencat.c:1332
 #, c-format
-msgid "cannot open input file `%s'"
-msgstr "`%s' ÀÔ·Â ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
+msgid "conversion modules not available"
+msgstr "º¯È¯ ¸ðµâÀÌ »ç¿ë ºÒ°¡´ÉÇÕ´Ï´Ù"
+
+#: catgets/gencat.c:1358
+#, c-format
+msgid "cannot determine escape character"
+msgstr "À̽ºÄÉÀÌÇÁ ¹®ÀÚ¸¦ °áÁ¤ÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
+
+#: debug/pcprofiledump.c:53
+msgid "Don't buffer output"
+msgstr "¹öÆÛ Ãâ·ÂÀ» ÇÏÁö ¾Ê½À´Ï´Ù"
+
+#: debug/pcprofiledump.c:58
+msgid "Dump information generated by PC profiling."
+msgstr "PC ÇÁ·ÎÆÄÀϸµÀ¸·Î ¸¸µé¾îÁø Á¤º¸¸¦ ´ýÇÁÇÕ´Ï´Ù."
+
+#: debug/pcprofiledump.c:61
+msgid "[FILE]"
+msgstr "[ÆÄÀÏ]"
+
+#: debug/pcprofiledump.c:104
+#, c-format
+msgid "cannot open input file"
+msgstr "ÀÔ·Â ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
+
+#: debug/pcprofiledump.c:111
+#, c-format
+msgid "cannot read header"
+msgstr "Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
+
+#: debug/pcprofiledump.c:175
+#, c-format
+msgid "invalid pointer size"
+msgstr "À߸øµÈ Æ÷ÀÎÅÍ Å©±â"
+
+#: debug/xtrace.sh:27 debug/xtrace.sh:45
+msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
+msgstr "»ç¿ë¹ý: xtrace [¿É¼Ç]... <ÇÁ·Î±×·¥> [ÇÁ·Î±×·¥¿É¼Ç]...\\n"
+
+#: debug/xtrace.sh:33
+msgid "Try \\`xtrace --help' for more information.\\n"
+msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é \\`xtrace --help' ÇϽʽÿÀ.\\n"
+
+#: debug/xtrace.sh:39
+msgid "xtrace: option \\`$1' requires an argument.\\n"
+msgstr "xtrace: \\`$1' ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù.\\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 ""
+"ÇÁ·Î±×·¥ ½ÇÇàÀ» ÃßÀûÇؼ­ ÇöÀç ½ÇÇàÇÏ°í ÀÖ´Â ÇÔ¼ö¸¦ Ç¥½ÃÇÕ´Ï´Ù.\n"
+"\n"
+"     --data=<ÆÄÀÏ>        ÇÁ·Î±×·¥À» ½ÇÇàÇÏÁö ¾Ê°í, <ÆÄÀÏ>¿¡¼­ µ¥ÀÌÅ͸¸ Ç¥½ÃÇÕ´Ï´Ù\n"
+"\n"
+"   -?,--help              µµ¿ò¸»À» Ç¥½ÃÇÏ°í ³¡³À´Ï´Ù\n"
+"      --usage             °£´ÜÇÑ »ç¿ë¹ý ¸Þ¼¼Áö¸¦ Ç¥½ÃÇÕ´Ï´Ù\n"
+"   -V,--version           ¹öÀü Á¤º¸¸¦ Ç¥½ÃÇÏ°í ³¡³À´Ï´Ù\n"
+"\n"
+"±ä ¿É¼Ç¿¡ ÇʼöÀûÀÎ Àμö´Â, °°Àº ªÀº ¿É¼Ç¿¡¼­µµ ÇʼöÀûÀÎ ÀμöÀÔ´Ï´Ù.\n"
+"\n"
+"¹ö±× º¸°íÇÏ´Â ¹æ¹ýÀº ´ÙÀ½À» Âü°íÇϽʽÿÀ:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\\n"
+
+#: debug/xtrace.sh:125
+msgid "xtrace: unrecognized option \\`$1'\\n"
+msgstr "xtrace: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç \\`$1'\\n"
+
+#: debug/xtrace.sh:138
+msgid "No program name given\\n"
+msgstr "ÇÁ·Î±×·¥ À̸§ÀÌ ¾ø½À´Ï´Ù\\n"
+
+#: debug/xtrace.sh:146
+#, sh-format
+msgid "executable \\`$program' not found\\n"
+msgstr "\\`$program' ½ÇÇà ÆÄÀÏÀÌ ¾ø½À´Ï´Ù\\n"
+
+#: debug/xtrace.sh:150
+#, sh-format
+msgid "\\`$program' is no executable\\n"
+msgstr "\\`$program' ÆÄÀÏÀÌ ½ÇÇà ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù\\n"
+
+#: dlfcn/dlinfo.c:64
+msgid "RTLD_SELF used in code not dynamically loaded"
+msgstr "µ¿ÀûÀ¸·Î ÀûÀçÇÏÁö ¾ÊÀº Äڵ忡 RTLD_SELF¸¦ »ç¿ëÇÔ"
+
+#: dlfcn/dlinfo.c:73
+msgid "unsupported dlinfo request"
+msgstr "Áö¿øÇÏÁö ¾Ê´Â dlinfo ¿äû"
+
+#: dlfcn/dlmopen.c:64
+msgid "invalid namespace"
+msgstr "À߸øµÈ ³×ÀÓ½ºÆäÀ̽º"
+
+#: dlfcn/dlmopen.c:69
+msgid "invalid mode"
+msgstr "À߸øµÈ ¸ðµå"
+
+#: dlfcn/dlopen.c:64
+msgid "invalid mode parameter"
+msgstr "À߸øµÈ ¸ðµå ¸Å°³º¯¼ö"
+
+#: elf/cache.c:69
+msgid "unknown"
+msgstr "¾Ë ¼ö ¾øÀ½"
+
+#: elf/cache.c:112
+msgid "Unknown OS"
+msgstr "¾Ë ¼ö ¾ø´Â ¿î¿µÃ¼Á¦"
+
+#: elf/cache.c:117
+#, c-format
+msgid ", OS ABI: %s %d.%d.%d"
+msgstr ", OS ABI: %s %d.%d.%d"
+
+#: elf/cache.c:134 elf/ldconfig.c:1270
+#, c-format
+msgid "Can't open cache file %s\n"
+msgstr "ij½Ã ÆÄÀÏ `%s'À»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù\n"
+
+#: elf/cache.c:148
+#, c-format
+msgid "mmap of cache file failed.\n"
+msgstr "ij½Ã ÆÄÀÏÀ» mmapÇÏ´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù.\n"
+
+#: elf/cache.c:152 elf/cache.c:166
+#, c-format
+msgid "File is not a cache file.\n"
+msgstr "ÆÄÀÏÀÌ Ä³½Ã ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù.\n"
+
+#: elf/cache.c:199 elf/cache.c:209
+#, c-format
+msgid "%d libs found in cache `%s'\n"
+msgstr "%2$s ij½Ã¿¡ %1$d°³ÀÇ ¶óÀ̺귯¸®°¡ ¹ß°ßµÇ¾ú½À´Ï´Ù\n"
+
+#: elf/cache.c:403
+#, c-format
+msgid "Can't create temporary cache file %s"
+msgstr "Àӽà ij½Ã ÆÄÀÏ %sÀ»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/cache.c:411 elf/cache.c:421 elf/cache.c:425 elf/cache.c:430
+#, c-format
+msgid "Writing of cache data failed"
+msgstr "ij½Ã µ¥ÀÌÅÍ ¾²±â°¡ ½ÇÆÐ"
+
+#: elf/cache.c:435
+#, c-format
+msgid "Changing access rights of %s to %#o failed"
+msgstr "%sÀÇ Á¢±Ù±ÇÇÑÀ» to %#o·Î(À¸·Î) ¹Ù²Ù´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
+
+#: elf/cache.c:440
+#, c-format
+msgid "Renaming of %s to %s failed"
+msgstr "%s¿¡¼­ %sÀ¸·Î(·Î) À̸§À» ¹Ù²Ù´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
+
+#: elf/dl-close.c:378 elf/dl-open.c:460
+msgid "cannot create scope list"
+msgstr "½ºÄÚÇÁ ¸ñ·ÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-close.c:724
+msgid "shared object not open"
+msgstr "°øÀ¯ ¿ÀºêÁ§Æ®°¡ ¿­¸®Áö ¾Ê¾Ò½À´Ï´Ù"
+
+#: elf/dl-deps.c:114
+msgid "DST not allowed in SUID/SGID programs"
+msgstr "SUID/SGID ÇÁ·Î±×·¥¿¡ DST´Â »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+# ¹ø¿ª: ¹º ¼Ò¸®¾ß?
+#: elf/dl-deps.c:127 elf/dl-open.c:282
+msgid "empty dynamic string token substitution"
+msgstr "ºñ¾î ÀÖ´Â µ¿Àû ¹®ÀÚ¿­ ÅäÅ« ġȯ"
+
+# ¹ø¿ª: ¹º ¼Ò¸®¾ß?
+#: elf/dl-deps.c:133
+#, c-format
+msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
+msgstr "µ¿Àû ¹®ÀÚ¿­ ÅäÅ« ġȯÀÌ ºñ¾î Àֱ⠶§¹®¿¡ `%s' ºÎ°¡ µ¥ÀÌÅ͸¦ ÀоîµéÀÏ ¼ö ¾ø½À´Ï´Ù\n"
+
+#: elf/dl-deps.c:474
+msgid "cannot allocate dependency list"
+msgstr "ÀÇÁ¸¼º ¸®½ºÆ®¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-deps.c:510 elf/dl-deps.c:565
+msgid "cannot allocate symbol search list"
+msgstr "±âÈ£ ã±â ¸®½ºÆ®¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-deps.c:550
+msgid "Filters not supported with LD_TRACE_PRELINKING"
+msgstr "LD_TRACE_PRELINKINGÀ» »ç¿ëÇÒ °æ¿ì ÇÊÅÍ´Â Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
+
+#: elf/dl-error.c:77
+msgid "DYNAMIC LINKER BUG!!!"
+msgstr "µ¿Àû ¸µÄ¿ ¹ö±×!!!"
+
+#: elf/dl-error.c:124
+msgid "error while loading shared libraries"
+msgstr "µ¿Àû ¶óÀ̺귯¸®¸¦ ÀоîµéÀÌ´Â µ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù"
+
+#: elf/dl-fptr.c:88
+msgid "cannot map pages for fdesc table"
+msgstr "fdesc Å×À̺íÀÇ ÆäÀÌÁö¸¦ ¸ÅÇÎÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-fptr.c:192
+msgid "cannot map pages for fptr table"
+msgstr "fptr Å×À̺íÀÇ ÆäÀÌÁö¸¦ ¸ÅÇÎÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-fptr.c:221
+msgid "internal error: symidx out of range of fptr table"
+msgstr "³»ºÎ ¿À·ù: symidx°¡ fptr Å×À̺íÀÇ ¹üÀ§¸¦ ¹þ¾î³µ½À´Ï´Ù"
+
+#: elf/dl-load.c:372
+msgid "cannot allocate name record"
+msgstr "³×ÀÓ ·¹Äڵ带 ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:474 elf/dl-load.c:582 elf/dl-load.c:667 elf/dl-load.c:780
+msgid "cannot create cache for search path"
+msgstr "ã±â °æ·Î¿¡ ´ëÇÑ Ä³½Ã¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:565
+msgid "cannot create RUNPATH/RPATH copy"
+msgstr "RUNPATH/RPATH Ä«ÇǸ¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:653
+msgid "cannot create search path array"
+msgstr "ã±â °æ·Î ¹è¿­À» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:864
+msgid "cannot stat shared object"
+msgstr "µ¿Àû ¿ÀºêÁ§Æ®¿¡ ´ëÇØ stat()ÀÌ ½ÇÆÐÇß½À´Ï´Ù"
+
+#: elf/dl-load.c:934
+msgid "cannot open zero fill device"
+msgstr "0À¸·Î ä¿î ÀåÄ¡¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:979 elf/dl-load.c:2224
+msgid "cannot create shared object descriptor"
+msgstr "°øÀ¯ ¿ÀºêÁ§Æ® µð½ºÅ©¸³Å͸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:998 elf/dl-load.c:1656 elf/dl-load.c:1748
+msgid "cannot read file data"
+msgstr "ÆÄÀÏ µ¥ÀÌÅ͸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:1042
+msgid "ELF load command alignment not page-aligned"
+msgstr "ELF ·Îµå ¸í·ÉÀÇÀÇ alignÀÌ ÆäÀÌÁö¿¡ alignµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
+
+#: elf/dl-load.c:1049
+msgid "ELF load command address/offset not properly aligned"
+msgstr "ELF ·Îµå ¸í·ÉÀÇ ÁÖ¼Ò/¿ÀÇÁ¼ÂÀÌ ¿Ã¹Ù¸£°Ô alignµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
+
+#: elf/dl-load.c:1132
+msgid "cannot allocate TLS data structures for initial thread"
+msgstr "ÃÖÃÊ ½º·¹µå¿¡ TLS µ¥ÀÌÅÍ ±¸Á¶¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:1155
+msgid "cannot handle TLS data"
+msgstr "TLS µ¥ÀÌÅ͸¦ ó¸®ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:1174
+msgid "object file has no loadable segments"
+msgstr "¿ÀºêÁ§Æ® ÆÄÀÏ¿¡ ÀоîµéÀÏ ¼ö ÀÖ´Â ¼½¼ÇÀÌ ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:1210
+msgid "failed to map segment from shared object"
+msgstr "µ¿Àû ¿ÀºêÁ§Æ®ÀÇ ¼¼±×¸ÕÆ®¸¦ ¸ÅÇÎÇÏ´Â ½ÇÆÐ"
+
+#: elf/dl-load.c:1236
+msgid "cannot dynamically load executable"
+msgstr "µ¿ÀûÀ¸·Î ½ÇÇàÆÄÀÏÀ» ·ÎµåÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:1298
+msgid "cannot change memory protections"
+msgstr "¸Þ¸ð¸® º¸È£¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:1317
+msgid "cannot map zero-fill pages"
+msgstr "0À¸·Î ä¿î ÆäÀÌÁö¸¦ ¸ÅÇÎÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:1331
+msgid "object file has no dynamic section"
+msgstr "¿ÀºêÁ§Æ® ÆÄÀÏ¿¡ µ¿Àû ¼½¼ÇÀÌ ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:1354
+msgid "shared object cannot be dlopen()ed"
+msgstr "µ¿Àû ¿ÀºêÁ§Æ®´Â dlopen()µÉ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:1367
+msgid "cannot allocate memory for program header"
+msgstr "ÇÁ·Î±×·¥ Çì´õ¿¡ ´ëÇÑ ¸Þ¸ð¸®¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:1384 elf/dl-open.c:218
+msgid "invalid caller"
+msgstr "È£ÃâÇÑ ÃøÀÌ ¿Ã¹Ù¸£Áö ¾Ê½À´Ï´Ù"
+
+#: elf/dl-load.c:1423
+msgid "cannot enable executable stack as shared object requires"
+msgstr "½ÇÇàÇÒ ¼ö ÀÖ´Â ½ºÅÃÀ» °øÀ¯ ¿ÀºêÁ§Æ® Çʼö¿ä¼Ò·Î ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:1436
+msgid "cannot close file descriptor"
+msgstr "ÆÄÀÏ µð½ºÅ©¸³Å͸¦ ´ÝÀ» ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:1478
+msgid "cannot create searchlist"
+msgstr "ã±â¸®½ºÆ®¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-load.c:1656
+msgid "file too short"
+msgstr "ÆÄÀÏÀÌ ³Ê¹« ª½À´Ï´Ù"
+
+#: elf/dl-load.c:1685
+msgid "invalid ELF header"
+msgstr "À߸øµÈ ELF Çì´õ"
+
+#: elf/dl-load.c:1697
+msgid "ELF file data encoding not big-endian"
+msgstr "ELF ÆÄÀÏ µ¥ÀÌÅÍ ÀÎÄÚµùÀÌ ºòÀεð¾ÈÀÌ ¾Æ´Õ´Ï´Ù"
+
+#: elf/dl-load.c:1699
+msgid "ELF file data encoding not little-endian"
+msgstr "ELF ÆÄÀÏ µ¥ÀÌÅÍ ÀÎÄÚµùÀÌ ¸®Æ²Àεð¾ÈÀÌ ¾Æ´Õ´Ï´Ù"
+
+#: elf/dl-load.c:1703
+msgid "ELF file version ident does not match current one"
+msgstr "ELF ÆÄÀÏ ¹öÀü ident°¡ ÇöÀç ident¿Í ¸ÂÁö ¾Ê½À´Ï´Ù"
+
+#: elf/dl-load.c:1707
+msgid "ELF file OS ABI invalid"
+msgstr "ELF ÆÄÀÏ OS ABI°¡ À߸øµÇ¾ú½À´Ï´Ù"
+
+#: elf/dl-load.c:1709
+msgid "ELF file ABI version invalid"
+msgstr "ELF ÆÄÀÏ ABI ¹öÀüÀÌ À߸øµÇ¾ú½À´Ï´Ù"
+
+#: elf/dl-load.c:1712
+msgid "internal error"
+msgstr "³»ºÎ ¿À·ù"
+
+#: elf/dl-load.c:1719
+msgid "ELF file version does not match current one"
+msgstr "ELF ÆÄÀÏ ¹öÀüÀÌ ÇöÀç ¹öÀü°ú ¸ÂÁö ¾Ê½À´Ï´Ù"
+
+#: elf/dl-load.c:1727
+msgid "only ET_DYN and ET_EXEC can be loaded"
+msgstr "ET_DYN°ú ET_EXEC¸¸À» ÀоîµéÀÏ ¼ö ÀÖ½À´Ï´Ù"
+
+#: elf/dl-load.c:1733
+msgid "ELF file's phentsize not the expected size"
+msgstr "ELF ÆÄÀÏÀÇ phentsize°¡ ¿¹»ó°ú ¸ÂÁö ¾Ê½À´Ï´Ù"
+
+#: elf/dl-load.c:2240
+msgid "wrong ELF class: ELFCLASS64"
+msgstr "ELF Ŭ·¡½º°¡ Ʋ·È½À´Ï´Ù: ELFCLASS64"
+
+#: elf/dl-load.c:2241
+msgid "wrong ELF class: ELFCLASS32"
+msgstr "ELF Ŭ·¡½º°¡ Ʋ·È½À´Ï´Ù: ELFCLASS32"
+
+#: elf/dl-load.c:2244
+msgid "cannot open shared object file"
+msgstr "µ¿Àû ¿ÀºêÁ§Æ® ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-lookup.c:356
+msgid "relocation error"
+msgstr "¸®·ÎÄÉÀÌ¼Ç ¿À·ù"
+
+#: elf/dl-lookup.c:384
+msgid "symbol lookup error"
+msgstr "½Éº¼ ã±â ¿À·ù"
+
+#: elf/dl-open.c:114
+msgid "cannot extend global scope"
+msgstr "Àü¿ª ½ºÄÚÇÁ¸¦ È®ÀåÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-open.c:512
+msgid "TLS generation counter wrapped!  Please report this."
+msgstr "TLS ¸¸µé±â Ä«¿îÅÍ°¡ °ãÃƽÀ´Ï´Ù!  ÀÌ ¹®Á¦¸¦ ¾Ë·Á ÁֽʽÿÀ."
+
+#: elf/dl-open.c:549
+msgid "invalid mode for dlopen()"
+msgstr "dlopen()¿¡ À߸øµÈ ¸ðµå"
+
+#: elf/dl-open.c:566
+msgid "no more namespaces available for dlmopen()"
+msgstr "dlmopen()¿¡ »ç¿ëÇÒ ¼ö ÀÖ´Â ³×ÀÓ½ºÆäÀ̽º°¡ ´õ ÀÌ»ó ¾ø½À´Ï´Ù"
+
+#: elf/dl-open.c:579
+msgid "invalid target namespace in dlmopen()"
+msgstr "dlmopen()¿¡ ´ë»ó ³×ÀÓ½ºÆäÀ̽º°¡ À߸øµÇ¾ú½À´Ï´Ù"
+
+#: elf/dl-reloc.c:54
+msgid "cannot allocate memory in static TLS block"
+msgstr "Á¤Àû TLS ºí·°¿¡´Â ¸Þ¸ð¸®¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-reloc.c:196
+msgid "cannot make segment writable for relocation"
+msgstr "¸®·ÎÄÉÀ̼ÇÀ» À§ÇØ ¼¼±×¸ÕÆ®¸¦ ¾²±â °¡´ÉÇϵµ·Ï ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-reloc.c:277
+#, c-format
+msgid "%s: no PLTREL found in object %s\n"
+msgstr "%s: %s ¿ÀºêÁ§Æ®¿¡ PLTRELÀÌ ¾ø½À´Ï´Ù\n"
+
+#: elf/dl-reloc.c:288
+#, c-format
+msgid "%s: out of memory to store relocation results for %s\n"
+msgstr "%s: %s¿¡ ´ëÇÑ ¸®·ÎÄÉÀÌ¼Ç °á°ú¸¦ ÀúÀåÇÒ ¸Þ¸ð¸®°¡ ºÎÁ·ÇÕ´Ï´Ù\n"
+
+#: elf/dl-reloc.c:304
+msgid "cannot restore segment prot after reloc"
+msgstr "¸®·ÎÄÉÀÌ¼Ç µÚ¿¡ prot ¼¼±×¸ÕÆ®¸¦ º¹±¸ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-reloc.c:329
+msgid "cannot apply additional memory protection after relocation"
+msgstr "¸®·ÎÄÉÀÌ¼Ç µÚ¿¡ Ãß°¡·Î ¸Þ¸ð¸® º¸È£¸¦ Àû¿ëÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-sym.c:162
+msgid "RTLD_NEXT used in code not dynamically loaded"
+msgstr "µ¿ÀûÀ¸·Î ÀûÀçÇÏÁö ¾ÊÀº Äڵ忡 RTLD_NEXT¸¦ »ç¿ëÇÔ"
+
+# ¹ø¿ª: capability´Â DB¿¡¼­ authenticationÀ» ÁÙÀ̱â À§ÇØ ¾²´Â °Í..
+# °¡±î¿î DBÃ¥ ÂüÁ¶.
+#: elf/dl-sysdep.c:469 elf/dl-sysdep.c:481
+msgid "cannot create capability list"
+msgstr "ÄÉÀÌÆÛºô¸®Æ¼ ¸®½ºÆ®¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-tls.c:825
+msgid "cannot create TLS data structures"
+msgstr "TLS µ¥ÀÌÅÍ ±¸Á¶¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/dl-version.c:303
+msgid "cannot allocate version reference table"
+msgstr "¹öÀü ÂüÁ¶ Å×À̺íÀ» ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/ldconfig.c:138
+msgid "Print cache"
+msgstr "ij½Ã Ç¥½Ã"
+
+#: elf/ldconfig.c:139
+msgid "Generate verbose messages"
+msgstr "´õ ¸¹Àº ¸Þ½ÃÁö Ç¥½Ã"
+
+#: elf/ldconfig.c:140
+msgid "Don't build cache"
+msgstr "ij½Ã¸¦ ¸¸µéÁö ¾ÊÀ½"
+
+#: elf/ldconfig.c:141
+msgid "Don't generate links"
+msgstr "¸µÅ©¸¦ ¸¸µéÁö ¾ÊÀ½"
+
+#: elf/ldconfig.c:142
+msgid "Change to and use ROOT as root directory"
+msgstr "<·çÆ®>·Î À̵¿ÇÑ ´ÙÀ½ <·çÆ®>¸¦ ·çÆ® µð·ºÅ丮·Î »ç¿ëÇÕ´Ï´Ù"
+
+#: elf/ldconfig.c:142
+msgid "ROOT"
+msgstr "<·çÆ®>"
+
+#: elf/ldconfig.c:143
+msgid "CACHE"
+msgstr "<ij½Ã>"
+
+#: elf/ldconfig.c:143
+msgid "Use CACHE as cache file"
+msgstr "ij½Ã ÆÄÀÏ·Î <ij½Ã>¸¦ »ç¿ëÇÕ´Ï´Ù"
+
+#: elf/ldconfig.c:144
+msgid "CONF"
+msgstr "<¼³Á¤>"
+
+#: elf/ldconfig.c:144
+msgid "Use CONF as configuration file"
+msgstr "¼³Á¤ ÆÄÀÏ·Î <¼³Á¤>À» »ç¿ëÇÕ´Ï´Ù"
+
+#: elf/ldconfig.c:145
+msgid "Only process directories specified on the command line.  Don't build cache."
+msgstr "¸í·ÉÇà¿¡ ÁöÁ¤ÇÑ µð·ºÅ丮¸¸ ó¸®ÇÕ´Ï´Ù.  ij½Ã¸¦ ¸¸µéÁö ¾Ê½À´Ï´Ù."
+
+#: elf/ldconfig.c:146
+msgid "Manually link individual libraries."
+msgstr "¼öµ¿À¸·Î °¢°¢ÀÇ ¶óÀ̺귯¸®¸¦ ¸µÅ©ÇϽʽÿÀ."
+
+#: elf/ldconfig.c:147
+msgid "FORMAT"
+msgstr "<Çü½Ä>"
+
+#: elf/ldconfig.c:147
+msgid "Format to use: new, old or compat (default)"
+msgstr "»ç¿ëÇÒ ¼ö ÀÖ´Â Çü½Ä: new, old, compat (±âº»°ª)"
+
+#: elf/ldconfig.c:148
+msgid "Ignore auxiliary cache file"
+msgstr "º¸Á¶ ij½Ã ÆÄÀÏ ¹«½Ã"
+
+#: elf/ldconfig.c:156
+msgid "Configure Dynamic Linker Run Time Bindings."
+msgstr "µ¿Àû ¸µÄ¿ÀÇ ·±Å¸ÀÓ ¹ÙÀεùÀ» ¼³Á¤ÇÕ´Ï´Ù."
+
+#: elf/ldconfig.c:319
+#, c-format
+msgid "Path `%s' given more than once"
+msgstr "`%s' °æ·Î°¡ ¿©·¯¹ø ÁÖ¾îÁ³½À´Ï´Ù"
+
+#: elf/ldconfig.c:359
+#, c-format
+msgid "%s is not a known library type"
+msgstr "%sÀº(´Â) ¾Ë·ÁÁø ¶óÀ̺귯¸® ŸÀÔÀÌ ¾Æ´Õ´Ï´Ù"
+
+#: elf/ldconfig.c:384
+#, c-format
+msgid "Can't stat %s"
+msgstr "%s¿¡ stat()ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/ldconfig.c:458
+#, c-format
+msgid "Can't stat %s\n"
+msgstr "%s¿¡ stat()ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
+
+#: elf/ldconfig.c:468
+#, c-format
+msgid "%s is not a symbolic link\n"
+msgstr "%sÀº(´Â) ½Éº¼¸¯ ¸µÅ©°¡ ¾Æ´Õ´Ï´Ù\n"
+
+#: elf/ldconfig.c:487
+#, c-format
+msgid "Can't unlink %s"
+msgstr "%sÀ»(¸¦) Áö¿ï ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/ldconfig.c:493
+#, c-format
+msgid "Can't link %s to %s"
+msgstr "%sÀ»(¸¦) %s(À¸)·Î ¸µÅ©ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/ldconfig.c:499
+msgid " (changed)\n"
+msgstr " (¹Ù²ñ)\n"
+
+#: elf/ldconfig.c:501
+msgid " (SKIPPED)\n"
+msgstr " (Áö³ªÄ§)\n"
+
+#: elf/ldconfig.c:556
+#, c-format
+msgid "Can't find %s"
+msgstr "%sÀ»(¸¦) ãÀ» ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/ldconfig.c:572 elf/ldconfig.c:745 elf/ldconfig.c:793 elf/ldconfig.c:827
+#, c-format
+msgid "Cannot lstat %s"
+msgstr "%s¿¡ lstat()ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/ldconfig.c:579
+#, c-format
+msgid "Ignored file %s since it is not a regular file."
+msgstr "ÀÏ¹Ý ÆÄÀÏÀÌ ¾Æ´Ï¹Ç·Î %s ÆÄÀÏÀ» ¹«½ÃÇÕ´Ï´Ù."
+
+#: elf/ldconfig.c:588
+#, c-format
+msgid "No link created since soname could not be found for %s"
+msgstr "%s¿¡ ´ëÇÑ sonameÀ» ãÀ» ¼ö ¾øÀ¸¹Ç·Î ¸µÅ©¸¦ ¸¸µéÁö ¾Ê½À´Ï´Ù"
+
+#: elf/ldconfig.c:671
+#, c-format
+msgid "Can't open directory %s"
+msgstr "µð·ºÅ丮 %sÀ»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/ldconfig.c:759
+#, c-format
+msgid "Cannot stat %s"
+msgstr "%s¿¡ stat()ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/ldconfig.c:814 elf/readlib.c:91
+#, c-format
+msgid "Input file %s not found.\n"
+msgstr "ÀÔ·Â ÆÄÀÏ %sÀ»(¸¦) ãÁö ¸øÇß½À´Ï´Ù.\n"
+
+#: elf/ldconfig.c:888
+#, c-format
+msgid "libc5 library %s in wrong directory"
+msgstr "libc5 library %sÀÌ(°¡) À߸øµÈ µð·ºÅ丮¿¡ ÀÖ½À´Ï´Ù"
+
+#: elf/ldconfig.c:891
+#, c-format
+msgid "libc6 library %s in wrong directory"
+msgstr "libc6 library %sÀÌ(°¡) À߸øµÈ µð·ºÅ丮¿¡ ÀÖ½À´Ï´Ù"
+
+#: elf/ldconfig.c:894
+#, c-format
+msgid "libc4 library %s in wrong directory"
+msgstr "libc4 library %sÀÌ(°¡) À߸øµÈ µð·ºÅ丮¿¡ ÀÖ½À´Ï´Ù"
+
+#: elf/ldconfig.c:922
+#, c-format
+msgid "libraries %s and %s in directory %s have same soname but different type."
+msgstr "µð·ºÅ丮 %sÀÇ ¶óÀ̺귯¸® %s°ú(¿Í) %sÀÌ(°¡) °°Àº sonameÀ» °¡Áö°í ÀÖÁö¸¸ ŸÀÔÀÌ ´Ù¸¨´Ï´Ù."
+
+#: elf/ldconfig.c:1031
+#, c-format
+msgid "Can't open configuration file %s"
+msgstr "¼³Á¤ ÆÄÀÏ `%s'À»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/ldconfig.c:1095
+#, c-format
+msgid "%s:%u: bad syntax in hwcap line"
+msgstr "%s:%u: hwcap ÁÙÀÇ ¹®¹ýÀÌ À߸øµÇ¾ú½À´Ï´Ù"
+
+#: elf/ldconfig.c:1101
+#, c-format
+msgid "%s:%u: hwcap index %lu above maximum %u"
+msgstr "%s:%u: hwcap À妽º %luÀº(´Â) ÃÖ´ë°ª %uÀ»(¸¦) ³Ñ¾î°¬½À´Ï´Ù"
+
+#: elf/ldconfig.c:1108 elf/ldconfig.c:1116
+#, c-format
+msgid "%s:%u: hwcap index %lu already defined as %s"
+msgstr "%s:%u: hwcap À妽º %luÀº(´Â) ÀÌ¹Ì %s(À¸)·Î Á¤ÀǵǾî ÀÖ½À´Ï´Ù"
+
+#: elf/ldconfig.c:1119
+#, c-format
+msgid "%s:%u: duplicate hwcap %lu %s"
+msgstr "%s:%u: Áߺ¹µÈ hwcap %lu %s"
+
+#: elf/ldconfig.c:1141
+#, c-format
+msgid "need absolute file name for configuration file when using -r"
+msgstr "-r ¿É¼ÇÀ» »ç¿ëÇÒ °æ¿ì ¼³Á¤ ÆÄÀÏÀÇ Àý´ë ÆÄÀÏ À̸§ÀÌ ÇÊ¿äÇÕ´Ï´Ù"
 
-#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:313
+#: elf/ldconfig.c:1148 locale/programs/xmalloc.c:70 malloc/obstack.c:434
+#: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1163
+#, c-format
+msgid "memory exhausted"
+msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
+
+#: elf/ldconfig.c:1178
+#, c-format
+msgid "%s:%u: cannot read directory %s"
+msgstr "%s:%u: %s µð·ºÅ丮¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/ldconfig.c:1223
+#, c-format
+msgid "relative path `%s' used to build cache"
+msgstr "ij½Ã¸¦ ¸¸µå´Â µ¥ »ó´ë °æ·ÎÀÎ `%s' °æ·Î¸¦ »ç¿ëÇß½À´Ï´Ù"
+
+#: elf/ldconfig.c:1249
+#, c-format
+msgid "Can't chdir to /"
+msgstr "/·Î µð·ºÅ丮¸¦ À̵¿ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/ldconfig.c:1291
+#, c-format
+msgid "Can't open cache file directory %s\n"
+msgstr "ij½Ã ÆÄÀÏ µð·ºÅ丮 `%s'À»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù\n"
+
+#: elf/ldd.bash.in:43
+msgid "Written by %s and %s.\n"
+msgstr "¸¸µç »ç¶÷: %s ¹× %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 ""
+"»ç¿ë¹ý: ldd [¿É¼Ç]... <ÆÄÀÏ>...\n"
+"      --help              ÀÌ µµ¿ò¸»À» Ãâ·ÂÇÏ°í ³¡³³´Ï´Ù\n"
+"      --version           ¹öÀü Á¤º¸¸¦ Ç¥½ÃÇÏ°í ³¡³³´Ï´Ù\n"
+"  -d, --data-relocs       µ¥ÀÌÅÍ ¸®·ÎÄÉÀ̼ÇÀ» ó¸®ÇÕ´Ï´Ù\n"
+"  -r, --function-relocs   µ¥ÀÌÅÍ ¹× ÇÔ¼ö ¸®·ÎÄÉÀ̼ÇÀ» ó¸®ÇÕ´Ï´Ù\n"
+"  -u, --unused            »ç¿ëÇÏÁö ¾Ê´Â Á÷Á¢ ÀÇÁ¸¼ºÀ» Ç¥½ÃÇÕ´Ï´Ù\n"
+"  -v, --verbose           Àüü Á¤º¸¸¦ Ç¥½ÃÇÕ´Ï´Ù\n"
+"¹ö±× º¸°í ¹æ¹ýÀº ´ÙÀ½À» Âü°íÇϽʽÿÀ:\n"
+"<http://www.gnu.org/software/libc/bugs.html>."
+
+#: elf/ldd.bash.in:80
+msgid "ldd: option \\`$1' is ambiguous"
+msgstr "ldd: \\`$1' ¿É¼ÇÀº ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù"
+
+#: elf/ldd.bash.in:87
+msgid "unrecognized option"
+msgstr "ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç"
+
+#: elf/ldd.bash.in:88 elf/ldd.bash.in:126
+msgid "Try \\`ldd --help' for more information."
+msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é \\`ldd --help' ÇϽʽÿÀ."
+
+#: elf/ldd.bash.in:125
+msgid "missing file arguments"
+msgstr "ÆÄÀÏ ÀÎÀÚ°¡ ¾ø½À´Ï´Ù"
+
+#. 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 "±×·± ÆÄÀÏÀ̳ª µð·ºÅ丮°¡ ¾ø½À´Ï´Ù"
+
+#: elf/ldd.bash.in:151 inet/rcmd.c:483
+msgid "not regular file"
+msgstr "ÀÏ¹Ý ÆÄÀÏÀÌ ¾Æ´Ô"
+
+#: elf/ldd.bash.in:154
+msgid "warning: you do not have execution permission for"
+msgstr "°æ°í: ´ÙÀ½¿¡ ´ëÇØ ½ÇÇà ±ÇÇÑÀÌ ¾ø½À´Ï´Ù"
+
+#: elf/ldd.bash.in:183
+msgid "\tnot a dynamic executable"
+msgstr "\tµ¿Àû ½ÇÇà ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù"
+
+#: elf/ldd.bash.in:191
+msgid "exited with unknown exit code"
+msgstr "¾Ë ¼ö ¾ø´Â Á¾·á ÄÚµå·Î ³¡³µ½À´Ï´Ù"
+
+#: elf/ldd.bash.in:196
+msgid "error: you do not have read permission for"
+msgstr "¿À·ù: ´ÙÀ½¿¡ ´ëÇØ Àб⠱ÇÇÑÀÌ ¾ø½À´Ï´Ù"
+
+#: elf/readelflib.c:35
+#, c-format
+msgid "file %s is truncated\n"
+msgstr "%s ÆÄÀÏÀÌ À߶óÁ³½À´Ï´Ù\n"
+
+#: elf/readelflib.c:67
+#, c-format
+msgid "%s is a 32 bit ELF file.\n"
+msgstr "%sÀº(´Â) 32ºñÆ® ELF ÆÄÀÏÀÔ´Ï´Ù.\n"
+
+#: elf/readelflib.c:69
+#, c-format
+msgid "%s is a 64 bit ELF file.\n"
+msgstr "%sÀº(´Â) 64ºñÆ® ELF ÆÄÀÏÀÔ´Ï´Ù.\n"
+
+#: elf/readelflib.c:71
+#, c-format
+msgid "Unknown ELFCLASS in file %s.\n"
+msgstr "%s ÆÄÀÏÀÌ ¾Ë·ÁÁöÁö ¾ÊÀº ELFCLASS.\n"
+
+#: elf/readelflib.c:78
+#, c-format
+msgid "%s is not a shared object file (Type: %d).\n"
+msgstr "%sÀº(´Â) µ¿Àû ¿ÀºêÁ§Æ® ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù (ŸÀÔ: %d).\n"
+
+#: elf/readelflib.c:109
+#, c-format
+msgid "more than one dynamic segment\n"
+msgstr "¿©·¯ °³ÀÇ µ¿Àû ¼¼±×¸ÕÆ®\n"
+
+#: elf/readlib.c:97
+#, c-format
+msgid "Cannot fstat file %s.\n"
+msgstr "`%s'ÆÄÀÏ¿¡ fstat()À» ÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
+
+#: elf/readlib.c:108
+#, c-format
+msgid "File %s is empty, not checked."
+msgstr "%s ÆÄÀÏÀÌ ºó ÆÄÀÏÀ̹ǷΠ°Ë»çÇÏÁö ¾Ê½À´Ï´Ù."
+
+#: elf/readlib.c:114
+#, c-format
+msgid "File %s is too small, not checked."
+msgstr "%s ÆÄÀÏÀÌ ³Ê¹« À۾Ƽ­ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù."
+
+#: elf/readlib.c:124
+#, c-format
+msgid "Cannot mmap file %s.\n"
+msgstr "ÆÄÀÏ `%s'¿¡ mmap()ÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
+
+#: elf/readlib.c:162
+#, c-format
+msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
+msgstr "%sÀº(´Â) ELF ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù - ½ÃÀۺκÐÀÇ ¸ÅÁ÷ ¹ÙÀÌÆ®°¡ Ʋ·È½À´Ï´Ù.\n"
+
+#: elf/sprof.c:77
+msgid "Output selection:"
+msgstr "Ãâ·Â ¼±ÅÃ:"
+
+#: elf/sprof.c:79
+msgid "print list of count paths and their number of use"
+msgstr "´Ü°èÀÇ ¸ñ·Ï°ú ±× °¢ ´Ü°èÀÇ »ç¿ë Ƚ¼ö¸¦ Ç¥½Ã"
+
+#: elf/sprof.c:81
+msgid "generate flat profile with counts and ticks"
+msgstr "Ƚ¼ö¿Í ƽ¼ö¸¦ ±â·ÏÇÑ Ç÷§ ÇÁ·ÎÆÄÀÏÀ» ¸¸µç´Ù"
+
+#: elf/sprof.c:82
+msgid "generate call graph"
+msgstr "È£Ãâ ±×·¡ÇÁ¸¦ ¸¸µê"
+
+#: elf/sprof.c:89
+msgid ""
+"Read and display shared object profiling data.\vFor bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+"°øÀ¯ ¿ÀºêÁ§Æ® ÇÁ·ÎÆÄÀϸµ µ¥ÀÌÅ͸¦ Àаí Ç¥½ÃÇÕ´Ï´Ù\\v¹ö±×¸¦ º¸°íÇÏ´Â ¹æ¹ýÀº ´ÙÀ½À» Âü°íÇϽʽÿÀ:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+
+#: elf/sprof.c:94
+msgid "SHOBJ [PROFDATA]"
+msgstr "SHOBJ [PROFDATA]"
+
+#: elf/sprof.c:400
+#, c-format
+msgid "failed to load shared object `%s'"
+msgstr "µ¿Àû ¿ÀºêÁ§Æ® `%s'À»(¸¦) Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù"
+
+#: elf/sprof.c:409
+#, c-format
+msgid "cannot create internal descriptors"
+msgstr "³»ºÎ µð½ºÅ©¸³Å͸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/sprof.c:528
+#, c-format
+msgid "Reopening shared object `%s' failed"
+msgstr "µ¿Àû ¿ÀºêÁ§Æ® `%s'À»(¸¦) ´Ù½Ã ¿©´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
+
+#: elf/sprof.c:535 elf/sprof.c:629
+#, c-format
+msgid "reading of section headers failed"
+msgstr "¼½¼Ç Çì´õ¸¦ Àд µ¥ ½ÇÆÐÇß½À´Ï´Ù"
+
+#: elf/sprof.c:543 elf/sprof.c:637
+#, c-format
+msgid "reading of section header string table failed"
+msgstr "¼½¼Ç Çì´õ ¹®ÀÚ¿­ Å×À̺íÀ» Àд µ¥ ½ÇÆÐÇß½À´Ï´Ù"
+
+#: elf/sprof.c:569
+#, c-format
+msgid "*** Cannot read debuginfo file name: %m\n"
+msgstr "*** µð¹ö±ëÁ¤º¸ ÆÄÀÏ À̸§À» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù: %m\n"
+
+#: elf/sprof.c:589
+#, c-format
+msgid "cannot determine file name"
+msgstr "ÆÄÀÏ À̸§À» ÆľÇÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/sprof.c:622
+#, c-format
+msgid "reading of ELF header failed"
+msgstr "ELF Çì´õ¸¦ Àд µ¥ ½ÇÆÐÇß½À´Ï´Ù"
+
+#: elf/sprof.c:658
+#, c-format
+msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
+msgstr "*** `%s' ÆÄÀÏÀº µð¹ö±ëÁ¤º¸°¡ Á¦°ÅµÇ¾ú½À´Ï´Ù: ´õ ÀÚ¼¼ÇÑ ºÐ¼®Àº ºÒ°¡´ÉÇÕ´Ï´Ù\n"
+
+#: elf/sprof.c:688
+#, c-format
+msgid "failed to load symbol data"
+msgstr "±âÈ£ µ¥ÀÌÅ͸¦ Àд µ¥ ½ÇÆÐÇß½À´Ï´Ù"
+
+#: elf/sprof.c:755
+#, c-format
+msgid "cannot load profiling data"
+msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌÅ͸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/sprof.c:764
+#, c-format
+msgid "while stat'ing profiling data file"
+msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌÅÍ ÆÄÀÏÀ» ¾²´Â µ¿¾È"
+
+#: elf/sprof.c:772
+#, c-format
+msgid "profiling data file `%s' does not match shared object `%s'"
+msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌÅÍ ÆÄÀÏ `%s'Àº(´Â) µ¿Àû ¿ÀºêÁ§Æ®`%s'¿Í ¸ÂÁö ¾Ê½À´Ï´Ù"
+
+#: elf/sprof.c:783
+#, c-format
+msgid "failed to mmap the profiling data file"
+msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌÅÍ ÆÄÀÏÀ» mmapÇÏ´Â µ¥ ½ÇÆÐ"
+
+#: elf/sprof.c:791
+#, c-format
+msgid "error while closing the profiling data file"
+msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌÅÍ ÆÄÀÏÀ» ´Ý´Â µµÁß ¿À·ù ¹ß»ý"
+
+#: elf/sprof.c:800 elf/sprof.c:870
+#, c-format
+msgid "cannot create internal descriptor"
+msgstr "³»ºÎ µð½ºÅ©¸³Å͸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+
+#: elf/sprof.c:846
+#, c-format
+msgid "`%s' is no correct profile data file for `%s'"
+msgstr "`%s'Àº(´Â) `%s'¿¡ ¸Â´Â ÇÁ·ÎÆÄÀÏ µ¥ÀÌÅÍ ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù"
+
+#: elf/sprof.c:1027 elf/sprof.c:1085
+#, c-format
+msgid "cannot allocate symbol data"
+msgstr "±âÈ£ µ¥ÀÌÅ͸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: iconv/iconv_charmap.c:176 iconv/iconv_prog.c:316
 #, c-format
 msgid "error while closing input `%s'"
 msgstr "`%s' ÀÔ·ÂÀ» ´Ý´Â µµÁß ¿À·ù ¹ß»ý"
 
-#: iconv/iconv_charmap.c:443
+#: iconv/iconv_charmap.c:450
 #, c-format
 msgid "illegal input sequence at position %Zd"
 msgstr "%Zd À§Ä¡¿¡ À߸øµÈ ÀÔ·Â ¼ø¼­¿­ÀÌ ÀÖÀ½"
 
-#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:506
+#: iconv/iconv_charmap.c:469 iconv/iconv_prog.c:526
+#, c-format
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr "¹öÆÛÀÇ ³¡¿¡ ºÒ¿ÏÀüÇÑ ¹®ÀÚ È¤Àº ½¬ÇÁÆ® ¿¬¼Ó"
 
-#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:549
-#: iconv/iconv_prog.c:585
+#: iconv/iconv_charmap.c:514 iconv/iconv_charmap.c:550 iconv/iconv_prog.c:569
+#: iconv/iconv_prog.c:605
+#, c-format
 msgid "error while reading the input"
 msgstr "ÀÔ·ÂÀ» Àд µµÁß¿¡ ¿À·ù ¹ß»ý"
 
-#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:567
+#: iconv/iconv_charmap.c:532 iconv/iconv_prog.c:587
+#, c-format
 msgid "unable to allocate buffer for input"
 msgstr "ÀÔ·ÂÀ» À§ÇÑ ¹öÆÛ¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: iconv/iconv_prog.c:61
+#: iconv/iconv_prog.c:60
 msgid "Input/Output format specification:"
 msgstr "ÀÔ/Ãâ·Â Çü½Ä ÁöÁ¤:"
 
-#: iconv/iconv_prog.c:62
+#: iconv/iconv_prog.c:61
 msgid "encoding of original text"
 msgstr "¿ø ¹®¼­ ÀÎÄÚµù"
 
-#: iconv/iconv_prog.c:63
+#: iconv/iconv_prog.c:62
 msgid "encoding for output"
 msgstr "Ãâ·Â ÀÎÄÚµù"
 
-#: iconv/iconv_prog.c:64
+#: iconv/iconv_prog.c:63
 msgid "Information:"
 msgstr "Á¤º¸:"
 
-#: iconv/iconv_prog.c:65
+#: iconv/iconv_prog.c:64
 msgid "list all known coded character sets"
 msgstr "¾Ë·ÁÁø ¸ðµç ¹®Àڼ Äڵ带 ¿­°ÅÇÔ"
 
-#: iconv/iconv_prog.c:66 locale/programs/localedef.c:128
+#: iconv/iconv_prog.c:65 locale/programs/localedef.c:127
 msgid "Output control:"
 msgstr "Ãâ·Â Á¶Á¤:"
 
-#: iconv/iconv_prog.c:67
+#: iconv/iconv_prog.c:66
 msgid "omit invalid characters from output"
 msgstr "Ãâ·Â¿¡¼­ À߸øµÈ ¹®ÀÚ¸¦ Á¦¿ÜÇÕ´Ï´Ù"
 
-#: iconv/iconv_prog.c:68
+#: iconv/iconv_prog.c:67
 msgid "output file"
 msgstr "Ãâ·Â ÆÄÀÏ"
 
-#: iconv/iconv_prog.c:69
+#: iconv/iconv_prog.c:68
 msgid "suppress warnings"
 msgstr "°æ°í¸¦ Ç¥½ÃÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: iconv/iconv_prog.c:70
+#: iconv/iconv_prog.c:69
 msgid "print progress information"
 msgstr "ÁøÇà Á¤º¸¸¦ Ç¥½Ã"
 
-#: iconv/iconv_prog.c:75
+#: iconv/iconv_prog.c:74
 msgid "Convert encoding of given files from one encoding to another."
 msgstr "ÁÖ¾îÁø ÆÄÀÏÀÇ ÀÎÄÚµùÀ» ÇÑ ÀÎÄÚµù¿¡¼­ ¶Ç´Ù¸¥ ÀÎÄÚµùÀ¸·Î º¯È¯ÇÔ."
 
-#: iconv/iconv_prog.c:79
+#: iconv/iconv_prog.c:78
 msgid "[FILE...]"
-msgstr "[<ÆÄÀÏ>...]"
+msgstr "[ÆÄÀÏ...]"
 
-#: iconv/iconv_prog.c:201
+#: iconv/iconv_prog.c:200
+#, c-format
 msgid "cannot open output file"
 msgstr "Ãâ·Â ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
 
-#: iconv/iconv_prog.c:243
+#: iconv/iconv_prog.c:242
 #, c-format
 msgid "conversions from `%s' and to `%s' are not supported"
-msgstr "`%s'¿¡¼­ º¯È¯ ¹× `%s'·ÎÀÇ º¯È¯Àº Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
+msgstr "`%s'¿¡¼­ º¯È¯ ¹× `%s'(À¸)·ÎÀÇ º¯È¯Àº Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: iconv/iconv_prog.c:248
+#: iconv/iconv_prog.c:247
 #, c-format
 msgid "conversion from `%s' is not supported"
-msgstr "`%s'¿¡¼­ º¯È¯Àº Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
+msgstr "`%s'¿¡¼­ º¯È¯Àº Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: iconv/iconv_prog.c:255
+#: iconv/iconv_prog.c:254
 #, c-format
 msgid "conversion to `%s' is not supported"
-msgstr "`%s'·ÎÀÇ º¯È¯Àº Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
+msgstr "`%s'·ÎÀÇ º¯È¯Àº Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: iconv/iconv_prog.c:259
+#: iconv/iconv_prog.c:258
 #, c-format
 msgid "conversion from `%s' to `%s' is not supported"
-msgstr "`%s'¿¡¼­ `%s'·ÎÀÇ º¯È¯Àº Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
+msgstr "`%s'¿¡¼­ `%s'·ÎÀÇ º¯È¯Àº Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: iconv/iconv_prog.c:265
+#: iconv/iconv_prog.c:268
+#, c-format
 msgid "failed to start conversion processing"
 msgstr "º¯È¯ÀÛ¾÷À» ½ÃÀÛÇϴµ¥ ½ÇÆÐ"
 
-#: iconv/iconv_prog.c:360
+#: iconv/iconv_prog.c:362
+#, c-format
 msgid "error while closing output file"
 msgstr "Ãâ·Â ÆÄÀÏÀ» ´Ý´Â µµÁß ¿À·ù ¹ß»ý"
 
-#: 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 "¹ö±×´Â `glibcbug' ½ºÅ©¸³Æ®¸¦ ÀÌ¿ëÇØ <bugs@gnu.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
-#, 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"
-"ÀÌ ÇÁ·Î±×·¥Àº °ø°³ ¼ÒÇÁÆ®¿þ¾îÀÔ´Ï´Ù; º¹»çÁ¶°ÇÀº ¼Ò½º¸¦ ÂüÁ¶ÇϽʽÿÀ.  »óÇ°¼º\n"
-"À̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿© ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n"
-
-#: 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:471 iconv/iconv_prog.c:497
 #, c-format
-msgid "Written by %s.\n"
-msgstr "¸¸µç »ç¶÷: %s\n"
-
-#: iconv/iconv_prog.c:458 iconv/iconv_prog.c:484
 msgid "conversion stopped due to problem in writing the output"
 msgstr "Ãâ·ÂÆÄÀÏ¿¡ ¾µ ¶§ ¹ß»ýÇÑ ¹®Á¦·Î º¯È¯ÀÛ¾÷ÀÌ ÁߴܵǾú½À´Ï´Ù"
 
-#: iconv/iconv_prog.c:502
+#: iconv/iconv_prog.c:522
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr "%ld À§Ä¡¿¡ À߸øµÈ ÀÔ·Â ¼ø¼­¿­ÀÌ ÀÖÀ½"
 
-#: iconv/iconv_prog.c:510
+#: iconv/iconv_prog.c:530
+#, c-format
 msgid "internal error (illegal descriptor)"
-msgstr "³»ºÎ ¿À·ù (À߸øµÈ ±â¼úÀÚ)"
+msgstr "³»ºÎ ¿À·ù (À߸øµÈ µð½ºÅ©¸³ÅÍ)"
 
-#: iconv/iconv_prog.c:513
+#: iconv/iconv_prog.c:533
 #, c-format
 msgid "unknown iconv() error %d"
 msgstr "¾Ë ¼ö ¾ø´Â iconv() ¿À·ù %d"
 
-#: iconv/iconv_prog.c:756
+#: iconv/iconv_prog.c:779
 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"
@@ -354,793 +1297,918 @@ msgstr "°í¼Ó·Îµù iconv ¸ðµâ ¼³Á¤ ÆÄÀÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù."
 
 #: iconv/iconvconfig.c:114
 msgid "[DIR...]"
-msgstr "[<µð·ºÅ丮>...]"
+msgstr "[µð·ºÅ丮...]"
 
-#: iconv/iconvconfig.c:126
+#: iconv/iconvconfig.c:127
 msgid "Prefix used for all file accesses"
 msgstr "¸ðµç ÆÄÀÏ Á¢±Ù¿¡ »ç¿ëÇÏ´Â Á¢µÎ¾î"
 
-#: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
+#: iconv/iconvconfig.c:128
+msgid "Put output in FILE instead of installed location (--prefix does not apply to FILE)"
+msgstr "Ãâ·ÂÀ» ¼³Ä¡ÇÑ À§Ä¡°¡ ¾Æ´Ï¶ó <ÆÄÀÏ>¿¡ Ãâ·ÂÇÕ´Ï´Ù (--prefix´Â <ÆÄÀÏ>¿¡ Àû¿ëÇÏÁö ¾Ê½À´Ï´Ù)"
+
+#: iconv/iconvconfig.c:132
+msgid "Do not search standard directories, only those on the command line"
+msgstr "Ç¥ÁØ µð·ºÅ丮¸¦ ãÁö ¾Ê°í, ¸í·ÉÇàÀÇ µð·ºÅ丮¸¸ ã½À´Ï´Ù"
+
+#: iconv/iconvconfig.c:301
+#, c-format
+msgid "Directory arguments required when using --nostdlib"
+msgstr "--nostdlib ¿É¼ÇÀ» »ç¿ëÇÏ¸é µð·ºÅ丮 Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù"
+
+#: iconv/iconvconfig.c:343 locale/programs/localedef.c:291
+#, c-format
 msgid "no output file produced because warnings were issued"
-msgstr "°æ°í°¡ Á¦±âµÇ¾ú±â ¶§¹®¿¡ Ãâ·Â ÆÄÀÏÀÌ ¸¸µé¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù"
+msgstr "°æ°í°¡ Á¦±âµÇ¾ú±â ¶§¹®¿¡ Ãâ·Â ÆÄÀÏÀ» ¸¸µéÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: iconv/iconvconfig.c:405
+#: iconv/iconvconfig.c:429
+#, c-format
 msgid "while inserting in search tree"
 msgstr "ã±â Æ®¸®¿¡ Ãß°¡ÇÏ´Â µ¿¾È"
 
-#: iconv/iconvconfig.c:1204
+#: iconv/iconvconfig.c:1238
+#, c-format
 msgid "cannot generate output file"
 msgstr "Ãâ·Â ÆÄÀÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
+#: inet/rcmd.c:157
+msgid "rcmd: Cannot allocate memory\n"
+msgstr "rcmd: ¸Þ¸ð¸®¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù\n"
+
+#: inet/rcmd.c:172
+msgid "rcmd: socket: All ports in use\n"
+msgstr "rcmd: socket: ¸ðµç Æ÷Æ®°¡ »ç¿ëÁß\n"
+
+#: inet/rcmd.c:200
+#, c-format
+msgid "connect to address %s: "
+msgstr "ÁÖ¼Ò %s¿¡ ¿¬°á: "
+
+#: inet/rcmd.c:213
+#, c-format
+msgid "Trying %s...\n"
+msgstr "%s ½ÃµµÁß...\n"
+
+#: inet/rcmd.c:249
+#, c-format
+msgid "rcmd: write (setting up stderr): %m\n"
+msgstr "rcmd: write (Ç¥ÁØ¿À·ù ¼³Á¤): %m\n"
+
+#: inet/rcmd.c:265
+#, c-format
+msgid "rcmd: poll (setting up stderr): %m\n"
+msgstr "rcmd: poll (Ç¥ÁØ¿À·ù ¼³Á¤): %m\n"
+
+#: inet/rcmd.c:268
+msgid "poll: protocol failure in circuit setup\n"
+msgstr "poll: ȸ·Î ¼³Á¤Áß ±Ô¾àÀÌ ºÒÀÌÇàµÊ\n"
+
+#: inet/rcmd.c:301
+msgid "socket: protocol failure in circuit setup\n"
+msgstr "socket: ȸ·Î ¼³Á¤Áß ±Ô¾àÀÌ ºÒÀÌÇàµÊ\n"
+
+#: inet/rcmd.c:325
+#, c-format
+msgid "rcmd: %s: short read"
+msgstr "rcmd: %s: ÀбⰡ ²÷°åÀ½"
+
+#: inet/rcmd.c:481
+msgid "lstat failed"
+msgstr "lstat ½ÇÆÐ"
+
+#: inet/rcmd.c:488
+msgid "cannot open"
+msgstr "¿­ ¼ö ¾ø½À´Ï´Ù"
+
+#: inet/rcmd.c:490
+msgid "fstat failed"
+msgstr "fstat ½ÇÆÐ"
+
+#: inet/rcmd.c:492
+msgid "bad owner"
+msgstr "À߸øµÈ ¼ÒÀ¯ÀÚ"
+
+#: inet/rcmd.c:494
+msgid "writeable by other than owner"
+msgstr "¼ÒÀ¯ÀÚ°¡ ¾Æ´Ñ »ç¶÷ÀÌ º¯°æÇÒ ¼ö ÀÖÀ½"
+
+#: inet/rcmd.c:496
+msgid "hard linked somewhere"
+msgstr "¾îµò°¡¿¡ ÇÏµå ¸µÅ©µÊ"
+
+#: inet/ruserpass.c:170 inet/ruserpass.c:193
+msgid "out of memory"
+msgstr "¸Þ¸ð¸® ºÎÁ·"
+
+#: inet/ruserpass.c:184
+msgid "Error: .netrc file is readable by others."
+msgstr "¿À·ù: .netrc ÆÄÀÏÀ» ´Ù¸¥ »ç¶÷ÀÌ ÀÐÀ» ¼ö ÀÖ½À´Ï´Ù."
+
+#: inet/ruserpass.c:185
+msgid "Remove password or make file unreadable by others."
+msgstr "¾ÏÈ£¸¦ Áö¿ì°Å³ª ÆÄÀÏÀ» ´Ù¸¥ »ç¶÷ÀÌ ÀÐÀ» ¼ö ¾ø°Ô ¸¸µì´Ï´Ù."
+
+#: inet/ruserpass.c:277
+#, c-format
+msgid "Unknown .netrc keyword %s"
+msgstr "¾Ë ¼ö ¾ø´Â .netrc Å°¿öµå %s"
+
+#: libidn/nfkc.c:464
+msgid "Character out of range for UTF-8"
+msgstr "UTF-8 ¹üÀ§¸¦ ¹þ¾î³­ ¹®ÀÚ"
+
 #: locale/programs/charmap-dir.c:59
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "`%s' ¹®ÀÚ Áöµµ µð·ºÅ丮¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/charmap.c:136
+#: locale/programs/charmap.c:138
 #, c-format
 msgid "character map file `%s' not found"
 msgstr "`%s' ¹®ÀÚ Áöµµ ÆÄÀÏÀ» ãÁö ¸øÇß½À´Ï´Ù"
 
-#: locale/programs/charmap.c:194
+#: locale/programs/charmap.c:195
 #, c-format
 msgid "default character map file `%s' not found"
 msgstr "`%s' ±âº» ¹®ÀÚ Áöµµ ÆÄÀÏÀ» ãÁö ¸øÇß½À´Ï´Ù"
 
-#: locale/programs/charmap.c:257
+#: locale/programs/charmap.c:258
 #, c-format
 msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
-msgstr "`%s' ¹®ÀÚ Áöµµ´Â ASCII¿¡ ȣȯµÇÁö ¾Ê½À´Ï´Ù. ·ÎÄÉÀÏÀÌ ISO C¿¡ ¸ÂÁö ¾Ê½À´Ï´Ù\n"
+msgstr "`%s' ¹®ÀÚ Áöµµ´Â ASCII¿¡ ȣȯÇÏÁö ¾Ê½À´Ï´Ù. ·ÎĶÀÌ ISO C¿¡ ¸ÂÁö ¾Ê½À´Ï´Ù\n"
 
-#: locale/programs/charmap.c:336
+#: locale/programs/charmap.c:337
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max>´Â <mb_cur_min>º¸´Ù Ä¿¾ß ÇÕ´Ï´Ù\n"
 
-#: locale/programs/charmap.c:356 locale/programs/charmap.c:373
-#: locale/programs/repertoire.c:175
+#: locale/programs/charmap.c:357 locale/programs/charmap.c:374
+#: locale/programs/repertoire.c:174
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "¸Ó¸´¸»¿¡ ¹®¹ý ¾Ö·¯: %s"
 
-#: locale/programs/charmap.c:357
+#: locale/programs/charmap.c:358
 msgid "invalid definition"
 msgstr "Á¤ÀÇ°¡ À߸øµÇ¾úÀ½"
 
-#: locale/programs/charmap.c:374 locale/programs/locfile.c:126
-#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
+#: locale/programs/charmap.c:375 locale/programs/locfile.c:126
+#: locale/programs/locfile.c:153 locale/programs/repertoire.c:175
 msgid "bad argument"
 msgstr "À߸øµÈ Àμö"
 
-#: locale/programs/charmap.c:402
+#: locale/programs/charmap.c:403
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr "<%s>ÀÌ(°¡) Áߺ¹ Á¤ÀǵǾî ÀÖ½À´Ï´Ù"
 
-#: locale/programs/charmap.c:409
+#: locale/programs/charmap.c:410
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr "%s¿¡ ´ëÇÑ °ªÀº 1 ÀÌ»óÀ̾î¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/charmap.c:421
+#: locale/programs/charmap.c:422
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "<%s>¿¡ ´ëÇÑ °ªÀº <%s>ÀÇ °ªº¸´Ù °°°Å³ª Ä¿¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/charmap.c:444 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "<%s>¿¡ ´ëÇÑ Àμö´Â ´ÜÀÏ ¹®ÀÚ¿©¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/charmap.c:470
+#: locale/programs/charmap.c:471
 msgid "character sets with locking states are not supported"
-msgstr "Àá±Ý»óÅÂÀÇ ¹®ÀÚ¼ÂÀº Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
+msgstr "Àá±Ý»óÅÂÀÇ ¹®ÀÚ¼ÂÀº Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: locale/programs/charmap.c:497 locale/programs/charmap.c:551
-#: locale/programs/charmap.c:583 locale/programs/charmap.c:677
-#: locale/programs/charmap.c:732 locale/programs/charmap.c:773
-#: locale/programs/charmap.c:814
+#: locale/programs/charmap.c:498 locale/programs/charmap.c:552
+#: locale/programs/charmap.c:584 locale/programs/charmap.c:678
+#: locale/programs/charmap.c:733 locale/programs/charmap.c:774
+#: locale/programs/charmap.c:815
 #, c-format
 msgid "syntax error in %s definition: %s"
-msgstr "%s Á¤ÀǺο¡ ¹®¹ý ¿À·ù ÀÖÀ½: %s"
+msgstr "%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:499 locale/programs/charmap.c:679
+#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
 msgid "no symbolic name given"
 msgstr "±âÈ£¸íÀÌ ÁÖ¾îÁöÁö ¾ÊÀ½"
 
-#: locale/programs/charmap.c:552
+#: locale/programs/charmap.c:553
 msgid "invalid encoding given"
-msgstr "À߸øµÈ ºÎȣȭ°¡ ÁÖ¾îÁü"
+msgstr "À߸øµÈ ÀÎÄÚµùÀÌ ÁÖ¾îÁ³½À´Ï´Ù"
 
-#: locale/programs/charmap.c:561
+#: locale/programs/charmap.c:562
 msgid "too few bytes in character encoding"
-msgstr "¹®ÀÚ ºÎȣȭ¿¡ ÇÊ¿äÇÑ ¹ÙÀÌÆ®°¡ ³Ê¹« ÀûÀ½"
+msgstr "¹®ÀÚ ÀÎÄÚµù¿¡ ¹ÙÀÌÆ®°¡ ³Ê¹« Àû½À´Ï´Ù"
 
-#: locale/programs/charmap.c:563
+#: locale/programs/charmap.c:564
 msgid "too many bytes in character encoding"
-msgstr "¹®ÀÚ ºÎȣȭ¿¡ ÇÊ¿äÇÑ ¹ÙÀÌÆ®°¡ ³Ê¹« ¸¹À½"
+msgstr "¹®ÀÚ ÀÎÄÚµù¿¡ ¹ÙÀÌÆ®°¡ ³Ê¹« ¸¹½À´Ï´Ù"
 
-#: locale/programs/charmap.c:585 locale/programs/charmap.c:733
-#: locale/programs/charmap.c:816 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:586 locale/programs/charmap.c:734
+#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296
 msgid "no symbolic name given for end of range"
 msgstr "¹üÀ§ÀÇ ³¡±îÁö ±âÈ£ À̸§ÀÌ ¾ø½À´Ï´Ù"
 
-#: locale/programs/charmap.c:609 locale/programs/locfile.c:818
-#: locale/programs/repertoire.c:314
+#: locale/programs/charmap.c:610 locale/programs/ld-address.c:600
+#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3924
+#: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984
+#: locale/programs/ld-identification.c:452
+#: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
+#: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307
+#: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241
+#: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221
+#: locale/programs/repertoire.c:313
 #, c-format
-msgid "`%1$s' definition does not end with `END %1$s'"
-msgstr "`%1$s' Á¤ÀÇ°¡ `END %1$s'¿Í °°ÀÌ ³¡³ªÁö ¾Ê½À´Ï´Ù"
+msgid "%1$s: definition does not end with `END %1$s'"
+msgstr "%1$s: Á¤ÀÇ°¡ `END %1$s'¿Í °°ÀÌ ³¡³ªÁö ¾Ê½À´Ï´Ù"
 
-#: locale/programs/charmap.c:642
+#: locale/programs/charmap.c:643
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr "CHARMAP Á¤ÀÇ ¹Ù·Î ´ÙÀ½¿¡´Â WIDTH Á¤ÀǸ¸ÀÌ °¡´ÉÇÕ´Ï´Ù"
 
-#: locale/programs/charmap.c:650 locale/programs/charmap.c:713
+#: locale/programs/charmap.c:651 locale/programs/charmap.c:714
 #, c-format
 msgid "value for %s must be an integer"
 msgstr "%s¿¡ ´ëÇÑ °ªÀº Á¤¼ö¿©¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/charmap.c:841
+#: locale/programs/charmap.c:842
 #, c-format
 msgid "%s: error in state machine"
 msgstr "%s: »óÅ ±â°è¿¡ ¿À·ù ¹ß»ý"
 
-#: 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
+#: locale/programs/charmap.c:850 locale/programs/ld-address.c:616
+#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4115
+#: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001
+#: locale/programs/ld-identification.c:468
+#: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
+#: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323
+#: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257
+#: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237
+#: locale/programs/locfile.c:826 locale/programs/repertoire.c:324
 #, c-format
 msgid "%s: premature end of file"
-msgstr "%s: ÆÄÀÏÀÌ ¿Ï°áµÇÁö ¾ÊÀº ä ³¡³²"
+msgstr "%s: ÆÄÀÏÀÌ ¿Ï°áÇÏÁö ¾ÊÀº ä ³¡³²"
 
-#: locale/programs/charmap.c:868 locale/programs/charmap.c:879
+#: locale/programs/charmap.c:869 locale/programs/charmap.c:880
 #, c-format
 msgid "unknown character `%s'"
 msgstr "¾Ë ¼ö ¾ø´Â ¹®ÀÚ `%s'"
 
 # ¹º ¼Ò¸®¿©?
-#: locale/programs/charmap.c:887
+#: locale/programs/charmap.c:888
 #, c-format
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
 msgstr "¹üÀ§ÀÇ ½ÃÀÛ°ú ³¡ÀÇ ¹ÙÀÌÆ® ½ÃÄö½º ¹ÙÀÌÆ® ¼ö°¡ ´Ù¸¨´Ï´Ù: %d ¹× %d"
 
-#: locale/programs/charmap.c:991 locale/programs/ld-collate.c:2930
-#: locale/programs/repertoire.c:420
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3047
+#: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr "¹®ÀÚÀÇ ¹üÀ§·Î À߸øµÈ À̸§"
 
-#: locale/programs/charmap.c:1003 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
 msgid "hexadecimal range format should use only capital characters"
 msgstr "16Áø¼ö ¹üÀ§ Æ÷¸ËÀº ´ë¹®ÀÚ¸¸À» »ç¿ëÇØ¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/charmap.c:1021
+#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449
 #, c-format
-msgid "<%s> and <%s> are illegal names for range"
-msgstr "¹®ÀÚÀÇ ¹üÀ§·Î À߸øµÈ À̸§ <%s>¿Í <%s>"
+msgid "<%s> and <%s> are invalid names for range"
+msgstr "<%s>°ú(¿Í) <%s>Àº(´Â) ¹®ÀÚÀÇ ¹üÀ§·Î À߸øµÈ À̸§ÀÔ´Ï´Ù"
 
-#: locale/programs/charmap.c:1027
-msgid "upper limit in range is not higher then lower limit"
-msgstr "¹üÀ§ÀÇ »óÇÑÀÌ ÇÏÇѺ¸´Ù Å©Áö ¾Ê½À´Ï´Ù"
+#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456
+msgid "upper limit in range is smaller than lower limit"
+msgstr "¹üÀ§ÀÇ »óÇÑ°ªÀÌ ÇÏÇÑ°ªº¸´Ù ÀÛ½À´Ï´Ù"
 
-#: locale/programs/charmap.c:1085
+#: locale/programs/charmap.c:1087
 msgid "resulting bytes for range not representable."
 msgstr "¹üÀ§ÀÇ ÃÖÁ¾ ¹ÙÀÌÆ®¼ö¸¦ Ç¥½ÃÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: 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:133 locale/programs/ld-collate.c:1556
+#: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133
+#: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
+#: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
+#: locale/programs/ld-numeric.c:98 locale/programs/ld-paper.c:91
+#: locale/programs/ld-telephone.c:94 locale/programs/ld-time.c:159
 #, c-format
 msgid "No definition for %s category found"
 msgstr "%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-address.c:144 locale/programs/ld-address.c:182
+#: locale/programs/ld-address.c:200 locale/programs/ld-address.c:229
+#: locale/programs/ld-address.c:301 locale/programs/ld-address.c:320
+#: locale/programs/ld-address.c:333 locale/programs/ld-identification.c:146
+#: locale/programs/ld-measurement.c:105 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
+#: locale/programs/ld-monetary.c:278 locale/programs/ld-name.c:105
+#: locale/programs/ld-name.c:142 locale/programs/ld-numeric.c:112
+#: locale/programs/ld-numeric.c:126 locale/programs/ld-paper.c:102
+#: locale/programs/ld-paper.c:111 locale/programs/ld-telephone.c:105
+#: locale/programs/ld-telephone.c:162 locale/programs/ld-time.c:175
+#: locale/programs/ld-time.c:196
 #, c-format
 msgid "%s: field `%s' not defined"
-msgstr "%s: `%s' Çʵ尡 Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
+msgstr "%s: `%s' Çʵ带 Á¤ÀÇÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: 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:156 locale/programs/ld-address.c:208
+#: locale/programs/ld-address.c:238 locale/programs/ld-address.c:276
+#: locale/programs/ld-name.c:117 locale/programs/ld-telephone.c:117
 #, c-format
 msgid "%s: field `%s' must not be empty"
 msgstr "%s: `%s' Çʵå´Â ºñ¾î ÀÖÀ¸¸é ¾È µË´Ï´Ù"
 
-#: locale/programs/ld-address.c:169
+#: locale/programs/ld-address.c:168
 #, c-format
 msgid "%s: invalid escape `%%%c' sequence in field `%s'"
 msgstr "%1$s: `%3$s' Çʵ忡 À߸øµÈ À̽ºÄÉÀÌÇÁ `%%%2$c' ¼ø¼­¿­"
 
 # ¹ø¿ª: terminology???
-#: locale/programs/ld-address.c:220
+#: locale/programs/ld-address.c:219
 #, c-format
 msgid "%s: terminology language code `%s' not defined"
-msgstr "%s: terminology ¾ð¾îÄÚµå `%s'ÀÌ(°¡) Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
+msgstr "%s: terminology ¾ð¾îÄÚµå `%s'ÀÌ(°¡) Á¤ÀÇÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
+
+#: locale/programs/ld-address.c:244
+#, c-format
+msgid "%s: field `%s' must not be defined"
+msgstr "%s: `%s' Çʵå´Â Á¤ÀÇÇؼ­´Â ¾È µË´Ï´Ù"
 
-#: locale/programs/ld-address.c:247 locale/programs/ld-address.c:276
+#: locale/programs/ld-address.c:258 locale/programs/ld-address.c:287
 #, c-format
 msgid "%s: language abbreviation `%s' not defined"
-msgstr "%s: ¾ð¾î ÁÙÀÓ¸» `%s'ÀÌ(°¡) Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
+msgstr "%s: ¾ð¾î ÁÙÀÓ¸» `%s'ÀÌ(°¡) Á¤ÀÇÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: 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:265 locale/programs/ld-address.c:293
+#: locale/programs/ld-address.c:327 locale/programs/ld-address.c:339
 #, c-format
 msgid "%s: `%s' value does not match `%s' value"
 msgstr "%s: `%s'ÀÇ °ªÀº `%s'ÀÇ °ª°ú ¸ÂÁö ¾Ê½À´Ï´Ù"
 
-#: locale/programs/ld-address.c:301
+#: locale/programs/ld-address.c:312
 #, c-format
 msgid "%s: numeric country code `%d' not valid"
 msgstr "%s: ±¹°¡ ÄÚµå ¼ýÀÚ `%d'¹øÀº ¿Ã¹Ù¸£Áö ¾Ê½À´Ï´Ù"
 
-#: 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
+#: locale/programs/ld-address.c:508 locale/programs/ld-address.c:545
+#: locale/programs/ld-address.c:583 locale/programs/ld-ctype.c:2608
+#: locale/programs/ld-identification.c:364
+#: locale/programs/ld-measurement.c:221 locale/programs/ld-messages.c:301
+#: locale/programs/ld-monetary.c:701 locale/programs/ld-monetary.c:736
+#: locale/programs/ld-monetary.c:777 locale/programs/ld-name.c:280
+#: locale/programs/ld-numeric.c:263 locale/programs/ld-paper.c:224
+#: locale/programs/ld-telephone.c:288 locale/programs/ld-time.c:1126
+#: locale/programs/ld-time.c:1168
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr "%s: `%s' Çʵ尡 ¿©·¯ ¹ø ¼±¾ðµÇ¾ú½À´Ï´Ù"
 
-#: 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:512 locale/programs/ld-address.c:550
+#: locale/programs/ld-identification.c:368 locale/programs/ld-messages.c:311
+#: locale/programs/ld-monetary.c:705 locale/programs/ld-monetary.c:740
+#: locale/programs/ld-name.c:284 locale/programs/ld-numeric.c:267
+#: locale/programs/ld-telephone.c:292 locale/programs/ld-time.c:1020
+#: locale/programs/ld-time.c:1089 locale/programs/ld-time.c:1131
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: `%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:597 locale/programs/ld-collate.c:3922
+#: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449
+#: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
+#: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305
+#: locale/programs/ld-numeric.c:366 locale/programs/ld-paper.c:239
+#: locale/programs/ld-telephone.c:311 locale/programs/ld-time.c:1219
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr "%s: ºÒ¿ÏÀüÇÑ `END' ÁÙ"
 
-#: 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
-#, c-format
-msgid "%1$s: definition does not end with `END %1$s'"
-msgstr "%1$s: Á¤ÀÇ°¡ `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
+#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:542
+#: locale/programs/ld-collate.c:594 locale/programs/ld-collate.c:890
+#: locale/programs/ld-collate.c:903 locale/programs/ld-collate.c:2733
+#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4105
+#: locale/programs/ld-ctype.c:1960 locale/programs/ld-ctype.c:2219
+#: locale/programs/ld-ctype.c:2806 locale/programs/ld-ctype.c:2992
+#: locale/programs/ld-identification.c:459
+#: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
+#: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314
+#: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248
+#: locale/programs/ld-telephone.c:320 locale/programs/ld-time.c:1228
 #, c-format
 msgid "%s: syntax error"
 msgstr "%s: ¹®¹ý ¿À·ù"
 
-#: locale/programs/ld-collate.c:398
+#: locale/programs/ld-collate.c:417
 #, c-format
 msgid "`%.*s' already defined in charmap"
-msgstr "`%.*s'Àº(´Â) ¹®ÀÚÁöµµ¿¡ ÀÌ¹Ì Á¤ÀǵǾî ÀÖ½À´Ï´Ù"
+msgstr "`%.*s'Àº(´Â) ¹®Àڸʿ¡ ÀÌ¹Ì Á¤ÀǵǾî ÀÖ½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:407
+#: locale/programs/ld-collate.c:426
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "`%.*s'Àº(´Â) ·¹ÆÄÅ丮¿¡ ÀÌ¹Ì Á¤ÀǵǾî ÀÖ½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:414
+#: locale/programs/ld-collate.c:433
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "`%.*s'Àº(´Â) »çÀü ±âÈ£·Î ÀÌ¹Ì Á¤ÀǵǾî ÀÖ½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:421
+#: locale/programs/ld-collate.c:440
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "`%.*s'Àº(´Â) »çÀü Ç׸ñÀ¸·Î ÀÌ¹Ì Á¤ÀǵǾî ÀÖ½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:452 locale/programs/ld-collate.c:478
+#: locale/programs/ld-collate.c:471 locale/programs/ld-collate.c:497
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: Á¤·Ä ¼ø¼­ `forward'¿Í `backward'´Â ¼­·Î ¹èŸÀûÀÔ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:462 locale/programs/ld-collate.c:488
-#: locale/programs/ld-collate.c:504
+#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507
+#: locale/programs/ld-collate.c:523
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%1$s: ¹«°Ô %3$dÀÇ Á¤ÀÇ¿¡¼­ `%2$s'ÀÌ(°¡) ¿©·¯ ¹ø ³ªÅ¸³µ½À´Ï´Ù"
 
 # ¹ø¿ª: ???? had???
-#: locale/programs/ld-collate.c:560
+#: locale/programs/ld-collate.c:579
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: ±ÔÄ¢ÀÌ ³Ê¹« ¸¹À½; ù ¹ø° Ç׸ñ¸¸ÀÌ %d°³¸¦ °¡Áý´Ï´Ù"
 
-#: locale/programs/ld-collate.c:596
+#: locale/programs/ld-collate.c:615
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: Á¤·Ä ±ÔÄ¢ÀÌ ÃæºÐÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:761
+#: locale/programs/ld-collate.c:780
 #, c-format
 msgid "%s: empty weight string not allowed"
-msgstr "%s: ºó weight ¹®ÀÚ¿­Àº Çã¿ëµÇÁö ¾Ê½À´Ï´Ù"
+msgstr "%s: ºó weight ¹®ÀÚ¿­Àº Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:856
+#: locale/programs/ld-collate.c:875
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: ¹«°Ô´Â À̸§¿¡ ¸»ÁÙÀÓÇ¥ ±âÈ£¸¦ ½á¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:912
+#: locale/programs/ld-collate.c:931
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: °ªÀÌ ³Ê¹« ¸¹½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
+#: locale/programs/ld-collate.c:1051 locale/programs/ld-collate.c:1226
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "`%.*s'ÀÇ ¼ø¼­´Â ÀÌ¹Ì %s:%Zu¿¡ Á¤ÀǵǾî ÀÖ½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1081
+#: locale/programs/ld-collate.c:1101
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: ¹üÀ§ÀÇ ½ÃÀÛ ±âÈ£¿Í ³¡ ½Éº¼Àº ¹®ÀÚ¸¦ ³ªÅ¸³»¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1108
+#: locale/programs/ld-collate.c:1128
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: ù¹ø° ¹®ÀÚ¿Í ¸¶Áö¸· ¹®ÀÚÀÇ ¹ÙÀÌÆ® ¼ø¼­´Â ±æÀÌ°¡ °°¾Æ¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1150
+#: locale/programs/ld-collate.c:1170
 #, c-format
-msgid "%s: byte sequence of first character of sequence is not lower than that of the last character"
-msgstr "%s: ¼ø¼­¿­ÀÇ Ã¹¹ø° ¹®ÀÚÀÇ ¹ÙÀÌÆ® ¼ø¼­°¡ ¸¶Áö¸· ¹®ÀÚÀÇ ¹ÙÀÌÆ® ¼ø¼­º¸´Ù ÀÛÁö ¾Ê½À´Ï´Ù"
+msgid "%s: byte sequence of first character of range is not lower than that of the last character"
+msgstr "%s: ¹üÀ§¿¡¼­ ù¹ø° ¹®ÀÚÀÇ ¹ÙÀÌÆ® ½ÃÄö½º°¡ ¸¶Áö¸· ¹®ÀÚÀÇ ¹ÙÀÌÆ® ½ÃÄö½ºº¸´Ù ÀÛÀº °ªÀÌ ¾Æ´Õ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1275
+#: locale/programs/ld-collate.c:1295
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: ±âÈ£ ¹üÀ§ ¸»ÁÙÀÓÇ¥´Â `order_start' ¹Ù·Î µÚ¿¡ ³ª¿Í¼­´Â ¾È µË´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1279
+#: locale/programs/ld-collate.c:1299
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr "%s: ±âÈ£ ¹üÀ§ ¸»ÁÙÀÓÇ¥´Â `order_end' ¹Ù·Î µÚ¿¡ ³ª¿Í¼­´Â ¾È µË´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
+#: locale/programs/ld-collate.c:1319 locale/programs/ld-ctype.c:1477
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
-msgstr "`%s'°ú(¿Í) `%.*s'Àº(´Â) ±âÈ£ ¹üÀ§·Î »ç¿ë°¡´ÉÇÑ À̸§ÀÌ ¾Æ´Õ´Ï´Ù"
+msgstr "`%s' ¹× `%.*s'Àº(´Â) ±âÈ£ ¹üÀ§·Î ¿Ã¹Ù¸¥ À̸§ÀÌ ¾Æ´Õ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
+#: locale/programs/ld-collate.c:1369 locale/programs/ld-collate.c:3858
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: `%.*s'¿¡ ´ëÇÑ ¼ø¼­´Â ÀÌ¹Ì %s:%Zu¿¡ Á¤ÀǵǾú½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1357
+#: locale/programs/ld-collate.c:1378
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: `%s'Àº(´Â) ´ÜÀÏ ¹®ÀÚ¿©¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1550
+#: locale/programs/ld-collate.c:1573
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
-msgstr "%s: `position'Àº ¸ðµç ¼½¼ÇÀÇ Æ¯Á¤ ´Ü°è¿¡¼­¸¸ »ç¿ëµÇ°Å³ª ¾Æ¿¹ »ç¿ëµÇÁö ¸»¾Æ¾ß ÇÕ´Ï´Ù"
+msgstr "%s: `position'Àº ¸ðµç ¼½¼ÇÀÇ Æ¯Á¤ ´Ü°è¿¡¼­¸¸ »ç¿ëµÇ°Å³ª ¾Æ¿¹ »ç¿ëÇÏÁö ¸»¾Æ¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1575
+#: locale/programs/ld-collate.c:1598
 #, c-format
 msgid "symbol `%s' not defined"
-msgstr "`%s' ½Éº¼Àº Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
+msgstr "`%s' ½Éº¼Àº Á¤ÀÇÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1651 locale/programs/ld-collate.c:1757
+#: locale/programs/ld-collate.c:1674 locale/programs/ld-collate.c:1780
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "±âÈ£ `%s'ÀÌ(°¡) °°Àº ´ÙÀ½°ú ÀÎÄÚµùÀÔ´Ï´Ù:"
 
-#: locale/programs/ld-collate.c:1655 locale/programs/ld-collate.c:1761
+#: locale/programs/ld-collate.c:1678 locale/programs/ld-collate.c:1784
 #, c-format
 msgid "symbol `%s'"
 msgstr "±âÈ£ `%s'"
 
-#: locale/programs/ld-collate.c:1803
+#: locale/programs/ld-collate.c:1826
+#, c-format
 msgid "no definition of `UNDEFINED'"
-msgstr "`UNDEFINED'ÀÇ Á¤ÀÇ°¡ ¾øÀ½"
+msgstr "`UNDEFINED'ÀÇ Á¤ÀÇ°¡ ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1832
+#: locale/programs/ld-collate.c:1855
+#, c-format
 msgid "too many errors; giving up"
 msgstr "¿À·ù°¡ ³Ê¹« ¸¹½À´Ï´Ù; Æ÷±âÇÕ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:2735
+#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4044
+#, c-format
+msgid "%s: nested conditionals not supported"
+msgstr "%s: ÁßøÇÑ Á¶°Ç¹®Àº Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
+
+#: locale/programs/ld-collate.c:2677
+#, c-format
+msgid "%s: more then one 'else'"
+msgstr "%s: 'else'°¡ ¿©·¯°³ÀÔ´Ï´Ù"
+
+#: locale/programs/ld-collate.c:2852
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: `%s'ÀÇ Á¤ÀÇ°¡ Áߺ¹µÇ¾ú½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:2771
+#: locale/programs/ld-collate.c:2888
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: ¼½¼Ç `%s'ÀÇ ¼±¾ðÀÌ Áߺ¹µÇ¾ú½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:2910
+#: locale/programs/ld-collate.c:3027
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: »çÀü¼ø¼­ ±âÈ£ À̸§¿¡ ¾Ë ¼ö ¾ø´Â ¹®ÀÚ"
 
 # ¹ø¿ª: equivalent definition??
-#: locale/programs/ld-collate.c:3042
+#: locale/programs/ld-collate.c:3159
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: ´ëÀÀ ¹®ÀÚ Á¤ÀÇ À̸§¿¡ ¾Ë·ÁÁöÁö ¾ÊÀº ¹®ÀÚ°¡ ÀÖ½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:3055
+#: locale/programs/ld-collate.c:3172
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: ´ëÀÀ ¹®ÀÚ Á¤ÀÇ °ª¿¡ ¾Ë·ÁÁöÁö ¾ÊÀº ¹®ÀÚ°¡ ÀÖ½À´Ï´Ù"
 
 # ¹ø¿ª: equivalent definition??
-#: locale/programs/ld-collate.c:3065
+#: locale/programs/ld-collate.c:3182
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: ´ëÀÀ¹®ÀÚ Á¤ÀÇ¿¡ ¾Ë ¼ö ¾ø´Â ±âÈ£ `%s'"
 
-#: locale/programs/ld-collate.c:3074
+#: locale/programs/ld-collate.c:3191
 msgid "error while adding equivalent collating symbol"
 msgstr "´ëÀÀµÇ´Â »çÀü ±âÈ£¸¦ ´õÇÏ´Â µ¥ ¿À·ù"
 
-#: locale/programs/ld-collate.c:3104
+#: locale/programs/ld-collate.c:3221
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "`%s' ½ºÅ©¸³Æ®°¡ Áߺ¹ Á¤ÀǵǾî ÀÖ½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:3152
+#: locale/programs/ld-collate.c:3269
 #, c-format
-msgid "%s: unknown section name `%s'"
-msgstr "%s: ¾Ë ¼ö ¾ø´Â ¼½¼Ç À̸§ `%s'"
+msgid "%s: unknown section name `%.*s'"
+msgstr "%s: ¾Ë ¼ö ¾ø´Â ¼½¼Ç À̸§ `%.*s'"
 
-#: locale/programs/ld-collate.c:3180
+#: locale/programs/ld-collate.c:3298
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: `%s' ¼½¼ÇÀÇ ¼ø¼­ Á¤ÀÇ°¡ Áߺ¹µÇ¾ú½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:3205
+#: locale/programs/ld-collate.c:3326
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: Á¤·Ä ±ÔÄ¢ÀÇ °¹¼ö°¡ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:3232
+#: locale/programs/ld-collate.c:3353
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: À̸§¾ø´Â ¼½¼Ç¿¡ ¼ø¼­ Á¤ÀÇ°¡ ¿©·¯¹ø ³ªÅ¸³µ½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:3286 locale/programs/ld-collate.c:3414
-#: locale/programs/ld-collate.c:3778
+#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537
+#: locale/programs/ld-collate.c:3900
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: `order_end' Å°¿öµå°¡ ºüÁ³½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:3347
+#: locale/programs/ld-collate.c:3470
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
-msgstr "%s: »çÀü¼ø¼­ ½Éº¼ `%.*s'ÀÇ ¼ø¼­´Â ¾ÆÁ÷ Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
+msgstr "%s: »çÀü¼ø¼­ ½Éº¼ `%.*s'ÀÇ ¼ø¼­´Â ¾ÆÁ÷ Á¤ÀÇÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:3365
+#: locale/programs/ld-collate.c:3488
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
-msgstr "%s: »çÀü¼ø¼­ ¿ä¼Ò `%.*s'ÀÇ ¼ø¼­´Â ¾ÆÁ÷ Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
+msgstr "%s: »çÀü¼ø¼­ ¿ä¼Ò `%.*s'ÀÇ ¼ø¼­´Â ¾ÆÁ÷ Á¤ÀÇÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
 
 # ????
-#: locale/programs/ld-collate.c:3376
+#: locale/programs/ld-collate.c:3499
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: %.*s µÚ¿¡ ¼ø¼­¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù: ±âÈ£¸¦ ¾Ë ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:3428 locale/programs/ld-collate.c:3790
+#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: `reorder-end' Å°¿öµå°¡ ºüÁ³½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:3462 locale/programs/ld-collate.c:3662
+#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: `%.*s' ¼½¼ÇÀ» ¾Ë ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:3527
+#: locale/programs/ld-collate.c:3650
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: ½Éº¼ÀÌ Æ²·È½À´Ï´Ù: <%.*s>"
 
-#: locale/programs/ld-collate.c:3725
+#: locale/programs/ld-collate.c:3846
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: ¸»ÁÙÀÓÇ¥ ¹üÀ§ÀÇ ³¡¿¡ `%s'À»(¸¦) µÑ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:3774
+#: locale/programs/ld-collate.c:3896
 #, c-format
 msgid "%s: empty category description not allowed"
-msgstr "%s: ºó ¹üÀ§ ±â¼úÀÚ¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù"
+msgstr "%s: ºó ¹üÀ§ µð½ºÅ©¸³Å͸¦ ¾µ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:3793
+#: locale/programs/ld-collate.c:3915
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: `reorder-sections-end' Å°¿öµå°¡ ºüÁ³½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:440
+#: locale/programs/ld-collate.c:4077
+#, c-format
+msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: '%s'ÀÌ(°¡) ÇØ´çÇÏ´Â 'ifdef' ȤÀº 'ifndef' ¾øÀÌ ³ªÅ¸³µ½À´Ï´Ù"
+
+#: locale/programs/ld-collate.c:4095
+#, c-format
+msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: 'endif'°¡ ÇØ´çÇÏ´Â 'ifdef' ȤÀº 'ifndef' ¾øÀÌ ³ªÅ¸³µ½À´Ï´Ù"
+
+#: locale/programs/ld-ctype.c:439
+#, c-format
 msgid "No character set name specified in charmap"
-msgstr "¹®ÀÚ Áöµµ¿¡¼­ ¹®Àڼ À̸§ÀÌ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
+msgstr "¹®ÀÚ Áöµµ¿¡¼­ ¹®Àڼ À̸§À» ÁöÁ¤ÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
 
 # %0*x ¿¡ positionalÀ» ¾î¶»°Ô Áý¾î ³ÖÀ»±î?  %1$0*x, %0*1$x ¸ðµÎ ½ÇÆÐ.
-#: locale/programs/ld-ctype.c:469
+#: locale/programs/ld-ctype.c:468
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr "L'\\u%0*x' ¹®ÀÚ´Â `%s' Ŭ·¡½º¿¡ µé¾î ÀÖÁö¸¸ `%s' Ŭ·¡½º¿¡ µé¾î ÀÖ¾î¾ß ÇÕ´Ï´Ù"
 
 # %0*x ¿¡ positionalÀ» ¾î¶»°Ô Áý¾î ³ÖÀ»±î?  %1$0*x, %0*1$x ¸ðµÎ ½ÇÆÐ.
-#: locale/programs/ld-ctype.c:484
+#: locale/programs/ld-ctype.c:483
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr "L'\\u%0*x' ¹®ÀÚ´Â `%s' Ŭ·¡½º¿¡ µé¾î ÀÖÁö¸¸ `%s' Ŭ·¡½º¿¡ µé¾î ÀÖÀ¸¸é ¾È µË´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:498 locale/programs/ld-ctype.c:556
+#: locale/programs/ld-ctype.c:497 locale/programs/ld-ctype.c:555
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr "%s, Çà %u¿¡ ³»ºÎ ¿À·ù ¹ß»ý"
 
-#: locale/programs/ld-ctype.c:527
+#: locale/programs/ld-ctype.c:526
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr "`%2$s' Ŭ·¡½ºÀÇ '%1$s' ¹®ÀÚ´Â `%3$s' Ŭ·¡½º¿¡ µé¾î ÀÖ¾î¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:543
+#: locale/programs/ld-ctype.c:542
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr "`%2$s' Ŭ·¡½ºÀÇ '%1$s' ¹®ÀÚ´Â `%3$s' Ŭ·¡½º¿¡ µé¾î ÀÖÀ¸¸é ¾È µË´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:573 locale/programs/ld-ctype.c:611
+#: locale/programs/ld-ctype.c:572 locale/programs/ld-ctype.c:610
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr "<SP> ¹®ÀÚ´Â `%s' Ŭ·¡½º¿¡ ¾øÀ½"
 
-#: locale/programs/ld-ctype.c:585 locale/programs/ld-ctype.c:622
+#: locale/programs/ld-ctype.c:584 locale/programs/ld-ctype.c:621
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr "<SP> ¹®ÀÚ´Â `%s' Ŭ·¡½º¿¡ ÀÖÀ¸¸é ¾ÈµË´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:600
+#: locale/programs/ld-ctype.c:599
+#, c-format
 msgid "character <SP> not defined in character map"
-msgstr "¹®ÀÚ <SP>°¡ ¹®ÀÚ Áöµµ¿¡¼­ Á¤ÀǵÇÁö ¾Ê¾ÒÀ½"
+msgstr "¹®ÀÚ <SP>°¡ ¹®ÀÚ Áöµµ¿¡¼­ Á¤ÀÇÇÏÁö ¾Ê¾ÒÀ½"
 
 #: locale/programs/ld-ctype.c:714
+#, c-format
 msgid "`digit' category has not entries in groups of ten"
 msgstr "`digit' ¹üÁÖ°¡ 10ÀÇ ¹è¼öÀÇ Ç׸ñÀ» °¡ÁöÁö ¾Ê¾Ò½À´Ï´Ù"
 
 #: locale/programs/ld-ctype.c:763
+#, c-format
 msgid "no input digits defined and none of the standard names in the charmap"
-msgstr "ÀÔ·Â ¼ýÀÚ°¡ Á¤ÀǵÇÁö ¾Ê¾Ò°í ¹®ÀÚÁöµµ¿¡ Ç¥ÁØ À̸§ÀÌ ¾ø½À´Ï´Ù"
+msgstr "ÀÔ·Â ¼ýÀÚ°¡ Á¤ÀÇÇÏÁö ¾Ê¾Ò°í ¹®Àڸʿ¡ Ç¥ÁØ À̸§ÀÌ ¾ø½À´Ï´Ù"
 
 #: locale/programs/ld-ctype.c:828
+#, c-format
 msgid "not all characters used in `outdigit' are available in the charmap"
-msgstr "¹®ÀÚÁöµµÀÇ `outdigit'¿¡ »ç¿ëµÈ ¹®ÀÚÀÇ ÀüºÎ°¡ »ç¿ë °¡´ÉÇÑ °ÍÀÌ ¾Æ´Õ´Ï´Ù"
+msgstr "¹®ÀÚ¸ÊÀÇ `outdigit'¿¡ »ç¿ëÇÑ ¹®ÀÚÀÇ ÀüºÎ°¡ »ç¿ë °¡´ÉÇÏÁö ¾Ê½À´Ï´Ù"
 
 #: locale/programs/ld-ctype.c:845
+#, c-format
 msgid "not all characters used in `outdigit' are available in the repertoire"
-msgstr "·¹ÆÄÅ丮ÀÇ `outdigit'¿¡ »ç¿ëµÈ ¹®ÀÚÀÇ ÀüºÎ°¡ »ç¿ë °¡´ÉÇÑ °ÍÀÌ ¾Æ´Õ´Ï´Ù"
+msgstr "·¹ÆÄÅ丮ÀÇ `outdigit'¿¡ »ç¿ëÇÑ ¹®ÀÚÀÇ ÀüºÎ°¡ »ç¿ë °¡´ÉÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:1244
+#: locale/programs/ld-ctype.c:1245
 #, c-format
 msgid "character class `%s' already defined"
 msgstr "`%s' ¹®ÀÚ Å¬·¡½º´Â ÀÌ¹Ì Á¤ÀǵǾú½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:1250
+#: locale/programs/ld-ctype.c:1251
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
-msgstr "±¸Çö»óÀÇ Á¦ÇÑ: %Zd°³ ¹®ÀÚº¸´Ù Å« Ŭ·¡½º´Â Çã¿ëµÇÁö ¾Ê½À´Ï´Ù"
+msgstr "±¸Çö»óÀÇ Á¦ÇÑ: %Zd°³ ¹®ÀÚº¸´Ù Å« Ŭ·¡½º´Â Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:1276
+#: locale/programs/ld-ctype.c:1277
 #, c-format
 msgid "character map `%s' already defined"
 msgstr "`%s' ¹®ÀÚ Áöµµ´Â ÀÌ¹Ì Á¤ÀǵǾú½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:1282
+#: locale/programs/ld-ctype.c:1283
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
-msgstr "±¸Çö»óÀÇ Á¦ÇÑ: %d °³ ÀÌ»óÀÇ ¹®ÀÚ Áöµµ´Â Çã¿ëµÇÁö ¾Ê½À´Ï´Ù"
+msgstr "±¸Çö»óÀÇ Á¦ÇÑ: %d °³ ÀÌ»óÀÇ ¹®ÀÚ Áöµµ´Â Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: 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:1548 locale/programs/ld-ctype.c:1673
+#: locale/programs/ld-ctype.c:1779 locale/programs/ld-ctype.c:2471
+#: locale/programs/ld-ctype.c:3467
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr "%s: `%s' Çʵ忡 µé¾î ÀÖ´Â Ç׸ñÀÌ 10°³°¡ ¾Æ´Õ´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:1575 locale/programs/ld-ctype.c:2146
+#: locale/programs/ld-ctype.c:1576 locale/programs/ld-ctype.c:2150
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr "¹üÀ§ÀÇ to-value <U%0*X>ÀÌ(°¡) from-value <U%0*X>º¸´Ù ÀÛ½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:1702
+#: locale/programs/ld-ctype.c:1703
 msgid "start and end character sequence of range must have the same length"
 msgstr "¹üÀ§ÀÇ ½ÃÀÛ ¹®ÀÚ ¼ø¼­¿­°ú ³¡ ¹®ÀÚ ¼ø¼­¿­Àº ±æÀÌ°¡ °°¾Æ¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:1709
+#: locale/programs/ld-ctype.c:1710
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr "to-value ¹®ÀÚ ¼ø¼­¿­ÀÌ from-value ¼ø¼­¿­º¸´Ù ÀÛ½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:2066 locale/programs/ld-ctype.c:2117
+#: locale/programs/ld-ctype.c:2070 locale/programs/ld-ctype.c:2121
 msgid "premature end of `translit_ignore' definition"
-msgstr "`translit_ignore' Á¤ÀÇ°¡ ¿Ï°áµÇÁö ¾ÊÀº ä ³¡³µ½À´Ï´Ù"
+msgstr "`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:2076 locale/programs/ld-ctype.c:2127
+#: locale/programs/ld-ctype.c:2169
 msgid "syntax error"
 msgstr "¹®¹ý ¿À·ù"
 
-#: locale/programs/ld-ctype.c:2296
+#: locale/programs/ld-ctype.c:2303
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr "%s: »õ·Î¿î ¹®ÀÚ Å¬·¡½º Á¤ÀÇ¿¡ ¹®¹ý ¿À·ù°¡ ÀÖ½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:2311
+#: locale/programs/ld-ctype.c:2318
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr "%s: »õ·Î¿î ¹®ÀÚ ¸Ê Á¤ÀÇ¿¡ ¹®¹ý ¿À·ù°¡ ÀÖ½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:2486
+#: locale/programs/ld-ctype.c:2493
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr "¸»ÁÙÀÓÇ¥ ¹üÀ§´Â °°Àº ŸÀÔÀÇ µÎ °³ÀÇ ÇÇ¿¬»êÀڷΠǥ½ÃÇØ¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:2495
+#: locale/programs/ld-ctype.c:2502
 msgid "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr "±âÈ£À̸§ ¹üÀ§ °ª¿¡¼­´Â Àý´ë ¸»ÁÙÀÓÇ¥ `..'À» ¾²Áö ¸»¾Æ¾ß ÇÕ´Ï´Ù"
 
 # ¹ø¿ª: ¹º¼Ò¸®¾ß?
-#: locale/programs/ld-ctype.c:2510
+#: locale/programs/ld-ctype.c:2517
 msgid "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr "UCS ¹üÀ§ °ª¿¡¼­´Â 16Áø¼ö ±âÈ£ ¸»ÁÙÀÓÇ¥ `..'À» ½á¾ß ÇÕ´Ï´Ù"
 
 # ¹ø¿ª: ¹º ¼Ò¸®¾ß?
-#: locale/programs/ld-ctype.c:2524
+#: locale/programs/ld-ctype.c:2531
 msgid "with character code range values one must use the absolute ellipsis `...'"
 msgstr "¹®ÀÚÄÚµå ¹üÀ§ °ª¿¡¼­´Â Àý´ë ¸»ÁÙÀÓÇ¥ `..'À» ½á¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:2675
+#: locale/programs/ld-ctype.c:2682
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr "¸ÅÇÎ `%s'ÀÌ(°¡) Áߺ¹ Á¤ÀǵǾî ÀÖ½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:2761 locale/programs/ld-ctype.c:2905
+#: locale/programs/ld-ctype.c:2768 locale/programs/ld-ctype.c:2912
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
 msgstr "%s: `translit_start' ¼½¼ÇÀÌ `translit_end'·Î ³¡³ªÁö ¾Ê½À´Ï´Ù."
 
-#: locale/programs/ld-ctype.c:2856
+#: locale/programs/ld-ctype.c:2863
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr "%s: `default_missing' Á¤ÀÇ°¡ Áߺ¹µÇ¾ú½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:2861
+#: locale/programs/ld-ctype.c:2868
 msgid "previous definition was here"
 msgstr "ÀÌÀü Á¤ÀÇ°¡ ¿©±â ÀÖ½À´Ï´Ù"
 
 # ¹ø¿ª: representableÀÌ ¿©±â¼­??
-#: locale/programs/ld-ctype.c:2883
+#: locale/programs/ld-ctype.c:2890
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
 msgstr "%s: Ç¥½ÃÇÒ ¼ö ÀÖ´Â `default_missing' Á¤ÀÇ°¡ ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:3036
-#, c-format
-msgid "%s: character `%s' not defined in charmap while needed as default value"
-msgstr "%s: `%s' ¹®ÀÚ´Â ±âº»°ªÀ¸·Î ÇÊ¿äÇÏÁö¸¸ ¹®Àڸʿ¡ Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
-
-#: 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
-#, c-format
-msgid "%s: character `%s' in charmap not representable with one byte"
-msgstr "%s: ¹®ÀÚÁöµµÀÇ `%s' ¹®ÀÚ´Â ÇÑ ¹ÙÀÌÆ®·Î Ç¥ÇöÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: 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: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
+#: locale/programs/ld-ctype.c:3401 locale/programs/ld-ctype.c:3426
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
-msgstr "%s: `%s' ¹®ÀÚ´Â ±âº»°ªÀ¸·Î ÇÊ¿äÇÏÁö¸¸ Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
+msgstr "%s: `%s' ¹®ÀÚ´Â ±âº»°ªÀ¸·Î ÇÊ¿äÇÏÁö¸¸ Á¤ÀÇÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:3161
+#: locale/programs/ld-ctype.c:3048 locale/programs/ld-ctype.c:3132
+#: locale/programs/ld-ctype.c:3152 locale/programs/ld-ctype.c:3173
+#: locale/programs/ld-ctype.c:3194 locale/programs/ld-ctype.c:3215
+#: locale/programs/ld-ctype.c:3236 locale/programs/ld-ctype.c:3276
+#: locale/programs/ld-ctype.c:3297 locale/programs/ld-ctype.c:3364
 #, c-format
-msgid "character `%s' not defined while needed as default value"
-msgstr "`%s' ¹®ÀÚ´Â ³»Á¤Ä¡·Î ÇÊ¿äÇÏÁö¸¸ Á¤ÀǵÇÁö ¾Ê¾ÒÀ½"
+msgid "%s: character `%s' in charmap not representable with one byte"
+msgstr "%s: ¹®ÀÚ¸ÊÀÇ `%s' ¹®ÀÚ´Â ÇÑ ¹ÙÀÌÆ®·Î Ç¥ÇöÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:3401 locale/programs/ld-ctype.c:3426
+#: locale/programs/ld-ctype.c:3408 locale/programs/ld-ctype.c:3433
 #, c-format
 msgid "%s: character `%s' needed as default value not representable with one byte"
 msgstr "%s: ±âº»°ª `%s' ¹®ÀÚ´Â ÇÑ ¹ÙÀÌÆ®·Î Ç¥ÇöÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:3481
+#: locale/programs/ld-ctype.c:3489
+#, c-format
 msgid "no output digits defined and none of the standard names in the charmap"
-msgstr "Ãâ·Â ¼ýÀÚ°¡ Á¤ÀǵÇÁö ¾Ê¾Ò°í ¹®ÀÚÁöµµ¿¡ Ç¥ÁØ À̸§ÀÌ ¾ø½À´Ï´Ù"
+msgstr "Ãâ·Â ¼ýÀÚ°¡ Á¤ÀÇÇÏÁö ¾Ê¾Ò°í ¹®Àڸʿ¡ Ç¥ÁØ À̸§ÀÌ ¾ø½À´Ï´Ù"
 
 # transliteration: °íÃľ¸, À½¿ª
-#: locale/programs/ld-ctype.c:3772
+#: locale/programs/ld-ctype.c:3780
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
-msgstr "%s: ·ÎÄÉÀÏ `%s'ÀÇ °íÃľ¸ µ¥ÀÌŸ°¡ ¾ø½À´Ï´Ù"
+msgstr "%s: ·ÎĶ `%s'ÀÇ °íÃľ¸ µ¥ÀÌÅÍ°¡ ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:3868
+#: locale/programs/ld-ctype.c:3881
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes\n"
 msgstr "%s: \"%s\" Ŭ·¡½º¿¡ ´ëÇÑ Å×À̺í: %lu ¹ÙÀÌÆ®\n"
 
-#: locale/programs/ld-ctype.c:3937
+#: locale/programs/ld-ctype.c:3950
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes\n"
 msgstr "%s: \"%s\" ¸Ê¿¡ ´ëÇÑ Å×À̺í: %lu ¹ÙÀÌÆ®\n"
 
-#: locale/programs/ld-ctype.c:4070
+#: locale/programs/ld-ctype.c:4083
 #, c-format
 msgid "%s: table for width: %lu bytes\n"
 msgstr "%s: Æø¿¡ ´ëÇÑ Å×À̺í: %lu bytes\n"
 
 # ¹ø¿ª: identificationÀÌ ¿©±â¼­???
-#: locale/programs/ld-identification.c:171
+#: locale/programs/ld-identification.c:170
 #, c-format
 msgid "%s: no identification for category `%s'"
 msgstr "%s: `%s' ¹üÁÖ¿¡ ¿Ã¹Ù¸¥ identificationÀÌ ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-identification.c:436
+#: locale/programs/ld-identification.c:435
 #, c-format
 msgid "%s: duplicate category version definition"
 msgstr "%s: ¹üÁÖ ¹öÀü Á¤ÀÇ°¡ Áߺ¹µÇ¾ú½À´Ï´Ù"
 
-#: locale/programs/ld-measurement.c:114
+#: locale/programs/ld-measurement.c:113
 #, c-format
 msgid "%s: invalid value for field `%s'"
 msgstr "%s: `%s' ÇʵåÀÇ °ªÀÌ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: locale/programs/ld-messages.c:115 locale/programs/ld-messages.c:149
+#: locale/programs/ld-messages.c:114 locale/programs/ld-messages.c:148
 #, c-format
 msgid "%s: field `%s' undefined"
-msgstr "%s: `%s' Çʵ尡 Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
+msgstr "%s: `%s' Çʵ尡 Á¤ÀÇÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: locale/programs/ld-messages.c:122 locale/programs/ld-messages.c:156
+#: locale/programs/ld-messages.c:121 locale/programs/ld-messages.c:155
+#: locale/programs/ld-monetary.c:256 locale/programs/ld-numeric.c:118
 #, c-format
 msgid "%s: value for field `%s' must not be an empty string"
 msgstr "%s: `%s' ÇʵåÀÇ °ªÀº ºó ¹®ÀÚ¿­ÀÌ µÇ¸é ¾È µË´Ï´Ù"
 
-#: locale/programs/ld-messages.c:138 locale/programs/ld-messages.c:172
+#: locale/programs/ld-messages.c:137 locale/programs/ld-messages.c:171
 #, c-format
 msgid "%s: no correct regular expression for field `%s': %s"
 msgstr "%s: `%s' Çʵ忡 ¿Ã¹Ù¸¥ Á¤±Ô½ÄÀÌ ¾ø½À´Ï´Ù: %s"
@@ -1155,126 +2223,117 @@ msgstr "%s: curr_symbol' ÇʵåÀÇ °ªÀÇ ±æÀÌ°¡ Ʋ·È½À´Ï´Ù"
 msgid "%s: value of field `int_curr_symbol' does not correspond to a valid name in ISO 4217"
 msgstr "%s: `int_curr_symbol' ÇʵåÀÇ °ªÀÌ ISO 4217¿¡ Çã¿ëµÇ´Â À̸§ÀÌ ¾Æ´Õ´Ï´Ù"
 
-#: locale/programs/ld-monetary.c:256 locale/programs/ld-numeric.c:119
-#, c-format
-msgid "%s: value for field `%s' must not be the empty string"
-msgstr "`%s' ¹üÁÖÀÇ `%s' ÇʵåÀÇ °ªÀº ºó ¹®ÀÚ¿­ÀÌ µÇ¸é ¾È µË´Ï´Ù"
-
-#: locale/programs/ld-monetary.c:284 locale/programs/ld-monetary.c:314
+#: locale/programs/ld-monetary.c:285 locale/programs/ld-monetary.c:315
 #, c-format
 msgid "%s: value for field `%s' must be in range %d...%d"
 msgstr "%s: `%s' ÇʵåÀÇ °ªÀº %d...%d »çÀÌ¿¡ ÀÖ¾î¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-monetary.c:746 locale/programs/ld-numeric.c:275
+#: locale/programs/ld-monetary.c:747 locale/programs/ld-numeric.c:274
 #, c-format
 msgid "%s: value for field `%s' must be a single character"
 msgstr "%s: `%s' Çʵ忡 ´ëÇÑ °ªÀº ´ÜÀÏ ¹®ÀÚ¿©¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-monetary.c:843 locale/programs/ld-numeric.c:319
+#: locale/programs/ld-monetary.c:844 locale/programs/ld-numeric.c:318
 #, c-format
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr "%s: `-1'Àº `%s' ÇʵåÀÇ ¸¶Áö¸· Ç׸ñÀ̾î¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-monetary.c:865 locale/programs/ld-numeric.c:340
+#: locale/programs/ld-monetary.c:866 locale/programs/ld-numeric.c:335
 #, c-format
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr "%s: `%s' ÇʵåÀÇ °ªÀº 127º¸´Ù ÀÛ¾Æ¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-monetary.c:908
+#: locale/programs/ld-monetary.c:909
 msgid "conversion rate value cannot be zero"
 msgstr "º¯È¯ ºñÀ²ÀÇ °ªÀº 0ÀÌ µÉ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-name.c:130 locale/programs/ld-telephone.c:127
-#: locale/programs/ld-telephone.c:150
+#: locale/programs/ld-name.c:129 locale/programs/ld-telephone.c:126
+#: locale/programs/ld-telephone.c:149
 #, c-format
 msgid "%s: invalid escape sequence in field `%s'"
 msgstr "%s: `%s' Çʵ忡 À߸øµÈ À̽ºÄÉÀÌÇÁ ¼ø¼­¿­ÀÌ ÀÖ½À´Ï´Ù"
 
-#: locale/programs/ld-time.c:248
+#: locale/programs/ld-time.c:247
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'"
 msgstr "%s: `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ `%Zd'ÀÇ ¹æÇâ Ç÷¡±×°¡ '+'µµ '-'µµ ¾Æ´Õ´Ï´Ù"
 
-#: locale/programs/ld-time.c:259
+#: locale/programs/ld-time.c:258
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not a single character"
 msgstr "%s: `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ `%Zd'ÀÇ ¹æÇâ Ç÷¡±×°¡ ´ÜÀÏ ¹®ÀÚ°¡ ¾Æ´Õ´Ï´Ù"
 
-#: locale/programs/ld-time.c:272
+#: locale/programs/ld-time.c:271
 #, c-format
 msgid "%s: invalid number for offset in string %Zd in `era' field"
 msgstr "%s: `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %ZdÀÇ ¿ÀÇÁ¼Â¿¡ À߸øµÈ ¼ýÀÚ°¡ ÀÖ½À´Ï´Ù "
 
-#: locale/programs/ld-time.c:280
+#: locale/programs/ld-time.c:279
 #, c-format
 msgid "%s: garbage at end of offset value in string %Zd in `era' field"
 msgstr "%s: `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %Zd¿¡¼­ ¿ÀÇÁ¼Â °ªÀÇ ³¡¿¡ ¾µ¸ð¾ø´Â °ÍÀÌ ÀÖ½À´Ï´Ù"
 
-#: locale/programs/ld-time.c:331
+#: locale/programs/ld-time.c:330
 #, c-format
 msgid "%s: invalid starting date in string %Zd in `era' field"
 msgstr "%s: `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %ZdÀÇ ¿ÀÇÁ¼Â¿¡ À߸øµÈ ½ÃÀÛ ³¯Â¥°¡ ÀÖ½À´Ï´Ù "
 
-#: locale/programs/ld-time.c:340
+#: locale/programs/ld-time.c:339
 #, c-format
 msgid "%s: garbage at end of starting date in string %Zd in `era' field "
 msgstr "%s: `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %Zd¿¡¼­ ½ÃÀÛ ³¯Â¥ °ªÀÇ ³¡¿¡ ¾µ¸ð¾ø´Â °ÍÀÌ ÀÖ½À´Ï´Ù"
 
-#: locale/programs/ld-time.c:359
+#: locale/programs/ld-time.c:358
 #, c-format
 msgid "%s: starting date is invalid in string %Zd in `era' field"
 msgstr "%s: `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %Zd¿¡¼­ ½ÃÀÛ ³¯Â¥°¡ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: locale/programs/ld-time.c:408
+#: locale/programs/ld-time.c:407
 #, c-format
 msgid "%s: invalid stopping date in string %Zd in `era' field"
 msgstr "%s: `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %ZdÀÇ ¿ÀÇÁ¼Â¿¡ À߸øµÈ Á¤Áö ³¯Â¥°¡ ÀÖ½À´Ï´Ù "
 
-#: locale/programs/ld-time.c:417
+#: locale/programs/ld-time.c:416
 #, c-format
 msgid "%s: garbage at end of stopping date in string %Zd in `era' field"
 msgstr "%s: `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %Zd¿¡¼­ ¸ØÃã ³¯Â¥ °ªÀÇ ³¡¿¡ ¾µ¸ð¾ø´Â °ÍÀÌ ÀÖ½À´Ï´Ù"
 
-#: locale/programs/ld-time.c:436
+#: locale/programs/ld-time.c:435
 #, c-format
 msgid "%s: stopping date is invalid in string %Zd in `era' field"
 msgstr "%s: `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %Zd¿¡¼­ Á¤Áö ³¯Â¥°¡ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: locale/programs/ld-time.c:445
+#: locale/programs/ld-time.c:444
 #, c-format
 msgid "%s: missing era name in string %Zd in `era' field"
 msgstr "%s: era Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %Zd¿¡ era À̸§ÀÌ ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-time.c:457
+#: locale/programs/ld-time.c:456
 #, c-format
 msgid "%s: missing era format in string %Zd in `era' field"
 msgstr "%s: era Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %Zd¿¡ era Çü½ÄÀÌ ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-time.c:486
+#: locale/programs/ld-time.c:497
 #, c-format
 msgid "%s: third operand for value of field `%s' must not be larger than %d"
 msgstr "%s: Çʵå `%s'ÀÇ °ªÀÇ ¼¼ ¹ø° ÇÇ¿¬»êÀÚ´Â %dº¸´Ù Ä¿¼­´Â ¾È µË´Ï´Ù"
 
-#: locale/programs/ld-time.c:494 locale/programs/ld-time.c:502
-#, c-format
-msgid "%s: values of field `%s' must not be larger than %d"
-msgstr "%s: `%s' ÇʵåÀÇ °ªÀº %dº¸´Ù Å©¸é ¾È µË´Ï´Ù"
-
-#: locale/programs/ld-time.c:510
+#: locale/programs/ld-time.c:505 locale/programs/ld-time.c:513
+#: locale/programs/ld-time.c:521
 #, c-format
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr "%s: `%s' ÇʵåÀÇ °ªÀº %dº¸´Ù Å©¸é ¾È µË´Ï´Ù"
 
-#: locale/programs/ld-time.c:986
+#: locale/programs/ld-time.c:1004
 #, c-format
 msgid "%s: too few values for field `%s'"
 msgstr "%s: `%s' ÇʵåÀÇ °ªÀÌ ³Ê¹« Àû½À´Ï´Ù"
 
-#: locale/programs/ld-time.c:1031
+#: locale/programs/ld-time.c:1049
 msgid "extra trailing semicolon"
 msgstr "¼¼¹ÌÄÝ·ÐÀÌ ´õ ºÙ¾î ÀÖÀ½"
 
-#: locale/programs/ld-time.c:1034
+#: locale/programs/ld-time.c:1052
 #, c-format
 msgid "%s: too many values for field `%s'"
 msgstr "%s: `%s' ÇʵåÀÇ °ªÀÌ ³Ê¹« ¸¹½À´Ï´Ù"
@@ -1283,77 +2342,77 @@ msgstr "%s: `%s' ÇʵåÀÇ °ªÀÌ ³Ê¹« ¸¹½À´Ï´Ù"
 msgid "trailing garbage at end of line"
 msgstr "ÆÄÀÏÀÇ ³¡¿¡ ¾µ¸ð¾ø´Â °ÍÀÌ ºÙ¾î ÀÖ½À´Ï´Ù"
 
-#: locale/programs/linereader.c:304
+#: locale/programs/linereader.c:298
 msgid "garbage at end of number"
 msgstr "¼ýÀÚÀÇ ³¡¿¡ ¾µ¸ð¾ø´Â °ÍÀÌ ÀÖÀ½"
 
-#: locale/programs/linereader.c:416
+#: locale/programs/linereader.c:410
 msgid "garbage at end of character code specification"
 msgstr "¹®ÀÚ ÄÚµå ¸í¼¼ÀÇ ³¡¿¡ ¾µ¸ð¾ø´Â °ÍÀÌ ÀÖÀ½"
 
-#: locale/programs/linereader.c:502
+#: locale/programs/linereader.c:496
 msgid "unterminated symbolic name"
-msgstr "Á¾·áµÇÁö ¾ÊÀº ±âÈ£ À̸§"
-
-#: locale/programs/linereader.c:566 catgets/gencat.c:1195
-msgid "invalid escape sequence"
-msgstr "À߸øµÈ À̽ºÄÉÀÌÇÁ ¼ø¼­¿­"
+msgstr "Á¾·áÇÏÁö ¾ÊÀº ±âÈ£ À̸§"
 
-#: locale/programs/linereader.c:629
+#: locale/programs/linereader.c:623
 msgid "illegal escape sequence at end of string"
 msgstr "¹®ÀÚ¿­ ³¡¿¡ À߸øµÈ À̽ºÄÉÀÌÇÁ ¼ø¼­¿­ÀÌ ÀÖÀ½"
 
-#: locale/programs/linereader.c:633 locale/programs/linereader.c:861
+#: locale/programs/linereader.c:627 locale/programs/linereader.c:855
 msgid "unterminated string"
-msgstr "Á¾·áµÇÁö ¾ÊÀº ¹®ÀÚ¿­"
+msgstr "Á¾·áÇÏÁö ¾ÊÀº ¹®ÀÚ¿­"
 
-#: locale/programs/linereader.c:675
+#: locale/programs/linereader.c:669
 msgid "non-symbolic character value should not be used"
-msgstr "±âÈ£ ¹®ÀÚ°¡ ¾Æ´Ñ °ªÀº »ç¿ëµÇÁö ¸»¾Æ¾ß ÇÕ´Ï´Ù"
+msgstr "±âÈ£ ¹®ÀÚ°¡ ¾Æ´Ñ °ªÀº »ç¿ëÇÏÁö ¸»¾Æ¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/linereader.c:822
+#: locale/programs/linereader.c:816
 #, c-format
 msgid "symbol `%.*s' not in charmap"
 msgstr "`%.*s' ±âÈ£´Â ¹®ÀÚ Áöµµ¿¡ ¾ø½À´Ï´Ù"
 
-#: locale/programs/linereader.c:843
+#: locale/programs/linereader.c:837
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
 msgstr "`%.*s' ±âÈ£´Â ·¹ÆÄÅ丮 Áöµµ¿¡ ¾ø½À´Ï´Ù"
 
-#: locale/programs/locale.c:75
+#: locale/programs/locale.c:74
 msgid "System information:"
 msgstr "½Ã½ºÅÛ Á¤º¸:"
 
-#: locale/programs/locale.c:77
+#: locale/programs/locale.c:76
 msgid "Write names of available locales"
-msgstr "»ç¿ë °¡´ÉÇÑ ·ÎÄÉÀÏÀÇ À̸§À» Ç¥½ÃÇÕ´Ï´Ù"
+msgstr "»ç¿ë °¡´ÉÇÑ ·ÎĶÀÇ À̸§À» Ç¥½ÃÇÕ´Ï´Ù"
 
-#: locale/programs/locale.c:79
+#: locale/programs/locale.c:78
 msgid "Write names of available charmaps"
-msgstr "»ç¿ë °¡´ÉÇÑ ¹®ÀÚÁöµµÀÇ À̸§µéÀ» Ãâ·ÂÇÕ´Ï´Ù"
+msgstr "»ç¿ë °¡´ÉÇÑ ¹®ÀÚ¸ÊÀÇ À̸§µéÀ» Ãâ·ÂÇÕ´Ï´Ù"
 
-#: locale/programs/locale.c:80
+#: locale/programs/locale.c:79
 msgid "Modify output format:"
 msgstr "Ãâ·Â Çü½Ä ¼öÁ¤:"
 
-#: locale/programs/locale.c:81
+#: locale/programs/locale.c:80
 msgid "Write names of selected categories"
 msgstr "»ç¿ë °¡´ÉÇÑ ¹üÁÖÀÇ À̸§À» Ç¥½ÃÇÕ´Ï´Ù"
 
-#: locale/programs/locale.c:82
+#: locale/programs/locale.c:81
 msgid "Write names of selected keywords"
-msgstr "¼±ÅÃµÈ Å°¿öµåÀÇ À̸§À» Ç¥½ÃÇÕ´Ï´Ù"
+msgstr "¼±ÅÃÇÑ Å°¿öµåÀÇ À̸§À» Ç¥½ÃÇÕ´Ï´Ù"
 
-#: locale/programs/locale.c:83
+#: locale/programs/locale.c:82
 msgid "Print more information"
 msgstr "´õ ¸¹Àº Á¤º¸¸¦ Ç¥½ÃÇÕ´Ï´Ù"
 
-#: locale/programs/locale.c:88
-msgid "Get locale-specific information."
-msgstr "·ÎÄÉÀÏ °ü·Ã Á¤º¸¸¦ ¾ò½À´Ï´Ù."
+#: locale/programs/locale.c:87
+msgid ""
+"Get locale-specific information.\vFor bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+"·ÎĶ °ü·Ã Á¤º¸¸¦ °¡Á®¿É´Ï´Ù\\v¹ö±×¸¦ º¸°íÇÏ´Â ¹æ¹ýÀº ´ÙÀ½À» Âü°íÇϽʽÿÀ:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
 
-#: locale/programs/locale.c:91
+#: locale/programs/locale.c:92
 msgid ""
 "NAME\n"
 "[-a|-m]"
@@ -1361,99 +2420,104 @@ msgstr ""
 "<À̸§>\n"
 "[-a|-m]"
 
-#: locale/programs/locale.c:195
+#: locale/programs/locale.c:193
+#, c-format
 msgid "Cannot set LC_CTYPE to default locale"
-msgstr "LC_CTYPEÀ» ±âº» ·ÎÄÉÀÏ·Î ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgstr "LC_CTYPEÀ» ±âº» ·ÎĶ·Î ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locale.c:197
+#: locale/programs/locale.c:195
+#, c-format
 msgid "Cannot set LC_MESSAGES to default locale"
-msgstr "LC_MESSAGESÀ» ±âº» ·ÎÄÉÀÏ·Î ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgstr "LC_MESSAGESÀ» ±âº» ·ÎĶ·Î ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locale.c:210
+#: locale/programs/locale.c:208
+#, c-format
 msgid "Cannot set LC_COLLATE to default locale"
-msgstr "LC_COLLATEÀ» ±âº» ·ÎÄÉÀÏ·Î ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgstr "LC_COLLATEÀ» ±âº» ·ÎĶ·Î ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locale.c:226
+#: locale/programs/locale.c:224
+#, c-format
 msgid "Cannot set LC_ALL to default locale"
-msgstr "LC_ALLÀ» ±âº» ·ÎÄÉÀÏ·Î ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgstr "LC_ALLÀ» ±âº» ·ÎĶ·Î ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locale.c:517
+#: locale/programs/locale.c:500
+#, c-format
 msgid "while preparing output"
 msgstr "Ãâ·ÂÀ» ÁغñÇÏ´Â µ¿¾È"
 
-#: locale/programs/localedef.c:121
+#: locale/programs/localedef.c:120
 msgid "Input Files:"
 msgstr "ÀÔ·Â ÆÄÀÏ:"
 
-#: locale/programs/localedef.c:123
+#: locale/programs/localedef.c:122
 msgid "Symbolic character names defined in FILE"
-msgstr "<ÆÄÀÏ>¿¡ ±âÈ£·Î Ç¥½ÃµÈ ¹®ÀÚ À̸§ÀÌ Á¤ÀǵÊ"
+msgstr "<ÆÄÀÏ>¿¡ ±âÈ£·Î Ç¥½ÃÇÑ ¹®ÀÚ À̸§À» Á¤ÀÇÇÔ"
 
-#: locale/programs/localedef.c:124
+#: locale/programs/localedef.c:123
 msgid "Source definitions are found in FILE"
 msgstr "<ÆÄÀÏ>¿¡ ¼Ò½º Á¤ÀÇ°¡ ÀÖ½À´Ï´Ù"
 
-#: locale/programs/localedef.c:126
+#: locale/programs/localedef.c:125
 msgid "FILE contains mapping from symbolic names to UCS4 values"
-msgstr "<ÆÄÀÏ>Àº ±âÈ£·Î Ç¥½ÃµÈ À̸§¿¡¼­ UCS4 °ªÀ¸·ÎÀÇ ¸ÅÇÎÀ» °®°í ÀÖ½À´Ï´Ù"
+msgstr "<ÆÄÀÏ>Àº ±âÈ£·Î Ç¥½ÃÇÑ À̸§¿¡¼­ UCS4 °ªÀ¸·ÎÀÇ ¸ÅÇÎÀ» °®°í ÀÖ½À´Ï´Ù"
 
-#: locale/programs/localedef.c:130
+#: locale/programs/localedef.c:129
 msgid "Create output even if warning messages were issued"
 msgstr "°æ°í ¸Þ¼¼Áö°¡ ³ª¿Ã °æ¿ì¿¡µµ Ãâ·ÂÇÔ"
 
-#: locale/programs/localedef.c:131
+#: locale/programs/localedef.c:130
 msgid "Create old-style tables"
 msgstr "°ú°Å ½ºÅ¸ÀÏÀÇ Å×À̺íÀ» ¸¸µì´Ï´Ù"
 
-#: locale/programs/localedef.c:132
+#: locale/programs/localedef.c:131
 msgid "Optional output file prefix"
 msgstr "Ãâ·Â ÆÄÀÏ Á¢µÎ¾î(¿É¼Ç)"
 
-#: locale/programs/localedef.c:133
+#: locale/programs/localedef.c:132
 msgid "Be strictly POSIX conform"
 msgstr "¾ö°ÝÇÏ°Ô POSIX¸¦ µû¸§"
 
-#: locale/programs/localedef.c:135
+#: locale/programs/localedef.c:134
 msgid "Suppress warnings and information messages"
 msgstr "°æ°í ¸Þ¼¼Áö¿Í °ü·Ã Á¤º¸ ¸Þ¼¼Áö¸¦ Ç¥½ÃÇÏÁö ¾ÊÀ½"
 
-#: locale/programs/localedef.c:136
+#: locale/programs/localedef.c:135
 msgid "Print more messages"
 msgstr "´õ ¸¹Àº ¸Þ½ÃÁö Ç¥½Ã"
 
-#: locale/programs/localedef.c:137
+#: locale/programs/localedef.c:136
 msgid "Archive control:"
 msgstr "¾ÆÄ«À̺ê ÄÁÆ®·Ñ:"
 
-#: locale/programs/localedef.c:139
+#: locale/programs/localedef.c:138
 msgid "Don't add new data to archive"
 msgstr "¾ÆÄ«À̺꿡 »õ µ¥ÀÌÅ͸¦ ´õÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: locale/programs/localedef.c:141
+#: locale/programs/localedef.c:140
 msgid "Add locales named by parameters to archive"
-msgstr "¾ÆÄ«À̺꿡 Àμö·Î ÁöÁ¤ÇÑ À̸§ÀÇ ·ÎÄÉÀÏÀ» ´õÇÕ´Ï´Ù"
+msgstr "¾ÆÄ«À̺꿡 Àμö·Î ÁöÁ¤ÇÑ À̸§ÀÇ ·ÎĶÀ» ´õÇÕ´Ï´Ù"
 
-#: locale/programs/localedef.c:142
+#: locale/programs/localedef.c:141
 msgid "Replace existing archive content"
 msgstr "ÇöÀç ¾ÆÄ«ÀÌºê ³»¿ëÀ» ¹Ù²ß´Ï´Ù"
 
-#: locale/programs/localedef.c:144
+#: locale/programs/localedef.c:143
 msgid "Remove locales named by parameters from archive"
-msgstr "¾ÆÄ«À̺꿡¼­ Àμö·Î ÁöÁ¤ÇÑ À̸§ÀÇ ·ÎÄÉÀÏÀ» Áö¿ó´Ï´Ù"
+msgstr "¾ÆÄ«À̺꿡¼­ Àμö·Î ÁöÁ¤ÇÑ À̸§ÀÇ ·ÎĶÀ» Áö¿ó´Ï´Ù"
 
-#: locale/programs/localedef.c:145
+#: locale/programs/localedef.c:144
 msgid "List content of archive"
 msgstr "¾ÆÄ«À̺êÀÇ ³»¿ëÀ» º¾´Ï´Ù"
 
-#: locale/programs/localedef.c:147
+#: locale/programs/localedef.c:146
 msgid "locale.alias file to consult when making archive"
 msgstr "¾ÆÄ«À̺긦 ¸¸µé ¶§ µé¿©´Ù º¼ locale.alias ÆÄÀÏ"
 
-#: locale/programs/localedef.c:152
+#: locale/programs/localedef.c:151
 msgid "Compile locale specification"
-msgstr "·ÎÄÉÀÏ ¸í¼¼¸¦ ÄÄÆÄÀÏ"
+msgstr "·ÎĶ ¸í¼¼¸¦ ÄÄÆÄÀÏ"
 
-#: locale/programs/localedef.c:155
+#: locale/programs/localedef.c:154
 msgid ""
 "NAME\n"
 "[--add-to-archive|--delete-from-archive] FILE...\n"
@@ -1461,28 +2525,30 @@ msgid ""
 msgstr ""
 "<À̸§>\n"
 "[--add-to-archive|--delete-from-archive] <ÆÄÀÏ>...\n"
-"--list-archive [<ÆÄÀÏ>]"
+"--list-archive [ÆÄÀÏ]"
 
-#: locale/programs/localedef.c:233
+#: locale/programs/localedef.c:232
+#, c-format
 msgid "cannot create directory for output files"
 msgstr "Ãâ·Â ÆÄÀÏÀÇ µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/localedef.c:244
+#: locale/programs/localedef.c:243
+#, c-format
 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
 msgstr "Áß¿ä: ½Ã½ºÅÛ¿¡ `_POSIX2_LOCALEDEF'°¡ Á¤ÀǵǾî ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: locale/programs/localedef.c:258 locale/programs/localedef.c:274
+#: locale/programs/localedef.c:257 locale/programs/localedef.c:273
 #: locale/programs/localedef.c:599 locale/programs/localedef.c:619
 #, c-format
 msgid "cannot open locale definition file `%s'"
-msgstr "·ÎÄÉÀÏ Á¤ÀÇ ÆÄÀÏ `%s' ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
+msgstr "·ÎĶ Á¤ÀÇ ÆÄÀÏ `%s' ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/localedef.c:286
+#: locale/programs/localedef.c:285
 #, c-format
 msgid "cannot write output files to `%s'"
 msgstr "Ãâ·Â ÆÄÀÏÀ» `%s'¿¡ ±â·ÏÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/localedef.c:367
+#: locale/programs/localedef.c:366
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
@@ -1492,2248 +2558,1908 @@ msgid ""
 msgstr ""
 "½Ã½ºÅÛÀÇ µð·ºÅ丮, ¹®ÀÚ Áöµµ    : %s\n"
 "                   ·¹ÆÄÅ丮 Áöµµ: %s\n"
-"                   ·ÎÄÉÀÏ °æ·Î  : %s\n"
+"                   ·ÎĶ °æ·Î  : %s\n"
 "%s"
 
 #: locale/programs/localedef.c:567
+#, c-format
 msgid "circular dependencies between locale definitions"
-msgstr "·ÎÄÉÀÏ Á¤ÀÇµé »çÀÌ¿¡ »óÈ£ ÀÇÁ¸¼º"
+msgstr "·ÎĶ Á¤ÀÇµé »çÀÌ¿¡ »óÈ£ ÀÇÁ¸¼º"
 
 #: locale/programs/localedef.c:573
 #, c-format
 msgid "cannot add already read locale `%s' a second time"
-msgstr "ÀÌ¹Ì ÀоîµéÀÎ `%s' ·ÎÄÉÀÏÀ» µÎ ¹ø ´õÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgstr "ÀÌ¹Ì ÀоîµéÀÎ `%s' ·ÎĶÀ» µÎ ¹ø ´õÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:89 locale/programs/locarchive.c:259
+#: locale/programs/locarchive.c:88 locale/programs/locarchive.c:261
+#, c-format
 msgid "cannot create temporary file"
 msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:118 locale/programs/locarchive.c:305
+#: locale/programs/locarchive.c:118 locale/programs/locarchive.c:307
+#, c-format
 msgid "cannot initialize archive file"
 msgstr "¾ÆÄ«À̺ê ÆÄÀÏÀ» ÃʱâÈ­ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:125 locale/programs/locarchive.c:312
+#: locale/programs/locarchive.c:125 locale/programs/locarchive.c:314
+#, c-format
 msgid "cannot resize archive file"
 msgstr "¾ÆÄ«À̺ê ÆÄÀÏÀÇ Å©±â¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:134 locale/programs/locarchive.c:321
-#: locale/programs/locarchive.c:511
+#: locale/programs/locarchive.c:134 locale/programs/locarchive.c:323
+#: locale/programs/locarchive.c:527
+#, c-format
 msgid "cannot map archive header"
 msgstr "¾ÆÄ«À̺ê Çì´õ¸¦ ¸ÅÇÎÇÒ ¼ö ¾ø½À´Ï´Ù"
 
 #: locale/programs/locarchive.c:156
+#, c-format
 msgid "failed to create new locale archive"
-msgstr "»õ ·ÎÄÉÀÏ ¾ÆÄ«À̺긦 ¸¸µå´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
+msgstr "»õ ·ÎĶ ¾ÆÄ«À̺긦 ¸¸µå´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
 
 #: locale/programs/locarchive.c:168
+#, c-format
 msgid "cannot change mode of new locale archive"
-msgstr "»õ ·ÎÄÉÀÏ ¾ÆÄ«À̺êÀÇ ¸ðµå¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù"
+msgstr "»õ ·ÎĶ ¾ÆÄ«À̺êÀÇ ¸ðµå¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:253
+#: locale/programs/locarchive.c:255
+#, c-format
 msgid "cannot map locale archive file"
-msgstr "·ÎÄÉÀÏ ¾ÆÄ«À̺ê ÆÄÀÏÀ» ¸ÅÇÎÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgstr "·ÎĶ ¾ÆÄ«À̺ê ÆÄÀÏÀ» ¸ÅÇÎÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:329
+#: locale/programs/locarchive.c:331
+#, c-format
 msgid "cannot lock new archive"
 msgstr "»õ ¾ÆÄ«À̺긦 Àá±Û ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:380
+#: locale/programs/locarchive.c:396
+#, c-format
 msgid "cannot extend locale archive file"
-msgstr "·ÎÄÉÀÏ ¾ÆÄ«À̺ê ÆÄÀÏÀ» È®ÀåÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgstr "·ÎĶ ¾ÆÄ«À̺ê ÆÄÀÏÀ» È®ÀåÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:389
+#: locale/programs/locarchive.c:405
+#, c-format
 msgid "cannot change mode of resized locale archive"
-msgstr "Å©±â¸¦ ¹Ù²Û ·ÎÄÉÀÏ ¾ÆÄ«À̺êÀÇ ¸ðµå¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù"
+msgstr "Å©±â¸¦ ¹Ù²Û ·ÎĶ ¾ÆÄ«À̺êÀÇ ¸ðµå¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:397
+#: locale/programs/locarchive.c:413
+#, c-format
 msgid "cannot rename new archive"
 msgstr "»õ ¾ÆÄ«À̺êÀÇ À̸§À» ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:450
+#: locale/programs/locarchive.c:466
 #, c-format
 msgid "cannot open locale archive \"%s\""
-msgstr "\"%s\" ·ÎÄÉÀÏ ¾ÆÄ«À̺긦 ¿­ ¼ö ¾ø½À´Ï´Ù"
+msgstr "\"%s\" ·ÎĶ ¾ÆÄ«À̺긦 ¿­ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:455
+#: locale/programs/locarchive.c:471
 #, c-format
 msgid "cannot stat locale archive \"%s\""
-msgstr "\"%s\" ·ÎÄÉÀÏ ¾ÆÄ«À̺êÀÇ Á¤º¸¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
+msgstr "\"%s\" ·ÎĶ ¾ÆÄ«À̺êÀÇ Á¤º¸¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:474
+#: locale/programs/locarchive.c:490
 #, c-format
 msgid "cannot lock locale archive \"%s\""
-msgstr "\"%s\" ·ÎÄÉÀÏ ¾ÆÄ«À̺긦 Àá±Û ¼ö ¾ø½À´Ï´Ù"
+msgstr "\"%s\" ·ÎĶ ¾ÆÄ«À̺긦 Àá±Û ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:497
+#: locale/programs/locarchive.c:513
+#, c-format
 msgid "cannot read archive header"
 msgstr "¾ÆÄ«À̺ê Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:557
+#: locale/programs/locarchive.c:573
 #, c-format
 msgid "locale '%s' already exists"
-msgstr "'%s' ·ÎÄÉÀÏÀº ÀÌ¹Ì ÀÖ½À´Ï´Ù"
+msgstr "'%s' ·ÎĶÀº ÀÌ¹Ì ÀÖ½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:788 locale/programs/locarchive.c:803
-#: locale/programs/locarchive.c:815 locale/programs/locarchive.c:827
-#: locale/programs/locfile.c:343
+#: locale/programs/locarchive.c:804 locale/programs/locarchive.c:819
+#: locale/programs/locarchive.c:831 locale/programs/locarchive.c:843
+#: locale/programs/locfile.c:344
+#, c-format
 msgid "cannot add to locale archive"
-msgstr "·ÎÄÉÀÏ ¾ÆÄ«À̺꿡 ´õÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgstr "·ÎĶ ¾ÆÄ«À̺꿡 ´õÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:982
+#: locale/programs/locarchive.c:998
 #, c-format
 msgid "locale alias file `%s' not found"
-msgstr "`%s' ·ÎÄÉÀÏ º°¸í ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù"
+msgstr "`%s' ·ÎĶ º°¸í ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locarchive.c:1126
+#: locale/programs/locarchive.c:1142
 #, c-format
 msgid "Adding %s\n"
 msgstr "%s ´õÇÏ´Â ÁßÀÔ´Ï´Ù\n"
 
-#: locale/programs/locarchive.c:1132
+#: locale/programs/locarchive.c:1148
 #, c-format
 msgid "stat of \"%s\" failed: %s: ignored"
 msgstr "\"%s\"ÀÇ Á¤º¸¸¦ Àд µ¥ ½ÇÆÐÇß½À´Ï´Ù: %s: ¹«½ÃÇÕ´Ï´Ù"
 
-#: locale/programs/locarchive.c:1138
+#: locale/programs/locarchive.c:1154
 #, c-format
 msgid "\"%s\" is no directory; ignored"
 msgstr "\"%s\" ÆÄÀÏÀº µð·ºÅ丮°¡ ¾Æ´Õ´Ï´Ù: ¹«½ÃÇÕ´Ï´Ù"
 
-#: locale/programs/locarchive.c:1145
+#: locale/programs/locarchive.c:1161
 #, c-format
 msgid "cannot open directory \"%s\": %s: ignored"
 msgstr "\"%s\" µð·ºÅ丮¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù: %s: ¹«½ÃÇÕ´Ï´Ù"
 
-#: locale/programs/locarchive.c:1217
+#: locale/programs/locarchive.c:1233
 #, c-format
 msgid "incomplete set of locale files in \"%s\""
-msgstr "\"%s\" ¾È¿¡ µé¾î ÀÖ´Â ·ÎÄÉÀÏ ÆÄÀÏÀÌ ºÒ¿ÏÀüÇÕ´Ï´Ù"
+msgstr "\"%s\" ¾È¿¡ µé¾î ÀÖ´Â ·ÎĶ ÆÄÀÏÀÌ ºÒ¿ÏÀüÇÕ´Ï´Ù"
 
-#: locale/programs/locarchive.c:1281
+#: locale/programs/locarchive.c:1297
 #, c-format
 msgid "cannot read all files in \"%s\": ignored"
 msgstr "\"%s\" ¾ÈÀÇ ¸ðµç ÆÄÀÏÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù: ¹«½ÃÇÕ´Ï´Ù"
 
-#: locale/programs/locarchive.c:1351
+#: locale/programs/locarchive.c:1367
 #, c-format
 msgid "locale \"%s\" not in archive"
-msgstr "\"%s\" ·ÎÄÉÀÏÀº ¾ÆÄ«À̺꿡 ¾ø½À´Ï´Ù"
+msgstr "\"%s\" ·ÎĶÀº ¾ÆÄ«À̺꿡 ¾ø½À´Ï´Ù"
 
 #: locale/programs/locfile.c:132
 #, c-format
 msgid "argument to `%s' must be a single character"
 msgstr "`%s'¿¡ ´ëÇÑ Àμö´Â ´ÜÀÏ ¹®ÀÚ¿©¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/locfile.c:251
+#: locale/programs/locfile.c:252
 msgid "syntax error: not inside a locale definition section"
-msgstr "¹®¹ý ¾Ö·¯: ·ÎÄÉÀÏ Á¤ÀÇ ºÎºÐÀÌ ¾Æ´Õ´Ï´Ù"
+msgstr "¹®¹ý ¾Ö·¯: ·ÎĶ Á¤ÀÇ ºÎºÐÀÌ ¾Æ´Õ´Ï´Ù"
 
-#: locale/programs/locfile.c:625
+#: locale/programs/locfile.c:626
 #, c-format
 msgid "cannot open output file `%s' for category `%s'"
 msgstr "Ãâ·Â ÆÄÀÏ `%s' ÆÄÀÏÀ» ¹üÁÖ `%s'¿¡ ´ëÇØ ¿­ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locfile.c:649
+#: locale/programs/locfile.c:650
 #, c-format
 msgid "failure while writing data for category `%s'"
 msgstr "¹üÁÖ `%s'ÀÇ ÀڷḦ ¾²´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: locale/programs/locfile.c:745
+#: locale/programs/locfile.c:746
 #, c-format
 msgid "cannot create output file `%s' for category `%s'"
 msgstr "Ãâ·Â ÆÄÀÏ `%s' ÆÄÀÏÀ» ¹üÁÖ `%s'¿¡ ´ëÇØ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locfile.c:781
+#: locale/programs/locfile.c:782
 msgid "expect string argument for `copy'"
 msgstr "`copy'¿¡ ´ëÇÑ ¹®ÀÚ¿­ Àμö°¡ ÇÊ¿äÇÔ"
 
-#: locale/programs/locfile.c:785
+#: locale/programs/locfile.c:786
 msgid "locale name should consist only of portable characters"
-msgstr "·ÎÄÉÀÏ À̸§Àº Æ÷ÅͺíÇÑ ¹®ÀÚ·Î ±¸¼ºµÇ¾î¾ß ÇÕ´Ï´Ù"
+msgstr "·ÎĶ À̸§Àº Æ÷ÅͺíÇÑ ¹®ÀÚ·Î ±¸¼ºµÇ¾î¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/locfile.c:804
+#: locale/programs/locfile.c:805
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr "`copy'°¡ »ç¿ëµÉ ¶© ´Ù¸¥ Å°¿öµå¸¦ ÁöÁ¤ÇÏ¸é ¾È µË´Ï´Ù"
 
-#: locale/programs/repertoire.c:230 locale/programs/repertoire.c:271
-#: locale/programs/repertoire.c:296
+#: locale/programs/locfile.c:819
+#, c-format
+msgid "`%1$s' definition does not end with `END %1$s'"
+msgstr "`%1$s' Á¤ÀÇ°¡ `END %1$s'¿Í °°ÀÌ ³¡³ªÁö ¾Ê½À´Ï´Ù"
+
+#: 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 "·¹ÆÄÅ丮 Áöµµ Á¤ÀÇ¿¡ ¹®¹ý ¿À·ù: %s"
 
-#: locale/programs/repertoire.c:272
+#: locale/programs/repertoire.c:271
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "<Uxxxx> ȤÀº <Uxxxxxxxx> °ªÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù"
 
-# ¹ø¿ª: safe°¡ µ¿»ç·Î ¹¹Áö???
-#: locale/programs/repertoire.c:332
+#: locale/programs/repertoire.c:331
+#, c-format
 msgid "cannot save new repertoire map"
-msgstr "»õ·Î¿î ·¹ÆÄÅ丮 Áöµµ ÆÄÀÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+msgstr "»õ·Î¿î ·¹ÆÄÅ丮 Áöµµ¸¦ ÀúÀåÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/repertoire.c:343
+#: locale/programs/repertoire.c:342
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr "·¹ÆÄÅ丮 Áöµµ ÆÄÀÏ `%s' ÆÄÀÏÀ» ãÁö ¸øÇßÀ½"
 
-#: locale/programs/repertoire.c:450
+#: login/programs/pt_chown.c:74
 #, c-format
-msgid "<%s> and <%s> are invalid names for range"
-msgstr "<%s>°ú(¿Í) <%s>Àº(´Â) ¹®ÀÚÀÇ ¹üÀ§·Î À߸øµÈ À̸§ÀÔ´Ï´Ù"
-
-#: locale/programs/repertoire.c:457
-msgid "upper limit in range is not smaller then lower limit"
-msgstr "¹üÀ§ÀÇ »óÇÑÀÌ ÇÏÇѺ¸´Ù ÀÛÁö ¾Ê½À´Ï´Ù"
+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 "ÆÄÀÏ µð½ºÅ©¸³ÅÍ `%d'¿¡ ³Ñ±ä ¸¶½ºÅÍ ¸ðÁ¶ Å͹̳ο¡ ÇØ´çÇÏ´Â ½½·¹ÀÌºê ¸ðÁ¶ Å͹̳ÎÀÇ ¼ÒÀ¯ÀÚ, ±×·ì, Á¢±Ù ±ÇÇÑÀ» ¼³Á¤ÇÕ´Ï´Ù. ÀÌ ÇÁ·Î±×·¥Àº `grantpt' ÇÔ¼öÀÇ º¸Á¶ ÇÁ·Î±×·¥ÀÔ´Ï´Ù. ÀÌ ÇÁ·Î±×·¥Àº Á÷Á¢ ¸í·ÉÇà¿¡¼­ ½ÇÇàÇϵµ·Ï ÀǵµÇÏÁö ¾Ê¾Ò½À´Ï´Ù.\n"
 
-#: locale/programs/xmalloc.c:70 malloc/obstack.c:505 malloc/obstack.c:508
-#: posix/getconf.c:1007
-msgid "memory exhausted"
-msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
+#: login/programs/pt_chown.c:84
+#, c-format
+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 ""
+"¼ÒÀ¯ÀÚ´Â ÇöÀç »ç¿ëÀÚ·Î ¼³Á¤, ±×·ìÀº `%s'(À¸)·Î ¼³Á¤, Á¢±Ù ±ÇÇÑÀº `%o'(À¸)·Î ¼³Á¤.\n"
+"\n"
+"%s"
 
-#: assert/assert-perr.c:57
+#: login/programs/pt_chown.c:161
 #, c-format
-msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
-msgstr "%s%s%s:%u: %s%s¿¹±âÄ¡ ¸øÇÑ ¿À·ù: %s.\n"
+msgid "too many arguments"
+msgstr "Àμö°¡ ³Ê¹« ¸¹½À´Ï´Ù"
 
-#: assert/assert.c:56
+#: login/programs/pt_chown.c:169
 #, c-format
-msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
-msgstr "%s%s%s:%u: %s%sAssertion `%s' ½ÇÆÐ.\n"
+msgid "needs to be installed setuid `root'"
+msgstr "setuid `root'·Î ¼³Ä¡ÇØ¾ß ÇÕ´Ï´Ù"
 
-# ??? ¿Ø Ä¡Áî?
-#: intl/tst-codeset.c:40 intl/tst-codeset.c:50
-msgid "cheese"
-msgstr "Ä¡Áî"
+#: malloc/mcheck.c:330
+msgid "memory is consistent, library is buggy\n"
+msgstr "¸Þ¸ð¸®´Â °ß°íÇÏÁö¸¸, ¶óÀ̺귯¸®´Â ¹ö±×°¡ ¸¹½À´Ï´Ù\n"
 
-#: intl/tst-gettext2.c:37
-msgid "First string for testing."
-msgstr "Å×½ºÆ®ÇÒ Ã¹ ¹ø° ¹®ÀÚ¿­."
+#: malloc/mcheck.c:333
+msgid "memory clobbered before allocated block\n"
+msgstr "ºí·°À» ÇÒ´çÇϱâ Àü¿¡ ¸Þ¸ð¸®°¡ ÈѼյÊ\n"
 
-#: intl/tst-gettext2.c:38
-msgid "Another string for testing."
-msgstr "Å×½ºÆ®ÇÒ ¶Ç ´Ù¸¥ ¹®ÀÚ¿­."
+#: malloc/mcheck.c:336
+msgid "memory clobbered past end of allocated block\n"
+msgstr "ºí·°À» ÇÒ´çÀÌ ³¡³ª±â Àü¿¡ ¸Þ¸ð¸®°¡ ÈѼյÊ\n"
 
-#: catgets/gencat.c:111 catgets/gencat.c:115 nscd/nscd.c:88
-msgid "NAME"
-msgstr "<À̸§>"
+#: malloc/mcheck.c:339
+msgid "block freed twice\n"
+msgstr "ºí·°ÀÌ µÎ¹ø ºñ¿öÁ³À½\n"
 
-#: catgets/gencat.c:112
-msgid "Create C header file NAME containing symbol definitions"
-msgstr "±âÈ£ Á¤ÀǸ¦ ´ã°í ÀÖ´Â C Çì´õ ÆÄÀÏ NAMEÀ» ¸¸µê"
+#: malloc/mcheck.c:342
+msgid "bogus mcheck_status, library is buggy\n"
+msgstr "¾ûÅ͸® mcheck_status, ¶óÀ̺귯¸®´Â ¹ö±×°¡ ÀÖ½À´Ï´Ù\n"
 
-#: catgets/gencat.c:114
-msgid "Do not use existing catalog, force new output file"
-msgstr "ÀÌ¹Ì Á¸ÀçÇÏ´Â ¸ñ·ÏÀ» »ç¿ëÇÏÁö ¾Ê°í, »õ·Î¿î ÆÄÀÏ¿¡ Ãâ·ÂÇÔ"
+#: malloc/memusage.sh:27
+msgid "Try \\`memusage --help' for more information."
+msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é \\`memusage --help' ÇϽʽÿÀ."
 
-#: catgets/gencat.c:115
-msgid "Write output to file NAME"
-msgstr "`À̸§' ÆÄÀÏ·Î Ãâ·ÂÇÔ"
+#: malloc/memusage.sh:33
+msgid "memusage: option \\`$1' requires an argument"
+msgstr "memusage: \\`$1' ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù"
 
-#: catgets/gencat.c:120
+#: 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 through 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 ""
-"¸Þ¼¼Áö ¸ñ·ÏÀ» ¸¸µì´Ï´Ù.^K<ÀÔ·Â-ÆÄÀÏ>ÀÌ - À̸é Ç¥ÁØ ÀÔ·ÂÀ» ÀÐ°Ô µË´Ï´Ù.  <Ãâ·Â-ÆÄÀÏ>ÀÌ - À̸é\n"
-"Ç¥ÁØ Ãâ·Â¿¡ Ãâ·ÂÇÕ´Ï´Ù.\n"
+"»ç¿ë¹ý: memusage [¿É¼Ç]... <ÇÁ·Î±×·¥> [ÇÁ·Î±×·¥¿É¼Ç]...\n"
+"<ÇÁ·Î±×·¥>ÀÇ ¸Þ¸ð¸® »ç¿ë·®À» ÇÁ·ÎÆÄÀϸµÇÕ´Ï´Ù.\n"
+"\n"
+"   -n,--progname=<À̸§>   ÇÁ·ÎÆÄÀϸµÇÒ ÇÁ·Î±×·¥ ÆÄÀÏÀÇ À̸§\n"
+"   -p,--png=<ÆÄÀÏ>        PNG ±×·¡ÇÈÀ» ¸¸µé¾î¼­ <ÆÄÀÏ>¿¡ ÀúÀåÇÕ´Ï´Ù\n"
+"   -d,--data=<ÆÄÀÏ>       ¹ÙÀ̳ʸ® µ¥ÀÌÅÍ ÆÄÀÏÀ» ¸¸µé¾î¼­ <ÆÄÀÏ>¿¡ ÀúÀåÇÕ´Ï´Ù\n"
+"   -u,--unbuffered        Ãâ·ÂÀ» ¹öÆÛ¸µÇÏÁö ¾Ê½À´Ï´Ù\n"
+"   -b,--buffer=<Å©±â>     ¾²±â Àü¿¡ <Å©±â>°³ÀÇ Ç׸ñÀ» ¸ð¾Æ ³õ½À´Ï´Ù\n"
+"      --no-timer          ŸÀ̸Ӹ¦ ÅëÇÑ Ãß°¡ Á¤º¸¸¦ ¼öÁýÇÏÁö ¾Ê½À´Ï´Ù\n"
+"   -m,--mmap              mmap ¹× ±× Á¾·ùµµ ÃßÀûÇÕ´Ï´Ù\n"
+"\n"
+"   -?,--help              ÀÌ µµ¿ò¸»À» Ç¥½ÃÇÏ°í ³¡³³´Ï´Ù\n"
+"      --usage             °£´ÜÇÑ »ç¿ë¹ýÀ» Ç¥½ÃÇÕ´Ï´Ù\n"
+"   -V,--version           ¹öÀü Á¤º¸¸¦ Ç¥½ÃÇÏ°í ³¡³³´Ï´Ù\n"
+"\n"
+" ´ÙÀ½ ¿É¼ÇÀº ±×·¡ÇÈ Ãâ·ÂÀ» ¸¸µé ¶§¸¸ »ç¿ëÇÒ ¼ö ÀÖ½À´Ï´Ù:\n"
+"   -t,--time-based        ±×·¡ÇÁ¸¦ ½Ã°£¿¡ ´ëÇØ ¸¸µì´Ï´Ù\n"
+"   -T,--total             Àüü ¸Þ¸ð¸® »ç¿ë·® ±×·¡ÇÁµµ ±×¸³´Ï´Ù\n"
+"      --title=<¹®ÀÚ¿­>    <¹®ÀÚ¿­>À» ±×·¡ÇÁÀÇ Á¦¸ñÀ¸·Î »ç¿ëÇÕ´Ï´Ù\n"
+"   -x,--x-size=<Å©±â>     ±×·¡ÇÈÀ» <Å©±â> Çȼ¿¸¸Å­ ³Ð°Ô ¸¸µì´Ï´Ù\n"
+"   -y,--y-size=<Å©±â>     ±×·¡ÇÈÀ» <Å©±â> Çȼ¿¸¸Å­ ³ô°Ô ¸¸µì´Ï´Ù\n"
+"\n"
+"±ä ¿É¼Ç¿¡ ÇʼöÀûÀÎ Àμö´Â, °°Àº ªÀº ¿É¼Ç¿¡¼­µµ ÇʼöÀûÀÎ ÀμöÀÔ´Ï´Ù.\n"
+"\n"
+"¹ö±× º¸°í ¹æ¹ýÀº ´ÙÀ½À» Âü°íÇϽʽÿÀ:\n"
+"<http://www.gnu.org/software/libc/bugs.html>."
 
-#: catgets/gencat.c:125
+#: malloc/memusage.sh:99
 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 <Ãâ·Â-ÆÄÀÏ> [<ÀÔ·Â-ÆÄÀÏ>]...\n"
-"[<Ãâ·Â-ÆÄÀÏ> [<ÀÔ·Â-ÆÄÀÏ>]...]"
+"Çü½Ä: memusage [--data=<ÆÄÀÏ>] [--progname=<À̸§>] [--png=<ÆÄÀÏ>] [--unbuffered]\n"
+"            [--buffer=<Å©±â>] [--no-timer] [--time-based] [--total]\n"
+"            [--title=<¹®ÀÚ¿­>] [--x-size=<Å©±â>] [--y-size=<Å©±â>]\n"
+"            <ÇÁ·Î±×·¥> [ÇÁ·Î±×·¥¿É¼Ç]..."
 
-#: catgets/gencat.c:282
-msgid "*standard input*"
-msgstr "*Ç¥ÁØ ÀÔ·Â*"
+#: malloc/memusage.sh:191
+msgid "memusage: option \\`${1##*=}' is ambiguous"
+msgstr "memusage: \\`${1##*=}' ¿É¼ÇÀº ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù"
 
-#: catgets/gencat.c:417 catgets/gencat.c:494
-msgid "illegal set number"
-msgstr "ÁýÇÕ ¹øÈ£°¡ À߸øµÇ¾úÀ½"
+#: malloc/memusage.sh:200
+msgid "memusage: unrecognized option \\`$1'"
+msgstr "memusage: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç \\`$1'"
 
-#: catgets/gencat.c:444
-msgid "duplicate set definition"
-msgstr "ÁýÇÕ Á¤ÀÇ°¡ Áߺ¹µÇ¾î ÀÖ½À´Ï´Ù"
+#: malloc/memusage.sh:213
+msgid "No program name given"
+msgstr "ÇÁ·Î±×·¥ À̸§ÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: catgets/gencat.c:446 catgets/gencat.c:623 catgets/gencat.c:677
-msgid "this is the first definition"
-msgstr "ÀÌ°ÍÀº ù¹ø° Á¤ÀÇÀÔ´Ï´Ù"
-
-#: catgets/gencat.c:522
-#, c-format
-msgid "unknown set `%s'"
-msgstr "¾Ë ¼ö ¾ø´Â ¼³Á¤ `%s'"
-
-#: catgets/gencat.c:563
-msgid "invalid quote character"
-msgstr "À߸øµÈ Àο빮ÀÚ"
-
-#: catgets/gencat.c:576
-#, c-format
-msgid "unknown directive `%s': line ignored"
-msgstr "¾Ë ¼ö ¾ø´Â Áö½ÃÀÚ `%s': Çà ¹«½ÃµÊ"
-
-#: catgets/gencat.c:621
-msgid "duplicated message number"
-msgstr "Áߺ¹µÈ ¸Þ½ÃÁö ¹øÈ£"
-
-#: catgets/gencat.c:674
-msgid "duplicated message identifier"
-msgstr "Áߺ¹µÈ ¸Þ½ÃÁö ½Äº°ÀÚ"
+# ¹ø¿ª: NameÀÌ µ¿»çÀΰ¡, ¸í»çÀΰ¡???
+#: malloc/memusagestat.c:54
+msgid "Name output file"
+msgstr "Ãâ·Â ÆÄÀÏ À̸§"
 
-#: catgets/gencat.c:731
-msgid "invalid character: message ignored"
-msgstr "À߸øµÈ ¹®ÀÚ: ¸Þ¼¼Áö´Â ¹«½ÃµË´Ï´Ù"
+#: malloc/memusagestat.c:55
+msgid "Title string used in output graphic"
+msgstr "Ãâ·Â ±×·¡ÇÈ¿¡ Á¦¸ñ ¹®ÀÚ¿­ »ç¿ë"
 
-#: catgets/gencat.c:774
-msgid "invalid line"
-msgstr "ºÎÀûÀýÇÑ ÁÙ"
+#: malloc/memusagestat.c:56
+msgid "Generate output linear to time (default is linear to number of function calls)"
+msgstr "½Ã°£¿¡ ºñ·ÊÇÏ´Â Ãâ·ÂÀ» ¸¸µì´Ï´Ù (±âº»°ªÀº ÇÔ¼ö È£Ãâ Ƚ¼ö¿¡ ºñ·ÊÇÕ´Ï´Ù)"
 
-#: catgets/gencat.c:828
-msgid "malformed line ignored"
-msgstr "À߸øµÈ ÇüŸ¦ °¡Áø ÇàÀº ¹«½ÃµÊ"
+#: malloc/memusagestat.c:58
+msgid "Also draw graph for total memory consumption"
+msgstr "Àüü ¸Þ¸ð¸® ¼Ò¸ð¿¡ ´ëÇÑ ±×·¡ÇÁµµ ±×¸³´Ï´Ù"
 
-#: catgets/gencat.c:992 catgets/gencat.c:1033
-#, c-format
-msgid "cannot open output file `%s'"
-msgstr "Ãâ·Â ÆÄÀÏ `%s' ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
+#: malloc/memusagestat.c:59
+msgid "Make output graphic VALUE pixels wide"
+msgstr "Ãâ·Â ±×·¡ÇÈÀ» <°ª> Çȼ¿¸¸Å­ ³Ð°Ô ¸¸µì´Ï´Ù"
 
-#: catgets/gencat.c:1217
-msgid "unterminated message"
-msgstr "Á¾·áµÇÁö ¾ÊÀº ¸Þ½ÃÁö"
+#: malloc/memusagestat.c:60
+msgid "Make output graphic VALUE pixels high"
+msgstr "Ãâ·Â ±×·¡ÇÈÀ» <°ª> Çȼ¿¸¸Å­ ³ô°Ô ¸¸µì´Ï´Ù"
 
-#: catgets/gencat.c:1241
-msgid "while opening old catalog file"
-msgstr "¿À·¡µÈ ¸ñ·Ï ÆÄÀÏÀ» ¿©´Â µ¿¾È"
+#: malloc/memusagestat.c:65
+msgid "Generate graphic from memory profiling data"
+msgstr "¸Þ¸ð¸® ÇÁ·ÎÆÄÀϸµ ÀÚ·á¿¡¼­ ±×·¡ÇÈ ¸¸µé±â"
 
-#: catgets/gencat.c:1332
-msgid "conversion modules not available"
-msgstr "º¯È¯ ¸ðµâÀÌ »ç¿ë ºÒ°¡´ÉÇÕ´Ï´Ù"
+#: malloc/memusagestat.c:68
+msgid "DATAFILE [OUTFILE]"
+msgstr "<µ¥ÀÌÅÍÆÄÀÏ> [Ãâ·ÂÆÄÀÏ]"
 
-#: catgets/gencat.c:1358
-msgid "cannot determine escape character"
-msgstr "À̽ºÄÉÀÌÇÁ ¹®ÀÚ¸¦ °áÁ¤ÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
+#: misc/error.c:118 timezone/zic.c:417
+msgid "Unknown system error"
+msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ ¿À·ù"
 
-#: 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: 8°³º¸´Ù ¸¹Àº ÀÎÀÚ¸¦ ¾î¶»°Ô ó¸®ÇÒ Áö ¾Ë ¼ö ¾ø½À´Ï´Ù\n"
+#: nis/nis_callback.c:189
+msgid "unable to free arguments"
+msgstr "ÀÎÀÚ¸¦ ºñ¿ï ¼ö ¾ø½À´Ï´Ù"
 
-#: 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 "¼º°ø"
 
-#. 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 "¸í·ÉÀÌ Çã¿ëµÇÁö ¾ÊÀ½"
-
-#. 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 "±×·± ÆÄÀÏÀ̳ª µð·ºÅ丮°¡ ¾øÀ½"
-
-#. 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 "±×·± ÇÁ·Î¼¼½º°¡ ¾øÀ½"
-
-#. 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 "Áß´ÜµÈ ½Ã½ºÅÛ È£Ãâ"
+#: nis/nis_error.h:2
+msgid "Probable success"
+msgstr "¾Æ¸¶µµ ¼º°ø"
 
-#. TRANS Input/output error; usually used for physical read or write errors.
-#: stdio-common/../sysdeps/gnu/errlist.c:61
-msgid "Input/output error"
-msgstr "ÀÔ·Â/Ãâ·Â ¿À·ù"
+#: nis/nis_error.h:3
+msgid "Not found"
+msgstr "ãÀ» ¼ö ¾øÀ½"
 
-#. 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 "±×·± ÀåÄ¡ ȤÀº ÁÖ¼Ò°¡ ¾øÀ½"
+#: nis/nis_error.h:4
+msgid "Probably not found"
+msgstr "¾Æ¸¶µµ ¾øÀ½"
 
-#. 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 "Àμö ¸í´ÜÀÌ ³Ê¹« ±è"
+#: nis/nis_error.h:5
+msgid "Cache expired"
+msgstr "ij½Ã ¸¸·á"
 
-#. 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 "Exec Çü½Ä ¿À·ù"
+#: nis/nis_error.h:6
+msgid "NIS+ servers unreachable"
+msgstr "NIS+ ¼­¹ö¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#. 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 "À߸øµÈ ÆÄÀÏ ±â¼úÀÚ"
+#: nis/nis_error.h:7
+msgid "Unknown object"
+msgstr "¾Ë ¼ö ¾ø´Â ¿ÀºêÁ§Æ®"
 
-#. 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 "ÇÏÀ§ ÇÁ·Î¼¼½º°¡ ¾øÀ½"
+#: nis/nis_error.h:8
+msgid "Server busy, try again"
+msgstr "¼­¹ö°¡ ´Ù¸¥ ÀÏÀ» ÇÏ°í ÀÖ½À´Ï´Ù, ´Ù½Ã ½ÃµµÇϼ¼¿ä"
 
-#. 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 "ÀÚ¿ø ±³Âø»óŸ¦ ÇÇÇß½À´Ï´Ù"
+#: nis/nis_error.h:9
+msgid "Generic system error"
+msgstr "ÀÏ¹Ý ½Ã½ºÅÛ ¿À·ù"
 
-#. 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 "¸Þ¸ð¸®¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: nis/nis_error.h:10
+msgid "First/next chain broken"
+msgstr "first/next ¿¬°áÀÌ ²÷¾îÁü"
 
 #. 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 "Çã°¡ °ÅºÎµÊ"
-
-#. 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 "À߸øµÈ ÁÖ¼Ò"
-
-#. 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 "ºí·° ÀåÄ¡°¡ ÇÊ¿äÇÔ"
-
-#. 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 "ÀåÄ¡³ª ÀÚ¿øÀÌ µ¿ÀÛ Áß"
+msgstr "Çã°¡ °ÅºÎ"
 
-#. 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 "ÆÄÀÏÀÌ Á¸ÀçÇÕ´Ï´Ù"
-
-#. 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 "ºÎÀûÀýÇÑ ÀåÄ¡°£ ¿¬°á"
-
-#. 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 "±×·± ÀåÄ¡°¡ ¾øÀ½"
-
-#. 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 "µð·ºÅ丮°¡ ¾Æ´Õ´Ï´Ù"
-
-#. 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 "µð·ºÅ丮ÀÔ´Ï´Ù"
-
-#. 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 "ºÎÀûÀýÇÑ Àμö"
-
-#. 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 "¿­¸° ÆÄÀÏÀÌ ³Ê¹« ¸¹À½"
-
-#. 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 "½Ã½ºÅÛ¿¡ ¿­¸° ÆÄÀÏÀÌ ³Ê¹« ¸¹À½"
-
-#. 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 "ÀåÄ¡¿¡ ´ëÇØ ºÎÀûÀýÇÑ ioctl"
-
-#. 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 "½ÇÇà ÆÄÀÏ »ç¿ë Áß"
-
-#. 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 "ÆÄÀÏÀÌ ³Ê¹« Å®´Ï´Ù"
-
-#. 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 "ÀåÄ¡¿¡ ³²Àº °ø°£ÀÌ ¾øÀ½"
-
-#. 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 "À߸øµÈ Ž»ö"
-
-#. 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 "ÀбâÀü¿ë ÆÄÀÏ ½Ã½ºÅÛ"
-
-#. 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 "¿¬°áÀÌ ³Ê¹« ¸¹À½"
-
-#. 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 "¿µ¿ªÀ» ¹þ¾î³­ ¼öÄ¡ Àμö"
+#: nis/nis_error.h:12
+msgid "Not owner"
+msgstr "¼ÒÀ¯ÀÚ°¡ ¾Æ´Õ´Ï´Ù"
 
-#. 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 "¹üÀ§¸¦ ¹þ¾î³­ ¼öÄ¡ °á°ú"
+#: nis/nis_error.h:13
+msgid "Name not served by this server"
+msgstr "ÀÌ ¼­¹ö¿¡¼­ ³×ÀÓ ¼­ºñ½º¸¦ ÇÏÁö ¾Ê½À´Ï´Ù"
 
-#. 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 "ÀÚ¿øÀÌ ÀϽÃÀûÀ¸·Î »ç¿ë ºÒ°¡´ÉÇÔ"
+#: nis/nis_error.h:14
+msgid "Server out of memory"
+msgstr "¼­¹ö ¸Þ¸ð¸® ºÎÁ·"
 
-#. 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 "µ¿ÀÛÀÌ ¸·Èú °ÍÀÔ´Ï´Ù"
+#: nis/nis_error.h:15
+msgid "Object with same name exists"
+msgstr "°°Àº À̸§ÀÇ ¿ÀºêÁ§Æ®°¡ ÀÖ½À´Ï´Ù"
 
-#. 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 "Áö±Ý ÁøÇà ÁßÀÎ ¸í·É"
+#: nis/nis_error.h:16
+msgid "Not master server for this domain"
+msgstr "ÀÌ µµ¸ÞÀÎÀÇ ÁÖ ¼­¹ö°¡ ¾Æ´Õ´Ï´Ù"
 
-#. 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 "ÀÌ¹Ì ÁøÇà ÁßÀÎ ¸í·É"
+#: nis/nis_error.h:17
+msgid "Invalid object for operation"
+msgstr "ÀÛ¾÷ÇÏ´Â µ¥ À߸øµÈ ¿ÀºêÁ§Æ®"
 
-#. 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 "ºñ¼ÒÄÏ»óÀÇ ¼ÒÄÏ µ¿ÀÛ"
+#: nis/nis_error.h:18
+msgid "Malformed name, or illegal name"
+msgstr "À߸øµÈ Çü½ÄÀÇ À̸§, ȤÀº ¾µ ¼ö ¾ø´Â À̸§"
 
-#. 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 "¸Þ½ÃÁö°¡ ³Ê¹« ±é´Ï´Ù"
+#: nis/nis_error.h:19
+msgid "Unable to create callback"
+msgstr "ÄݹéÀ» ¸¸µé ¼ö ¾øÀ½"
 
-#. 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 "¼ÒÄÏ¿¡ ´ëÇÑ ±Ô¾àÀÌ À߸øµÊ"
+#: nis/nis_error.h:20
+msgid "Results sent to callback proc"
+msgstr "°á°ú¸¦ Äݹé ÇÁ·Î½ÃÀú·Î º¸³ÂÀ½"
 
-#. 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 "±Ô¾à »ç¿ë ºÒ°¡´É"
+#: nis/nis_error.h:21
+msgid "Not found, no such name"
+msgstr "ãÀ» ¼ö ¾øÀ½.  ±×·± À̸§ÀÌ ¾øÀ½"
 
-#. 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 "±Ô¾àÀÌ Áö¿øµÇÁö ¾ÊÀ½"
+#: nis/nis_error.h:22
+msgid "Name/entry isn't unique"
+msgstr "À̸§/Ç׸ñÀÌ À¯ÀÏÇÏÁö ¾Ê½À´Ï´Ù"
 
-#. 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 "¼ÒÄÏ Å¸ÀÔÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
+#: nis/nis_error.h:23
+msgid "Modification failed"
+msgstr "¼öÁ¤ÇÏ´Â µ¥ ½ÇÆÐ"
 
-#. 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 "¸í·ÉÀÌ Áö¿øµÇÁö ¾ÊÀ½"
+#: nis/nis_error.h:24
+msgid "Database for table does not exist"
+msgstr "Å×ÀÌºí¿¡ ´ëÇÑ µ¥ÀÌÅͺ£À̽º°¡ ¾ø½À´Ï´Ù"
 
-#. 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 "±Ô¾à±ºÀÌ Áö¿øµÇÁö ¾ÊÀ½"
+#: nis/nis_error.h:25
+msgid "Entry/table type mismatch"
+msgstr "entry/table ŸÀÔÀÌ ¸ÂÁö ¾Ê½À´Ï´Ù"
 
-#. 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 "ÁÖ¼Ò±ºÀÌ ±Ô¾à¿¡¼­ Áö¿øµÇÁö ¾ÊÀ½"
+#: nis/nis_error.h:26
+msgid "Link points to illegal name"
+msgstr "¸µÅ©°¡ À߸øµÈ À̸§À» °¡¸®Å´"
 
-#. 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 "ÁÖ¼Ò°¡ ÀÌ¹Ì »ç¿ë ÁßÀÔ´Ï´Ù"
+#: nis/nis_error.h:27
+msgid "Partial success"
+msgstr "ºÎºÐÀûÀÎ ¼º°ø"
 
-#. 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 "¿äûµÈ ÁÖ¼Ò¸¦ ¹èÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: nis/nis_error.h:28
+msgid "Too many attributes"
+msgstr "¼Ó¼ºÀÌ ³Ê¹« ¸¹À½"
 
-#. 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 "³×Æ®¿öÅ©°¡ Á×¾ú½À´Ï´Ù"
+#: nis/nis_error.h:29
+msgid "Error in RPC subsystem"
+msgstr "RPC ¼­ºê ½Ã½ºÅÛ¿¡ ¿À·ù: "
 
-#. 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 "³×Æ®¿öÅ©°¡ Á¢±Ù ºÒ°¡´ÉÇÕ´Ï´Ù"
+#: nis/nis_error.h:30
+msgid "Missing or malformed attribute"
+msgstr "¼Ó¼ºÀÌ ¾ø°Å³ª Çü½ÄÀÌ Æ²·ÈÀ½"
 
-#. 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 "³×Æ®¿÷ÀÌ reset¶§¹®¿¡ ¿¬°áÀ» ²÷¾ú½À´Ï´Ù"
+#: nis/nis_error.h:31
+msgid "Named object is not searchable"
+msgstr "À̸§¿¡ ÇØ´çµÇ´Â ¿ÀºêÁ§Æ®¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#. 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 "¼ÒÇÁÆ®¿þ¾î°¡ ¿¬°á Áß´ÜÀ» ÃÊ·¡Çß½À´Ï´Ù"
+#: nis/nis_error.h:32
+msgid "Error while talking to callback proc"
+msgstr "Äݹé ÇÁ·Î½ÃÀú¸¦ »ç¿ëÇÏ´Â µ¥ ¿À·ù"
 
-#. 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 "¿¬°áÀÌ »ó´ëÆí¿¡ ÀÇÇØ ²÷¾îÁü"
+#: nis/nis_error.h:33
+msgid "Non NIS+ namespace encountered"
+msgstr "NIS+°¡ ¾Æ´Ñ ³×ÀÓ½ºÆäÀ̽º ¹ß°ß"
 
-#. 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 "»ç¿ë °¡´ÉÇÑ ¹öÆÛ °ø°£ÀÌ ¾øÀ½"
+#: nis/nis_error.h:34
+msgid "Illegal object type for operation"
+msgstr "ÀÛ¾÷ÇÏ´Â µ¥ À߸øµÈ ¿ÀºêÁ§Æ® ŸÀÔ"
 
-#. 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 "Àü¼Û Á¾·áÁöÁ¡ÀÌ ÀÌ¹Ì ¿¬°áµÇ¾î ÀÖ½À´Ï´Ù"
+#: nis/nis_error.h:35
+msgid "Passed object is not the same object on server"
+msgstr "Åë°úÇÑ ¿ÀºêÁ§Æ®´Â ¼­¹öÀÇ °°Àº ¿ÀºêÁ§Æ®°¡ ¾Æ´Õ´Ï´Ù"
 
-#. 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 "Àü¼Û Á¾·áÁöÁ¡ÀÌ ¿¬°áµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
+#: nis/nis_error.h:36
+msgid "Modify operation failed"
+msgstr "¼öÁ¤ ÀÛ¾÷ÀÌ ½ÇÆÐÇÏ¿´À½"
 
-#. 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 "¸ñÀûÁö ÁÖ¼Ò°¡ ÇÊ¿äÇÔ"
+#: nis/nis_error.h:37
+msgid "Query illegal for named table"
+msgstr "À̸§ Å×ÀÌºí¿¡ À߸øµÈ ÁúÀÇ"
 
-#. TRANS The socket has already been shut down.
-#: stdio-common/../sysdeps/gnu/errlist.c:659
-msgid "Cannot send after transport endpoint shutdown"
-msgstr "Àü¼Û Á¾·áÁöÁ¡ÀÌ Áö³­ ÈÄ¿¡ º¸³¾ ¼ö ¾ø½À´Ï´Ù"
+#: nis/nis_error.h:38
+msgid "Attempt to remove a non-empty table"
+msgstr "ºñ¾îÀÖÁö ¾ÊÀº Å×À̺íÀ» Áö¿ì·Á°í ½Ãµµ"
 
-#. 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 "ÂüÁ¶°¡ ³Ê¹« ¸¹À½: ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: nis/nis_error.h:39
+msgid "Error in accessing NIS+ cold start file.  Is NIS+ installed?"
+msgstr "NIS+ ½ÃÀÛ ÆÄÀÏ¿¡ Á¢±ÙÇÏ´Â µ¥ ¿À·ù.  NIS+°¡ ¼³Ä¡µÇ¾ú½À´Ï±î?"
 
-#. 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 "¿¬°á ½Ã°£ ÃÊ°ú"
+#: nis/nis_error.h:40
+msgid "Full resync required for directory"
+msgstr "µð·ºÅ丮¿¡ ´ëÇØ ¿ÏÀüÇÑ resync°¡ ÇÊ¿äÇÔ"
 
-#. 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 "¿¬°áÀÌ °ÅºÎµÊ"
+#: nis/nis_error.h:41
+msgid "NIS+ operation failed"
+msgstr "NIS+ µ¿ÀÛ ½ÇÆÐ"
 
-#. 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 "±âÈ£ ¿¬°áÀÇ ´Ü°è°¡ ³Ê¹« ¸¹À½"
+#: nis/nis_error.h:42
+msgid "NIS+ service is unavailable or not installed"
+msgstr "NIS+ ¼­ºñ½º¸¦ »ç¿ëÇÒ ¼ö ¾ø°Å³ª NIS+ ¼­ºñ½º¸¦ ¼³Ä¡ÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#. 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 "ÆÄÀÏ À̸§ÀÌ ³Ê¹« ±é´Ï´Ù"
+#: nis/nis_error.h:43
+msgid "Yes, 42 is the meaning of life"
+msgstr "¿¹, 42´Â Á¤»óÀûÀ¸·Î µ¿ÀÛÇÑ´Ù´Â ¶æÇÕ´Ï´Ù"
 
-#. 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 "È£½ºÆ®°¡ Á×¾ú½À´Ï´Ù"
+#: nis/nis_error.h:44
+msgid "Unable to authenticate NIS+ server"
+msgstr "NIS+ ¼­¹ö¿¡ ÀÎÁõÇÒ ¼ö ¾øÀ½"
 
-#. 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 "È£½ºÆ®·Î °¥ ·çÆ®°¡ ¾øÀ½"
+#: nis/nis_error.h:45
+msgid "Unable to authenticate NIS+ client"
+msgstr "NIS+ Ŭ¶óÀ̾ðÆ®¿¡ ÀÎÁõÇÒ ¼ö ¾øÀ½"
 
-#. 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 "µð·ºÅ丮°¡ ºñ¾îÀÖÁö ¾ÊÀ½"
+#: nis/nis_error.h:46
+msgid "No file space on server"
+msgstr "¼­¹ö¿¡ ³²Àº °ø°£ÀÌ ¾øÀ½"
 
-#. 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 "ÇÁ·Î¼¼½º°¡ ³Ê¹« ¸¹À½"
+#: nis/nis_error.h:47
+msgid "Unable to create process on server"
+msgstr "¼­¹ö¿¡¼­ ÇÁ·Î¼¼½º¸¦ ¸¸µé ¼ö ¾øÀ½"
 
-#. 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 "»ç¿ëÀÚ°¡ ³Ê¹« ¸¹À½"
+#: nis/nis_error.h:48
+msgid "Master server busy, full dump rescheduled."
+msgstr "¸¶½ºÅÍ ¼­¹ö°¡ ÀÛ¾÷ÁßÀ̹ǷÎ, Àüü ´ýÇÁ¸¦ ¿¬±âÇÕ´Ï´Ù."
 
-#. TRANS The user's disk quota was exceeded.
-#: stdio-common/../sysdeps/gnu/errlist.c:767
-msgid "Disk quota exceeded"
-msgstr "µð½ºÅ© ÇÒ´ç·®ÀÌ ÃÊ°úµÊ"
+#: nis/nis_local_names.c:122
+#, c-format
+msgid "LOCAL entry for UID %d in directory %s not unique\n"
+msgstr "µð·ºÅ丮 %2$sÀÇ UID %1$d¹øÀ» À§ÇÑ LOCAL entry°¡ À¯ÀÏÇÏÁö ¾Ê½À´Ï´Ù\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.
-#: stdio-common/../sysdeps/gnu/errlist.c:779
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:181
-msgid "Stale NFS file handle"
-msgstr "²÷¾îÁø NFS ÆÄÀÏ ÇÚµé"
+#: nis/nis_print.c:51
+msgid "UNKNOWN"
+msgstr "¾Ë¼ö¾øÀ½"
 
-#. 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 "¿ø°Ý °³Ã¼ÀÔ´Ï´Ù"
+#: nis/nis_print.c:109
+msgid "BOGUS OBJECT\n"
+msgstr "¾ûÅ͸® ¿ÀºêÁ§Æ®\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:800
-msgid "RPC struct is bad"
-msgstr "RPC ±¸Á¶°¡ À߸øµÇ¾ú½À´Ï´Ù"
+#: nis/nis_print.c:112
+msgid "NO OBJECT\n"
+msgstr "¿ÀºêÁ§Æ®°¡ ¾øÀ½\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:809
-msgid "RPC version wrong"
-msgstr "RPC ¹öÀüÀÌ À߸øµÊ"
+#: nis/nis_print.c:115
+msgid "DIRECTORY\n"
+msgstr "µð·ºÅ丮\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:818
-msgid "RPC program not available"
-msgstr "RPC ÇÁ·Î±×·¥ »ç¿ë ºÒ°¡´É"
+#: nis/nis_print.c:118
+msgid "GROUP\n"
+msgstr "±×·ì\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:827
-msgid "RPC program version wrong"
-msgstr "RPC ÇÁ·Î±×·¥ ¹öÀüÀÌ À߸øµÊ"
+#: nis/nis_print.c:121
+msgid "TABLE\n"
+msgstr "Å×À̺í\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:836
-msgid "RPC bad procedure for program"
-msgstr "RPC ÇÁ·Î±×·¥ÀÇ ÇÁ·Î½ÃÁ®°¡ À߸øµÊ"
+#: nis/nis_print.c:124
+msgid "ENTRY\n"
+msgstr "ENTRY\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 "»ç¿ë°¡´ÉÇÑ Àá±ÝÀåÄ¡°¡ ¾øÀ½"
+#: nis/nis_print.c:127
+msgid "LINK\n"
+msgstr "¿¬°á\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 "ºÎÀûÀýÇÑ ÆÄÀÏ Å¸ÀÔ ¶Ç´Â Çü½Ä"
+#: nis/nis_print.c:130
+msgid "PRIVATE\n"
+msgstr "°³ÀÎ\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:870
-msgid "Authentication error"
-msgstr "ÀÎÁõ ¿À·ù"
+#: nis/nis_print.c:133
+msgid "(Unknown object)\n"
+msgstr "(¾Ë ¼ö ¾ø´Â ¿ÀºêÁ§Æ®)\n"
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:879
-msgid "Need authenticator"
-msgstr "ÀÎÁõ±â°¡ ÇÊ¿äÇÔ"
+#: nis/nis_print.c:167
+#, c-format
+msgid "Name : `%s'\n"
+msgstr "À̸§ : `%s'\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 "ÇÔ¼ö°¡ ±¸ÇöµÇÁö ¾Ê¾ÒÀ½"
+#: nis/nis_print.c:168
+#, c-format
+msgid "Type : %s\n"
+msgstr "ŸÀÔ : %s\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 "Áö¿øµÇÁö ¾ÊÀ½"
+#: nis/nis_print.c:173
+msgid "Master Server :\n"
+msgstr "ÁÖ ¼­¹ö :\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 "ºÎÀûÀýÇϰųª ºÒ¿ÏÀüÇÑ ´ÙÁß¹ÙÀÌÆ® ¶Ç´Â ±¤¿ª ¹®ÀÚ"
+#: nis/nis_print.c:175
+msgid "Replicate :\n"
+msgstr "Áߺ¹µÊ    :\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 "¹è°æ ÇÁ·Î¼¼½º·Î ºÎÀûÇÕÇÑ µ¿ÀÛ"
+#: nis/nis_print.c:176
+#, c-format
+msgid "\tName       : %s\n"
+msgstr "\tÀ̸§       : %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 "º¯È¯±â°¡ Á×¾úÀ½"
+#: nis/nis_print.c:177
+msgid "\tPublic Key : "
+msgstr "\t°ø¿ë Å°    : "
 
-#. 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:181
+msgid "None.\n"
+msgstr "¾øÀ½.\n"
 
-#. TRANS You did @strong{what}?
-#: stdio-common/../sysdeps/gnu/errlist.c:967
-msgid "You really blew it this time"
-msgstr "À̹ø¿£ Á¤¸»·Î ³¯·Á¹ö·È½À´Ï´Ù"
+#: nis/nis_print.c:184
+#, c-format
+msgid "Diffie-Hellmann (%d bits)\n"
+msgstr "Diffie-Hellman (%d ºñÆ®)\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 "ÄÄÇ»ÅÍ°¡ ³óÀåÀ» »ò½À´Ï´Ù"
+#: nis/nis_print.c:189
+#, c-format
+msgid "RSA (%d bits)\n"
+msgstr "RSA (%d ºñÆ®)\n"
 
-#. TRANS This error code has no purpose.
-#: stdio-common/../sysdeps/gnu/errlist.c:985
-msgid "Gratuitous error"
-msgstr "ÀÌÀ¯¾ø´Â ¿À·ù"
+#: nis/nis_print.c:192
+msgid "Kerberos.\n"
+msgstr "Kerberos.\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:993
-msgid "Bad message"
-msgstr "À߸øµÈ ¸Þ½ÃÁö"
+#: nis/nis_print.c:195
+#, c-format
+msgid "Unknown (type = %d, bits = %d)\n"
+msgstr "¾Ë ¼ö ¾øÀ½ (ŸÀÔ = %d, ºñÆ®¼ö = %d)\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1001
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:66
-msgid "Identifier removed"
-msgstr "½Äº°ÀÚ Áö¿ò"
+#: nis/nis_print.c:206
+#, c-format
+msgid "\tUniversal addresses (%u)\n"
+msgstr "\tº¸Æí ÁÖ¼Ò (%u)\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1009
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:104
-msgid "Multihop attempted"
-msgstr "¿©·¯°³ÀÇ hopÀÌ ½ÃµµµÊ"
+#: nis/nis_print.c:228
+msgid "Time to live : "
+msgstr "À¯ÁöµÇ´Â ½Ã°£ : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1017
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:91
-msgid "No data available"
-msgstr "»ç¿ë °¡´ÉÇÑ ÀÚ·á°¡ ¾øÀ½"
+#: nis/nis_print.c:230
+msgid "Default Access rights :\n"
+msgstr "±âº» Á¢±Ù ±ÇÇÑ :\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 "¸µÅ©°¡ ¼Õ»óµÇ¾ú½À´Ï´Ù"
+#: nis/nis_print.c:239
+#, c-format
+msgid "\tType         : %s\n"
+msgstr "\tŸÀÔ         : %s\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 "Àû´çÇÑ ÇüÀ» °¡Áø ¸Þ½ÃÁö°¡ ¾øÀ½"
+#: nis/nis_print.c:240
+msgid "\tAccess rights: "
+msgstr "\tÁ¢±Ù ±ÇÇÑ: "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1041
-msgid "Out of streams resources"
-msgstr "½ºÆ®¸² ÀÚ¿ø ºÎÁ·"
+#: nis/nis_print.c:254
+msgid "Group Flags :"
+msgstr "±×·ì Ç÷¡±× :"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1049
-msgid "Device not a stream"
-msgstr "ÀåÄ¡°¡ ½ºÆ®¸²ÀÌ ¾Æ´Ô"
+#: nis/nis_print.c:257
+msgid ""
+"\n"
+"Group Members :\n"
+msgstr ""
+"\n"
+"±×·ì ¸â¹ö :\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 "Á¤ÀÇµÈ ÀÚ·áÇüÀ¸·Î ¾²±â¿£ ³Ê¹« Å« °ª"
+#: nis/nis_print.c:269
+#, c-format
+msgid "Table Type          : %s\n"
+msgstr "Å×À̺í ŸÀÔ         : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1065
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:101
-msgid "Protocol error"
-msgstr "±Ô¾à ¿À·ù"
+#: nis/nis_print.c:270
+#, c-format
+msgid "Number of Columns   : %d\n"
+msgstr "¿­ÀÇ ¼ö             : %d\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1073
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:92
-msgid "Timer expired"
-msgstr "ŸÀÌ¸Ó ½Ã°£ ÃÊ°úµÊ"
+#: nis/nis_print.c:271
+#, c-format
+msgid "Character Separator : %c\n"
+msgstr "¹®ÀÚ ±¸ºÐÀÚ : %c\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 "¸í·ÉÀÌ Ãë¼ÒµÇ¾úÀ½"
+#: nis/nis_print.c:272
+#, c-format
+msgid "Search Path         : %s\n"
+msgstr "ã±â °æ·Î           : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1093
-msgid "Interrupted system call should be restarted"
-msgstr "Áß´ÜµÈ ½Ã½ºÅÛ È£ÃâÀº Àç½ÃÀ۵Ǿî¾ß ÇÕ´Ï´Ù"
+#: nis/nis_print.c:273
+msgid "Columns             :\n"
+msgstr "¿­                  :\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 "¹üÀ§¸¦ ¹þ¾î³­ ä³Î ¹øÈ£"
+#: nis/nis_print.c:276
+#, c-format
+msgid "\t[%d]\tName          : %s\n"
+msgstr "\t[%d]\tÀ̸§          : %s\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 "µî±Þ 2°¡ µ¿±âÈ­µÇÁö ¾ÊÀ½"
+#: nis/nis_print.c:278
+msgid "\t\tAttributes    : "
+msgstr "\t\t¼Ó¼º          : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1117
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:69
-msgid "Level 3 halted"
-msgstr "µî±Þ 3 ¸Ü¾úÀ½"
+#: nis/nis_print.c:280
+msgid "\t\tAccess Rights : "
+msgstr "\t\tÁ¢±Ù ±ÇÇÑ     : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1125
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:70
-msgid "Level 3 reset"
-msgstr "µî±Þ 3 ¸®¼Â"
+#: nis/nis_print.c:290
+msgid "Linked Object Type : "
+msgstr "¿¬°áµÈ ¿ÀºêÁ§Æ® ŸÀÔ : "
 
-#: 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 "¹üÀ§¸¦ ¹þ¾î³­ ¸µÅ© ¹øÈ£"
+#: nis/nis_print.c:292
+#, c-format
+msgid "Linked to : %s\n"
+msgstr "%s¿Í ¿¬°á\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1141
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:72
-msgid "Protocol driver not attached"
-msgstr "±Ô¾à ±¸µ¿±â¿¡ ¿¬°áµÇÁö ¾ÊÀ½"
+#: nis/nis_print.c:302
+#, c-format
+msgid "\tEntry data of type %s\n"
+msgstr "\tŸÀÔ %sÀÇ entry µ¥ÀÌÅÍ\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1149
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:73
-msgid "No CSI structure available"
-msgstr "»ç¿ë °¡´ÉÇÑ CSI ±¸Á¶°¡ ¾øÀ½"
+#: nis/nis_print.c:305
+#, c-format
+msgid "\t[%u] - [%u bytes] "
+msgstr "\t[%u] - [%u ¹ÙÀÌÆ®] "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1157
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:74
-msgid "Level 2 halted"
-msgstr "µî±Þ 2 ¸Ü¾úÀ½"
+#: nis/nis_print.c:308
+msgid "Encrypted data\n"
+msgstr "¾ÏȣȭÇÑ µ¥ÀÌÅÍ\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1165
-msgid "Invalid exchange"
-msgstr "ºÎÀûÀýÇÑ ±³È¯"
+#: nis/nis_print.c:310
+msgid "Binary data\n"
+msgstr "ÀÌÁø µ¥ÀÌÅÍ\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1173
-msgid "Invalid request descriptor"
-msgstr "À߸øµÈ ¿äû ±â¼úÀÚ"
+#: nis/nis_print.c:326
+#, c-format
+msgid "Object Name   : %s\n"
+msgstr "¿ÀºêÁ§Æ® À̸§ : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1181
-msgid "Exchange full"
-msgstr "±³È¯ÀÌ °¡µæÂü"
+#: nis/nis_print.c:327
+#, c-format
+msgid "Directory     : %s\n"
+msgstr "µð·ºÅ丮      : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1189
-msgid "No anode"
-msgstr "anode°¡ ¾øÀ½"
+#: nis/nis_print.c:328
+#, c-format
+msgid "Owner         : %s\n"
+msgstr "¼ÒÀ¯ÀÚ        : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1197
-msgid "Invalid request code"
-msgstr "ºÎÀûÀýÇÑ ¿äû ÄÚµå"
+#: nis/nis_print.c:329
+#, c-format
+msgid "Group         : %s\n"
+msgstr "±×·ì          : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1205
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:85
-msgid "Invalid slot"
-msgstr "ºÎÀûÀýÇÑ ½½·Ô"
+#: nis/nis_print.c:330
+msgid "Access Rights : "
+msgstr "Á¢±Ù ±ÇÇÑ : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1213
-msgid "File locking deadlock error"
-msgstr "ÆÄÀÏ Àá±Ý ±³Âø»óÅ ¿À·ù"
+#: nis/nis_print.c:332
+#, c-format
+msgid ""
+"\n"
+"Time to Live  : "
+msgstr ""
+"\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 "À߸øµÈ ÆùÆ® ÆÄÀÏ Çü½Ä"
+#: nis/nis_print.c:335
+#, c-format
+msgid "Creation Time : %s"
+msgstr "¸¸µé¾îÁø ½Ã°¢ : %s"
 
-#: 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 "±â°è°¡ ³×Æ®¿öÅ© »ó¿¡ ÀÖÁö ¾Ê½À´Ï´Ù"
+#: nis/nis_print.c:337
+#, c-format
+msgid "Mod. Time     : %s"
+msgstr "º¯°æ ½Ã°¢     : %s"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1237
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:95
-msgid "Package not installed"
-msgstr "ÆÐÅ°Áö°¡ ¼³Ä¡µÇÁö ¾ÊÀ½"
+#: nis/nis_print.c:338
+msgid "Object Type   : "
+msgstr "¿ÀºêÁ§Æ® ŸÀÔ : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1245
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:98
-msgid "Advertise error"
-msgstr "±¤°í ¿À·ù"
+#: nis/nis_print.c:358
+#, c-format
+msgid "    Data Length = %u\n"
+msgstr "    µ¥ÀÌÅÍ ±æÀÌ = %u\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1253
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:99
-msgid "Srmount error"
-msgstr "Srmount ¿À·ù"
+#: nis/nis_print.c:372
+#, c-format
+msgid "Status            : %s\n"
+msgstr "»óÅÂ              : %s\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1261
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:100
-msgid "Communication error on send"
-msgstr "Àü¼Û Áß Åë½Å ¿À·ù"
+#: nis/nis_print.c:373
+#, c-format
+msgid "Number of objects : %u\n"
+msgstr "¿ÀºêÁ§Æ®ÀÇ ¼ö     : %u\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1269
-msgid "RFS specific error"
-msgstr "RFS¿¡ ±¹ÇÑµÈ ¿À·ù"
+#: nis/nis_print.c:377
+#, c-format
+msgid "Object #%d:\n"
+msgstr "¿ÀºêÁ§Æ® #%d:\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 "À̸§ÀÌ ³×Æ®¿öÅ© »ó¿¡¼­ ´ÜÀÏÇÏÁö ¾ÊÀ½"
+#: nis/nis_print_group_entry.c:117
+#, c-format
+msgid "Group entry for \"%s.%s\" group:\n"
+msgstr "\"%s.%s\" ±×·ìÀ» À§ÇÑ ±×·ì entry:\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 "ÆÄÀÏ ±â¼úÀÚ°¡ À߸øµÈ »óÅ¿¡ ÀÖÀ½"
+#: nis/nis_print_group_entry.c:125
+msgid "    Explicit members:\n"
+msgstr "    ¸í½ÃÀû ¸â¹ö:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1293
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:112
-msgid "Remote address changed"
-msgstr "¿ø°Ý ÁÖ¼Ò°¡ ¹Ù²î¾úÀ½"
+#: nis/nis_print_group_entry.c:130
+msgid "    No explicit members\n"
+msgstr "    ¸í½ÃÀû ¸â¹ö ¾øÀ½\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 "ÇÊ¿äÇÑ °øÀ¯ ¶óÀ̺귯¸®¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: nis/nis_print_group_entry.c:133
+msgid "    Implicit members:\n"
+msgstr "    ¾Ï¹¬Àû ¸â¹ö:\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 "¼Õ»óµÈ °øÀ¯ ¶óÀ̺귯¸®¿¡ Á¢±ÙÇÔ"
+#: nis/nis_print_group_entry.c:138
+msgid "    No implicit members\n"
+msgstr "    ¾Ï¹¬Àû ¸â¹ö ¾øÀ½\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 "a.outÀÇ .lib ÀýÀÌ ¼Õ»óµÇ¾úÀ½"
+#: nis/nis_print_group_entry.c:141
+msgid "    Recursive members:\n"
+msgstr "    Àç±Í ¸â¹ö:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1325
-msgid "Attempting to link in too many shared libraries"
-msgstr "³Ê¹« ¸¹Àº µ¿Àû ¶óÀ̺귯¸®¿Í ¸µÅ©ÇÏ·Á°í ½ÃµµÇÏ¿´À½"
+#: nis/nis_print_group_entry.c:146
+msgid "    No recursive members\n"
+msgstr "    Àç±Í ¸â¹ö ¾øÀ½\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1333
-msgid "Cannot exec a shared library directly"
-msgstr "°øÀ¯ ¶óÀ̺귯¸®¸¦ Á÷Á¢ ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: nis/nis_print_group_entry.c:149
+msgid "    Explicit nonmembers:\n"
+msgstr "    ¸í½ÃÀû ¸â¹ö ¾Æ´Ô:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1341
-msgid "Streams pipe error"
-msgstr "½ºÆ®¸² ÆÄÀÌÇÁ ¿À·ù"
+#: nis/nis_print_group_entry.c:154
+msgid "    No explicit nonmembers\n"
+msgstr "    ¸í½ÃÀû ¸â¹ö ¾Æ´Ô ¾øÀ½\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1349
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:165
-msgid "Structure needs cleaning"
-msgstr "±¸Á¶¿¡ û¼Ò°¡ ÇÊ¿äÇÕ´Ï´Ù"
+#: nis/nis_print_group_entry.c:157
+msgid "    Implicit nonmembers:\n"
+msgstr "    ¾Ï¹¬Àû ¸â¹ö ¾Æ´Ô:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1357
-msgid "Not a XENIX named type file"
-msgstr "XENIX named ŸÀÔ ÆÄÀÏÀÌ ¾Æ´Ô"
+#: nis/nis_print_group_entry.c:162
+msgid "    No implicit nonmembers\n"
+msgstr "    ¾Ï¹¬Àû ¸â¹ö ¾Æ´Ô ¾øÀ½\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1365
-msgid "No XENIX semaphores available"
-msgstr "»ç¿ë °¡´ÉÇÑ XENIX ¼¼¸¶Æ÷¾î°¡ ¾øÀ½"
+#: nis/nis_print_group_entry.c:165
+msgid "    Recursive nonmembers:\n"
+msgstr "    Àç±Í ¸â¹ö ¾Æ´Ô:\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1373
-msgid "Is a named type file"
-msgstr "named ŸÀÔ ÆÄÀÏÀÔ´Ï´Ù"
+#: nis/nis_print_group_entry.c:170
+msgid "    No recursive nonmembers\n"
+msgstr "    Àç±Í ¸â¹ö ¾Æ´Ô ¾øÀ½\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 "¿ø°Ý ÀÔÃâ·Â ¿À·ù"
+#: 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 "netname %s¿¡ ´ëÇÑ DES ¿£Æ®¸®°¡ À¯ÀÏÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1389
-msgid "No medium found"
-msgstr "¸Å°³¹°ÀÌ ¾øÀ½"
+#: nis/nss_nisplus/nisplus-publickey.c:220
+#, c-format
+msgid "netname2user: missing group id list in `%s'"
+msgstr "netname2user: `%s'¿¡ ±×·ì ID ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1397
-msgid "Wrong medium type"
-msgstr "À߸øµÈ ¸Å°³Ã¼ ŸÀÔ"
+#: 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: (NIS+ ã±â): %s\n"
 
-#: stdio-common/../sysdeps/unix/siglist.c:26
-msgid "Signal 0"
-msgstr "½ÅÈ£ 0"
+#: nis/nss_nisplus/nisplus-publickey.c:321
+#, c-format
+msgid "netname2user: DES entry for %s in directory %s not unique"
+msgstr "netname2user: µð·ºÅ丮 %2$sÀÇ %1$s¿¡ ´ëÇÑ DES entry°¡ À¯ÀÏÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/siglist.c:32
-msgid "IOT trap"
-msgstr "IOT Æ®·¦"
+#: nis/nss_nisplus/nisplus-publickey.c:339
+#, c-format
+msgid "netname2user: principal name `%s' too long"
+msgstr "netname2user: ÁÖ¿ä À̸§ `%s'Àº(´Â) ³Ê¹« ±é´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:30
-msgid "Error 0"
-msgstr "¿À·ù 0"
+#: nis/nss_nisplus/nisplus-publickey.c:395
+#, c-format
+msgid "netname2user: LOCAL entry for %s in directory %s not unique"
+msgstr "netname2user: µð·ºÅ丮 %2$sÀÇ %1$s¿¡ ´ëÇÑ LOCAL ¿£Æ®¸®°¡ À¯ÀÏÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:31
-#: nis/nis_error.c:40
-msgid "Not owner"
-msgstr "¼ÒÀ¯ÀÚ°¡ ¾Æ´Ô"
+#: nis/nss_nisplus/nisplus-publickey.c:402
+msgid "netname2user: should not have uid 0"
+msgstr "netname2user: UID¸¦ 0À¸·Î ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:35
-msgid "I/O error"
-msgstr "ÀÔÃâ·Â ¿À·ù"
+#: nis/ypclnt.c:825
+msgid "Request arguments bad"
+msgstr "¿äû Àμö°¡ À߸øµÊ"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:37
-msgid "Arg list too long"
-msgstr "Àμö ¸í´ÜÀÌ ³Ê¹« ±è"
+#: nis/ypclnt.c:828
+msgid "RPC failure on NIS operation"
+msgstr "NIS ¿¬»ê Áß RPC ½ÇÆÐÇÔ"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:39
-msgid "Bad file number"
-msgstr "À߸øµÈ ÆÄÀÏ ¹øÈ£"
+#: nis/ypclnt.c:831
+msgid "Can't bind to server which serves this domain"
+msgstr "ÀÌ µµ¸ÞÀÎÀ» Á¦°øÇÏ´Â ¼­¹ö¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:42
-msgid "Not enough space"
-msgstr "¿ë·®ÀÌ ¸ðÀÚ¶÷"
+#: nis/ypclnt.c:834
+msgid "No such map in server's domain"
+msgstr "¼­¹öÀÇ µµ¸ÞÀο¡ ±×·± Áöµµ°¡ ¾øÀ½"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:46
-msgid "Device busy"
-msgstr "ÀåÄ¡°¡ »ç¿ë ÁßÀÓ"
+#: nis/ypclnt.c:837
+msgid "No such key in map"
+msgstr "Áöµµ¿¡ ±×·± Å°°¡ ¾øÀ½"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:48
-msgid "Cross-device link"
-msgstr "ÀåÄ¡°£ ¿¬°á"
+#: nis/ypclnt.c:840
+msgid "Internal NIS error"
+msgstr "³»ºÎ NIS ¿À·ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:53
-msgid "File table overflow"
-msgstr "ÆÄÀÏ Å×À̺í Èê·¯ ³Ñħ"
+#: nis/ypclnt.c:843
+msgid "Local resource allocation failure"
+msgstr "Áö¿ª ÀÚ¿ø ÇÒ´ç ½ÇÆÐ"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:63
-msgid "Argument out of domain"
-msgstr "ÀÎÀÚ°¡ ¿µ¿ªÀ» ¹þ¾î³²"
+#: nis/ypclnt.c:846
+msgid "No more records in map database"
+msgstr "Áöµµ µ¥ÀÌÅͺ£À̽º¿¡ ´õ ÀÌ»óÀÇ ±â·ÏÀÌ ¾øÀ½"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:64
-msgid "Result too large"
-msgstr "°á°ú¹°ÀÌ ³Ê¹« Å®´Ï´Ù"
+#: nis/ypclnt.c:849
+msgid "Can't communicate with portmapper"
+msgstr "rpcinfo: Æ÷Æ®¸ÅÆÛ¿Í Åë½ÅÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:75
-msgid "Deadlock situation detected/avoided"
-msgstr "±³Âø»óÅ°¡ ¹ß°ßµÇ¾ú°Å³ª ȸÇÇÇÕ´Ï´Ù"
+#: nis/ypclnt.c:852
+msgid "Can't communicate with ypbind"
+msgstr "ypbind¿Í Åë½ÅÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-# (FIXME)
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:76
-msgid "No record locks available"
-msgstr "·¹ÄÚµå Àá±ÝÀåÄ¡°¡ ¾øÀ½"
+#: nis/ypclnt.c:855
+msgid "Can't communicate with ypserv"
+msgstr "ypserv¿Í Åë½ÅÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:79
-msgid "Disc quota exceeded"
-msgstr "µð½ºÅ© ÇÒ´ç·®ÀÌ ÃÊ°úµÊ"
+#: nis/ypclnt.c:858
+msgid "Local domain name not set"
+msgstr "Áö¿ª µµ¸ÞÀθíÀ» ¼³Á¤ÇÏÁö ¾Ê¾ÒÀ½"
 
-# (FIXME)
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:80
-msgid "Bad exchange descriptor"
-msgstr "À߸øµÈ exchange ±â¼úÀÚ"
+#: nis/ypclnt.c:861
+msgid "NIS map database is bad"
+msgstr "NIS Áöµµ µ¥ÀÌÅͺ£À̽º°¡ Ʋ·È½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:81
-msgid "Bad request descriptor"
-msgstr "À߸øµÈ ¿äû ±â¼úÀÚ"
+#: nis/ypclnt.c:864
+msgid "NIS client/server version mismatch - can't supply service"
+msgstr "NIS Ŭ¶óÀ̾ðÆ®/¼­¹ö ¹öÀü ºÒÀÏÄ¡ - ¼­ºñ½º¸¦ Á¦°øÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:82
-msgid "Message tables full"
-msgstr "¸Þ½ÃÁö Ç¥°¡ ²Ë á½À´Ï´Ù"
+#: nis/ypclnt.c:870
+msgid "Database is busy"
+msgstr "µ¥ÀÌÅͺ£À̽º°¡ ÀÛ¾÷ ÁßÀÔ´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:83
-msgid "Anode table overflow"
-msgstr "Anode Å×À̺í Èê·¯ ³Ñħ"
+#: nis/ypclnt.c:873
+msgid "Unknown NIS error code"
+msgstr "¾Ë ¼ö ¾ø´Â NIS ¿À·ù ÄÚµå"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:84
-msgid "Bad request code"
-msgstr "À߸øµÈ ¿äû ÄÚµå"
+#: nis/ypclnt.c:913
+msgid "Internal ypbind error"
+msgstr "³»ºÎ ypbind ¿À·ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:86
-msgid "File locking deadlock"
-msgstr "ÆÄÀÏ Àá±Ý ±³Âø»óÅÂ"
+#: nis/ypclnt.c:916
+msgid "Domain not bound"
+msgstr "µµ¸ÞÀÎÀÌ ¹Ù¿îµåµÇÁö ¾ÊÀ½"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:88
-msgid "Error 58"
-msgstr "¿À·ù 142"
+#: nis/ypclnt.c:919
+msgid "System resource allocation failure"
+msgstr "½Ã½ºÅÛ ÀÚ¿ø ÇÒ´ç ½ÇÆÐ"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:89
-msgid "Error 59"
-msgstr "¿À·ù 59"
+#: nis/ypclnt.c:922
+msgid "Unknown ypbind error"
+msgstr "¾Ë ¼ö ¾ø´Â ypbind ¿À·ù"
 
-# (FIXME)
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:90
-msgid "Not a stream device"
-msgstr "½ºÆ®¸² ÀåÄ¡°¡ ¾Æ´Ô"
+#: nis/ypclnt.c:963
+msgid "yp_update: cannot convert host to netname\n"
+msgstr "yp_update: È£½ºÆ®¸¦ ³×Æ®À̸§À¸·Î ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù\n"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:93
-msgid "Out of stream resources"
-msgstr "½ºÆ®¸² ÀÚ¿ø ºÎÁ·"
+#: nis/ypclnt.c:981
+msgid "yp_update: cannot get server address\n"
+msgstr "yp_update: ¼­¹ö ÁÖ¼Ò¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:102
-msgid "Error 72"
-msgstr "¿À·ù 72"
+#: nscd/aicache.c:77 nscd/hstcache.c:468
+#, c-format
+msgid "Haven't found \"%s\" in hosts cache!"
+msgstr "È£½ºÆ® ij½Ã¿¡¼­ \"%s\"À»(¸¦) ãÀ» ¼ö ¾ø¾ú½À´Ï´Ù!"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:103
-msgid "Error 73"
-msgstr "¿À·ù 73"
+#: nscd/aicache.c:79 nscd/hstcache.c:470
+#, c-format
+msgid "Reloading \"%s\" in hosts cache!"
+msgstr "È£½ºÆ® ij½Ã¿¡¼­ \"%s\"À»(¸¦) ´Ù½Ã ÀоîµéÀÔ´Ï´Ù!"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:105
-msgid "Error 75"
-msgstr "¿À·ù 75"
+#: nscd/cache.c:146
+#, c-format
+msgid "add new entry \"%s\" of type %s for %s to cache%s"
+msgstr "»õ Ç׸ñ \"%s\" ´õÇϱâ, Á¾·ù %s, ¿ëµµ %s, ij½Ã %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:106
-msgid "Error 76"
-msgstr "¿À·ù 76"
+#: nscd/cache.c:148
+msgid " (first)"
+msgstr " (óÀ½)"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:107
-msgid "Not a data message"
-msgstr "µ¥ÀÌŸ ¸Þ½ÃÁö°¡ ¾Æ´Ô"
+#: nscd/cache.c:256 nscd/connections.c:810
+#, c-format
+msgid "cannot stat() file `%s': %s"
+msgstr "`%s' ÆÄÀÏ¿¡ stat()À» ÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:116
-msgid "Attempting to link in more shared libraries than system limit"
-msgstr "½Ã½ºÅÛÀÇ Á¦ÇѺ¸´Ù ¸¹Àº µ¿Àû ¶óÀ̺귯¸®¿Í ¸µÅ©ÇÏ·Á°í ÇßÀ½"
+#: nscd/cache.c:285
+#, c-format
+msgid "pruning %s cache; time %ld"
+msgstr "À߶󳻱â: %s ij½Ã; ½Ã°£ %ld"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:117
-msgid "Can not exec a shared library directly"
-msgstr "°øÀ¯ ¶óÀ̺귯¸®¸¦ Á÷Á¢ ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: nscd/cache.c:312
+#, c-format
+msgid "considering %s entry \"%s\", timeout %<PRIu64>"
+msgstr "ó¸®: %s Ç׸ñ \"%s\", Á¦Çѽð£ %<PRIu64>"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:118
-msgid "Illegal byte sequence"
-msgstr "¹ÙÀÌÆ® ¼ø¼­°¡ À߸øµÊ"
+#: nscd/connections.c:521 nscd/connections.c:533 nscd/connections.c:545
+#: nscd/connections.c:564
+#, c-format
+msgid "invalid persistent database file \"%s\": %s"
+msgstr "À߸øµÈ °íÁ¤ µ¥ÀÌÅÍ º£À̽º ÆÄÀÏ \"%s\": %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:119
-msgid "Operation not applicable"
-msgstr "¸í·ÉÀ» ¼öÇàÇÒ ¼ö ¾ÊÀ½"
+#: nscd/connections.c:535
+msgid "header size does not match"
+msgstr "Çì´õ Å©±â°¡ ¸ÂÁö ¾Ê½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:120
-msgid "Number of symbolic links encountered during path name traversal exceeds MAXSYMLINKS"
-msgstr "°æ·Î¸íÀ» ÂѾư¥ ¶§ ¹ß°ßµÈ ½Éº¼¸¯ ¸µÅ©ÀÇ °¹¼ö°¡ MAXSYMLINKSº¸´Ù ¸¹½À´Ï´Ù"
+#: nscd/connections.c:547
+msgid "file size does not match"
+msgstr "ÆÄÀÏ Å©±â°¡ ¸ÂÁö ¾Ê½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:121
-msgid "Error 91"
-msgstr "¿À·ù 91"
+#: nscd/connections.c:566
+msgid "verification failed"
+msgstr "È®ÀÎ ½ÇÆÐ"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:122
-msgid "Error 92"
-msgstr "¿À·ù 92"
+#: nscd/connections.c:580
+#, c-format
+msgid "suggested size of table for database %s larger than the persistent database's table"
+msgstr "%s µ¥ÀÌÅͺ£À̽ºÀÇ Á¦¾ÈÇÑ Å×À̺í Å©±â°¡ °íÁ¤ µ¥ÀÌÅͺ£À̽º Å×ÀÌºíº¸´Ù Å®´Ï´Ù"
 
-# (FIXME)
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:129
-msgid "Option not supported by protocol"
-msgstr "ÇÁ·ÎÅäÄÝÀÌ ¿É¼ÇÀ» Áö¿øÇÏÁö ¾ÊÀ½"
+#: nscd/connections.c:591 nscd/connections.c:673
+#, c-format
+msgid "cannot create read-only descriptor for \"%s\"; no mmap"
+msgstr "\"%s\"¿¡ ´ëÇÑ Àбâ Àü¿ë µð½ºÅ©¸³Å͸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù: mmapÀÌ ¾ø½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:130
-msgid "Error 100"
-msgstr "¿À·ù 100"
+#: nscd/connections.c:652
+#, c-format
+msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
+msgstr "%s¿¡ ´ëÇÑ µ¥ÀÌÅͺ£À̽º°¡ ¼Õ»óµÇ¾ú°Å³ª µ¿½Ã¿¡ »ç¿ëÇÏ°í ÀÖ½À´Ï´Ù. ÇÊ¿äÇϸé %sÀ»(¸¦) ¼öµ¿À¸·Î Áö¿ì°í ´Ù½Ã ½ÃÀÛÇϽʽÿÀ"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:131
-msgid "Error 101"
-msgstr "¿À·ù 101"
+#: nscd/connections.c:659
+#, c-format
+msgid "cannot create %s; no persistent database used"
+msgstr "%sÀ»(¸¦) ¸¸µé ¼ö ¾ø½À´Ï´Ù: °íÁ¤ µ¥ÀÌÅͺ£À̽º¸¦ »ç¿ëÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:132
-msgid "Error 102"
-msgstr "¿À·ù 102"
+#: nscd/connections.c:662
+#, c-format
+msgid "cannot create %s; no sharing possible"
+msgstr "%sÀ»(¸¦) ¸¸µé ¼ö ¾ø½À´Ï´Ù: °øÀ¯°¡ ºÒ°¡´ÉÇÕ´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:133
-msgid "Error 103"
-msgstr "¿À·ù 103"
+#: nscd/connections.c:733
+#, c-format
+msgid "cannot write to database file %s: %s"
+msgstr "%s µ¥ÀÌÅͺ£À̽º ÆÄÀÏ¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:134
-msgid "Error 104"
-msgstr "¿À·ù 104"
+#: nscd/connections.c:772
+#, c-format
+msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
+msgstr "¼ÒÄÏÀ» ½ÇÇàÇÒ ¶§ ´Ýµµ·Ï ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù: %s: ÆĶó³ëÀÌ¾Æ ¸ðµå¸¦ »ç¿ëÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:135
-msgid "Error 105"
-msgstr "¿À·ù 105"
+#: nscd/connections.c:823
+#, c-format
+msgid "cannot open socket: %s"
+msgstr "¼ÒÄÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:136
-msgid "Error 106"
-msgstr "¿À·ù 106"
+#: nscd/connections.c:840
+#, c-format
+msgid "cannot change socket to nonblocking mode: %s"
+msgstr "¼ÒÄÏÀ» ºñµ¿±â ¸ðµå·Î ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:137
-msgid "Error 107"
-msgstr "¿À·ù 107"
+#: nscd/connections.c:848
+#, c-format
+msgid "cannot set socket to close on exec: %s"
+msgstr "¼ÒÄÏÀ» ½ÇÇàÇÒ ¶§ ´Ýµµ·Ï ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:138
-msgid "Error 108"
-msgstr "¿À·ù 108"
+#: nscd/connections.c:859
+#, c-format
+msgid "cannot enable socket to accept connections: %s"
+msgstr "¼ÒÄÏÀÌ ¿¬°áÀ» ¹Þ¾ÆµéÀ̵µ·Ï ÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:139
-msgid "Error 109"
-msgstr "¿À·ù 109"
+#: nscd/connections.c:955
+#, c-format
+msgid "provide access to FD %d, for %s"
+msgstr "FD %d¹ø¿¡ Á¢±Ù, ¿ëµµ %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:140
-msgid "Error 110"
-msgstr "¿À·ù 110"
+#: nscd/connections.c:967
+#, c-format
+msgid "cannot handle old request version %d; current version is %d"
+msgstr "°ú°ÅÀÇ ¿äû ¹öÀü %d ¹öÀüÀ» ó¸®ÇÒ ¼ö ¾ø½À´Ï´Ù; ÇöÀç ¹öÀüÀº %dÀÔ´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:141
-msgid "Error 111"
-msgstr "¿À·ù 111"
+#: nscd/connections.c:1009 nscd/connections.c:1062
+#, c-format
+msgid "cannot write result: %s"
+msgstr "°á°ú¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:142
-msgid "Error 112"
-msgstr "¿À·ù 112"
+#: nscd/connections.c:1145
+#, c-format
+msgid "error getting caller's id: %s"
+msgstr "È£ÃâÇÑ Ãø ID¸¦ ¾ò´Âµ¥ ¿À·ù: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:143
-msgid "Error 113"
-msgstr "¿À·ù 113"
+#: nscd/connections.c:1204
+#, c-format
+msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
+msgstr "/proc/self/cmdlineÀ» ¿­ ¼ö ¾ø½À´Ï´Ù: %s: ÆĶó³ëÀÌ¾Æ ¸ðµå¸¦ »ç¿ëÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:144
-msgid "Error 114"
-msgstr "¿À·ù 114"
+#: nscd/connections.c:1218
+#, c-format
+msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
+msgstr "/proc/self/cmdlineÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù: %s: ÆĶó³ëÀÌ¾Æ ¸ðµå¸¦ »ç¿ëÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:145
-msgid "Error 115"
-msgstr "¿À·ù 115"
+#: nscd/connections.c:1258
+#, c-format
+msgid "cannot change to old UID: %s; disabling paranoia mode"
+msgstr "°ú°Å UID·Î ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù: %s: ÆĶó³ëÀÌ¾Æ ¸ðµå¸¦ »ç¿ëÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:146
-msgid "Error 116"
-msgstr "¿À·ù 116"
+#: nscd/connections.c:1268
+#, c-format
+msgid "cannot change to old GID: %s; disabling paranoia mode"
+msgstr "°ú°Å GID·Î ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù: %s: ÆĶó³ëÀÌ¾Æ ¸ðµå¸¦ »ç¿ëÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:147
-msgid "Error 117"
-msgstr "¿À·ù 117"
+#: nscd/connections.c:1281
+#, c-format
+msgid "cannot change to old working directory: %s; disabling paranoia mode"
+msgstr "°ú°Å ÀÛ¾÷ µð·ºÅ丮·Î ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù: %s: ÆĶó³ëÀÌ¾Æ ¸ðµå¸¦ »ç¿ëÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:148
-msgid "Error 118"
-msgstr "¿À·ù 118"
+#: nscd/connections.c:1310
+#, c-format
+msgid "re-exec failed: %s; disabling paranoia mode"
+msgstr "´Ù½Ã ½ÇÇà ½ÇÆÐ: %s: ÆĶó³ëÀÌ¾Æ ¸ðµå¸¦ »ç¿ëÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:149
-msgid "Error 119"
-msgstr "¿À·ù 119"
+#: nscd/connections.c:1319
+#, c-format
+msgid "cannot change current working directory to \"/\": %s"
+msgstr "ÇöÀç ÀÛ¾÷ µð·ºÅ丮¸¦ \"/\"·Î ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:152
-msgid "Operation not supported on transport endpoint"
-msgstr "Àü¼Û ºÎºÐ¿¡¼­ ÇØ´ç ¸í·ÉÀ» Áö¿øÇÏÁö ¾ÊÀ½"
+#: nscd/connections.c:1437
+#, c-format
+msgid "short read while reading request: %s"
+msgstr "¿ä±¸»çÇ×À» ´Ù ÀÐÁö ¸øÇßÀ½: %s"
 
-# (FIXME)
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:154
-msgid "Address family not supported by protocol family"
-msgstr "ÁÖ¼Ò±ºÀÌ ±Ô¾à±º¿¡¼­ Áö¿øµÇÁö ¾ÊÀ½"
+#: nscd/connections.c:1468
+#, c-format
+msgid "key length in request too long: %d"
+msgstr "¿äûÇÑ Å°ÀÇ ±æÀÌ°¡ ³Ê¹« ±è: %d"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:159
-msgid "Network dropped connection because of reset"
-msgstr "¸®¼Â¶§¹®¿¡ ³×Æ®¿öÅ©°¡ ¿¬°áÀ» ²÷¾ú½À´Ï´Ù"
+#: nscd/connections.c:1481
+#, c-format
+msgid "short read while reading request key: %s"
+msgstr "¿äûÇÑ Å°¸¦ ´Ù ÀÐÁö ¸øÇßÀ½: %s"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:166
-msgid "Error 136"
-msgstr "¿À·ù 136"
+#: nscd/connections.c:1490
+#, c-format
+msgid "handle_request: request received (Version = %d) from PID %ld"
+msgstr "handle_request: ¿äûÀ» ¹Þ¾ÒÀ½ (¹öÀü = %d), PID %ld"
 
-# (FIXME)
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:167
-msgid "Not a name file"
-msgstr "name ÆÄÀÏÀÌ ¾Æ´Ô"
+#: nscd/connections.c:1495
+#, c-format
+msgid "handle_request: request received (Version = %d)"
+msgstr "handle_request: ¿äûÀ» ¹Þ¾ÒÀ½ (¹öÀü = %d)"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:168
-msgid "Not available"
-msgstr "»ç¿ë ºÒ°¡´É"
+#: nscd/connections.c:1856
+#, c-format
+msgid "could only start %d threads; terminating"
+msgstr "½º·¹µå %d°³¸¸ ½ÃÀÛÇÒ ¼ö ÀÖ½À´Ï´Ù: ³¡³À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:169
-msgid "Is a name file"
-msgstr "name ÆÄÀÏÀÔ´Ï´Ù"
+#: nscd/connections.c:1904 nscd/connections.c:1905 nscd/connections.c:1922
+#: nscd/connections.c:1931 nscd/connections.c:1949 nscd/connections.c:1960
+#: nscd/connections.c:1971
+#, c-format
+msgid "Failed to run nscd as user '%s'"
+msgstr "nscd¸¦ '%s' »ç¿ëÀÚ·Î ½ÇÇàÇÏ´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:171
-msgid "Reserved for future use"
-msgstr "¹Ì·¡¿¡ »ç¿ëÇϱâ À§ÇØ ¿¹¾àµÊ"
+#: nscd/connections.c:1923
+#, c-format
+msgid "initial getgrouplist failed"
+msgstr "ÃÖÃÊ getgrouplist ½ÇÆÐ"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:172
-msgid "Error 142"
-msgstr "¿À·ù 142"
+#: nscd/connections.c:1932
+#, c-format
+msgid "getgrouplist failed"
+msgstr "getgrouplist ½ÇÆÐ"
 
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:173
-msgid "Cannot send after socket shutdown"
-msgstr "¼ÒÄÏÀ» Á¾·áÇÑ ÈÄ¿¡´Â º¸³¾ ¼ö ¾ø½À´Ï´Ù"
+#: nscd/connections.c:1950
+#, c-format
+msgid "setgroups failed"
+msgstr "setgroups ½ÇÆÐ"
 
-#: stdio-common/psignal.c:63
+#: nscd/grpcache.c:402 nscd/hstcache.c:418 nscd/initgrcache.c:412
+#: nscd/pwdcache.c:397 nscd/servicescache.c:343
 #, c-format
-msgid "%s%sUnknown signal %d\n"
-msgstr "%s%s¾Ë ¼ö ¾ø´Â ½ÅÈ£ %d\n"
+msgid "short write in %s: %s"
+msgstr "%s¿¡¼­ ´Ù ¾²Áö ¸øÇß½À´Ï´Ù: %s"
 
-#: dlfcn/dlinfo.c:51
-msgid "RTLD_SELF used in code not dynamically loaded"
-msgstr "µ¿ÀûÀ¸·Î ÀûÀçµÇÁö ¾ÊÀº Äڵ忡 RTLD_SELF¸¦ »ç¿ëÇÔ"
+#: nscd/grpcache.c:445 nscd/initgrcache.c:78
+#, c-format
+msgid "Haven't found \"%s\" in group cache!"
+msgstr "±×·ì ij½Ã¿¡¼­ \"%s\"À»(¸¦) ãÀ» ¼ö ¾ø¾ú½À´Ï´Ù!"
 
-#: dlfcn/dlinfo.c:61
-msgid "unsupported dlinfo request"
-msgstr "Áö¿øÇÏÁö ¾Ê´Â dlinfo ¿äû"
+#: nscd/grpcache.c:447 nscd/initgrcache.c:80
+#, c-format
+msgid "Reloading \"%s\" in group cache!"
+msgstr "±×·ì ij½Ã¿¡¼­ \"%s\"À»(¸¦) ´Ù½Ã ÀоîµéÀÔ´Ï´Ù!"
 
-#: malloc/mcheck.c:346
-msgid "memory is consistent, library is buggy\n"
-msgstr "¸Þ¸ð¸®´Â °ß°íÇÏÁö¸¸, ¶óÀ̺귯¸®´Â ¹ö±×°¡ ¸¹½À´Ï´Ù\n"
+#: nscd/grpcache.c:524
+#, c-format
+msgid "Invalid numeric gid \"%s\"!"
+msgstr "gid ¹øÈ£ \"%s\"¹øÀÌ À߸øµÇ¾ú½À´Ï´Ù!"
 
-#: malloc/mcheck.c:349
-msgid "memory clobbered before allocated block\n"
-msgstr "ºí·°À» ÇÒ´çÇϱâ Àü¿¡ ¸Þ¸ð¸®°¡ ÈѼյÊ\n"
+#: nscd/mem.c:383
+#, c-format
+msgid "freed %zu bytes in %s cache"
+msgstr "%zu ¹ÙÀÌÆ® ¸Þ¸ð¸® ÇØÁ¦ (%s ij½Ã) "
 
-#: malloc/mcheck.c:352
-msgid "memory clobbered past end of allocated block\n"
-msgstr "ºí·°À» ÇÒ´çÀÌ ³¡³ª±â Àü¿¡ ¸Þ¸ð¸®°¡ ÈѼյÊ\n"
+#: nscd/mem.c:512
+#, c-format
+msgid "no more memory for database '%s'"
+msgstr "'%s' µ¥ÀÌÅͺ£À̽º¿¡ ¸Þ¸ð¸®°¡ ´õ ÀÌ»ó ¾ø½À´Ï´Ù"
 
-#: malloc/mcheck.c:355
-msgid "block freed twice\n"
-msgstr "ºí·°ÀÌ µÎ¹ø ºñ¿öÁ³À½\n"
+#: nscd/nscd.c:98
+msgid "Read configuration data from NAME"
+msgstr "<À̸§>¿¡¼­ ¼³Á¤ µ¥ÀÌÅ͸¦ ÀнÀ´Ï´Ù"
 
-#: malloc/mcheck.c:358
-msgid "bogus mcheck_status, library is buggy\n"
-msgstr "¾ûÅ͸® mcheck_status, ¶óÀ̺귯¸®´Â ¹ö±×°¡ ÀÖ½À´Ï´Ù\n"
+#: nscd/nscd.c:100
+msgid "Do not fork and display messages on the current tty"
+msgstr "forkÇÏÁö ¾Ê°í ÇöÀç TTY¿¡ ¸Þ¼¼Áö¸¦ Ç¥½ÃÇÕ´Ï´Ù"
 
-# ¹ø¿ª: NameÀÌ µ¿»çÀΰ¡, ¸í»çÀΰ¡???
-#: malloc/memusagestat.c:53
-msgid "Name output file"
-msgstr "Ãâ·Â ÆÄÀÏ À̸§"
+#: nscd/nscd.c:101
+msgid "NUMBER"
+msgstr "<¼ýÀÚ>"
 
-#: malloc/memusagestat.c:54
-msgid "Title string used in output graphic"
-msgstr "Ãâ·Â ±×·¡ÇÈ¿¡ Á¦¸ñ ¹®ÀÚ¿­ »ç¿ë"
+#: nscd/nscd.c:101
+msgid "Start NUMBER threads"
+msgstr "<¼ýÀÚ>°³ÀÇ ½º·¹µå¸¦ ½ÃÀÛÇÕ´Ï´Ù"
 
-#: malloc/memusagestat.c:55
-msgid "Generate output linear to time (default is linear to number of function calls)"
-msgstr "½Ã°£¿¡ ºñ·ÊÇÏ´Â Ãâ·ÂÀ» ¸¸µì´Ï´Ù (±âº»°ªÀº ÇÔ¼ö È£Ãâ Ƚ¼ö¿¡ ºñ·ÊÇÕ´Ï´Ù)"
+#: nscd/nscd.c:102
+msgid "Shut the server down"
+msgstr "¼­¹ö¸¦ ³¡³À´Ï´Ù"
 
-#: malloc/memusagestat.c:57
-msgid "Also draw graph for total memory consumption"
-msgstr "Àüü ¸Þ¸ð¸® ¼Ò¸ð¿¡ ´ëÇÑ ±×·¡ÇÁµµ ±×¸³´Ï´Ù"
+#: nscd/nscd.c:103
+msgid "Print current configuration statistic"
+msgstr "ÇöÀç ¼³Á¤ »óŸ¦ Ç¥½ÃÇÕ´Ï´Ù"
 
-#: malloc/memusagestat.c:58
-msgid "make output graphic VALUE pixel wide"
-msgstr "Ãâ·Â ±×·¡ÇÈ Çȼ¿°ªÀ» ³Ð°Ô ÇÕ´Ï´Ù"
+#: nscd/nscd.c:104
+msgid "TABLE"
+msgstr "<Å×À̺í>"
 
-#: malloc/memusagestat.c:59
-msgid "make output graphic VALUE pixel high"
-msgstr "Ãâ·Â ±×·¡ÇÈ Çȼ¿°ªÀ» ³ô°Ô ÇÕ´Ï´Ù"
+#: nscd/nscd.c:105
+msgid "Invalidate the specified cache"
+msgstr "ÁöÁ¤ÇÑ Ä³½Ã¸¦ ¹«È¿È­ÇÕ´Ï´Ù"
 
-#: malloc/memusagestat.c:64
-msgid "Generate graphic from memory profiling data"
-msgstr "¸Þ¸ð¸® ÇÁ·ÎÆÄÀϸµ ÀÚ·á¿¡¼­ ±×·¡ÇÈ ¸¸µé±â"
+#: nscd/nscd.c:106
+msgid "TABLE,yes"
+msgstr "<Å×À̺í>,¿¹"
 
-#: malloc/memusagestat.c:67
-msgid "DATAFILE [OUTFILE]"
-msgstr "<µ¥ÀÌŸÆÄÀÏ> [<Ãâ·ÂÆÄÀÏ>]"
+#: nscd/nscd.c:107
+msgid "Use separate cache for each user"
+msgstr "»ç¿ëÀÚº°·Î º°µµÀÇ Ä³½Ã »ç¿ë"
 
-#: string/strerror.c:43 posix/../sysdeps/posix/gai_strerror.c:57
-msgid "Unknown error"
-msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù"
+#: nscd/nscd.c:112
+msgid "Name Service Cache Daemon."
+msgstr "³×ÀÓ ¼­ºñ½º ij½Ã µ¥¸ó."
 
-#: string/strsignal.c:69
+#: nscd/nscd.c:144 nss/getent.c:858 nss/makedb.c:123
 #, c-format
-msgid "Real-time signal %d"
-msgstr "½Ç-½Ã°¢ ½Ã±×³¯ %d"
+msgid "wrong number of arguments"
+msgstr "ÀμöÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
 
-#: string/strsignal.c:73
+#: nscd/nscd.c:154
 #, c-format
-msgid "Unknown signal %d"
-msgstr "¾Ë ¼ö ¾ø´Â ½ÅÈ£ %d"
+msgid "failure while reading configuration file; this is fatal"
+msgstr "¼³Á¤ ÆÄÀÏÀ» Àд µ¥ ½ÇÆÐ: Ä¡¸íÀûÀÔ´Ï´Ù"
 
-#: timezone/zdump.c:176
+#: nscd/nscd.c:163
 #, c-format
-msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
-msgstr "%s: »ç¿ë¹ýÀº %s [ --version ] [ -v ] [ -c Àý´Ü ] Áö¿ª¸í ... ÀÔ´Ï´Ù\n"
+msgid "already running"
+msgstr "ÀÌ¹Ì ½ÇÇà Áß"
 
-#: timezone/zdump.c:269
-msgid "Error writing to standard output"
-msgstr "Ç¥ÁØ Ãâ·Â¿¡ ¾²´Â µ¥ ¿À·ù"
+#: nscd/nscd.c:178 nscd/nscd.c:233
+#, c-format
+msgid "cannot fork"
+msgstr "forkÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: timezone/zic.c:361
+#: nscd/nscd.c:241
 #, c-format
-msgid "%s: Memory exhausted: %s\n"
-msgstr "%s: ¸Þ¸ð¸®°¡ ¹Ù´Ú³²: %s\n"
+msgid "cannot change current working directory to \"/\""
+msgstr "ÇöÀç ÀÛ¾÷ µð·ºÅ丮¸¦ \"/\"·Î ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù"
 
-#: timezone/zic.c:386 misc/error.c:129 misc/error.c:157
-msgid "Unknown system error"
-msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ ¿À·ù"
+#: nscd/nscd.c:249
+msgid "Could not create log file"
+msgstr "±â·Ï ÆÄÀÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: timezone/zic.c:420
+#: nscd/nscd.c:302 nscd/nscd.c:327 nscd/nscd_stat.c:172
 #, c-format
-msgid "\"%s\", line %d: %s"
-msgstr "\"%s\", Çà %d: %s"
+msgid "Only root is allowed to use this option!"
+msgstr "root¸¸ÀÌ ÀÌ ¿É¼ÇÀ» »ç¿ëÇÒ ¼ö ÀÖ½À´Ï´Ù!"
 
-#: timezone/zic.c:423
+#: nscd/nscd.c:364 nscd/nscd_stat.c:191
 #, c-format
-msgid " (rule from \"%s\", line %d)"
-msgstr " (\"%s\"¿¡ ÀÖ´Â ±ÔÄ¢, Çà %d)"
-
-#: timezone/zic.c:435
-msgid "warning: "
-msgstr "°æ°í: "
+msgid "write incomplete"
+msgstr "¿ÏÀüÈ÷ ¾²Áö ¸øÇß½À´Ï´Ù"
 
-#: timezone/zic.c:445
+#: nscd/nscd.c:375
 #, 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: »ç¿ë¹ýÀº %s [ --version ] [ -s ] [ -v ] [ -l Áö¿ª½Ã°¢ ] [ -p Æ÷½Ä½º±ÔÄ¢ ] \\\n"
-"\t[ -d µð·ºÅ丮 ] [ -L À±ÃÊ ] [ -y  ¿¬µµÀÇÇüÅ ] [ ÆÄÀÏÀ̸§ ... ] ÀÔ´Ï´Ù\n"
+msgid "cannot read invalidate ACK"
+msgstr "¹«È¿È­ ACK¸¦ ÀÐÁö ¸øÇß½À´Ï´Ù"
 
-#: timezone/zic.c:492
+#: nscd/nscd.c:381
 #, c-format
-msgid "%s: More than one -d option specified\n"
-msgstr "%s: Çϳª ÀÌ»óÀÇ -d ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
+msgid "invalidation failed"
+msgstr "¹«È¿È­ ½ÇÆÐ"
 
-#: timezone/zic.c:502
+#: nscd/nscd.c:391
 #, c-format
-msgid "%s: More than one -l option specified\n"
-msgstr "%s: Çϳª ÀÌ»óÀÇ -l ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
+msgid "secure services not implemented anymore"
+msgstr "º¸¾È ¼­ºñ½º´Â ´õ ÀÌ»ó ±¸ÇöÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: timezone/zic.c:512
+#: nscd/nscd_conf.c:57
 #, c-format
-msgid "%s: More than one -p option specified\n"
-msgstr "%s: Çϳª ÀÌ»óÀÇ -p ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
+msgid "database %s is not supported"
+msgstr "%s µ¥ÀÌÅͺ£À̽º´Â Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: timezone/zic.c:522
+#: nscd/nscd_conf.c:108
 #, c-format
-msgid "%s: More than one -y option specified\n"
-msgstr "%s: Çϳª ÀÌ»óÀÇ -y ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
+msgid "Parse error: %s"
+msgstr "ÆÄ½Ì ¿À·ù: %s"
 
-#: timezone/zic.c:532
+#: nscd/nscd_conf.c:193
 #, c-format
-msgid "%s: More than one -L option specified\n"
-msgstr "%s: Çϳª ÀÌ»óÀÇ -L ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
+msgid "Must specify user name for server-user option"
+msgstr "server-user ¿É¼Ç¿¡¼­ »ç¿ëÀÚÀ̸§À» ÁöÁ¤ÇØ¾ß ÇÕ´Ï´Ù"
 
-#: timezone/zic.c:639
+#: nscd/nscd_conf.c:200
 #, c-format
-msgid "%s: Can't unlink  %s: %s\n"
-msgstr "%s: %sÀ»(¸¦) Áö¿ï ¼ö ¾ø½À´Ï´Ù: %s\n"
-
-#: timezone/zic.c:646
-msgid "hard link failed, symbolic link used"
-msgstr "ÇÏµå ¸µÅ© ½ÇÆÐ, ½Éº¼¸¯ ¸µÅ©°¡ »ç¿ëµË´Ï´Ù"
+msgid "Must specify user name for stat-user option"
+msgstr "stat-user ¿É¼Ç¿¡¼­ »ç¿ëÀÚÀ̸§À» ÁöÁ¤ÇØ¾ß ÇÕ´Ï´Ù"
 
-#: timezone/zic.c:654
+#: nscd/nscd_conf.c:244
 #, c-format
-msgid "%s: Can't link from %s to %s: %s\n"
-msgstr "%s: %sÀ»(¸¦) %s(À¸)·Î ¸µÅ©ÇÒ ¼ö ¾ø½À´Ï´Ù: %s\n"
+msgid "invalid value for 'reload-count': %u"
+msgstr "'reload-count'ÀÇ °ªÀÌ À߸øµÇ¾ú½À´Ï´Ù: %u"
 
-#: timezone/zic.c:752 timezone/zic.c:754
-msgid "same rule name in multiple files"
-msgstr "¿©·¯ ÆÄÀÏ¿¡ °°Àº À̸§ÀÇ ±ÔÄ¢ÀÌ ÀÖÀ½"
+#: nscd/nscd_conf.c:259
+#, c-format
+msgid "Must specify value for restart-interval option"
+msgstr "restart-interval ¿É¼ÇÀÇ °ªÀ» ÁöÁ¤ÇØ¾ß ÇÕ´Ï´Ù"
 
-#: timezone/zic.c:795
-msgid "unruly zone"
-msgstr "±ÔÄ¢¾ø´Â Áö¿ª"
+#: nscd/nscd_conf.c:273
+#, c-format
+msgid "Unknown option: %s %s %s"
+msgstr "¾Ë ¼ö ¾ø´Â ¿É¼Ç: %s %s %s"
 
-#: timezone/zic.c:802
+#: nscd/nscd_conf.c:286
 #, c-format
-msgid "%s in ruleless zone"
-msgstr "±ÔÄ¢¾ø´Â Áö¿ª¿¡ %s ÀÖÀ½"
+msgid "cannot get current working directory: %s; disabling paranoia mode"
+msgstr "ÇöÀç ÀÛ¾÷ µð·ºÅ丮¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù: %s: ÆĶó³ëÀÌ¾Æ ¸ðµå¸¦ »ç¿ëÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: timezone/zic.c:823
-msgid "standard input"
-msgstr "Ç¥ÁØ ÀÔ·Â"
+#: nscd/nscd_conf.c:306
+#, c-format
+msgid "maximum file size for %s database too small"
+msgstr "%s µ¥ÀÌÅͺ£À̽ºÀÇ ÃÖ´ë ÆÄÀÏ Å©±â°¡ ³Ê¹« ÀÛ½À´Ï´Ù"
 
-#: timezone/zic.c:828
+#: nscd/nscd_stat.c:141
 #, c-format
-msgid "%s: Can't open %s: %s\n"
-msgstr "%s: %sÀ»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù: %s\n"
+msgid "cannot write statistics: %s"
+msgstr "Åë°è¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: timezone/zic.c:839
-msgid "line too long"
-msgstr "ÇàÀÌ ³Ê¹« ±é´Ï´Ù"
+#: nscd/nscd_stat.c:156
+msgid "yes"
+msgstr "¿¹"
 
-#: timezone/zic.c:859
-msgid "input line of unknown type"
-msgstr "¾Ë ¼ö ¾ø´Â ÇüÅÂÀÇ ÀÔ·ÂÇà"
+#: nscd/nscd_stat.c:157
+msgid "no"
+msgstr "¾Æ´Ï¿À"
 
-#: timezone/zic.c:875
+#: nscd/nscd_stat.c:168
 #, c-format
-msgid "%s: Leap line in non leap seconds file %s\n"
-msgstr "%s: À±ÃÊ ÆÄÀÏÀÌ ¾Æ´Ñ %s ÆÄÀÏ¿¡ Leap ÁÙÀÌ ÀÖÀ½\n"
+msgid "Only root or %s is allowed to use this option!"
+msgstr "root³ª %s »ç¿ëÀÚ¸¸ÀÌ ÀÌ ¿É¼ÇÀ» »ç¿ëÇÒ ¼ö ÀÖ½À´Ï´Ù!"
 
-#: 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: panic: ºÎÀûÀýÇÑ ÁÂÇ×°ª %d\n"
+msgid "nscd not running!\n"
+msgstr "nscd°¡ ½ÇÇàµÇÁö ¾Ê¾Ò½À´Ï´Ù!\n"
 
-#: timezone/zic.c:890
+#: nscd/nscd_stat.c:203
 #, c-format
-msgid "%s: Error reading %s\n"
-msgstr "%s: %sÀ»(¸¦) Àд µµÁß ¿À·ù ¹ß»ý\n"
+msgid "cannot read statistics data"
+msgstr "Åë°è µ¥ÀÌÅ͸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: timezone/zic.c:897
+#: nscd/nscd_stat.c:206
 #, c-format
-msgid "%s: Error closing %s: %s\n"
-msgstr "%s: %sÀ»(¸¦) ´Ý´Â µµÁß ¿À·ù ¹ß»ý: %s\n"
-
-#: timezone/zic.c:902
-msgid "expected continuation line not found"
-msgstr "¿¹»óÇß´ø ¿¬¼Ó ÇàÀ» ãÁö ¸øÇßÀ½"
-
-#: timezone/zic.c:958
-msgid "wrong number of fields on Rule line"
-msgstr "Rule ÁÙ¿¡ ÇʵåÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
-
-#: timezone/zic.c:962
-msgid "nameless rule"
-msgstr "À̸§¾ø´Â ±ÔÄ¢"
-
-#: timezone/zic.c:967
-msgid "invalid saved time"
-msgstr "Àý¾à ½Ã°£ÀÌ ºÎÀûÀýÇÔ"
-
-#: timezone/zic.c:986
-msgid "wrong number of fields on Zone line"
-msgstr "Zone ÁÙ¿¡ ÇʵåÀÇ °¹¼ö°¡ À߸øµÇ¾úÀ½"
+msgid ""
+"nscd configuration:\n"
+"\n"
+"%15d  server debug level\n"
+msgstr ""
+"nscd ¼³Á¤:\n"
+"\n"
+"%15d  ¼­¹ö µð¹ö±× ±íÀÌ\n"
 
-#: timezone/zic.c:992
+#: nscd/nscd_stat.c:230
 #, c-format
-msgid "\"Zone %s\" line and -l option are mutually exclusive"
-msgstr "\"Áö¿ª %s\" Çà°ú -l ¿É¼ÇÀº »óÈ£ ¹èŸÀûÀÔ´Ï´Ù"
+msgid "%3ud %2uh %2um %2lus  server runtime\n"
+msgstr "%3ud %2uh %2um %2lus  ¼­¹ö ·±Å¸ÀÓ\n"
 
-#: timezone/zic.c:1000
+#: nscd/nscd_stat.c:233
 #, c-format
-msgid "\"Zone %s\" line and -p option are mutually exclusive"
-msgstr "\"Áö¿ª %s\" Çà°ú -p ¿É¼ÇÀº »óÈ£ ¹èŸÀûÀÔ´Ï´Ù"
+msgid "    %2uh %2um %2lus  server runtime\n"
+msgstr "    %2uh %2um %2lus  ¼­¹ö ·±Å¸ÀÓ\n"
 
-#: timezone/zic.c:1012
+#: nscd/nscd_stat.c:235
 #, c-format
-msgid "duplicate zone name %s (file \"%s\", line %d)"
-msgstr "Áö¿ª¸í %s (ÆÄÀÏ \"%s\", Çà %d) Áߺ¹µÇ¾î ÀÖ½À´Ï´Ù"
-
-#: timezone/zic.c:1028
-msgid "wrong number of fields on Zone continuation line"
-msgstr "Zone continuation ÁÙ¿¡ ÇʵåÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
-
-#: timezone/zic.c:1068
-msgid "invalid UTC offset"
-msgstr "UTC ¿É¼ÂÀÌ ºÎÀûÀýÇÔ"
-
-#: timezone/zic.c:1071
-msgid "invalid abbreviation format"
-msgstr "¾à¾î Çü½ÄÀÌ ºÎÀûÀýÇÔ"
-
-#: timezone/zic.c:1097
-msgid "Zone continuation line end time is not after end time of previous line"
-msgstr "°è¼ÓµÇ´Â Zone ÁÙ¿¡ ÀÖ´Â ³¡ ½Ã°¢ÀÌ À­ ÁÙ¿¡ ÀÖ´Â ³¡½Ã°¢º¸´Ù ´ÊÀº ½Ã°¢ÀÌ ¾Æ´Õ´Ï´Ù"
-
-#: timezone/zic.c:1124
-msgid "wrong number of fields on Leap line"
-msgstr "Leap ÁÙ¿¡ ÇʵåÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
-
-#: timezone/zic.c:1133
-msgid "invalid leaping year"
-msgstr "ºÎÀûÀýÇÑ À±³â"
-
-#: timezone/zic.c:1148 timezone/zic.c:1252
-msgid "invalid month name"
-msgstr "´Þ À̸§ÀÌ ºÎÀûÀýÇÔ"
-
-#: timezone/zic.c:1161 timezone/zic.c:1374 timezone/zic.c:1388
-msgid "invalid day of month"
-msgstr "´ÞÀÇ ³¯Â¥ ¼ö°¡ ºÎÀûÀýÇÔ"
-
-#: timezone/zic.c:1166
-msgid "time before zero"
-msgstr "0 ÀÌÀüÀÇ ½Ã°£"
-
-#: timezone/zic.c:1170
-msgid "time too small"
-msgstr "½Ã°£ °ªÀÌ ³Ê¹« ÀÛ½À´Ï´Ù"
-
-#: timezone/zic.c:1174
-msgid "time too large"
-msgstr "½Ã°£ °ªÀÌ ³Ê¹« Å®´Ï´Ù"
-
-#: timezone/zic.c:1178 timezone/zic.c:1281
-msgid "invalid time of day"
-msgstr "ºÎÀûÀýÇÑ ÇÏ·çÁß ½Ã°¢"
+msgid "        %2um %2lus  server runtime\n"
+msgstr "        %2um %2lus  ¼­¹ö ·±Å¸ÀÓ\n"
 
-#: timezone/zic.c:1197
-msgid "illegal CORRECTION field on Leap line"
-msgstr "Leap ÁÙ¿¡ À߸øµÈ CORRECTION Çʵå"
+#: nscd/nscd_stat.c:237
+#, c-format
+msgid "            %2lus  server runtime\n"
+msgstr "            %2lus  ¼­¹ö ·±Å¸ÀÓ\n"
 
-#: timezone/zic.c:1201
-msgid "illegal Rolling/Stationary field on Leap line"
-msgstr "Leap ÁÙ¿¡ À߸øµÈ Rolling/Stationary Çʵå"
+#: 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  ÇöÀç ½º·¹µå °³¼ö\n"
+"%15d  ÃÖ´ë ½º·¹µå °³¼ö\n"
+"%15lu  Ŭ¶óÀ̾ðÆ®°¡ ±â´Ù¸± ȸ¼ö\n"
+"%15s  ÆĶó³ëÀÌ¾Æ ¸ðµå »ç¿ë\n"
+"%15lu  ³»ºÎ ´Ù½Ã ½ÃÀÛ\n"
 
-#: timezone/zic.c:1216
-msgid "wrong number of fields on Link line"
-msgstr "Link ÁÙ¿¡ ÇʵåÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
+#: 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 ij½Ã:\n"
+"\n"
+"%15s  °³ÀÇ Ä³½Ã »ç¿ëÁß\n"
+"%15s  °³ÀÇ Ä³½Ã °íÁ¤\n"
+"%15s  °³ÀÇ Ä³½Ã °øÀ¯\n"
+"%15zu  ¸¸Å­ÀÇ Á¦¾ÈµÈ Å©±â\n"
+"%15zu  ¸¸Å­ÀÇ Àüü µ¥ÀÌÅÍ Ç® Å©±â\n"
+"%15zu  ¸¸Å­ÀÇ »ç¿ë µ¥ÀÌÅÍ Ç® Å©±â\n"
+"%15lu  Ãʵ¿¾È Æ÷ÁöƼºê ¿£Æ®¸® À¯Áö\n"
+"%15lu  Ãʵ¿¾È ³×°ÅƼºê ¿£Æ®¸® À¯Áö\n"
+"%15<PRIuMAX>  ¹ø Æ÷ÁöƼºê ¿£Æ®¸®¿¡ ´ëÇØ Ä³½Ã È÷Æ®\n"
+"%15<PRIuMAX>  ¹ø ³×°ÅƼºê ¿£Æ®¸®¿¡ ´ëÇØ Ä³½Ã È÷Æ®\n"
+"%15<PRIuMAX>  ¹ø Æ÷ÁöƼºê ¿£Æ®¸®¿¡ ´ëÇØ Ä³½Ã ¹Ì½º\n"
+"%15<PRIuMAX>  ¹ø ³×°ÅƼºê ¿£Æ®¸®¿¡ ´ëÇØ Ä³½Ã ¹Ì½º\n"
+"%15lu%% ij½Ã È÷Æ®À²\n"
+"%15zu  ÇöÀç ij½Ã °ª\n"
+"%15zu  ÃÖ´ë ij½Ã °ª\n"
+"%15zu  ÃÖ´ë °Ë»ö üÀÎ ±æÀÌ\n"
+"%15<PRIuMAX>  Àбâ Àá±ÝÀÇ Áö¿¬ ½Ã°£\n"
+"%15<PRIuMAX>  ÀÐ°í¾²±â Àá±ÝÀÇ Áö¿¬ ½Ã°£\n"
+"%15<PRIuMAX>  ¸Þ¸ð¸® ÇÒ´ç ½ÇÆÐ\n"
+"%15s  ¹Ù²ï »çÇ׿¡ ´ëÇØ /etc/%s °Ë»ç\n"
+
+#: nscd/pwdcache.c:440
+#, c-format
+msgid "Haven't found \"%s\" in password cache!"
+msgstr "¾ÏÈ£ ij½Ã¿¡¼­ \"%s\"À»(¸¦) ãÀ» ¼ö ¾ø¾ú½À´Ï´Ù!"
 
-#: timezone/zic.c:1220
-msgid "blank FROM field on Link line"
-msgstr "Link ÁÙ¿¡ FROM Çʵ尡 ¾øÀ½"
+#: nscd/pwdcache.c:442
+#, c-format
+msgid "Reloading \"%s\" in password cache!"
+msgstr "¾ÏÈ£ ij½Ã¿¡¼­ \"%s\"À»(¸¦) ´Ù½Ã ÀоîµéÀÔ´Ï´Ù!"
 
-#: timezone/zic.c:1224
-msgid "blank TO field on Link line"
-msgstr "Link ÁÙ¿¡ TO Çʵ尡 ¾øÀ½"
+#: nscd/pwdcache.c:520
+#, c-format
+msgid "Invalid numeric uid \"%s\"!"
+msgstr "UID ¹øÈ£ \"%s\"¹øÀÌ À߸øµÇ¾ú½À´Ï´Ù!"
 
-#: timezone/zic.c:1301
-msgid "invalid starting year"
-msgstr "½ÃÀÛÇÏ´Â ÇØ°¡ ºÎÀûÀýÇÔ"
+#: nscd/selinux.c:156
+#, c-format
+msgid "Failed opening connection to the audit subsystem: %m"
+msgstr "º¸¾È ½É»ç ¼­ºê½Ã½ºÅÛ¿¡ ¿¬°áÀ» ¿©´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù: %m"
 
-#: timezone/zic.c:1305
-msgid "starting year too low to be represented"
-msgstr "½ÃÀÛ ¿¬µµ°¡ ³Ê¹« ³·Àº ¼ö¶ó¼­ Ç¥½ÃÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: nscd/selinux.c:177
+msgid "Failed to set keep-capabilities"
+msgstr "keep-capabilities ¼³Á¤ ½ÇÆÐ"
 
-#: timezone/zic.c:1307
-msgid "starting year too high to be represented"
-msgstr "½ÃÀÛ ¿¬µµ°¡ ³Ê¹« ³ôÀº ¼ö¶ó¼­ Ç¥½ÃÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: nscd/selinux.c:178 nscd/selinux.c:241
+#, c-format
+msgid "prctl(KEEPCAPS) failed"
+msgstr "prctl(KEEPCAPS) ½ÇÆÐ"
 
-#: timezone/zic.c:1326
-msgid "invalid ending year"
-msgstr "³¡³ª´Â ÇØ°¡ ºÎÀûÀýÇÔ"
+#: nscd/selinux.c:192
+msgid "Failed to initialize drop of capabilities"
+msgstr "ÄÉÀÌÆÛºô¸®Æ¼ µå·Ó ÃʱâÈ­ ½ÇÆÐ"
 
-#: timezone/zic.c:1330
-msgid "ending year too low to be represented"
-msgstr "³¡ ¿¬µµ°¡ ³Ê¹« ³·Àº ¼ö¶ó¼­ Ç¥½ÃÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: nscd/selinux.c:193
+#, c-format
+msgid "cap_init failed"
+msgstr "cap_init ½ÇÆÐ"
 
-#: timezone/zic.c:1332
-msgid "ending year too high to be represented"
-msgstr "³¡ ¿¬µµ°¡ ³Ê¹« ³ôÀº ¼ö¶ó¼­ Ç¥½ÃÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: nscd/selinux.c:214 nscd/selinux.c:231
+msgid "Failed to drop capabilities"
+msgstr "ÄÉÀÌÆÛºô¸®Æ¼ µå·Ó ½ÇÆÐ"
 
-#: timezone/zic.c:1335
-msgid "starting year greater than ending year"
-msgstr "½ÃÀÛÇÏ´Â ÇØ°¡ ³¡³ª´Â Çغ¸´Ù Å®´Ï´Ù"
+#: nscd/selinux.c:215 nscd/selinux.c:232
+#, c-format
+msgid "cap_set_proc failed"
+msgstr "cap_set_proc ½ÇÆÐ"
 
-#: timezone/zic.c:1342
-msgid "typed single year"
-msgstr "ÇÑ°³ÀÇ ¿¬µµ°¡ ŸÀÌÇÁµÇ¾ú½À´Ï´Ù"
+#: nscd/selinux.c:240
+msgid "Failed to unset keep-capabilities"
+msgstr "keep-capabilities ¼³Á¤À» ÇØÁ¦ÇÏ´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: timezone/zic.c:1379
-msgid "invalid weekday name"
-msgstr "ºÎÀûÀýÇÑ ¿äÀÏ À̸§"
+#: nscd/selinux.c:256
+msgid "Failed to determine if kernel supports SELinux"
+msgstr "Ä¿³ÎÀÌ SELinux¸¦ Áö¿øÇÏ´Â Áö ¿©ºÎ¸¦ ¾Ë¾Æ³»´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: timezone/zic.c:1494
+#: nscd/selinux.c:271
 #, c-format
-msgid "%s: Can't remove %s: %s\n"
-msgstr "%s: %sÀ»(¸¦) Áö¿ï ¼ö ¾ø½À´Ï´Ù: %s\n"
+msgid "Failed to start AVC thread"
+msgstr "AVC ½º·¹µå¸¦ ½ÃÀÛÇÏ´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: timezone/zic.c:1504
+#: nscd/selinux.c:293
 #, c-format
-msgid "%s: Can't create %s: %s\n"
-msgstr "%s: %sÀ»(¸¦) ¸¸µé ¼ö ¾ø½À´Ï´Ù: %s\n"
+msgid "Failed to create AVC lock"
+msgstr "AVC Àá±ÝÀ» ¸¸µå´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: timezone/zic.c:1570
+#: nscd/selinux.c:333
 #, c-format
-msgid "%s: Error writing %s\n"
-msgstr "%s: %sÀ»(¸¦) ¾²´Â µµÁß ¿À·ù ¹ß»ý\n"
-
-#: timezone/zic.c:1760
-msgid "can't determine time zone abbreviation to use just after until time"
-msgstr "´ÜÁö Á¾·á½Ã°¢ ÀÌÈÄ¿¡ »ç¿ëÇϱâ À§ÇÑ ½Ã°£´ë ¾à¾î¸¦ °áÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: timezone/zic.c:1803
-msgid "too many transitions?!"
-msgstr "³Ê¹« ¸¹Àº ÀüÀÌ?!"
+msgid "Failed to start AVC"
+msgstr "AVC¸¦ ½ÃÀÛÇÏ´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: timezone/zic.c:1822
-msgid "internal error - addtype called with bad isdst"
-msgstr "³»ºÎ ¿À·ù - Ʋ¸° isdst·Î addtypeÀ» È£ÃâÇßÀ½"
-
-#: timezone/zic.c:1826
-msgid "internal error - addtype called with bad ttisstd"
-msgstr "³»ºÎ ¿À·ù - Ʋ¸° ttisstd·Î addtypeÀ» È£ÃâÇßÀ½"
-
-#: timezone/zic.c:1830
-msgid "internal error - addtype called with bad ttisgmt"
-msgstr "³»ºÎ ¿À·ù - Ʋ¸° ttisgmt·Î addtypeÀ» È£ÃâÇßÀ½"
+#: nscd/selinux.c:335
+msgid "Access Vector Cache (AVC) started"
+msgstr "¾×¼¼½º º¤ÅÍ Ä³½Ã (AVC) ½ÃÀÛ"
 
-#: timezone/zic.c:1849
-msgid "too many local time types"
-msgstr "Áö¿ª½ÃÀÇ Á¾·ù°¡ ³Ê¹« ¸¹À½"
+#: nscd/selinux.c:356
+msgid "Error getting context of socket peer"
+msgstr "¼ÒÄÏ »ó´ë¹æÀÇ ÄÁÅؽºÆ®¸¦ ¾ò´Â µ¥ ¿À·ù"
 
-#: timezone/zic.c:1877
-msgid "too many leap seconds"
-msgstr "À±ÃÊ°¡ ³Ê¹« ¸¹À½"
+#: nscd/selinux.c:361
+msgid "Error getting context of nscd"
+msgstr "NSCD ÄÁÅؽºÆ®¸¦ ¾ò´Â µ¥ ¿À·ù"
 
-#: timezone/zic.c:1883
-msgid "repeated leap second moment"
-msgstr "À±ÃÊÀÇ Å©±â°¡ Áߺ¹µÇ¾úÀ½"
+#: nscd/selinux.c:367
+msgid "Error getting sid from context"
+msgstr "ÄÁÅؽºÆ®¸¦ ¾ø¾Ö´Â µ¥ ¿À·ù"
 
-#: timezone/zic.c:1935
-msgid "Wild result from command execution"
-msgstr "¸í·É ½ÇÇà¿¡¼­ Á¦ ¸Ú´ë·ÎÀÇ °á°ú°¡ ³ª¿ÔÀ½"
-
-#: timezone/zic.c:1936
+#: nscd/selinux.c:399
 #, c-format
-msgid "%s: command was '%s', result was %d\n"
-msgstr "%s: ¸í·ÉÀº '%s'¿´°í, °á°ú´Â %d¿´½À´Ï´Ù\n"
+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 Åë°è:\n"
+"\n"
+"%15u  ¿£Æ®¸® ã¾Æº¸±â\n"
+"%15u  ¿£Æ®¸® È÷Æ®\n"
+"%15u  ¿£Æ®¸® ¹Ì½º\n"
+"%15u  ¿£Æ®¸® ¹ö¸²\n"
+"%15u  CAV ã¾Æº¸±â\n"
+"%15u  CAV È÷Æ®\n"
+"%15u  CAV °Ë»ç\n"
+"%15u  CAV ¹Ì½º\n"
 
-#: timezone/zic.c:2031
-msgid "Odd number of quotation marks"
-msgstr "µû¿ÈÇ¥°¡ Ȧ¼ö °³ÀÔ´Ï´Ù"
+#: nscd/servicescache.c:390
+#, c-format
+msgid "Haven't found \"%s\" in services cache!"
+msgstr "¼­ºñ½º ij½Ã¿¡¼­ \"%s\"À»(¸¦) ãÀ» ¼ö ¾ø½À´Ï´Ù!"
 
-#: timezone/zic.c:2051 timezone/zic.c:2070
-msgid "time overflow"
-msgstr "½Ã°£ Èê·¯ ³Ñħ"
+#: nscd/servicescache.c:392
+#, c-format
+msgid "Reloading \"%s\" in services cache!"
+msgstr "¼­ºñ½º ij½Ã¿¡¼­ \"%s\"À»(¸¦) ´Ù½Ã ÀоîµéÀÔ´Ï´Ù!"
 
-#: timezone/zic.c:2117
-msgid "use of 2/29 in non leap-year"
-msgstr "Æò³â¿¡ 2¿ù 29ÀÏÀ» »ç¿ëÇÔ"
+#: nss/getent.c:52
+msgid "database [key ...]"
+msgstr "µ¥ÀÌÅͺ£À̽º [Å° ...]"
 
-#: timezone/zic.c:2151
-msgid "no day in month matches rule"
-msgstr "±ÔÄ¢¿¡ ºÎÇյǴ ³¯ÀÌ ´Þ ¾È¿¡ ¾øÀ½"
+#: nss/getent.c:57
+msgid "Service configuration to be used"
+msgstr "»ç¿ëÇÒ ¼­ºñ½º ¼³Á¤"
 
-#: timezone/zic.c:2175
-msgid "too many, or too long, time zone abbreviations"
-msgstr "³Ê¹« ¸¹°Å³ª ³Ê¹« ±ä ½Ã°£´ë ¾à¾î"
+#: nss/getent.c:62
+msgid ""
+"Get entries from administrative database.\vFor bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+"°ü¸®ÀÚ µ¥ÀÌÅͺ£À̽º¿¡¼­ Ç׸ñÀ» °¡Á®¿É´Ï´Ù\\v¹ö±×¸¦ º¸°íÇÏ´Â ¹æ¹ýÀº ´ÙÀ½À» Âü°íÇϽʽÿÀ:\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: %s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù: %s\n"
+msgid "Enumeration not supported on %s\n"
+msgstr "%s¿¡ ÀÌ´º¸Ó·¹À̼ÇÀ» Áö¿øÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: timezone/zic.c:2238
+#: nss/getent.c:782
 #, c-format
-msgid "%s: %d did not sign extend correctly\n"
-msgstr "%s: %dÀº(´Â) ºÎÈ£ È®ÀåÀÌ Á¦´ë·Î µÇÁö ¾Ê¾Ò½À´Ï´Ù\n"
-
-#: posix/../sysdeps/generic/wordexp.c:1797
-msgid "parameter null or not set"
-msgstr "ÀÎÀÚ°¡ nullÀ̰ųª ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-
-#: posix/../sysdeps/posix/gai_strerror.c:31
-msgid "Address family for hostname not supported"
-msgstr "È£½ºÆ®À̸§¿¡ ´ëÇÑ ÁÖ¼Ò±ºÀÌ Áö¿øµÇÁö ¾ÊÀ½"
-
-#: posix/../sysdeps/posix/gai_strerror.c:32
-msgid "Temporary failure in name resolution"
-msgstr "name resolution¿¡¼­ ÀϽÃÀûÀÎ ½ÇÆÐ"
+msgid "Unknown database name"
+msgstr "¾Ë ¼ö ¾ø´Â µ¥ÀÌÅͺ£À̽º À̸§"
 
-#: posix/../sysdeps/posix/gai_strerror.c:33
-msgid "Bad value for ai_flags"
-msgstr "À߸øµÈ ai_flagsÀÇ °ª"
+#: nss/getent.c:808
+msgid "Supported databases:\n"
+msgstr "Áö¿øÇÏ´Â µ¥ÀÌÅͺ£À̽º:\n"
 
-#: posix/../sysdeps/posix/gai_strerror.c:34
-msgid "Non-recoverable failure in name resolution"
-msgstr "name resolution¿¡¼­ º¹±¸ÇÒ ¼ö ¾ø´Â ½ÇÆÐ"
+#: nss/getent.c:868
+#, c-format
+msgid "Unknown database: %s\n"
+msgstr "¾Ë ¼ö ¾ø´Â µ¥ÀÌÅͺ£À̽º: `%s'\n"
 
-#: posix/../sysdeps/posix/gai_strerror.c:35
-msgid "ai_family not supported"
-msgstr "ai_family°¡ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
+#: nss/makedb.c:60
+msgid "Convert key to lower case"
+msgstr "Å°¸¦ ¼Ò¹®ÀÚ·Î º¯È¯ÇÕ´Ï´Ù "
 
-#: posix/../sysdeps/posix/gai_strerror.c:36
-msgid "Memory allocation failure"
-msgstr "¸Þ¸ð¸® ÇÒ´ç ½ÇÆÐ"
+#: nss/makedb.c:63
+msgid "Do not print messages while building database"
+msgstr "µ¥ÀÌÅͺ£À̽º¸¦ ¸¸µå´Â Áß¿¡ ¸Þ¼¼Áö¸¦ Ãâ·ÂÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: posix/../sysdeps/posix/gai_strerror.c:37
-msgid "No address associated with hostname"
-msgstr "È£½ºÆ®À̸§°ú ´ëÀÀµÇ´Â ÁÖ¼Ò°¡ ¾øÀ½"
+#: nss/makedb.c:65
+msgid "Print content of database file, one entry a line"
+msgstr "µ¥ÀÌÅͺ£À̽º ÆÄÀÏÀÇ ³»¿ëÀ» ÇÑ ÁÙ¿¡ ÇÑ Ç׸ñ¾¿ Ç¥½ÃÇÕ´Ï´Ù"
 
-#: posix/../sysdeps/posix/gai_strerror.c:38
-msgid "Name or service not known"
-msgstr "Name ȤÀº ¼­ºñ½º¸¦ ¾Ë ¼ö ¾ø½À´Ï´Ù"
+#: nss/makedb.c:70
+msgid "Create simple DB database from textual input."
+msgstr "ÅؽºÆ® ÀԷ¿¡¼­ °£´ÜÇÑ DB µ¥ÀÌÅͺ£À̽º¸¦ ¸¸µì´Ï´Ù."
 
-#: posix/../sysdeps/posix/gai_strerror.c:39
-msgid "Servname not supported for ai_socktype"
-msgstr "ai_socktype¿¡¼­´Â servnameÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
+#: nss/makedb.c:73
+msgid ""
+"INPUT-FILE OUTPUT-FILE\n"
+"-o OUTPUT-FILE INPUT-FILE\n"
+"-u INPUT-FILE"
+msgstr ""
+"<ÀÔ·Â-ÆÄÀÏ> <Ãâ·Â-ÆÄÀÏ>\n"
+"-o <Ãâ·Â-ÆÄÀÏ> <ÀÔ·Â-ÆÄÀÏ>\n"
+"-u <ÀÔ·Â-ÆÄÀÏ>"
 
-#: posix/../sysdeps/posix/gai_strerror.c:40
-msgid "ai_socktype not supported"
-msgstr "ai_socktypeÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
+#: nss/makedb.c:142
+#, c-format
+msgid "No usable database library found."
+msgstr "»ç¿ëÇÒ ¼ö ÀÖ´Â µ¥ÀÌÅͺ£À̽º ¶óÀ̺귯¸®°¡ ¾ø½À´Ï´Ù."
 
-#: posix/../sysdeps/posix/gai_strerror.c:41
-msgid "System error"
-msgstr "½Ã½ºÅÛ ¿À·ù"
+#: nss/makedb.c:149
+#, c-format
+msgid "cannot open database file `%s': %s"
+msgstr "`%s' µ¥ÀÌÅͺ£À̽º ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: posix/../sysdeps/posix/gai_strerror.c:42
-msgid "Processing request in progress"
-msgstr "ÁøÇàÁßÀÎ ¿äûÀ» ¼öÇàÁßÀÔ´Ï´Ù"
+#: nss/makedb.c:151
+msgid "incorrectly formatted file"
+msgstr "Çü½ÄÀÌ Æ²¸° ÆÄÀÏ"
 
-#: posix/../sysdeps/posix/gai_strerror.c:43
-msgid "Request canceled"
-msgstr "¿äûÀÌ Ãë¼ÒµÇ¾úÀ½"
+#: nss/makedb.c:331
+msgid "duplicate key"
+msgstr "Áߺ¹µÈ Å°"
 
-#: posix/../sysdeps/posix/gai_strerror.c:44
-msgid "Request not canceled"
-msgstr "¿äûÀÌ Ãë¼ÒµÇÁö ¾Ê¾ÒÀ½"
+#: nss/makedb.c:337
+#, c-format
+msgid "while writing database file"
+msgstr "µ¥ÀÌÅͺ£À̽º ÆÄÀÏÀ» ¾²´Â Áß¿¡"
 
-#: posix/../sysdeps/posix/gai_strerror.c:45
-msgid "All requests done"
-msgstr "¸ðµç ¿äûÀÌ ¿Ï·áµÇ¾ú½À´Ï´Ù"
+#: nss/makedb.c:348
+#, c-format
+msgid "problems while reading `%s'"
+msgstr "`%s'À»(¸¦) Àд Áß¿¡ ¹®Á¦"
 
-#: posix/../sysdeps/posix/gai_strerror.c:46
-msgid "Interrupted by a signal"
-msgstr "½Ã±×³Î¿¡ ÀÇÇØ ÁߴܵÊ"
+#: nss/makedb.c:368 nss/makedb.c:385
+#, c-format
+msgid "while reading database"
+msgstr "µ¥ÀÌÅͺ£À̽º¸¦ Àд Áß¿¡"
 
-#: posix/getconf.c:892
+#: posix/getconf.c:945
 #, c-format
 msgid "Usage: %s [-v specification] variable_name [pathname]\n"
-msgstr "»ç¿ë¹ý: %s [-v <½ºÆå>] <º¯¼ö¸í> [<°æ·Î¸í>]\n"
+msgstr "»ç¿ë¹ý: %s [-v <½ºÆå>] <º¯¼öÀ̸§> [°æ·ÎÀ̸§]\n"
+
+#: posix/getconf.c:948
+#, c-format
+msgid "       %s -a [pathname]\n"
+msgstr "       %s -a [°æ·ÎÀ̸§]\n"
 
-#: posix/getconf.c:950
+#: posix/getconf.c:1067
 #, c-format
 msgid "unknown specification \"%s\""
 msgstr "¾Ë ¼ö ¾ø´Â ½ºÆå \"%s\""
 
-#: posix/getconf.c:979 posix/getconf.c:995
+#: posix/getconf.c:1095
+#, c-format
+msgid "Couldn't execute %s"
+msgstr "%s ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: posix/getconf.c:1135 posix/getconf.c:1151
 msgid "undefined"
-msgstr "Á¤ÀǵÇÁö ¾ÊÀ½"
+msgstr "Á¤ÀÇÇÏÁö ¾ÊÀ½"
 
-#: posix/getconf.c:1017
+#: posix/getconf.c:1173
 #, c-format
 msgid "Unrecognized variable `%s'"
 msgstr "ÀνÄÇÒ ¼ö ¾ø´Â º¯¼ö `%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: `%s' ¿É¼ÇÀº ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\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: `--%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\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: `%c%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\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: `%s' ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù\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: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `--%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: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `%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: À߸øµÈ ¿É¼Ç -- %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: ºÎÀûÀýÇÑ ¿É¼Ç -- %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: ÀÌ ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù -- %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: `-W %s' ¿É¼ÇÀº ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\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: `-W %s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: posix/regcomp.c:150
+#: posix/regcomp.c:135
 msgid "No match"
 msgstr "¸Â´Â ¦ ¾øÀ½"
 
-#: posix/regcomp.c:153
+#: posix/regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "ºÎÀûÀýÇÑ Á¤±Ô½Ä"
 
-#: posix/regcomp.c:156
+#: posix/regcomp.c:141
 msgid "Invalid collation character"
 msgstr "ºÎÀûÀýÇÑ ´ëÁ¶ ¹®ÀÚ"
 
-#: posix/regcomp.c:159
+#: posix/regcomp.c:144
 msgid "Invalid character class name"
 msgstr "ºÎÀûÀýÇÑ ¹®ÀÚ Å¬·¡½º À̸§"
 
-#: posix/regcomp.c:162
+#: posix/regcomp.c:147
 msgid "Trailing backslash"
 msgstr "µû¶óºÙ´Â ¿ª½½·¡½¬"
 
-#: posix/regcomp.c:165
+#: posix/regcomp.c:150
 msgid "Invalid back reference"
 msgstr "ºÎÀûÀýÇÑ ÈĹæ ÂüÁ¶"
 
-#: posix/regcomp.c:168
+#: posix/regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â [ ¶Ç´Â [^"
 
-#: posix/regcomp.c:171
+#: posix/regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â ( ¶Ç´Â \\("
 
-#: posix/regcomp.c:174
+#: posix/regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â \\{"
 
-#: posix/regcomp.c:177
+#: posix/regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "\\{\\}¿¡ ºÎÀûÀýÇÑ ³»¿ë¹°ÀÌ ÀÖÀ½"
 
-#: posix/regcomp.c:180
+#: posix/regcomp.c:165
 msgid "Invalid range end"
 msgstr "ºÎÀûÀýÇÑ ¹üÀ§ ³¡"
 
-#: posix/regcomp.c:183
+#: posix/regcomp.c:168
 msgid "Memory exhausted"
 msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
 
-#: posix/regcomp.c:186
+#: posix/regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "¾Õ¼± Á¤±Ô½ÄÀÌ ºÎÀûÀýÇÔ"
 
-#: posix/regcomp.c:189
+#: posix/regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Á¤±Ô½ÄÀÌ ¿Ï°áµÇÁö ¾ÊÀº ä ³¡³²"
 
-#: posix/regcomp.c:192
+#: posix/regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Á¤±Ô½ÄÀÌ ³Ê¹« Å®´Ï´Ù"
 
-#: posix/regcomp.c:195
+#: posix/regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â ) ¶Ç´Â \\)"
 
-#: posix/regcomp.c:661
+#: posix/regcomp.c:660
 msgid "No previous regular expression"
 msgstr "ÀÌÀüÀÇ Á¤±Ô½ÄÀÌ ¾øÀ½"
 
-#: argp/argp-help.c:224
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr "%.*s: ARGP_HELP_FMT Àμö´Â °ªÀÌ ÇÊ¿äÇÕ´Ï´Ù"
-
-#: argp/argp-help.c:233
-#, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr "%.*s: ¾Ë ¼ö ¾ø´Â ARGP_HELP_FMT ÀÎÀÚ"
-
-#: argp/argp-help.c:245
-#, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr "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 "±ä ¿É¼Ç¿¡¼­ ´ëÇØ ²À ÇÊ¿äÇϰųª ¼±ÅÃÀûÀÎ ÀÎÀÚ´Â ±× ±ä ¿É¼Ç¿¡ ÇØ´çÇϴ ªÀº ¿É¼Ç¿¡¼­µµ ²À ÇÊ¿äÇϰųª ¼±ÅÃÀûÀÔ´Ï´Ù."
-
-#: argp/argp-help.c:1592
-msgid "Usage:"
-msgstr "»ç¿ë¹ý:"
-
-#: argp/argp-help.c:1596
-msgid "  or: "
-msgstr "  ȤÀº: "
-
-#: argp/argp-help.c:1608
-msgid " [OPTION...]"
-msgstr "[<¿É¼Ç>...]"
-
-#: argp/argp-help.c:1635
-#, c-format
-msgid "Try `%s --help' or `%s --usage' for more information.\n"
-msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ȤÀº `%s --usage' ÇϽʽÿÀ.\n"
-
-#: argp/argp-help.c:1663
-#, c-format
-msgid "Report bugs to %s.\n"
-msgstr "¹ö±×¸¦ %s ÁÖ¼Ò·Î ¾Ë·ÁÁֽʽÿÀ.\n"
-
-#: argp/argp-parse.c:115
-msgid "Give this help list"
-msgstr "ÀÌ µµ¿ò¸» ¸®½ºÆ®¸¦ Ç¥½ÃÇÔ"
-
-#: argp/argp-parse.c:116
-msgid "Give a short usage message"
-msgstr "°£·«ÇÑ »ç¿ë¹ý ¸Þ¼¼Áö¸¦ Ç¥½ÃÇÔ"
-
-#: argp/argp-parse.c:117
-msgid "Set the program name"
-msgstr "ÇÁ·Î±×·¥ À̸§ °áÁ¤"
-
-#: argp/argp-parse.c:119
-msgid "Hang for SECS seconds (default 3600)"
-msgstr "SECSÃÊ µ¿¾È ¸ØÃã (±âº»°ª 3600)"
-
-#: argp/argp-parse.c:180
-msgid "Print program version"
-msgstr "ÇÁ·Î±×·¥ ¹öÀü Ç¥½Ã"
-
-#: argp/argp-parse.c:196
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr "(ÇÁ·Î±×·¥ ¿À·ù) ¹öÀüÀ» ¾Ë ¼ö ¾ø½À´Ï´Ù!?"
-
-#: argp/argp-parse.c:672
-#, c-format
-msgid "%s: Too many arguments\n"
-msgstr "%s: ÀÎÀÚ°¡ ³Ê¹« ¸¹À½\n"
-
-#: argp/argp-parse.c:813
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr "(ÇÁ·Î±×·¥ ¿À·ù) ¿É¼ÇÀ» ¾Ë ¼ö ÀÖ¾î¾ß ÇÕ´Ï´Ù!?"
+#: posix/wordexp.c:1798
+msgid "parameter null or not set"
+msgstr "ÀÎÀÚ°¡ NULLÀ̰ųª ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
 #: resolv/herror.c:68
 msgid "Resolver Error 0 (no error)"
-msgstr "ÇØ°á±â ¿À·ù 0 (¿À·ù¾Æ´Ô)"
+msgstr "¸®Á¹¹ö ¿À·ù 0 (¿À·ù ¾Æ´Ô)"
 
 #: resolv/herror.c:69
 msgid "Unknown host"
@@ -3751,201 +4477,73 @@ msgstr "¾Ë ¼ö ¾ø´Â ¼­¹ö ¿À·ù"
 msgid "No address associated with name"
 msgstr "À̸§°ú ´ëÀÀµÇ´Â ÁÖ¼Ò°¡ ¾øÀ½"
 
-#: resolv/herror.c:108
+#: resolv/herror.c:107
 msgid "Resolver internal error"
-msgstr "ÇØ°á±â ³»ºÎ ¿À·ù"
+msgstr "¸®Á¹¹ö ³»ºÎ ¿À·ù"
 
-#: resolv/herror.c:111
+#: resolv/herror.c:110
 msgid "Unknown resolver error"
-msgstr "¾Ë ¼ö ¾ø´Â ÇØ°á±â ¿À·ù"
-
-#: resolv/res_hconf.c:147
-#, c-format
-msgid "%s: line %d: expected service, found `%s'\n"
-msgstr "%s: %d¹ø° ÁÙ: ¼­ºñ½º°¡ ÀÖ¾î¾ß ÇÏÁö¸¸, `%s'ÀÌ(°¡) ÀÖ½À´Ï´Ù\n"
-
-#: resolv/res_hconf.c:165
-#, c-format
-msgid "%s: line %d: cannot specify more than %d services"
-msgstr "%s: %d¹ø° ÁÙ: ÇÑ°³ ÀÌ»óÀÇ %d ¼­ºñ½º¸¦ ÁöÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: resolv/res_hconf.c:191
-#, c-format
-msgid "%s: line %d: list delimiter not followed by keyword"
-msgstr "%s: %d¹ø° ÁÙ: ¸®½ºÆ® ±¸ºÐÀÚ µÚ¿¡ keyword°¡ ¿ÀÁö ¾Ê¾Ò½À´Ï´Ù"
+msgstr "¾Ë ¼ö ¾ø´Â ¸®Á¹¹ö ¿À·ù"
 
-#: resolv/res_hconf.c:231
+#: resolv/res_hconf.c:124
 #, c-format
 msgid "%s: line %d: cannot specify more than %d trim domains"
 msgstr "%s: %d¹ø° ÁÙ: %d°³ ÀÌ»óÀÇ trim domainÀ» ÁöÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: resolv/res_hconf.c:256
+#: resolv/res_hconf.c:145
 #, c-format
 msgid "%s: line %d: list delimiter not followed by domain"
 msgstr "%s: %d¹ø° ÁÙ: ¸®½ºÆ® ±¸ºÐÀÚ µÚ¿¡ domainÀÌ ¿ÀÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: 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: %d¹ø° ÁÙ: `on' ȤÀº `off'°¡ ÀÖ¾î¾ß ÇÏÁö¸¸, `%s'ÀÌ(°¡) ÀÖ½À´Ï´Ù\n"
 
-#: resolv/res_hconf.c:366
+#: resolv/res_hconf.c:247
 #, c-format
 msgid "%s: line %d: bad command `%s'\n"
 msgstr "%s: %d¹ø° ÁÙ: À߸øµÈ ¸í·É¾î `%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: %d¹ø° ÁÙ: ¸Ç µÚÀÇ ÀÌ»óÇÑ °ÍÀ» ¹«½ÃÇÕ´Ï´Ù: `%s'\n"
 
-#: nss/getent.c:51
-msgid "database [key ...]"
-msgstr "µ¥ÀÌŸº£À̽º [Å°...]"
-
-#: nss/getent.c:56
-msgid "Service configuration to be used"
-msgstr "»ç¿ëÇÒ ¼­ºñ½º ¼³Á¤"
-
-#: nss/getent.c:136 nss/getent.c:375
-#, c-format
-msgid "Enumeration not supported on %s\n"
-msgstr "%s¿¡ enumerationÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù\n"
-
-#: nss/getent.c:800
-msgid "getent - get entries from administrative database."
-msgstr "getent - °ü¸® µ¥ÀÌŸº£À̽º¿¡¼­ entry¸¦ ¾òÀ½."
-
-#: nss/getent.c:801
-msgid "Supported databases:"
-msgstr "Áö¿øµÇ´Â µ¥ÀÌŸº£À̽º:"
-
-#: nss/getent.c:858 nscd/nscd.c:131 nscd/nscd_nischeck.c:64
-msgid "wrong number of arguments"
-msgstr "ÀμöÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
-
-#: nss/getent.c:868
-#, c-format
-msgid "Unknown database: %s\n"
-msgstr "¾Ë ¼ö ¾ø´Â µ¥ÀÌŸº£À̽º: `%s'\n"
-
-#: debug/pcprofiledump.c:52
-msgid "Don't buffer output"
-msgstr "¹öÆÛ Ãâ·ÂÀ» ÇÏÁö ¾Ê½À´Ï´Ù"
-
-#: debug/pcprofiledump.c:57
-msgid "Dump information generated by PC profiling."
-msgstr "PC ÇÁ·ÎÆÄÀϸµÀ¸·Î ¸¸µé¾îÁø Á¤º¸¸¦ ´ýÇÁÇÕ´Ï´Ù."
-
-#: debug/pcprofiledump.c:60
-msgid "[FILE]"
-msgstr "[<ÆÄÀÏ>]"
-
-#: debug/pcprofiledump.c:100
-msgid "cannot open input file"
-msgstr "ÀÔ·Â ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
-
-#: debug/pcprofiledump.c:106
-msgid "cannot read header"
-msgstr "Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
-
-#: debug/pcprofiledump.c:170
-msgid "invalid pointer size"
-msgstr "À߸øµÈ Æ÷ÀÎÅÍ Å©±â"
-
-#: inet/rcmd.c:163 inet/rcmd.c:166
-msgid "rcmd: Cannot allocate memory\n"
-msgstr "rcmd: ¸Þ¸ð¸®¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-
-#: inet/rcmd.c:185 inet/rcmd.c:188
-msgid "rcmd: socket: All ports in use\n"
-msgstr "rcmd: socket: ¸ðµç Æ÷Æ®°¡ »ç¿ëÁß\n"
-
-#: inet/rcmd.c:222
-#, c-format
-msgid "connect to address %s: "
-msgstr "ÁÖ¼Ò %s¿¡ ¿¬°á: "
-
-#: inet/rcmd.c:240
+#: stdio-common/psignal.c:51
 #, c-format
-msgid "Trying %s...\n"
-msgstr "%s ½ÃµµÁß...\n"
-
-#: inet/rcmd.c:289
-#, c-format
-msgid "rcmd: write (setting up stderr): %m\n"
-msgstr "rcmd: write (Ç¥ÁØ¿À·ù ¼³Á¤): %m\n"
+msgid "%s%sUnknown signal %d\n"
+msgstr "%s%s¾Ë ¼ö ¾ø´Â ½Ã±×³Î %d¹ø\n"
 
-#: inet/rcmd.c:310
-#, c-format
-msgid "rcmd: poll (setting up stderr): %m\n"
-msgstr "rcmd: poll (Ç¥ÁØ¿À·ù ¼³Á¤): %m\n"
+#: stdio-common/psignal.c:52
+msgid "Unknown signal"
+msgstr "¾Ë ¼ö ¾ø´Â ½Ã±×³Î"
 
-#: inet/rcmd.c:313
-msgid "poll: protocol failure in circuit setup\n"
-msgstr "poll: ȸ·Î ¼³Á¤Áß ±Ô¾àÀÌ ºÒÀÌÇàµÊ\n"
+#: string/_strerror.c:45 sysdeps/mach/_strerror.c:87
+msgid "Unknown error "
+msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù"
 
-#: inet/rcmd.c:358
-msgid "socket: protocol failure in circuit setup\n"
-msgstr "socket: ȸ·Î ¼³Á¤Áß ±Ô¾àÀÌ ºÒÀÌÇàµÊ\n"
+#: string/strerror.c:43
+msgid "Unknown error"
+msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù"
 
-#: inet/rcmd.c:387
+#: string/strsignal.c:65
 #, c-format
-msgid "rcmd: %s: short read"
-msgstr "rcmd: %s: ÀбⰡ ²÷°åÀ½"
-
-#: inet/rcmd.c:549
-msgid "lstat failed"
-msgstr "lstat ½ÇÆÐ"
-
-#: inet/rcmd.c:551
-msgid "not regular file"
-msgstr "ÀÏ¹Ý ÆÄÀÏÀÌ ¾Æ´Ô"
-
-#: inet/rcmd.c:556
-msgid "cannot open"
-msgstr "¿­ ¼ö ¾ø½À´Ï´Ù"
-
-#: inet/rcmd.c:558
-msgid "fstat failed"
-msgstr "fstat ½ÇÆÐ"
-
-#: inet/rcmd.c:560
-msgid "bad owner"
-msgstr "À߸øµÈ ¼ÒÀ¯ÀÚ"
-
-#: inet/rcmd.c:562
-msgid "writeable by other than owner"
-msgstr "¼ÒÀ¯ÀÚ°¡ ¾Æ´Ñ »ç¶÷ÀÌ º¯°æÇÒ ¼ö ÀÖÀ½"
-
-#: inet/rcmd.c:564
-msgid "hard linked somewhere"
-msgstr "¾îµò°¡¿¡ ÇÏµå ¸µÅ©µÊ"
-
-#: inet/ruserpass.c:170 inet/ruserpass.c:193
-msgid "out of memory"
-msgstr "¸Þ¸ð¸® ºÎÁ·"
-
-#: inet/ruserpass.c:184
-msgid "Error: .netrc file is readable by others."
-msgstr "¿À·ù: .netrc ÆÄÀÏÀ» ´Ù¸¥ »ç¶÷ÀÌ ÀÐÀ» ¼ö ÀÖ½À´Ï´Ù."
-
-#: inet/ruserpass.c:185
-msgid "Remove password or make file unreadable by others."
-msgstr "¿­¼è±ÛÀ» Áö¿ì°Å³ª ´Ù¸¥ »ç¶÷ÀÌ ÀÐÀ» ¼ö ¾ø´Â ÆÄÀÏÀ» ¸¸µì´Ï´Ù."
+msgid "Real-time signal %d"
+msgstr "½ÇÁ¦ ½Ã°¢ ½Ã±×³Î %d¹ø"
 
-#: inet/ruserpass.c:277
+#: string/strsignal.c:69
 #, c-format
-msgid "Unknown .netrc keyword %s"
-msgstr "¾Ë ¼ö ¾ø´Â .netrc Å°¿öµå %s"
+msgid "Unknown signal %d"
+msgstr "¾Ë ¼ö ¾ø´Â ½Ã±×³Î %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: ¸Þ¸ð¸® ºÎÁ·\n"
 
-#: sunrpc/auth_unix.c:318
-msgid "auth_none.c - Fatal marshalling problem"
-msgstr "auto_none.c - Ä¡¸íÀûÀÎ Á¤·Ä(marshalling) ¹®Á¦"
+#: sunrpc/auth_unix.c:350
+msgid "auth_unix.c: Fatal marshalling problem"
+msgstr "auth_unix.c: Ä¡¸íÀûÀÎ ¸¶¼£¸µ ¹®Á¦"
 
 #: sunrpc/clnt_perr.c:118 sunrpc/clnt_perr.c:139
 #, c-format
@@ -3961,304 +4559,288 @@ msgstr "; ÀÌÀ¯ = "
 msgid "(unknown authentication error - %d)"
 msgstr "(¾Ë ¼ö ¾ø´Â ÀÎÁõ ¿À·ù - %d)"
 
-#: sunrpc/clnt_perr.c:177
+#: sunrpc/clnt_perr.c:172
 msgid "RPC: Success"
 msgstr "RPC: ¼º°ø"
 
-#: sunrpc/clnt_perr.c:180
+#: sunrpc/clnt_perr.c:175
 msgid "RPC: Can't encode arguments"
-msgstr "RPC: Àμö¸¦ ºÎȣȭÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgstr "RPC: Àμö¸¦ ÀÎÄÚµùÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/clnt_perr.c:184
+#: sunrpc/clnt_perr.c:179
 msgid "RPC: Can't decode result"
-msgstr "RPC: °á°ú¸¦ Çص¶ÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgstr "RPC: °á°ú¸¦ µðÄÚµùÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/clnt_perr.c:188
+#: sunrpc/clnt_perr.c:183
 msgid "RPC: Unable to send"
-msgstr "RPC: º¸³¾ ¼ö ¾øÀ½"
+msgstr "RPC: º¸³¾ ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/clnt_perr.c:192
+#: sunrpc/clnt_perr.c:187
 msgid "RPC: Unable to receive"
-msgstr "RPC: ¹ÞÀ» ¼ö ¾øÀ½"
+msgstr "RPC: ¹ÞÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/clnt_perr.c:196
+#: sunrpc/clnt_perr.c:191
 msgid "RPC: Timed out"
 msgstr "RPC: ½Ã°£ ÃÊ°ú"
 
-#: sunrpc/clnt_perr.c:200
+#: sunrpc/clnt_perr.c:195
 msgid "RPC: Incompatible versions of RPC"
 msgstr "RPC: ȣȯµÇÁö ¾Ê´Â RPC ¹öÀü"
 
-#: sunrpc/clnt_perr.c:204
+#: sunrpc/clnt_perr.c:199
 msgid "RPC: Authentication error"
 msgstr "RPC: ÀÎÁõ ¿À·ù"
 
-#: sunrpc/clnt_perr.c:208
+#: sunrpc/clnt_perr.c:203
 msgid "RPC: Program unavailable"
 msgstr "RPC: ÇÁ·Î±×·¥ »ç¿ë ºÒ°¡´É"
 
-#: sunrpc/clnt_perr.c:212
+#: sunrpc/clnt_perr.c:207
 msgid "RPC: Program/version mismatch"
 msgstr "RPC: ÇÁ·Î±×·¥/¹öÀü ºÒÀÏÄ¡"
 
-#: sunrpc/clnt_perr.c:216
+#: sunrpc/clnt_perr.c:211
 msgid "RPC: Procedure unavailable"
 msgstr "RPC: ÇÁ·Î½ÃÁ® »ç¿ë ºÒ°¡´É"
 
-#: sunrpc/clnt_perr.c:220
+#: sunrpc/clnt_perr.c:215
 msgid "RPC: Server can't decode arguments"
-msgstr "RPC: ¼­¹ö°¡ Àμö¸¦ Çص¶ÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgstr "RPC: ¼­¹ö°¡ Àμö¸¦ µðÄÚµùÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/clnt_perr.c:224
+#: sunrpc/clnt_perr.c:219
 msgid "RPC: Remote system error"
 msgstr "RPC: ¿ø°Ý ½Ã½ºÅÛ ¿À·ù"
 
-#: sunrpc/clnt_perr.c:228
+#: sunrpc/clnt_perr.c:223
 msgid "RPC: Unknown host"
 msgstr "RPC: ¾Ë ¼ö ¾ø´Â È£½ºÆ®"
 
-#: sunrpc/clnt_perr.c:232
+#: sunrpc/clnt_perr.c:227
 msgid "RPC: Unknown protocol"
 msgstr "RPC: ¾Ë ¼ö ¾ø´Â ±Ô¾à"
 
-#: sunrpc/clnt_perr.c:236
+#: sunrpc/clnt_perr.c:231
 msgid "RPC: Port mapper failure"
 msgstr "RPC: Æ÷Æ® ¸ÊÆÛ ½ÇÆÐ"
 
-#: sunrpc/clnt_perr.c:240
+#: sunrpc/clnt_perr.c:235
 msgid "RPC: Program not registered"
 msgstr "RPC: ÇÁ·Î±×·¥ÀÌ µî·ÏµÇÁö ¾ÊÀ½"
 
-#: sunrpc/clnt_perr.c:244
+#: sunrpc/clnt_perr.c:239
 msgid "RPC: Failed (unspecified error)"
 msgstr "RPC: ½ÇÆÐ (ÁöÁ¤µÇÁö ¾ÊÀº ¿À·ù)"
 
-#: sunrpc/clnt_perr.c:285
+#: sunrpc/clnt_perr.c:280
 msgid "RPC: (unknown error code)"
 msgstr "RPC: (¾Ë ¼ö ¾ø´Â ¿À·ù ÄÚµå)"
 
-#: sunrpc/clnt_perr.c:357
+#: sunrpc/clnt_perr.c:342
 msgid "Authentication OK"
 msgstr "ÀÎÁõ ¼º°ø"
 
-#: sunrpc/clnt_perr.c:360
+#: sunrpc/clnt_perr.c:345
 msgid "Invalid client credential"
 msgstr "ºÎÀûÀýÇÑ Å¬¶óÀ̾ðÆ® ÀÚ°Ý ºÎ¿©"
 
-#: sunrpc/clnt_perr.c:364
+#: sunrpc/clnt_perr.c:349
 msgid "Server rejected credential"
 msgstr "¼­¹ö°¡ ÀÚ°Ý ºÎ¿©¸¦ °ÅºÎÇß½À´Ï´Ù"
 
-#: sunrpc/clnt_perr.c:368
+#: sunrpc/clnt_perr.c:353
 msgid "Invalid client verifier"
 msgstr "ºÎÀûÀýÇÑ Å¬¶óÀ̾ðÆ® °ËÁõ±â"
 
-#: sunrpc/clnt_perr.c:372
+#: sunrpc/clnt_perr.c:357
 msgid "Server rejected verifier"
 msgstr "¼­¹ö°¡ °ËÁõ±â¸¦ °ÅºÎÇß½À´Ï´Ù"
 
-#: sunrpc/clnt_perr.c:376
+#: sunrpc/clnt_perr.c:361
 msgid "Client credential too weak"
 msgstr "Ŭ¶óÀ̾ðÆ® ÀÚ°Ý ºÎ¿©°¡ ³Ê¹« ¾àÇÔ"
 
-#: sunrpc/clnt_perr.c:380
+#: sunrpc/clnt_perr.c:365
 msgid "Invalid server verifier"
 msgstr "ºÎÀûÀýÇÑ ¼­¹ö °ËÁõ±â"
 
-#: sunrpc/clnt_perr.c:384
+#: sunrpc/clnt_perr.c:369
 msgid "Failed (unspecified error)"
 msgstr "½ÇÆÐ (ÁöÁ¤µÇÁö ¾ÊÀº ¿À·ù)"
 
 #: sunrpc/clnt_raw.c:117
-msgid "clnt_raw.c - Fatal header serialization error."
-msgstr "clnt_raw.c - Ä¡¸íÀûÀÎ Çì´õ ¿¬¼ÓÈ­ ¿À·ù."
+msgid "clnt_raw.c: fatal header serialization error"
+msgstr "clnt_raw.c: Ä¡¸íÀûÀÎ Çì´õ Á÷·ÄÈ­ ¿À·ù"
 
-#: 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: ¸Þ¸ð¸® ºÎÁ·\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: ¸Þ¸ð¸® ºÎÁ·\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: ¸Þ¸ð¸® ºÎÁ·\n"
 
-#: sunrpc/get_myaddr.c:78
-msgid "get_myaddress: ioctl (get interface configuration)"
-msgstr "get_myaddress: ioctl (ÀÎÅÍÆäÀ̽º ¼³Á¤À» ¾òÀ½)"
-
-#: sunrpc/pm_getmaps.c:74
-msgid "pmap_getmaps rpc problem"
-msgstr "pmap_genmaps rcp ¹®Á¦"
+#: sunrpc/pm_getmaps.c:83
+msgid "pmap_getmaps.c: rpc problem"
+msgstr "pmap_getmaps.c: RPC ¹®Á¦"
 
-#: sunrpc/pmap_clnt.c:72
-msgid "__get_myaddress: ioctl (get interface configuration)"
-msgstr "__get_myaddress: ioctl (ÀÎÅÍÆäÀ̽º ¼³Á¤À» ¾òÀ½)"
-
-#: sunrpc/pmap_clnt.c:137
+#: sunrpc/pmap_clnt.c:129
 msgid "Cannot register service"
 msgstr "¼­ºñ½º¸¦ µî·ÏÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/pmap_rmt.c:190
-msgid "broadcast: ioctl (get interface configuration)"
-msgstr "broadcast: ioctl (ÀÎÅÍÆäÀ̽º ¼³Á¤ ¾òÀ½)"
-
-#: sunrpc/pmap_rmt.c:199
-msgid "broadcast: ioctl (get interface flags)"
-msgstr "broadcast: ioctl (ÀÎÅÍÆäÀ̽º Ç÷¡±× ¾òÀ½)"
-
-#: sunrpc/pmap_rmt.c:269
+#: sunrpc/pmap_rmt.c:248
 msgid "Cannot create socket for broadcast rpc"
 msgstr "ºê·Îµåij½ºÆ® rpc¸¦ À§ÇÑ ¼ÒÄÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/pmap_rmt.c:276
+#: sunrpc/pmap_rmt.c:255
 msgid "Cannot set socket option SO_BROADCAST"
 msgstr "¼ÒÄÏ ¿É¼Ç SO_BROADCAST¸¦ ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/pmap_rmt.c:328
+#: sunrpc/pmap_rmt.c:307
 msgid "Cannot send broadcast packet"
 msgstr "ºê·Îµåij½ºÆ® ÆÐŶÀ» º¸³¾ ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/pmap_rmt.c:353
+#: sunrpc/pmap_rmt.c:332
 msgid "Broadcast poll problem"
 msgstr "ºê·Îµåij½ºÆ® ¼±Åà ¹®Á¦"
 
-#: sunrpc/pmap_rmt.c:366
+#: sunrpc/pmap_rmt.c:345
 msgid "Cannot receive reply to broadcast"
 msgstr "ºê·Îµåij½ºÆ®¿¡ ´ëÇÑ ÀÀ´äÀ» ¹ÞÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/rpc_main.c:288
+#: sunrpc/rpc_main.c:286
 #, c-format
 msgid "%s: output would overwrite %s\n"
 msgstr "%s: Ãâ·ÂÀÌ %sÀ»(¸¦) µ¤¾î¾µ °ÍÀÔ´Ï´Ù\n"
 
-#: sunrpc/rpc_main.c:295
+#: sunrpc/rpc_main.c:293
 #, c-format
 msgid "%s: unable to open %s: %m\n"
 msgstr "%s: %sÀ»(¸¦) ¿­ ¼ö ¾øÀ½: %m\n"
 
-#: sunrpc/rpc_main.c:307
+#: sunrpc/rpc_main.c:305
 #, c-format
 msgid "%s: while writing output %s: %m"
 msgstr "%s: %sÀ»(¸¦) Ãâ·ÂÇÏ´Â µµÁß ¿À·ù ¹ß»ý: %m"
 
-#: sunrpc/rpc_main.c:342
+#: sunrpc/rpc_main.c:340
 #, c-format
 msgid "cannot find C preprocessor: %s \n"
 msgstr "C Àü󸮱⸦ ãÀ» ¼ö ¾ø½À´Ï´Ù: %s \n"
 
-#: sunrpc/rpc_main.c:350
+#: sunrpc/rpc_main.c:348
 msgid "cannot find any C preprocessor (cpp)\n"
 msgstr "¾î¶² C Àü󸮱⵵ (cpp) ãÀ» ¼ö ¾ø½À´Ï´Ù\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 Àü󸮱Ⱑ ½Ã±×³¯ %d¹øÀ¸·Î ½ÇÆÐÇÏ¿´½À´Ï´Ù\n"
+msgstr "%s: C Àü󸮱Ⱑ ½Ã±×³Î %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 Àü󸮱Ⱑ Á¾·á ÄÚµå %d¹øÀ¸·Î ½ÇÆÐÇÏ¿´½À´Ï´Ù\n"
+msgstr "%s: C Àü󸮱Ⱑ exit ÄÚµå %d¹øÀ¸·Î ½ÇÆÐÇÏ¿´½À´Ï´Ù\n"
 
-#: sunrpc/rpc_main.c:462
+#: sunrpc/rpc_main.c:460
 #, c-format
-msgid "illegal nettype :`%s'\n"
-msgstr "À߸øµÈ ³×ƮŸÀÔ :`%s'\n"
+msgid "illegal nettype: `%s'\n"
+msgstr "³×Æ®¿öÅ© Á¾·ù°¡ À߸øµÇ¾ú½À´Ï´Ù: `%s'\n"
 
-#: sunrpc/rpc_main.c:1104
+#: sunrpc/rpc_main.c:1122
 #, c-format
 msgid "rpcgen: too many defines\n"
 msgstr "rpcgen: ³Ê¹« ¸¹Àº Á¤ÀÇ\n"
 
-#: sunrpc/rpc_main.c:1116
+#: sunrpc/rpc_main.c:1134
 #, c-format
 msgid "rpcgen: arglist coding error\n"
 msgstr "rcpgen: arglist ÄÚµù ¿À·ù\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 "`%s' ÆÄÀÏÀÌ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù.  µ¤¾î ¾µ ¼öµµ ÀÖ½À´Ï´Ù\n"
+msgstr "`%s' ÆÄÀÏÀÌ ÀÌ¹Ì ÀÖ½À´Ï´Ù.  µ¤¾î ¾µ ¼öµµ ÀÖ½À´Ï´Ù\n"
 
-#: sunrpc/rpc_main.c:1194
+#: sunrpc/rpc_main.c:1212
 #, c-format
 msgid "Cannot specify more than one input file!\n"
 msgstr "ÇÑ°³ ÀÌ»óÀÇ ÀÔ·Â ÆÄÀÏÀ» ÁöÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù!\n"
 
-#: sunrpc/rpc_main.c:1364
+#: sunrpc/rpc_main.c:1382
 msgid "This implementation doesn't support newstyle or MT-safe code!\n"
 msgstr "ÀÌ ±¸Çö¹°Àº newstyleÀ̳ª MT-safe Äڵ带 Áö¿øÇÏÁö ¾Ê½À´Ï´Ù!\n"
 
-#: sunrpc/rpc_main.c:1373
+#: sunrpc/rpc_main.c:1391
 #, c-format
 msgid "Cannot use netid flag with inetd flag!\n"
-msgstr "³×Æ®id Ç÷¡±×¸¦ inetd Ç÷¡±×¿Í ÇÔ²² ¾µ ¼ö ¾ø½À´Ï´Ù!\n"
+msgstr "³×Æ®¿öÅ©ID Ç÷¡±×¸¦ inetd Ç÷¡±×¿Í ÇÔ²² ¾µ ¼ö ¾ø½À´Ï´Ù!\n"
 
-#: sunrpc/rpc_main.c:1385
+#: sunrpc/rpc_main.c:1403
 msgid "Cannot use netid flag without TIRPC!\n"
-msgstr "³×Æ®id Ç÷¡±×¸¦ TIRPC¿Í ÇÔ²² ¾µ ¼ö ¾ø½À´Ï´Ù!\n"
+msgstr "³×Æ®¿öÅ©ID Ç÷¡±×¸¦ TIRPC¿Í ÇÔ²² ¾µ ¼ö ¾ø½À´Ï´Ù!\n"
 
-#: sunrpc/rpc_main.c:1392
+#: sunrpc/rpc_main.c:1410
 msgid "Cannot use table flags with newstyle!\n"
 msgstr "»õ·Î¿î ½ºÅ¸ÀÏ¿¡¼­´Â Å×À̺í Ç÷¡±×¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù!\n"
 
-#: sunrpc/rpc_main.c:1411
+#: sunrpc/rpc_main.c:1429
 #, c-format
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr "ÅÛÇø´ »ý¼º Ç÷¡±×¸¦ À§Çؼ­´Â \"ÀÔ·ÂÆÄÀÏ\"ÀÌ ÇÊ¿äÇÕ´Ï´Ù.\n"
 
-#: sunrpc/rpc_main.c:1416
+#: sunrpc/rpc_main.c:1434
 #, c-format
 msgid "Cannot have more than one file generation flag!\n"
 msgstr "ÇÑ °³ ÀÌ»óÀÇ ÆÄÀÏ »ý¼º Ç÷¡±×¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: sunrpc/rpc_main.c:1425
+#: sunrpc/rpc_main.c:1443
 #, c-format
 msgid "usage: %s infile\n"
 msgstr "»ç¿ë¹ý: %s ÀÔ·ÂÆÄÀÏ\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][-DÀ̸§[=°ª]] [-i Å©±â] [-I [-K ÃÊ]] [-Y °æ·Î] ÀÔ·ÂÆÄÀÏ\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 Ãâ·ÂÆÄÀÏ] [ÀÔ·ÂÆÄÀÏ]\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 ³×ƮŸÀÔ]* [-o Ãâ·ÂÆÄÀÏ] [ÀÔ·ÂÆÄÀÏ]\n"
+msgstr "\t%s [-s ³×Æ®¿öÅ©Á¾·ù]* [-o Ãâ·ÂÆÄÀÏ] [ÀÔ·ÂÆÄÀÏ]\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 ³×Æ®id]* [-o Ãâ·ÂÆÄÀÏ] [ÀÔ·ÂÆÄÀÏ]\n"
+msgstr "\t%s [-n ³×Æ®¿öÅ©ID]* [-o Ãâ·ÂÆÄÀÏ] [ÀÔ·ÂÆÄÀÏ]\n"
 
-#: sunrpc/rpc_scan.c:116
+#: sunrpc/rpc_scan.c:114
 msgid "constant or identifier expected"
 msgstr "»ó¼ö ȤÀº ½Äº°ÀÚ°¡ ¿Í¾ß ÇÔ"
 
-#: sunrpc/rpc_scan.c:312
+#: sunrpc/rpc_scan.c:310
 msgid "illegal character in file: "
 msgstr "ÆÄÀÏ¿¡ À߸øµÈ ¹®ÀÚ°¡ ÀÖÀ½"
 
-#: 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 "Á¾·áµÇÁö ¾ÊÀº ¹®ÀÚ¿­ »ó¼ö"
 
-#: sunrpc/rpc_scan.c:383
+#: sunrpc/rpc_scan.c:381
 msgid "empty char string"
 msgstr "ºó ¹®ÀÚ¿­"
 
-#: sunrpc/rpc_scan.c:525 sunrpc/rpc_scan.c:535
+#: sunrpc/rpc_scan.c:523 sunrpc/rpc_scan.c:533
 msgid "preprocessor error"
 msgstr "Àü󸮱⠿À·ù"
 
@@ -4289,7 +4871,7 @@ msgstr "¿ø°Ý ÇÁ·Î±×·¥ÀÌ µî·ÏµÇÁö ¾Ê¾ÒÀ½.\n"
 
 #: sunrpc/rpcinfo.c:574
 msgid "   program vers proto   port\n"
-msgstr "   ÇÁ·Î±×·¥ ¹öÀü ¿øÇü   Æ÷Æ®\n"
+msgstr "   ÇÁ·Î±×·¥ ¹öÀü ÇÁ·ÎÅä  Æ÷Æ®\n"
 
 #: sunrpc/rpcinfo.c:613
 msgid "(unknown)"
@@ -4302,7 +4884,7 @@ msgstr "rpcinfo: ºê·Îµåij½ºÆ® ½ÇÆÐÇÔ: %s\n"
 
 #: sunrpc/rpcinfo.c:658
 msgid "Sorry. You are not root\n"
-msgstr "Á˼ÛÇÕ´Ï´Ù. ´ç½ÅÀº root°¡ ¾Æ´Õ´Ï´Ù\n"
+msgstr "Á˼ÛÇÕ´Ï´Ù. root°¡ ¾Æ´Õ´Ï´Ù\n"
 
 #: sunrpc/rpcinfo.c:665
 #, c-format
@@ -4339,7 +4921,11 @@ msgstr "rpcinfo: %sÀº(´Â) ¾Ë ¼ö ¾ø´Â ¼­ºñ½ºÀÔ´Ï´Ù\n"
 msgid "rpcinfo: %s is unknown host\n"
 msgstr "rpcinfo: %sÀº(´Â) ¾Ë ¼ö ¾ø´Â È£½ºÆ®ÀÔ´Ï´Ù\n"
 
-#: sunrpc/svc_run.c:76
+#: sunrpc/svc_run.c:70
+msgid "svc_run: - out of memory"
+msgstr "svc_run: - ¸Þ¸ð¸® ºÎÁ·"
+
+#: sunrpc/svc_run.c:90
 msgid "svc_run: - poll failed"
 msgstr "svc_run: - poll ½ÇÆÐ"
 
@@ -4348,42 +4934,42 @@ msgstr "svc_run: - poll ½ÇÆÐ"
 msgid "can't reassign procedure number %ld\n"
 msgstr "ÇÁ·Î½ÃÁ® ¹øÈ£ %ld¹øÀ» ÀçÁöÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: sunrpc/svc_simple.c:96
+#: sunrpc/svc_simple.c:97
 msgid "couldn't create an rpc server\n"
-msgstr "rpc ¼­¹ö¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù\n"
+msgstr "RPC ¼­¹ö¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù\n"
 
-#: sunrpc/svc_simple.c:104
+#: sunrpc/svc_simple.c:105
 #, c-format
 msgid "couldn't register prog %ld vers %ld\n"
 msgstr "ÇÁ·Î±×·¥ %ld %ld ¹öÀüÀ» µî·ÏÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: sunrpc/svc_simple.c:111
+#: sunrpc/svc_simple.c:113
 msgid "registerrpc: out of memory\n"
 msgstr "registerrpc: ¸Þ¸ð¸® ºÎÁ·\n"
 
-#: sunrpc/svc_simple.c:175
+#: sunrpc/svc_simple.c:173
 #, c-format
 msgid "trouble replying to prog %d\n"
 msgstr "ÇÁ·Î±×·¥ %d¿¡ ÀÀ´äÇÏ´Â µ¥ ¹®Á¦°¡ ÀÖÀ½\n"
 
-#: sunrpc/svc_simple.c:183
+#: sunrpc/svc_simple.c:182
 #, c-format
 msgid "never registered prog %d\n"
 msgstr "°áÄÚ µî·ÏµÇÁö ¾ÊÀº ÇÁ·Î±×·¥ %d\n"
 
 #: sunrpc/svc_tcp.c:155
 msgid "svc_tcp.c - tcp socket creation problem"
-msgstr "svc_tcp_c - tcp ¼ÒÄÏ »ý¼º ¹®Á¦"
+msgstr "svc_tcp.c - tcp ¼ÒÄÏ »ý¼º ¹®Á¦"
 
 #: sunrpc/svc_tcp.c:170
 msgid "svc_tcp.c - cannot getsockname or listen"
 msgstr "svc_tcp.c - getsockname ȤÀº listen ºÒ°¡´É"
 
-#: 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: ¸Þ¸ð¸® ºÎÁ·\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: ¸Þ¸ð¸® ºÎÁ·\n"
 
@@ -4395,39 +4981,39 @@ msgstr "svcudp_create: ¼ÒÄÏ ¸¸µé±â ¹®Á¦"
 msgid "svcudp_create - cannot getsockname"
 msgstr "svcudp_create - getsockname ºÒ°¡´É"
 
-#: 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: ¸Þ¸ð¸® ºÎÁ·\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°¡ IP_PKTINFO¿¡ ´ëÇÏ¿© ³Ê¹« ÀÛ½À´Ï´Ù\n"
 
-#: sunrpc/svc_udp.c:493
+#: sunrpc/svc_udp.c:474
 msgid "enablecache: cache already enabled"
-msgstr "enablecache: ij½¬°¡ ÀÌ¹Ì È°¼ºÈ­µÇ¾î ÀÖÀ½"
+msgstr "enablecache: ij½Ã°¡ ÀÌ¹Ì È°¼ºÈ­µÇ¾î ÀÖÀ½"
 
-#: sunrpc/svc_udp.c:499
+#: sunrpc/svc_udp.c:480
 msgid "enablecache: could not allocate cache"
-msgstr "enablecache: ij½¬¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgstr "enablecache: ij½Ã¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/svc_udp.c:507
+#: sunrpc/svc_udp.c:489
 msgid "enablecache: could not allocate cache data"
-msgstr "enablecache: ij½¬ ÀڷḦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgstr "enablecache: ij½Ã ÀڷḦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/svc_udp.c:514
+#: sunrpc/svc_udp.c:497
 msgid "enablecache: could not allocate cache fifo"
-msgstr "enablecache: ij½¬ fifo¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgstr "enablecache: ij½Ã FIFO¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/svc_udp.c:550
+#: sunrpc/svc_udp.c:532
 msgid "cache_set: victim not found"
-msgstr "cache_set: ¹ö¸±°ÍÀ» ãÁö ¸øÇßÀ½"
+msgstr "cache_set: ¹ö¸± °ÍÀ» ãÁö ¸øÇß½À´Ï´Ù"
 
-#: sunrpc/svc_udp.c:561
+#: sunrpc/svc_udp.c:543
 msgid "cache_set: victim alloc failed"
-msgstr "cache_set: ¹ö¸±°ÍÀ» ÇÒ´çÇÏÁö ¸øÇßÀ½"
+msgstr "cache_set: ¹ö¸± °ÍÀ» ÇÒ´çÇÏÁö ¸øÇß½À´Ï´Ù"
 
-#: sunrpc/svc_udp.c:567
+#: sunrpc/svc_udp.c:550
 msgid "cache_set: could not allocate new rpc_buffer"
 msgstr "cache_set: »õ rpc_buffer¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
 
@@ -4439,1586 +5025,1502 @@ msgstr "svc_unix.c - AF_UNIX ¼ÒÄÏ »ý¼º ¹®Á¦"
 msgid "svc_unix.c - cannot getsockname or listen"
 msgstr "svc_unix.c - getsockname ȤÀº listen ºÒ°¡´É"
 
-#: 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: ¸Þ¸ð¸® ºÎÁ·\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: makefc_xprt: ¸Þ¸ð¸® ºÎÁ·\n"
 
-#: sunrpc/xdr.c:570 sunrpc/xdr.c:573
+#: sunrpc/xdr.c:566
 msgid "xdr_bytes: out of memory\n"
 msgstr "xdr_bytes: ¸Þ¸ð¸® ºÎÁ·\n"
 
-#: sunrpc/xdr.c:728 sunrpc/xdr.c:731
+#: sunrpc/xdr.c:718
 msgid "xdr_string: out of memory\n"
 msgstr "xdr_string: ¸Þ¸ð¸® ºÎÁ·\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: ¸Þ¸ð¸® ºÎÁ·\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: ¸Þ¸ð¸® ºÎÁ·\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: ¸Þ¸ð¸® ºÎÁ·\n"
 
-#: nis/nis_callback.c:189
-msgid "unable to free arguments"
-msgstr "ÀÎÀÚ¸¦ ºñ¿ï ¼ö ¾ø½À´Ï´Ù"
+#: sysdeps/generic/siglist.h:29 sysdeps/unix/siglist.c:27
+msgid "Hangup"
+msgstr "²÷¾îÁü"
 
-#: nis/nis_error.c:30
-msgid "Probable success"
-msgstr "¾Æ¸¶µµ ¼º°ø"
+#: sysdeps/generic/siglist.h:30 sysdeps/unix/siglist.c:28
+msgid "Interrupt"
+msgstr "ÀÎÅÍ·´Æ®"
 
-#: nis/nis_error.c:31
-msgid "Not found"
-msgstr "ãÀ» ¼ö ¾øÀ½"
+#: sysdeps/generic/siglist.h:31 sysdeps/unix/siglist.c:29
+msgid "Quit"
+msgstr "Á¾·á"
 
-#: nis/nis_error.c:32
-msgid "Probably not found"
-msgstr "¾Æ¸¶µµ ¾øÀ½"
+#: sysdeps/generic/siglist.h:32 sysdeps/unix/siglist.c:30
+msgid "Illegal instruction"
+msgstr "À߸øµÈ ¸í·É¾î"
 
-#: nis/nis_error.c:33
-msgid "Cache expired"
-msgstr "ij½¬°¡ ½Ã°£ ÃÊ°úµÊ"
+#: sysdeps/generic/siglist.h:33 sysdeps/unix/siglist.c:31
+msgid "Trace/breakpoint trap"
+msgstr "ÃßÀû/Áß´ÜÁ¡ ÇÔÁ¤"
 
-#: nis/nis_error.c:34
-msgid "NIS+ servers unreachable"
-msgstr "NIS+ ¼­¹ö¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: sysdeps/generic/siglist.h:34
+msgid "Aborted"
+msgstr "ÁßÁöµÊ"
 
-#: nis/nis_error.c:35
-msgid "Unknown object"
-msgstr "¾Ë ¼ö ¾ø´Â ¿ÀºêÁ§Æ®"
+#: sysdeps/generic/siglist.h:35 sysdeps/unix/siglist.c:34
+msgid "Floating point exception"
+msgstr "ºÎµ¿ ¼Ò¼öÁ¡ ¿¹¿Ü"
 
-#: nis/nis_error.c:36
-msgid "Server busy, try again"
-msgstr "¼­¹ö°¡ ´Ù¸¥ ÀÏÀ» ÇÏ°í ÀÖ½À´Ï´Ù, ´Ù½Ã ½ÃµµÇϼ¼¿ä"
+#: sysdeps/generic/siglist.h:36 sysdeps/unix/siglist.c:35
+msgid "Killed"
+msgstr "Á×¾úÀ½"
 
-#: nis/nis_error.c:37
-msgid "Generic system error"
-msgstr "ÀÏ¹Ý ½Ã½ºÅÛ ¿À·ù"
+#: sysdeps/generic/siglist.h:37 sysdeps/unix/siglist.c:36
+msgid "Bus error"
+msgstr "¹ö½º ¿À·ù"
 
-#: nis/nis_error.c:38
-msgid "First/next chain broken"
-msgstr "First/next ¿¬°áÀÌ ²÷¾îÁü"
+#: sysdeps/generic/siglist.h:38 sysdeps/unix/siglist.c:37
+msgid "Segmentation fault"
+msgstr "¼¼±×¸àÅ×ÀÌ¼Ç ¿À·ù"
 
-#: nis/nis_error.c:41
-msgid "Name not served by this server"
-msgstr "ÀÌ ¼­¹ö¿¡¼­ name ¼­ºñ½º°¡ µÇÁö ¾Ê½À´Ï´Ù"
+#. 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 "ÆÄÀÌÇÁ°¡ ±ú¾îÁü"
 
-#: nis/nis_error.c:42
-msgid "Server out of memory"
-msgstr "¼­¹ö ¸Þ¸ð¸® ºÎÁ·"
+#: sysdeps/generic/siglist.h:40 sysdeps/unix/siglist.c:40
+msgid "Alarm clock"
+msgstr "ÀÚ¸íÁ¾ ½Ã°è"
 
-#: nis/nis_error.c:43
-msgid "Object with same name exists"
-msgstr "°°Àº À̸§ÀÇ ¿ÀºêÁ§Æ®°¡ Á¸ÀçÇÕ´Ï´Ù"
+#: sysdeps/generic/siglist.h:41 sysdeps/unix/siglist.c:41
+msgid "Terminated"
+msgstr "Á¾·áµÊ"
 
-#: nis/nis_error.c:44
-msgid "Not master server for this domain"
-msgstr "ÀÌ µµ¸ÞÀÎÀÇ ÁÖ ¼­¹ö°¡ ¾Æ´Ô"
+#: sysdeps/generic/siglist.h:42 sysdeps/unix/siglist.c:42
+msgid "Urgent I/O condition"
+msgstr "½Ã±ÞÇÑ ÀÔÃâ·Â »óȲ"
 
-#: nis/nis_error.c:45
-msgid "Invalid object for operation"
-msgstr "ÀÛ¾÷ÇÏ´Â µ¥ À߸øµÈ ¿ÀºêÁ§Æ®"
+#: sysdeps/generic/siglist.h:43 sysdeps/unix/siglist.c:43
+msgid "Stopped (signal)"
+msgstr "Á¤ÁöµÊ (½Ã±×³Î)"
 
-#: nis/nis_error.c:46
-msgid "Malformed name, or illegal name"
-msgstr "À߸øµÈ Çü½ÄÀÇ À̸§, ȤÀº ¾µ ¼ö ¾ø´Â À̸§"
+#: sysdeps/generic/siglist.h:44 sysdeps/unix/siglist.c:44
+msgid "Stopped"
+msgstr "Á¤ÁöµÊ"
 
-#: nis/nis_error.c:47
-msgid "Unable to create callback"
-msgstr "ÄݹéÀ» ¸¸µé ¼ö ¾øÀ½"
+#: sysdeps/generic/siglist.h:45 sysdeps/unix/siglist.c:45
+msgid "Continued"
+msgstr "°è¼ÓµÊ"
 
-#: nis/nis_error.c:48
-msgid "Results sent to callback proc"
-msgstr "°á°ú¸¦ Äݹé ÇÁ·Î½ÃÀú·Î º¸³ÂÀ½"
+#: sysdeps/generic/siglist.h:46 sysdeps/unix/siglist.c:46
+msgid "Child exited"
+msgstr "ÇÏÀ§ ÇÁ·Î¼¼½º°¡ ³¡³µÀ½"
 
-#: nis/nis_error.c:49
-msgid "Not found, no such name"
-msgstr "ãÀ» ¼ö ¾øÀ½.  ±×·± À̸§ÀÌ ¾øÀ½"
+#: sysdeps/generic/siglist.h:47 sysdeps/unix/siglist.c:47
+msgid "Stopped (tty input)"
+msgstr "Á¤ÁöµÊ (tty ÀÔ·Â)"
 
-#: nis/nis_error.c:50
-msgid "Name/entry isn't unique"
-msgstr "Name/entry°¡ À¯ÀÏÇÏÁö ¾Ê½À´Ï´Ù"
+#: sysdeps/generic/siglist.h:48 sysdeps/unix/siglist.c:48
+msgid "Stopped (tty output)"
+msgstr "Á¤ÁöµÊ (tty Ãâ·Â)"
 
-#: nis/nis_error.c:51
-msgid "Modification failed"
-msgstr "¼öÁ¤ÇÏ´Â µ¥ ½ÇÆÐ"
+#: sysdeps/generic/siglist.h:49 sysdeps/unix/siglist.c:49
+msgid "I/O possible"
+msgstr "ÀÔÃâ·Â °¡´É"
 
-#: nis/nis_error.c:52
-msgid "Database for table does not exist"
-msgstr "Å×ÀÌºí¿¡ ´ëÇÑ µ¥ÀÌŸº£À̽º°¡ ¾ø½À´Ï´Ù"
+#: sysdeps/generic/siglist.h:50 sysdeps/unix/siglist.c:50
+msgid "CPU time limit exceeded"
+msgstr "CPU ½Ã°£ Á¦ÇÑ ÃÊ°úÇÔ"
 
-#: nis/nis_error.c:53
-msgid "Entry/table type mismatch"
-msgstr "Entry/table ŸÀÔÀÌ ¸ÂÁö ¾Ê½À´Ï´Ù"
+#: sysdeps/generic/siglist.h:51 sysdeps/unix/siglist.c:51
+msgid "File size limit exceeded"
+msgstr "ÆÄÀÏ Å©±â Á¦ÇÑÀ» ÃÊ°úÇÔ"
 
-#: nis/nis_error.c:54
-msgid "Link points to illegal name"
-msgstr "¸µÅ©°¡ À߸øµÈ À̸§À» °¡¸®Å´"
+#: sysdeps/generic/siglist.h:52 sysdeps/unix/siglist.c:52
+msgid "Virtual timer expired"
+msgstr "°¡»ó ŸÀÌ¸Ó ¸¸·á"
 
-#: nis/nis_error.c:55
-msgid "Partial success"
-msgstr "ºÎºÐÀûÀÎ ¼º°ø"
+#: sysdeps/generic/siglist.h:53 sysdeps/unix/siglist.c:53
+msgid "Profiling timer expired"
+msgstr "ÇÁ·ÎÆÄÀϸµ ŸÀÌ¸Ó ¸¸·á"
 
-#: nis/nis_error.c:56
-msgid "Too many attributes"
-msgstr "¼Ó¼ºÀÌ ³Ê¹« ¸¹À½"
+#: sysdeps/generic/siglist.h:54 sysdeps/unix/siglist.c:54
+msgid "Window changed"
+msgstr "À©µµ¿ì ¹Ù²ñ"
 
-#: nis/nis_error.c:57
-msgid "Error in RPC subsystem"
-msgstr "RPC ¼­ºê ½Ã½ºÅÛ¿¡ ¿À·ù: "
+#: sysdeps/generic/siglist.h:55 sysdeps/unix/siglist.c:56
+msgid "User defined signal 1"
+msgstr "»ç¿ëÀÚ Á¤ÀÇ ½Ã±×³Î 1"
 
-#: nis/nis_error.c:58
-msgid "Missing or malformed attribute"
-msgstr "¼Ó¼ºÀÌ ¾ø°Å³ª Çü½ÄÀÌ Æ²·ÈÀ½"
+#: sysdeps/generic/siglist.h:56 sysdeps/unix/siglist.c:57
+msgid "User defined signal 2"
+msgstr "»ç¿ëÀÚ Á¤ÀÇ ½Ã±×³Î 2"
 
-#: nis/nis_error.c:59
-msgid "Named object is not searchable"
-msgstr "À̸§¿¡ ÇØ´çµÇ´Â ¿ÀºêÁ§Æ®¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù"
+#: sysdeps/generic/siglist.h:60 sysdeps/unix/siglist.c:33
+msgid "EMT trap"
+msgstr "EMT Æ®·¦"
 
-#: nis/nis_error.c:60
-msgid "Error while talking to callback proc"
-msgstr "Äݹé ÇÁ·Î½ÃÀú¸¦ »ç¿ëÇÏ´Â µ¥ ¿À·ù"
+#: sysdeps/generic/siglist.h:63 sysdeps/unix/siglist.c:38
+msgid "Bad system call"
+msgstr "À߸øµÈ ½Ã½ºÅÛ ÄÝ"
 
-#: nis/nis_error.c:61
-msgid "Non NIS+ namespace encountered"
-msgstr "NIS+°¡ ¾Æ´Ñ namespace ¹ß°ß"
+#: sysdeps/generic/siglist.h:66
+msgid "Stack fault"
+msgstr "½ºÅà ¿À·ù"
 
-#: nis/nis_error.c:62
-msgid "Illegal object type for operation"
-msgstr "ÀÛ¾÷ÇÏ´Â µ¥ À߸øµÈ ¿ÀºêÁ§Æ® ŸÀÔ"
+#: sysdeps/generic/siglist.h:69
+msgid "Information request"
+msgstr "Á¤º¸ ¿äû"
 
-#: nis/nis_error.c:63
-msgid "Passed object is not the same object on server"
-msgstr "Åë°úµÈ ¿ÀºêÁ§Æ®´Â ¼­¹öÀÇ °°Àº ¿ÀºêÁ§Æ®°¡ ¾Æ´Õ´Ï´Ù"
+#: sysdeps/generic/siglist.h:71
+msgid "Power failure"
+msgstr "Àü·ÂÀÌ ²÷¾îÁü"
 
-#: nis/nis_error.c:64
-msgid "Modify operation failed"
-msgstr "¼öÁ¤ ÀÛ¾÷ÀÌ ½ÇÆÐÇÏ¿´À½"
+#: sysdeps/generic/siglist.h:74 sysdeps/unix/siglist.c:55
+msgid "Resource lost"
+msgstr "ÀÚ¿øÀ» ¼Õ½ÇÇßÀ½"
 
-#: nis/nis_error.c:65
-msgid "Query illegal for named table"
-msgstr "À̸§ Å×ÀÌºí¿¡ À߸øµÈ ÁúÀÇ"
+#. 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 "¸í·ÉÀÌ Çã¿ëµÇÁö ¾ÊÀ½"
 
-#: nis/nis_error.c:66
-msgid "Attempt to remove a non-empty table"
-msgstr "ºñ¾îÀÖÁö ¾ÊÀº Å×À̺íÀ» Áö¿ì·Á°í ½Ãµµ"
+#. TRANS No process matches the specified process ID.
+#: sysdeps/gnu/errlist.c:45
+msgid "No such process"
+msgstr "±×·± ÇÁ·Î¼¼½º°¡ ¾øÀ½"
 
-#: nis/nis_error.c:67
-msgid "Error in accessing NIS+ cold start file.  Is NIS+ installed?"
-msgstr "NIS+ ½ÃÀÛ ÆÄÀÏ¿¡ Á¢±ÙÇÏ´Â µ¥ ¿À·ù.  NIS+°¡ ¼³Ä¡µÇ¾ú½À´Ï±î?"
+#. 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 "Áß´ÜµÈ ½Ã½ºÅÛ ÄÝ"
 
-#: nis/nis_error.c:68
-msgid "Full resync required for directory"
-msgstr "µð·ºÅ丮¿¡ ´ëÇØ ¿ÏÀüÇÑ resync°¡ ÇÊ¿äÇÔ"
+#. TRANS Input/output error; usually used for physical read or write errors.
+#: sysdeps/gnu/errlist.c:69
+msgid "Input/output error"
+msgstr "ÀÔ·Â/Ãâ·Â ¿À·ù"
 
-#: nis/nis_error.c:69
-msgid "NIS+ operation failed"
-msgstr "NIS+ µ¿ÀÛ ½ÇÆÐ"
+#. 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 "±×·± ÀåÄ¡ ȤÀº ÁÖ¼Ò°¡ ¾øÀ½"
 
-#: nis/nis_error.c:70
-msgid "NIS+ service is unavailable or not installed"
-msgstr "NIS+ ¼­ºñ½º¸¦ »ç¿ëÇÒ ¼ö ¾ø°Å³ª NIS+ ¼­ºñ½º°¡ ¼³Ä¡µÇÁö ¾Ê¾Ò½À´Ï´Ù"
+#. 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 "Àμö ¸í´ÜÀÌ ³Ê¹« ±è"
 
-#: nis/nis_error.c:71
-msgid "Yes, 42 is the meaning of life"
-msgstr "¿¹, 42´Â Á¤»óÀûÀ¸·Î µ¿ÀÛÇÑ´Ù´Â ¶æÇÕ´Ï´Ù"
+#. 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 "Exec Çü½Ä ¿À·ù"
 
-#: nis/nis_error.c:72
-msgid "Unable to authenticate NIS+ server"
-msgstr "NIS+ ¼­¹ö¿¡ ÀÎÁõÇÒ ¼ö ¾øÀ½"
+#. 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 "À߸øµÈ ÆÄÀÏ µð½ºÅ©¸³ÅÍ"
 
-#: nis/nis_error.c:73
-msgid "Unable to authenticate NIS+ client"
-msgstr "NIS+ Ŭ¶óÀ̾ðÆ®¿¡ ÀÎÁõÇÒ ¼ö ¾øÀ½"
+#. 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 "ÇÏÀ§ ÇÁ·Î¼¼½º°¡ ¾øÀ½"
 
-#: nis/nis_error.c:74
-msgid "No file space on server"
-msgstr "¼­¹ö¿¡ ³²Àº °ø°£ÀÌ ¾øÀ½"
+#. 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 "ÀÚ¿ø ±³Âø»óŸ¦ ÇÇÇß½À´Ï´Ù"
 
-#: nis/nis_error.c:75
-msgid "Unable to create process on server"
-msgstr "¼­¹ö¿¡¼­ ÇÁ·Î¼¼½º¸¦ ¸¸µé ¼ö ¾øÀ½"
+#. 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 "¸Þ¸ð¸®¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: nis/nis_error.c:76
-msgid "Master server busy, full dump rescheduled."
-msgstr "ÁÖ ¼­¹ö°¡ ÀÛ¾÷ÁßÀ̹ǷÎ, ¿ÏÀüÇÑ ´ýÇÁ´Â ¿¬±âµË´Ï´Ù."
+#. 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 "À߸øµÈ ÁÖ¼Ò"
 
-#: nis/nis_local_names.c:126
-#, c-format
-msgid "LOCAL entry for UID %d in directory %s not unique\n"
-msgstr "µð·ºÅ丮 %2$sÀÇ UID %1$d¹øÀ» À§ÇÑ LOCAL entry°¡ À¯ÀÏÇÏÁö ¾Ê½À´Ï´Ù\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 "ºí·° ÀåÄ¡°¡ ÇÊ¿äÇÔ"
 
-#: nis/nis_print.c:51
-msgid "UNKNOWN"
-msgstr "¾Ë¼ö¾øÀ½"
+#. 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 "ÀåÄ¡³ª ÀÚ¿øÀÌ µ¿ÀÛ Áß"
 
-#: nis/nis_print.c:109
-msgid "BOGUS OBJECT\n"
-msgstr "¾ûÅ͸® ¿ÀºêÁ§Æ®\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 "ÆÄÀÏÀÌ ÀÖ½À´Ï´Ù"
 
-#: nis/nis_print.c:112
-msgid "NO OBJECT\n"
-msgstr "¿ÀºêÁ§Æ®°¡ ¾øÀ½\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 "ºÎÀûÀýÇÑ ÀåÄ¡°£ ¿¬°á"
 
-#: nis/nis_print.c:115
-msgid "DIRECTORY\n"
-msgstr "µð·ºÅ丮\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 "±×·± ÀåÄ¡°¡ ¾øÀ½"
 
-#: nis/nis_print.c:118
-msgid "GROUP\n"
-msgstr "±×·ì\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 "µð·ºÅ丮°¡ ¾Æ´Õ´Ï´Ù"
 
-#: nis/nis_print.c:121
-msgid "TABLE\n"
-msgstr "Å×À̺í\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 "µð·ºÅ丮ÀÔ´Ï´Ù"
 
-#: nis/nis_print.c:124
-msgid "ENTRY\n"
-msgstr "ENTRY\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 "ºÎÀûÀýÇÑ Àμö"
 
-#: nis/nis_print.c:127
-msgid "LINK\n"
-msgstr "¿¬°á\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 "¿­¸° ÆÄÀÏÀÌ ³Ê¹« ¸¹À½"
 
-#: nis/nis_print.c:130
-msgid "PRIVATE\n"
-msgstr "°³ÀÎ\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 "½Ã½ºÅÛ¿¡ ¿­¸° ÆÄÀÏÀÌ ³Ê¹« ¸¹À½"
 
-#: nis/nis_print.c:133
-msgid "(Unknown object)\n"
-msgstr "(¾Ë ¼ö ¾ø´Â ¿ÀºêÁ§Æ®)\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 "ÀåÄ¡¿¡ ´ëÇØ ºÎÀûÀýÇÑ ioctl"
 
-#: nis/nis_print.c:166
-#, c-format
-msgid "Name : `%s'\n"
-msgstr "À̸§ : `%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 "½ÇÇà ÆÄÀÏ »ç¿ë Áß"
 
-#: nis/nis_print.c:167
-#, c-format
-msgid "Type : %s\n"
-msgstr "ŸÀÔ : %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 "ÆÄÀÏÀÌ ³Ê¹« Å®´Ï´Ù"
 
-#: nis/nis_print.c:172
-msgid "Master Server :\n"
-msgstr "ÁÖ ¼­¹ö :\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 "ÀåÄ¡¿¡ ³²Àº °ø°£ÀÌ ¾øÀ½"
 
-#: nis/nis_print.c:174
-msgid "Replicate :\n"
-msgstr "Áߺ¹µÊ    :\n"
+#. TRANS Invalid seek operation (such as on a pipe).
+#: sysdeps/gnu/errlist.c:326
+msgid "Illegal seek"
+msgstr "À߸øµÈ Ž»ö"
 
-#: nis/nis_print.c:175
-#, c-format
-msgid "\tName       : %s\n"
-msgstr "\tÀ̸§       : %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 "ÀбâÀü¿ë ÆÄÀÏ ½Ã½ºÅÛ"
 
-#: nis/nis_print.c:176
-msgid "\tPublic Key : "
-msgstr "\t°ø¿ë Å°    : "
+#. 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 "¿¬°áÀÌ ³Ê¹« ¸¹À½"
 
-#: nis/nis_print.c:180
-msgid "None.\n"
-msgstr "¾øÀ½.\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 "¿µ¿ªÀ» ¹þ¾î³­ ¼öÄ¡ Àμö"
 
-#: nis/nis_print.c:183
-#, c-format
-msgid "Diffie-Hellmann (%d bits)\n"
-msgstr "Diffie-Hellman (%d ºñÆ®)\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 "¹üÀ§¸¦ ¹þ¾î³­ ¼öÄ¡ °á°ú"
 
-#: nis/nis_print.c:188
-#, c-format
-msgid "RSA (%d bits)\n"
-msgstr "RSA (%d ºñÆ®)\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 "ÀÚ¿øÀÌ ÀϽÃÀûÀ¸·Î »ç¿ë ºÒ°¡´ÉÇÔ"
 
-#: 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 "µ¿ÀÛÀÌ ¸·Èú °ÍÀÔ´Ï´Ù"
 
-#: nis/nis_print.c:194
-#, c-format
-msgid "Unknown (type = %d, bits = %d)\n"
-msgstr "¾Ë ¼ö ¾øÀ½ (ŸÀÔ = %d, ºñÆ®¼ö = %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 "Áö±Ý ÁøÇà ÁßÀÎ ¸í·É"
 
-#: nis/nis_print.c:205
-#, c-format
-msgid "\tUniversal addresses (%u)\n"
-msgstr "\tº¸Æí ÁÖ¼Ò (%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 "ÀÌ¹Ì ÁøÇà ÁßÀÎ ¸í·É"
 
-#: nis/nis_print.c:227
-msgid "Time to live : "
-msgstr "À¯ÁöµÇ´Â ½Ã°£ : "
+#. 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 "ºñ¼ÒÄÏ»óÀÇ ¼ÒÄÏ µ¿ÀÛ"
 
-#: nis/nis_print.c:229
-msgid "Default Access rights :\n"
-msgstr "±âº» Á¢±Ù ±ÇÇÑ :\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 "¸Þ½ÃÁö°¡ ³Ê¹« ±é´Ï´Ù"
 
-#: nis/nis_print.c:238
-#, c-format
-msgid "\tType         : %s\n"
-msgstr "\tŸÀÔ         : %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 "¼ÒÄÏ¿¡ ´ëÇÑ ±Ô¾àÀÌ À߸øµÊ"
 
-#: nis/nis_print.c:239
-msgid "\tAccess rights: "
-msgstr "\tÁ¢±Ù ±ÇÇÑ: "
+#. 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 "±Ô¾à »ç¿ë ºÒ°¡´É"
 
-#: nis/nis_print.c:252
-msgid "Group Flags :"
-msgstr "±×·ì Ç÷¡±× :"
+#. 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 "±Ô¾àÀÌ Áö¿øµÇÁö ¾ÊÀ½"
 
-#: nis/nis_print.c:255
-msgid ""
-"\n"
-"Group Members :\n"
-msgstr ""
-"\n"
-"±×·ì ¸â¹ö :\n"
+#. TRANS The socket type is not supported.
+#: sysdeps/gnu/errlist.c:513
+msgid "Socket type not supported"
+msgstr "¼ÒÄÏ Å¸ÀÔÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
 
-#: nis/nis_print.c:266
-#, c-format
-msgid "Table Type          : %s\n"
-msgstr "Å×À̺í ŸÀÔ         : %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 "¸í·ÉÀÌ Áö¿øµÇÁö ¾ÊÀ½"
 
-#: nis/nis_print.c:267
-#, c-format
-msgid "Number of Columns   : %d\n"
-msgstr "¿­ÀÇ ¼ö             : %d\n"
+#. TRANS The socket communications protocol family you requested is not supported.
+#: sysdeps/gnu/errlist.c:536
+msgid "Protocol family not supported"
+msgstr "±Ô¾à±ºÀÌ Áö¿øµÇÁö ¾ÊÀ½"
 
-#: nis/nis_print.c:268
-#, c-format
-msgid "Character Separator : %c\n"
-msgstr "¹®ÀÚ ±¸ºÐÀÚ : %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 "ÁÖ¼Ò±ºÀÌ ±Ô¾à¿¡¼­ Áö¿øµÇÁö ¾ÊÀ½"
 
-#: nis/nis_print.c:269
-#, c-format
-msgid "Search Path         : %s\n"
-msgstr "ã±â °æ·Î           : %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 "ÁÖ¼Ò°¡ ÀÌ¹Ì »ç¿ë ÁßÀÔ´Ï´Ù"
 
-#: nis/nis_print.c:270
-msgid "Columns             :\n"
-msgstr "¿­                  :\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 "¿äûÇÑ ÁÖ¼Ò¸¦ ¹èÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: nis/nis_print.c:273
-#, c-format
-msgid "\t[%d]\tName          : %s\n"
-msgstr "\t[%d]\tÀ̸§          : %s\n"
+#. TRANS A socket operation failed because the network was down.
+#: sysdeps/gnu/errlist.c:575
+msgid "Network is down"
+msgstr "³×Æ®¿öÅ©°¡ Á×¾ú½À´Ï´Ù"
 
-#: nis/nis_print.c:275
-msgid "\t\tAttributes    : "
-msgstr "\t\t¼Ó¼º          : "
+#. 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 "³×Æ®¿öÅ©°¡ Á¢±Ù ºÒ°¡´ÉÇÕ´Ï´Ù"
 
-#: nis/nis_print.c:277
-msgid "\t\tAccess Rights : "
-msgstr "\t\tÁ¢±Ù ±ÇÇÑ     : "
+#. TRANS A network connection was reset because the remote host crashed.
+#: sysdeps/gnu/errlist.c:594
+msgid "Network dropped connection on reset"
+msgstr "³×Æ®¿÷ÀÌ reset¶§¹®¿¡ ¿¬°áÀ» ²÷¾ú½À´Ï´Ù"
 
-#: nis/nis_print.c:286
-msgid "Linked Object Type : "
-msgstr "¿¬°áµÈ ¿ÀºêÁ§Æ® ŸÀÔ : "
+#. TRANS A network connection was aborted locally.
+#: sysdeps/gnu/errlist.c:603
+msgid "Software caused connection abort"
+msgstr "¼ÒÇÁÆ®¿þ¾î°¡ ¿¬°á Áß´ÜÀ» ÃÊ·¡Çß½À´Ï´Ù"
 
-#: nis/nis_print.c:288
-#, c-format
-msgid "Linked to : %s\n"
-msgstr "%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 "¿¬°áÀÌ »ó´ëÆí¿¡ ÀÇÇØ ²÷¾îÁü"
 
-#: nis/nis_print.c:297
-#, c-format
-msgid "\tEntry data of type %s\n"
-msgstr "\tŸÀÔ %sÀÇ entry µ¥ÀÌŸ\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 "»ç¿ë °¡´ÉÇÑ ¹öÆÛ °ø°£ÀÌ ¾øÀ½"
 
-#: nis/nis_print.c:300
-#, c-format
-msgid "\t[%u] - [%u bytes] "
-msgstr "\t[%u] - [%u ¹ÙÀÌÆ®] "
+#. 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 "Àü¼Û Á¾·áÁöÁ¡ÀÌ ÀÌ¹Ì ¿¬°áµÇ¾î ÀÖ½À´Ï´Ù"
 
-#: nis/nis_print.c:303
-msgid "Encrypted data\n"
-msgstr "¾ÏȣȭµÈ µ¥ÀÌŸ\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 "Àü¼Û Á¾·áÁöÁ¡ÀÌ ¿¬°áµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: nis/nis_print.c:305
-msgid "Binary data\n"
-msgstr "ÀÌÁø µ¥ÀÌŸ\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 "¸ñÀûÁö ÁÖ¼Ò°¡ ÇÊ¿äÇÔ"
 
-#: nis/nis_print.c:320
-#, c-format
-msgid "Object Name   : %s\n"
-msgstr "¿ÀºêÁ§Æ® À̸§ : %s\n"
+#. TRANS The socket has already been shut down.
+#: sysdeps/gnu/errlist.c:667
+msgid "Cannot send after transport endpoint shutdown"
+msgstr "Àü¼Û Á¾·áÁöÁ¡ÀÌ Áö³­ ÈÄ¿¡ º¸³¾ ¼ö ¾ø½À´Ï´Ù"
 
-#: nis/nis_print.c:321
-#, c-format
-msgid "Directory     : %s\n"
-msgstr "µð·ºÅ丮      : %s\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:676
+msgid "Too many references: cannot splice"
+msgstr "ÂüÁ¶°¡ ³Ê¹« ¸¹À½: ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: nis/nis_print.c:322
-#, c-format
-msgid "Owner         : %s\n"
-msgstr "¼ÒÀ¯ÀÚ        : %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 "¿¬°á ½Ã°£ ÃÊ°ú"
 
-#: nis/nis_print.c:323
-#, c-format
-msgid "Group         : %s\n"
-msgstr "±×·ì          : %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 "¿¬°áÀÌ °ÅºÎµÊ"
 
-#: nis/nis_print.c:324
-msgid "Access Rights : "
-msgstr "Á¢±Ù ±ÇÇÑ : "
+#. 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 "±âÈ£ ¿¬°áÀÇ ´Ü°è°¡ ³Ê¹« ¸¹À½"
 
-#: nis/nis_print.c:326
-#, c-format
-msgid ""
-"\n"
-"Time to Live  : "
-msgstr ""
-"\n"
-"À¯Áö ½Ã°£ : "
+#. 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 "ÆÄÀÏ À̸§ÀÌ ³Ê¹« ±é´Ï´Ù"
 
-#: nis/nis_print.c:329
-#, c-format
-msgid "Creation Time : %s"
-msgstr "¸¸µé¾îÁø ½Ã°¢ : %s"
+#. TRANS The remote host for a requested network connection is down.
+#: sysdeps/gnu/errlist.c:726
+msgid "Host is down"
+msgstr "È£½ºÆ®°¡ Á×¾ú½À´Ï´Ù"
 
-#: nis/nis_print.c:331
-#, c-format
-msgid "Mod. Time     : %s"
-msgstr "º¯°æ ½Ã°¢     : %s"
+#. TRANS The remote host for a requested network connection is not reachable.
+#: sysdeps/gnu/errlist.c:735
+msgid "No route to host"
+msgstr "È£½ºÆ®·Î °¥ ·çÆ®°¡ ¾øÀ½"
 
-#: nis/nis_print.c:332
-msgid "Object Type   : "
-msgstr "¿ÀºêÁ§Æ® ŸÀÔ : "
+#. 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 "µð·ºÅ丮°¡ ºñ¾îÀÖÁö ¾ÊÀ½"
 
-#: nis/nis_print.c:352
-#, c-format
-msgid "    Data Length = %u\n"
-msgstr "    µ¥ÀÌŸ ±æÀÌ = %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 "ÇÁ·Î¼¼½º°¡ ³Ê¹« ¸¹À½"
 
-#: nis/nis_print.c:365
-#, c-format
-msgid "Status            : %s\n"
-msgstr "»óÅÂ              : %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 "»ç¿ëÀÚ°¡ ³Ê¹« ¸¹À½"
 
-#: nis/nis_print.c:366
-#, c-format
-msgid "Number of objects : %u\n"
-msgstr "¿ÀºêÁ§Æ®ÀÇ ¼ö     : %u\n"
+#. TRANS The user's disk quota was exceeded.
+#: sysdeps/gnu/errlist.c:775
+msgid "Disk quota exceeded"
+msgstr "µð½ºÅ© ÇÒ´ç·®ÀÌ ÃÊ°úµÊ"
 
-#: nis/nis_print.c:370
-#, c-format
-msgid "Object #%d:\n"
-msgstr "¿ÀºêÁ§Æ® #%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 "²÷¾îÁø NFS ÆÄÀÏ ÇÚµé"
 
-#: nis/nis_print_group_entry.c:115
-#, c-format
-msgid "Group entry for \"%s.%s\" group:\n"
-msgstr "\"%s.%s\" ±×·ìÀ» À§ÇÑ ±×·ì entry:\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 "¿ø°Ý °³Ã¼ÀÔ´Ï´Ù"
 
-#: nis/nis_print_group_entry.c:123
-msgid "    Explicit members:\n"
-msgstr "    ¸í½ÃÀûÀÎ ¸â¹ö:\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:808
+msgid "RPC struct is bad"
+msgstr "RPC ±¸Á¶°¡ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: nis/nis_print_group_entry.c:128
-msgid "    No explicit members\n"
-msgstr "    ¸í½ÃÀûÀÎ ¸â¹ö°¡ ¾Æ´Ô\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:817
+msgid "RPC version wrong"
+msgstr "RPC ¹öÀüÀÌ À߸øµÊ"
 
-#: nis/nis_print_group_entry.c:131
-msgid "    Implicit members:\n"
-msgstr "    ¾Ï¹¬ÀûÀÎ ¸â¹ö:\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:826
+msgid "RPC program not available"
+msgstr "RPC ÇÁ·Î±×·¥ »ç¿ë ºÒ°¡´É"
 
-#: nis/nis_print_group_entry.c:136
-msgid "    No implicit members\n"
-msgstr "    ¾Ï¹¬ÀûÀÎ ºñ¸â¹ö°¡ ¾Æ´Ô\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:835
+msgid "RPC program version wrong"
+msgstr "RPC ÇÁ·Î±×·¥ ¹öÀüÀÌ À߸øµÊ"
 
-#: nis/nis_print_group_entry.c:139
-msgid "    Recursive members:\n"
-msgstr "    Àç±ÍÀû ¸â¹ö:\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:844
+msgid "RPC bad procedure for program"
+msgstr "RPC ÇÁ·Î±×·¥ÀÇ ÇÁ·Î½ÃÁ®°¡ À߸øµÊ"
 
-#: nis/nis_print_group_entry.c:144
-msgid "    No recursive members\n"
-msgstr "    Àç±ÍÀûÀÎ ¸â¹ö°¡ ¾Æ´Ô\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 "»ç¿ë°¡´ÉÇÑ Àá±ÝÀåÄ¡°¡ ¾øÀ½"
 
-#: nis/nis_print_group_entry.c:147 nis/nis_print_group_entry.c:163
-msgid "    Explicit nonmembers:\n"
-msgstr "    ¸í½ÃÀûÀÎ ºñ¸â¹ö:\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 "ºÎÀûÀýÇÑ ÆÄÀÏ Å¸ÀÔ ¶Ç´Â Çü½Ä"
 
-#: nis/nis_print_group_entry.c:152
-msgid "    No explicit nonmembers\n"
-msgstr "    ¸í½ÃÀûÀÎ ºñ¸â¹ö°¡ ¾Æ´Ô\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:878
+msgid "Authentication error"
+msgstr "ÀÎÁõ ¿À·ù"
 
-#: nis/nis_print_group_entry.c:155
-msgid "    Implicit nonmembers:\n"
-msgstr "    ¾Ï¹¬ÀûÀÎ ºñ¸â¹ö:\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:887
+msgid "Need authenticator"
+msgstr "ÀÎÁõ±â°¡ ÇÊ¿äÇÔ"
 
-#: nis/nis_print_group_entry.c:160
-msgid "    No implicit nonmembers\n"
-msgstr "    ¾Ï¹¬ÀûÀÎ ¸â¹ö°¡ ¾Æ´Ô\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 "ÇÔ¼ö°¡ ±¸ÇöµÇÁö ¾Ê¾ÒÀ½"
 
-#: nis/nis_print_group_entry.c:168
-msgid "    No recursive nonmembers\n"
-msgstr "    Àç±ÍÀûÀÎ ºñ¸â¹ö°¡ ¾Æ´Ô\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 "Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: 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 "³×Æ®name %s¿¡ ´ëÇÑ DES entry°¡ À¯ÀÏÇÏÁö ¾Ê½À´Ï´Ù\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 "ºÎÀûÀýÇϰųª ºÒ¿ÏÀüÇÑ ´ÙÁß¹ÙÀÌÆ® ¶Ç´Â ±¤¿ª ¹®ÀÚ"
 
-#: nis/nss_nisplus/nisplus-publickey.c:218
-#, c-format
-msgid "netname2user: missing group id list in `%s'."
-msgstr "netname2user: `%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 "¹è°æ ÇÁ·Î¼¼½º·Î ºÎÀûÇÕÇÑ µ¿ÀÛ"
 
-#: 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+ ã±â): %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 "º¯È¯±â°¡ Á×¾úÀ½"
 
-#: nis/nss_nisplus/nisplus-publickey.c:319
-#, c-format
-msgid "netname2user: DES entry for %s in directory %s not unique"
-msgstr "netname2user: µð·ºÅ丮 %2$sÀÇ %1$s¿¡ ´ëÇÑ DES entry°¡ À¯ÀÏÇÏÁö ¾Ê½À´Ï´Ù"
+#. 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: ÁÖ¿ä À̸§ `%s'Àº(´Â) ³Ê¹« ±é´Ï´Ù"
+#. TRANS You did @strong{what}?
+#: sysdeps/gnu/errlist.c:975
+msgid "You really blew it this time"
+msgstr "À̹ø¿£ Á¤¸»·Î ³¯·Á¹ö·È½À´Ï´Ù"
 
-#: nis/nss_nisplus/nisplus-publickey.c:392
-#, c-format
-msgid "netname2user: LOCAL entry for %s in directory %s not unique"
-msgstr "netname2user: µð·ºÅ丮 %2$sÀÇ %1$s¿¡ ´ëÇÑ LOCAL entry°¡ À¯ÀÏÇÏÁö ¾Ê½À´Ï´Ù"
+#. TRANS Go home and have a glass of warm, dairy-fresh milk.
+#: sysdeps/gnu/errlist.c:984
+msgid "Computer bought the farm"
+msgstr "ÄÄÇ»ÅÍ°¡ ³óÀåÀ» »ò½À´Ï´Ù"
 
-#: nis/nss_nisplus/nisplus-publickey.c:399
-msgid "netname2user: should not have uid 0"
-msgstr "netname2user: uid¸¦ 0À¸·Î ÇÒ ¼ö ¾ø½À´Ï´Ù"
+#. TRANS This error code has no purpose.
+#: sysdeps/gnu/errlist.c:993
+msgid "Gratuitous error"
+msgstr "ÀÌÀ¯¾ø´Â ¿À·ù"
 
-#: 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 "À߸øµÈ ¸Þ½ÃÁö"
 
-#: nis/ypclnt.c:780
-msgid "Request arguments bad"
-msgstr "¿äûµÈ Àμö°¡ À߸øµÊ"
+#: sysdeps/gnu/errlist.c:1009
+msgid "Identifier removed"
+msgstr "½Äº°ÀÚ Áö¿ò"
 
-#: nis/ypclnt.c:782
-msgid "RPC failure on NIS operation"
-msgstr "NIS ¿¬»ê Áß RPC ½ÇÆÐÇÔ"
+#: sysdeps/gnu/errlist.c:1017
+msgid "Multihop attempted"
+msgstr "¿©·¯°³ÀÇ hopÀÌ ½ÃµµµÊ"
 
-#: nis/ypclnt.c:784
-msgid "Can't bind to server which serves this domain"
-msgstr "ÀÌ µµ¸ÞÀÎÀ» Á¦°øÇÏ´Â ¼­¹ö¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: sysdeps/gnu/errlist.c:1025
+msgid "No data available"
+msgstr "»ç¿ë °¡´ÉÇÑ ÀÚ·á°¡ ¾øÀ½"
 
-#: nis/ypclnt.c:786
-msgid "No such map in server's domain"
-msgstr "¼­¹öÀÇ µµ¸ÞÀο¡ ±×·± Áöµµ°¡ ¾øÀ½"
+#: sysdeps/gnu/errlist.c:1033
+msgid "Link has been severed"
+msgstr "¸µÅ©°¡ ¼Õ»óµÇ¾ú½À´Ï´Ù"
 
-#: nis/ypclnt.c:788
-msgid "No such key in map"
-msgstr "Áöµµ¿¡ ±×·± Å°°¡ ¾øÀ½"
+#: sysdeps/gnu/errlist.c:1041
+msgid "No message of desired type"
+msgstr "Àû´çÇÑ ÇüÀ» °¡Áø ¸Þ½ÃÁö°¡ ¾øÀ½"
 
-#: nis/ypclnt.c:790
-msgid "Internal NIS error"
-msgstr "³»ºÎ NIS ¿À·ù"
+#: sysdeps/gnu/errlist.c:1049
+msgid "Out of streams resources"
+msgstr "½ºÆ®¸² ÀÚ¿ø ºÎÁ·"
 
-#: nis/ypclnt.c:792
-msgid "Local resource allocation failure"
-msgstr "Áö¿ª ÀÚ¿ø ÇÒ´ç ½ÇÆÐ"
+#: sysdeps/gnu/errlist.c:1057
+msgid "Device not a stream"
+msgstr "ÀåÄ¡°¡ ½ºÆ®¸²ÀÌ ¾Æ´Ô"
 
-#: nis/ypclnt.c:794
-msgid "No more records in map database"
-msgstr "Áöµµ µ¥ÀÌÅͺ£À̽º¿¡ ´õ ÀÌ»óÀÇ ±â·ÏÀÌ ¾øÀ½"
+#: sysdeps/gnu/errlist.c:1065
+msgid "Value too large for defined data type"
+msgstr "Á¤ÀÇÇÑ ÀÚ·áÇüÀ¸·Î ¾²±â¿£ ³Ê¹« Å« °ª"
 
-#: nis/ypclnt.c:796
-msgid "Can't communicate with portmapper"
-msgstr "rpcinfo: Æ÷Æ®¸ÅÆÛ¿Í Åë½ÅÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: sysdeps/gnu/errlist.c:1073
+msgid "Protocol error"
+msgstr "±Ô¾à ¿À·ù"
 
-#: nis/ypclnt.c:798
-msgid "Can't communicate with ypbind"
-msgstr "ypbind¿Í Åë½ÅÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: sysdeps/gnu/errlist.c:1081
+msgid "Timer expired"
+msgstr "ŸÀÌ¸Ó ¸¸·á"
 
-#: nis/ypclnt.c:800
-msgid "Can't communicate with ypserv"
-msgstr "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 "¸í·ÉÀÌ Ãë¼ÒµÇ¾úÀ½"
 
-#: nis/ypclnt.c:802
-msgid "Local domain name not set"
-msgstr "Áö¿ª µµ¸ÞÀθíÀÌ ¼³Á¤µÇÁö ¾Ê¾ÒÀ½"
+#: sysdeps/gnu/errlist.c:1101
+msgid "Interrupted system call should be restarted"
+msgstr "Áß´ÜµÈ ½Ã½ºÅÛ ÄÝÀ» ´Ù½Ã ½ÃÀÛÇØ¾ß ÇÕ´Ï´Ù"
 
-#: nis/ypclnt.c:804
-msgid "NIS map database is bad"
-msgstr "NIS Áöµµ µ¥ÀÌÅͺ£À̽º°¡ À߸øµÇ¾ú½À´Ï´Ù"
+#: sysdeps/gnu/errlist.c:1109
+msgid "Channel number out of range"
+msgstr "¹üÀ§¸¦ ¹þ¾î³­ ä³Î ¹øÈ£"
 
-#: nis/ypclnt.c:806
-msgid "NIS client/server version mismatch - can't supply service"
-msgstr "NIS Ŭ¶óÀ̾ðÆ®/¼­¹ö ¹öÀü ºÒÀÏÄ¡ - ¼­ºñ½º¸¦ Á¦°øÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: sysdeps/gnu/errlist.c:1117
+msgid "Level 2 not synchronized"
+msgstr "µî±Þ 2°¡ µ¿±âÈ­µÇÁö ¾ÊÀ½"
 
-#: nis/ypclnt.c:810
-msgid "Database is busy"
-msgstr "µ¥ÀÌÅͺ£À̽º°¡ ÀÛ¾÷ ÁßÀÔ´Ï´Ù"
+#: sysdeps/gnu/errlist.c:1125
+msgid "Level 3 halted"
+msgstr "µî±Þ 3 ¸Ü¾úÀ½"
 
-#: nis/ypclnt.c:812
-msgid "Unknown NIS error code"
-msgstr "¾Ë ¼ö ¾ø´Â NIS ¿À·ù ÄÚµå"
+#: sysdeps/gnu/errlist.c:1133
+msgid "Level 3 reset"
+msgstr "µî±Þ 3 ¸®¼Â"
 
-#: nis/ypclnt.c:854
-msgid "Internal ypbind error"
-msgstr "³»ºÎ ypbind ¿À·ù"
+#: sysdeps/gnu/errlist.c:1141
+msgid "Link number out of range"
+msgstr "¹üÀ§¸¦ ¹þ¾î³­ ¸µÅ© ¹øÈ£"
 
-#: nis/ypclnt.c:856
-msgid "Domain not bound"
-msgstr "µµ¸ÞÀÎÀÌ ¹Ù¿îµåµÇÁö ¾ÊÀ½"
+#: sysdeps/gnu/errlist.c:1149
+msgid "Protocol driver not attached"
+msgstr "±Ô¾à ±¸µ¿±â¿¡ ¿¬°áµÇÁö ¾ÊÀ½"
 
-#: nis/ypclnt.c:858
-msgid "System resource allocation failure"
-msgstr "½Ã½ºÅÛ ÀÚ¿ø ÇÒ´ç ½ÇÆÐ"
+#: sysdeps/gnu/errlist.c:1157
+msgid "No CSI structure available"
+msgstr "»ç¿ë °¡´ÉÇÑ CSI ±¸Á¶°¡ ¾øÀ½"
 
-#: nis/ypclnt.c:860
-msgid "Unknown ypbind error"
-msgstr "¾Ë ¼ö ¾ø´Â ypbind ¿À·ù"
+#: sysdeps/gnu/errlist.c:1165
+msgid "Level 2 halted"
+msgstr "µî±Þ 2 ¸Ü¾úÀ½"
 
-#: nis/ypclnt.c:899
-msgid "yp_update: cannot convert host to netname\n"
-msgstr "yp_update: È£½ºÆ®¸¦ ³×Æ®À̸§À¸·Î ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù\n"
+#: sysdeps/gnu/errlist.c:1173
+msgid "Invalid exchange"
+msgstr "ºÎÀûÀýÇÑ ±³È¯"
 
-#: nis/ypclnt.c:911
-msgid "yp_update: cannot get server address\n"
-msgstr "yp_update: ¼­¹ö ÁÖ¼Ò¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù\n"
+#: sysdeps/gnu/errlist.c:1181
+msgid "Invalid request descriptor"
+msgstr "À߸øµÈ ¿äû µð½ºÅ©¸³ÅÍ"
 
-#: nscd/cache.c:94
-msgid "while allocating hash table entry"
-msgstr "Çؽ¬ Å×ÀÌºí¿¡ entry¸¦ ÇÒ´çÇÏ´Â µ¿¾È"
+#: sysdeps/gnu/errlist.c:1189
+msgid "Exchange full"
+msgstr "±³È¯ÀÌ °¡µæ Âü"
 
-#: nscd/cache.c:162 nscd/connections.c:184
-#, c-format
-msgid "cannot stat() file `%s': %s"
-msgstr "`%s'ÆÄÀÏ¿¡ stat()À» ÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
+#: sysdeps/gnu/errlist.c:1197
+msgid "No anode"
+msgstr "anode°¡ ¾ø½À´Ï´Ù"
 
-#: nscd/connections.c:150
-msgid "Cannot run nscd in secure mode as unprivileged user"
-msgstr "ÀÏ¹Ý »ç¿ëÀÚ´Â nscd¸¦ º¸¾È ¸ðµå¿¡¼­ ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: sysdeps/gnu/errlist.c:1205
+msgid "Invalid request code"
+msgstr "ºÎÀûÀýÇÑ ¿äû ÄÚµå"
 
-#: nscd/connections.c:172
-#, c-format
-msgid "while allocating cache: %s"
-msgstr "ij½¬¸¦ ÇÒ´çÇÏ´Â Áß: %s"
+#: sysdeps/gnu/errlist.c:1213
+msgid "Invalid slot"
+msgstr "ºÎÀûÀýÇÑ ½½·Ô"
 
-#: nscd/connections.c:197
-#, c-format
-msgid "cannot open socket: %s"
-msgstr "¼ÒÄÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù: %s"
+#: sysdeps/gnu/errlist.c:1221
+msgid "File locking deadlock error"
+msgstr "ÆÄÀÏ Àá±Ý ±³Âø»óÅ ¿À·ù"
 
-#: nscd/connections.c:215
-#, c-format
-msgid "cannot enable socket to accept connections: %s"
-msgstr "¼ÒÄÏÀÌ ¿¬°áÀ» ¹Þ¾ÆµéÀ̵µ·Ï ÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
+#: sysdeps/gnu/errlist.c:1229
+msgid "Bad font file format"
+msgstr "±Û²Ã ÆÄÀÏ Çü½ÄÀÌ Æ²·È½À´Ï´Ù"
 
-#: nscd/connections.c:260
-#, c-format
-msgid "cannot handle old request version %d; current version is %d"
-msgstr "°ú°ÅÀÇ ¿äû ¹öÀü %d ¹öÀüÀ» ó¸®ÇÒ ¼ö ¾ø½À´Ï´Ù; ÇöÀç ¹öÀüÀº %dÀÔ´Ï´Ù"
+#: sysdeps/gnu/errlist.c:1237
+msgid "Machine is not on the network"
+msgstr "ÄÄÇ»ÅÍ°¡ ³×Æ®¿öÅ©¿¡ ºÙ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: nscd/connections.c:298 nscd/connections.c:324
-#, c-format
-msgid "cannot write result: %s"
-msgstr "°á°ú¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù: %s"
+#: sysdeps/gnu/errlist.c:1245
+msgid "Package not installed"
+msgstr "ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: nscd/connections.c:392 nscd/connections.c:514
-#, c-format
-msgid "error getting caller's id: %s"
-msgstr "È£ÃâÀÚÀÇ ID¸¦ ¾ò´Âµ¥ ¿À·ù: %s"
+#: sysdeps/gnu/errlist.c:1253
+msgid "Advertise error"
+msgstr "¼±Àü ¿À·ù"
 
-#: nscd/connections.c:485
-#, c-format
-msgid "while accepting connection: %s"
-msgstr "¿¬°áÀ» ¹Þ¾ÆµéÀÌ´Â µµÁß: %s"
+#: sysdeps/gnu/errlist.c:1261
+msgid "Srmount error"
+msgstr "srmount ¿À·ù"
 
-#: nscd/connections.c:498
-#, c-format
-msgid "short read while reading request: %s"
-msgstr "¿ä±¸»çÇ×À» ´Ù ÀÐÁö ¸øÇßÀ½: %s"
+#: sysdeps/gnu/errlist.c:1269
+msgid "Communication error on send"
+msgstr "Àü¼Û Áß Åë½Å ¿À·ù"
 
-#: nscd/connections.c:542
-#, c-format
-msgid "key length in request too long: %d"
-msgstr "¿äûµÈ Å°ÀÇ ±æÀÌ°¡ ³Ê¹« ±è: %d"
+#: sysdeps/gnu/errlist.c:1277
+msgid "RFS specific error"
+msgstr "RFS °ü·Ã ¿À·ù"
 
-#: nscd/connections.c:556
-#, c-format
-msgid "short read while reading request key: %s"
-msgstr "¿äûÇÑ Å°¸¦ ´Ù ÀÐÁö ¸øÇßÀ½: %s"
+#: sysdeps/gnu/errlist.c:1285
+msgid "Name not unique on network"
+msgstr "À̸§ÀÌ ³×Æ®¿öÅ© »ó¿¡¼­ ´ÜÀÏÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: nscd/connections.c:566
-#, c-format
-msgid "handle_request: request received (Version = %d) from PID %ld"
-msgstr "handle_request: ¿äûÀ» ¹Þ¾ÒÀ½ (¹öÀü = %d), PID %ld"
+#: sysdeps/gnu/errlist.c:1293
+msgid "File descriptor in bad state"
+msgstr "ÆÄÀÏ µð½ºÅ©¸³ÅÍ°¡ À߸øµÈ »óÅ¿¡ ÀÖ½À´Ï´Ù"
 
-#: nscd/connections.c:571
-#, c-format
-msgid "handle_request: request received (Version = %d)"
-msgstr "handle_request: ¿äûÀ» ¹Þ¾ÒÀ½ (¹öÀü = %d)"
+#: sysdeps/gnu/errlist.c:1301
+msgid "Remote address changed"
+msgstr "¿ø°Ý ÁÖ¼Ò°¡ ¹Ù²î¾ú½À´Ï´Ù"
 
-#: 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 "nscd¸¦ '%s' »ç¿ëÀÚ·Î ½ÇÇàÇÏ´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
+#: sysdeps/gnu/errlist.c:1309
+msgid "Can not access a needed shared library"
+msgstr "ÇÊ¿äÇÑ °øÀ¯ ¶óÀ̺귯¸®¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: nscd/connections.c:656
-msgid "getgrouplist failed"
-msgstr "getgrouplist ½ÇÆÐ"
+#: sysdeps/gnu/errlist.c:1317
+msgid "Accessing a corrupted shared library"
+msgstr "¼Õ»óµÈ °øÀ¯ ¶óÀ̺귯¸®¿¡ Á¢±ÙÇÕ´Ï´Ù"
 
-#: nscd/connections.c:669
-msgid "setgroups failed"
-msgstr "setgroups ½ÇÆÐ"
+#: sysdeps/gnu/errlist.c:1325
+msgid ".lib section in a.out corrupted"
+msgstr "a.outÀÇ .lib ¼½¼ÇÀÌ ¼Õ»óµÇ¾ú½À´Ï´Ù"
 
-#: nscd/grpcache.c:103 nscd/hstcache.c:111 nscd/pwdcache.c:109
-msgid "while allocating key copy"
-msgstr "Å° º¹»ç¸¦ ÇÒ´çÇÏ´Â µ¿¾È"
+#: sysdeps/gnu/errlist.c:1333
+msgid "Attempting to link in too many shared libraries"
+msgstr "³Ê¹« ¸¹Àº µ¿Àû ¶óÀ̺귯¸®¿Í ¸µÅ©ÇÏ·Á°í ½ÃµµÇÕ´Ï´Ù"
 
-#: nscd/grpcache.c:153 nscd/hstcache.c:168 nscd/pwdcache.c:146
-msgid "while allocating cache entry"
-msgstr "ij½¬¿¡ ³ÖÀ» Ç׸ñÀ» ÇÒ´çÇÏ´Â µµÁß"
+#: sysdeps/gnu/errlist.c:1341
+msgid "Cannot exec a shared library directly"
+msgstr "°øÀ¯ ¶óÀ̺귯¸®¸¦ Á÷Á¢ ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: nscd/grpcache.c:197 nscd/hstcache.c:283 nscd/pwdcache.c:193
-#, c-format
-msgid "short write in %s: %s"
-msgstr "%s¿¡¼­ ´Ù ¾²Áö ¸øÇß½À´Ï´Ù: %s"
+#: sysdeps/gnu/errlist.c:1349
+msgid "Streams pipe error"
+msgstr "½ºÆ®¸² ÆÄÀÌÇÁ ¿À·ù"
 
-#: nscd/grpcache.c:219
-#, c-format
-msgid "Haven't found \"%s\" in group cache!"
-msgstr "±×·ì ij½¬¿¡¼­ \"%s\"À»(¸¦) ãÀ» ¼ö ¾ø¾ú½À´Ï´Ù!"
+#: sysdeps/gnu/errlist.c:1357
+msgid "Structure needs cleaning"
+msgstr "±¸Á¶¿¡ û¼Ò°¡ ÇÊ¿äÇÕ´Ï´Ù"
 
-#: nscd/grpcache.c:285
-#, c-format
-msgid "Invalid numeric gid \"%s\"!"
-msgstr "gid ¹øÈ£ \"%s\"¹øÀÌ À߸øµÇ¾ú½À´Ï´Ù!"
+#: sysdeps/gnu/errlist.c:1365
+msgid "Not a XENIX named type file"
+msgstr "XENIX named ŸÀÔ ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù"
 
-#: nscd/grpcache.c:292
-#, c-format
-msgid "Haven't found \"%d\" in group cache!"
-msgstr "±×·ì ij½¬¿¡¼­ \"%d\"À»(¸¦) ãÀ» ¼ö ¾ø¾ú½À´Ï´Ù!"
+#: sysdeps/gnu/errlist.c:1373
+msgid "No XENIX semaphores available"
+msgstr "»ç¿ë °¡´ÉÇÑ XENIX ¼¼¸¶Æ÷¾î°¡ ¾ø½À´Ï´Ù"
 
-#: 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 "È£½ºÆ® ij½¬¿¡¼­ \"%s\"À»(¸¦) ãÀ» ¼ö ¾ø¾ú½À´Ï´Ù!"
+#: sysdeps/gnu/errlist.c:1381
+msgid "Is a named type file"
+msgstr "named ŸÀÔ ÆÄÀÏÀÔ´Ï´Ù"
 
-#: nscd/nscd.c:89
-msgid "Read configuration data from NAME"
-msgstr "`À̸§'¿¡¼­ ¼³Á¤ µ¥ÀÌŸ¸¦ Àбâ"
+#: sysdeps/gnu/errlist.c:1389
+msgid "Remote I/O error"
+msgstr "¿ø°Ý ÀÔÃâ·Â ¿À·ù"
 
-#: nscd/nscd.c:91
-msgid "Do not fork and display messages on the current tty"
-msgstr "forkÇÏÁö ¾Ê°í ÇöÀç tty¿¡ ¸Þ¼¼Áö¸¦ Ç¥½ÃÇÔ"
+#: sysdeps/gnu/errlist.c:1397
+msgid "No medium found"
+msgstr "¸Å°³¹°ÀÌ ¾øÀ½"
 
-#: nscd/nscd.c:92
-msgid "NUMBER"
-msgstr "¼ýÀÚ"
+#: sysdeps/gnu/errlist.c:1405
+msgid "Wrong medium type"
+msgstr "À߸øµÈ ¸Å°³Ã¼ ŸÀÔ"
 
-#: nscd/nscd.c:92
-msgid "Start NUMBER threads"
-msgstr "`¼ýÀÚ'°³ÀÇ ¾²·¹µå¸¦ ½ÃÀÛÇÔ"
+#: sysdeps/gnu/errlist.c:1413
+msgid "Required key not available"
+msgstr "ÇÊ¿äÇÑ Å°°¡ ¾ø½À´Ï´Ù"
 
-#: nscd/nscd.c:93
-msgid "Shut the server down"
-msgstr "¼­¹ö¸¦ ¼Ë´Ù¿îÇÔ"
+#: sysdeps/gnu/errlist.c:1421
+msgid "Key has expired"
+msgstr "Å°°¡ ¸¸·áµÇ¾ú½À´Ï´Ù"
 
-#: nscd/nscd.c:94
-msgid "Print current configuration statistic"
-msgstr "ÇöÀç ¼³Á¤ »óŸ¦ Ç¥½ÃÇÔ"
+#: sysdeps/gnu/errlist.c:1429
+msgid "Key has been revoked"
+msgstr "Å°°¡ Á¾·áµÇ¾ú½À´Ï´Ù"
 
-#: nscd/nscd.c:95
-msgid "TABLE"
-msgstr "Å×À̺í"
+#: sysdeps/gnu/errlist.c:1437
+msgid "Key was rejected by service"
+msgstr "¼­ºñ½º°¡ Å°¸¦ °ÅºÎÇß½À´Ï´Ù"
 
-#: nscd/nscd.c:96
-msgid "Invalidate the specified cache"
-msgstr "ÁöÁ¤ÇÑ Ä³½¬¸¦ ¹«È¿È­ÇÕ´Ï´Ù"
+#: sysdeps/gnu/errlist.c:1445
+msgid "Owner died"
+msgstr "¼ÒÀ¯ÀÚ°¡ Á×¾ú½À´Ï´Ù"
 
-# (FIXME)
-#: nscd/nscd.c:97
-msgid "TABLE,yes"
-msgstr "Å×À̺í,¿¹"
+#: sysdeps/gnu/errlist.c:1453
+msgid "State not recoverable"
+msgstr "»óŸ¦ º¹±¸ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: nscd/nscd.c:97
-msgid "Use separate cache for each user"
-msgstr "»ç¿ëÀÚº°·Î º°µµÀÇ Ä³½¬ »ç¿ë"
+#: sysdeps/mach/_strerror.c:57
+msgid "Error in unknown error system: "
+msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù ½Ã½ºÅÛ¿¡ ¿À·ù: "
 
-#: nscd/nscd.c:102
-msgid "Name Service Cache Daemon."
-msgstr "Name ¼­ºñ½º ij½¬ µ¥¸ó."
+#: sysdeps/posix/gai_strerror-strs.h:1
+msgid "Address family for hostname not supported"
+msgstr "È£½ºÆ®À̸§¿¡ ´ëÇÑ ÁÖ¼Ò±ºÀÌ Áö¿øµÇÁö ¾ÊÀ½"
 
-#: nscd/nscd.c:141
-msgid "cannot read configuration file; this is fatal"
-msgstr "¼³Á¤ ÆÄÀÏÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù; Ä¡¸íÀûÀÓ"
+#: sysdeps/posix/gai_strerror-strs.h:2
+msgid "Temporary failure in name resolution"
+msgstr "name resolution¿¡¼­ ÀϽÃÀûÀÎ ½ÇÆÐ"
 
-#: nscd/nscd.c:152
-msgid "already running"
-msgstr "ÀÌ¹Ì ½ÇÇàÁß"
+#: sysdeps/posix/gai_strerror-strs.h:3
+msgid "Bad value for ai_flags"
+msgstr "À߸øµÈ 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 "root¸¸ÀÌ ÀÌ ¿É¼ÇÀ» »ç¿ëÇÒ ¼ö ÀÖ½À´Ï´Ù!"
+#: sysdeps/posix/gai_strerror-strs.h:4
+msgid "Non-recoverable failure in name resolution"
+msgstr "name resolution¿¡¼­ º¹±¸ÇÒ ¼ö ¾ø´Â ½ÇÆÐ"
 
-#: nscd/nscd_conf.c:88
-#, c-format
-msgid "Parse error: %s"
-msgstr "ÆÄ½Ì ¿À·ù: %s"
+#: sysdeps/posix/gai_strerror-strs.h:5
+msgid "ai_family not supported"
+msgstr "ai_family°¡ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
 
-#: nscd/nscd_conf.c:171
-#, c-format
-msgid "Could not create log file \"%s\""
-msgstr "±â·Ï ÆÄÀÏ `%s'À»(¸¦) ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+#: sysdeps/posix/gai_strerror-strs.h:6
+msgid "Memory allocation failure"
+msgstr "¸Þ¸ð¸® ÇÒ´ç ½ÇÆÐ"
 
-#: nscd/nscd_conf.c:187
-msgid "Must specify user name for server-user option"
-msgstr "server-user ¿É¼Ç¿¡¼­ »ç¿ëÀÚÀ̸§À» ÁöÁ¤ÇØ¾ß ÇÕ´Ï´Ù"
+#: sysdeps/posix/gai_strerror-strs.h:7
+msgid "No address associated with hostname"
+msgstr "È£½ºÆ®À̸§°ú ´ëÀÀµÇ´Â ÁÖ¼Ò°¡ ¾øÀ½"
 
-#: nscd/nscd_conf.c:194
-msgid "Must specify user name for stat-user option"
-msgstr "stat-user ¿É¼Ç¿¡¼­ »ç¿ëÀÚÀ̸§À» ÁöÁ¤ÇØ¾ß ÇÕ´Ï´Ù"
+#: sysdeps/posix/gai_strerror-strs.h:8
+msgid "Name or service not known"
+msgstr "À̸§ ȤÀº ¼­ºñ½º¸¦ ¾Ë ¼ö ¾ø½À´Ï´Ù"
 
-#: nscd/nscd_conf.c:205
-#, c-format
-msgid "Unknown option: %s %s %s"
-msgstr "¾Ë ¼ö ¾ø´Â ¿É¼Ç: %s %s %s"
+#: sysdeps/posix/gai_strerror-strs.h:9
+msgid "Servname not supported for ai_socktype"
+msgstr "ai_socktype¿¡¼­´Â servnameÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
 
-#: nscd/nscd_stat.c:103
-#, c-format
-msgid "cannot write statistics: %s"
-msgstr "Åë°è¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù: %s"
+#: sysdeps/posix/gai_strerror-strs.h:10
+msgid "ai_socktype not supported"
+msgstr "ai_socktypeÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
 
-#: nscd/nscd_stat.c:128
-#, c-format
-msgid "Only root or %s is allowed to use this option!"
-msgstr "root³ª %s »ç¿ëÀÚ¸¸ÀÌ ÀÌ ¿É¼ÇÀ» »ç¿ëÇÒ ¼ö ÀÖ½À´Ï´Ù!"
+#: sysdeps/posix/gai_strerror-strs.h:11
+msgid "System error"
+msgstr "½Ã½ºÅÛ ¿À·ù"
 
-#: nscd/nscd_stat.c:139
-msgid "nscd not running!\n"
-msgstr "nscd°¡ ½ÇÇàµÇÁö ¾Ê¾Ò½À´Ï´Ù!\n"
+#: sysdeps/posix/gai_strerror-strs.h:12
+msgid "Processing request in progress"
+msgstr "ÁøÇàÁßÀÎ ¿äûÀ» ¼öÇàÁßÀÔ´Ï´Ù"
 
-#: nscd/nscd_stat.c:150
-msgid "write incomplete"
-msgstr "¿ÏÀüÈ÷ ¾²Áö ¸øÇß½À´Ï´Ù"
+#: sysdeps/posix/gai_strerror-strs.h:13
+msgid "Request canceled"
+msgstr "¿äûÀÌ Ãë¼ÒµÇ¾úÀ½"
 
-#: nscd/nscd_stat.c:162
-msgid "cannot read statistics data"
-msgstr "Åë°è µ¥ÀÌŸ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
+#: sysdeps/posix/gai_strerror-strs.h:14
+msgid "Request not canceled"
+msgstr "¿äûÀÌ Ãë¼ÒµÇÁö ¾Ê¾ÒÀ½"
 
-#: nscd/nscd_stat.c:165
-#, c-format
-msgid ""
-"nscd configuration:\n"
-"\n"
-"%15d  server debug level\n"
-msgstr ""
-"nscd ¼³Á¤:\n"
-"\n"
-"%15d  ¼­¹ö µð¹ö±× ±íÀÌ\n"
+#: sysdeps/posix/gai_strerror-strs.h:15
+msgid "All requests done"
+msgstr "¸ðµç ¿äûÀÌ ¿Ï·áµÇ¾ú½À´Ï´Ù"
 
-#: nscd/nscd_stat.c:189
-#, c-format
-msgid "%3ud %2uh %2um %2lus  server runtime\n"
-msgstr "%3ud %2uh %2um %2lus  ¼­¹ö ·±Å¸ÀÓ\n"
+#: sysdeps/posix/gai_strerror-strs.h:16
+msgid "Interrupted by a signal"
+msgstr "½Ã±×³Î¿¡ ÀÇÇØ ÁߴܵÊ"
 
-#: nscd/nscd_stat.c:192
-#, c-format
-msgid "    %2uh %2um %2lus  server runtime\n"
-msgstr "    %2uh %2um %2lus  ¼­¹ö ·±Å¸ÀÓ\n"
+#: sysdeps/posix/gai_strerror-strs.h:17
+msgid "Parameter string not correctly encoded"
+msgstr "ÆĶó¹ÌÅÍ ¹®ÀÚ¿­À» ¿Ã¹Ù¸£°Ô ÀÎÄÚµùÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: nscd/nscd_stat.c:194
-#, c-format
-msgid "        %2um %2lus  server runtime\n"
-msgstr "        %2um %2lus  ¼­¹ö ·±Å¸ÀÓ\n"
+#: sysdeps/unix/siglist.c:26
+msgid "Signal 0"
+msgstr "½Ã±×³Î 0"
 
-#: nscd/nscd_stat.c:196
-#, c-format
-msgid "            %2lus  server runtime\n"
-msgstr "            %2lus  ¼­¹ö ·±Å¸ÀÓ\n"
+#: sysdeps/unix/siglist.c:32
+msgid "IOT trap"
+msgstr "IOT Æ®·¦"
 
-#: 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  Ŭ¶óÀ̾ðÆ®°¡ ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£\n"
-
-#: nscd/nscd_stat.c:213 nscd/nscd_stat.c:215
-msgid "      no"
-msgstr "      ¾Æ´Ï¿À"
-
-#: nscd/nscd_stat.c:213 nscd/nscd_stat.c:215
-msgid "     yes"
-msgstr "     ¿¹"
+msgid "%s is for unknown machine %d.\n"
+msgstr "%sÀº(´Â) ¾Ë·ÁÁöÁö ¾ÊÀº ±â°è %dÀ»(¸¦) À§ÇÑ °ÍÀÔ´Ï´Ù.\n"
 
-#: nscd/nscd_stat.c:221
-#, 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 ij½¬:\n"
-"\n"
-"%15s  °³ÀÇ Ä³½¬ »ç¿ëÁß\n"
-"%15Zu  ¸¸Å­ÀÇ Á¦¾ÈµÈ Å©±â\n"
-"%15lu  Ãʵ¿¾È positive entry À¯Áö\n"
-"%15lu  Ãʵ¿¾È negative entry À¯Áö\n"
-"%15lu  ¹ø positive entriy¿¡ ´ëÇØ Ä³½¬ È÷Æ®\n"
-"%15lu  ¹ø negative entriy¿¡ ´ëÇØ Ä³½¬ È÷Æ®\n"
-"%15lu  ¹ø positive entriy¿¡ ´ëÇØ Ä³½¬ ¹Ì½º\n"
-"%15lu  ¹ø negative entriy¿¡ ´ëÇØ Ä³½¬ ¹Ì½º\n"
-"%15lu%% ij½¬ È÷Æ®À²\n"
-"%15lu  ÇöÀç ij½¬ °ª\n"
-"%15lu  ÃÖ´ë ij½¬ °ª\n"
-"%15lu  ÃÖ´ë °Ë»ö üÀÎ ±æÀÌ\n"
-"%15lu  rdlockÀÇ Áö¿¬ ½Ã°£\n"
-"%15lu  wrlockÀÇ Áö¿¬ ½Ã°£\n"
-"%15s  ¹Ù²ï Á¡¿¡ ´ëÇØ /etc/%s °Ë»ç\n"
-
-#: nscd/pwdcache.c:215
+#: sysdeps/unix/sysv/linux/ia64/makecontext.c:63
 #, c-format
-msgid "Haven't found \"%s\" in password cache!"
-msgstr "¿­¼è±Û ij½¬¿¡¼­ \"%s\"À»(¸¦) ãÀ» ¼ö ¾ø¾ú½À´Ï´Ù!"
+msgid "makecontext: does not know how to handle more than 8 arguments\n"
+msgstr "makecontext: 8°³º¸´Ù ¸¹Àº ÀÎÀÚ¸¦ ¾î¶»°Ô ó¸®ÇÒ Áö ¾Ë ¼ö ¾ø½À´Ï´Ù\n"
 
-#: nscd/pwdcache.c:281
+#: sysdeps/unix/sysv/linux/lddlibc4.c:64
 #, c-format
-msgid "Invalid numeric uid \"%s\"!"
-msgstr "uid ¹øÈ£ \"%s\"¹øÀÌ À߸øµÇ¾ú½À´Ï´Ù!"
+msgid "cannot open `%s'"
+msgstr "`%s'À»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù"
 
-#: nscd/pwdcache.c:288
+#: sysdeps/unix/sysv/linux/lddlibc4.c:68
 #, c-format
-msgid "Haven't found \"%d\" in password cache!"
-msgstr "¿­¼è±Û ij½¬¿¡¼­ \"%d\"À»(¸¦) ãÀ» ¼ö ¾ø¾ú½À´Ï´Ù!"
+msgid "cannot read header from `%s'"
+msgstr "`%s'¿¡¼­ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-# ¹ø¿ª: capability´Â DB¿¡¼­ authenticationÀ» ÁÙÀ̱â À§ÇØ ¾²´Â °Í..
-# °¡±î¿î DBÃ¥ ÂüÁ¶.
-#: elf/../sysdeps/generic/dl-sysdep.c:422
-msgid "cannot create capability list"
-msgstr "ÄÉÀÌÆÛºô¸®Æ¼ ¸®½ºÆ®¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zdump.c:211
+msgid "lacks alphabetic at start"
+msgstr "¾ËÆĺªÀ¸·Î ½ÃÀÛÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: elf/../sysdeps/generic/readelflib.c:35
-#, c-format
-msgid "file %s is truncated\n"
-msgstr "%s ÆÄÀÏÀÌ À߶óÁ³½À´Ï´Ù\n"
+#: timezone/zdump.c:213
+msgid "has fewer than 3 alphabetics"
+msgstr "¾ËÆĺª 3ÀÚº¸´Ù Àû½À´Ï´Ù"
 
-#: elf/../sysdeps/generic/readelflib.c:67
-#, c-format
-msgid "%s is a 32 bit ELF file.\n"
-msgstr "%sÀº(´Â) 32ºñÆ® ELF ÆÄÀÏÀÔ´Ï´Ù.\n"
+#: timezone/zdump.c:215
+msgid "has more than 6 alphabetics"
+msgstr "¾ËÆĺª 6ÀÚº¸´Ù ¸¹½À´Ï´Ù"
 
-#: elf/../sysdeps/generic/readelflib.c:69
-#, c-format
-msgid "%s is a 64 bit ELF file.\n"
-msgstr "%sÀº(´Â) 64ºñÆ® ELF ÆÄÀÏÀÔ´Ï´Ù.\n"
+#: timezone/zdump.c:223
+msgid "differs from POSIX standard"
+msgstr "POSIX Ç¥ÁØ°ú ´Ù¸¨´Ï´Ù"
 
-#: elf/../sysdeps/generic/readelflib.c:71
+#: timezone/zdump.c:229
 #, c-format
-msgid "Unknown ELFCLASS in file %s.\n"
-msgstr "%s ÆÄÀÏÀÌ ¾Ë·ÁÁöÁö ¾ÊÀº ELFCLASS.\n"
+msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"
+msgstr "%s: °æ°í: Áö¿ª \"%s\" ¾à¾î \"%s\" %s\n"
 
-#: elf/../sysdeps/generic/readelflib.c:78
+#: timezone/zdump.c:280
 #, c-format
-msgid "%s is not a shared object file (Type: %d).\n"
-msgstr "%sÀº(´Â) µ¿Àû ¿ÀºêÁ§Æ® ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù (ŸÀÔ: %d).\n"
-
-#: elf/../sysdeps/generic/readelflib.c:109
-msgid "more than one dynamic segment\n"
-msgstr "¿©·¯ °³ÀÇ µ¿Àû ¼¼±×¸ÕÆ®\n"
+msgid "%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"
+msgstr "%s: »ç¿ë¹ýÀº %s [ --version ] [ -v ] [ -c [ÇÏÀ§¿¬µµ,]»óÀ§¿¬µµ ] Áö¿ªÀ̸§ ...\n"
 
-#: elf/../sysdeps/unix/sysv/linux/i386/readelflib.c:49
+#: timezone/zdump.c:297
 #, c-format
-msgid "%s is for unknown machine %d.\n"
-msgstr "%sÀº(´Â) ¾Ë·ÁÁöÁö ¾ÊÀº ±â°è %dÀ»(¸¦) À§ÇÑ °ÍÀÔ´Ï´Ù.\n"
-
-#: elf/cache.c:70
-msgid "unknown"
-msgstr "¾Ë ¼ö ¾øÀ½"
+msgid "%s: wild -c argument %s\n"
+msgstr "%s: Á¦¸Ú´ë·ÎÀÎ -c Àμö %s\n"
 
-#: elf/cache.c:111
-msgid "Unknown OS"
-msgstr "¾Ë ¼ö ¾ø´Â ¿î¿µÃ¼Á¦"
+#: timezone/zdump.c:388
+msgid "Error writing to standard output"
+msgstr "Ç¥ÁØ Ãâ·Â¿¡ ¾²´Â µ¥ ¿À·ù"
 
-#: elf/cache.c:116
+#: timezone/zdump.c:411
 #, c-format
-msgid ", OS ABI: %s %d.%d.%d"
-msgstr ", OS ABI: %s %d.%d.%d"
+msgid "%s: use of -v on system with floating time_t other than float or double\n"
+msgstr "%s: floatÀ̳ª doubleÀÌ ¾Æ´Ñ ºÎµ¿¼Ò¼ö time_t¸¦ »ç¿ëÇÏ´Â ½Ã½ºÅÛ¿¡¼­ -v ¿É¼Ç »ç¿ë\n"
 
-#: elf/cache.c:142 elf/ldconfig.c:1078
+#: timezone/zic.c:392
 #, c-format
-msgid "Can't open cache file %s\n"
-msgstr "ij½¬ ÆÄÀÏ `%s'À»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù\n"
-
-#: elf/cache.c:154
-msgid "mmap of cache file failed.\n"
-msgstr "ij½¬ ÆÄÀÏÀ» mmapÇÏ´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù.\n"
-
-#: elf/cache.c:158 elf/cache.c:168
-msgid "File is not a cache file.\n"
-msgstr "ÆÄÀÏÀÌ Ä³½¬ ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù.\n"
+msgid "%s: Memory exhausted: %s\n"
+msgstr "%s: ¸Þ¸ð¸®°¡ ¹Ù´Ú³²: %s\n"
 
-#: elf/cache.c:201 elf/cache.c:211
+#: timezone/zic.c:451
 #, c-format
-msgid "%d libs found in cache `%s'\n"
-msgstr "%2$s ij½¬¿¡ %1$d°³ÀÇ ¶óÀ̺귯¸®°¡ ¹ß°ßµÇ¾ú½À´Ï´Ù\n"
+msgid "\"%s\", line %d: %s"
+msgstr "\"%s\", Çà %d: %s"
 
-#: elf/cache.c:410
+#: timezone/zic.c:454
 #, c-format
-msgid "Can't remove old temporary cache file %s"
-msgstr "¿À·¡µÈ Àӽà ij½¬ ÆÄÀÏ %sÀ»(¸¦) Áö¿ï ¼ö ¾ø½À´Ï´Ù"
+msgid " (rule from \"%s\", line %d)"
+msgstr " (\"%s\"¿¡ ÀÖ´Â ±ÔÄ¢, Çà %d)"
 
-#: elf/cache.c:417
-#, c-format
-msgid "Can't create temporary cache file %s"
-msgstr "Àӽà ij½¬ ÆÄÀÏ %sÀ»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:466
+msgid "warning: "
+msgstr "°æ°í: "
 
-#: elf/cache.c:425 elf/cache.c:434 elf/cache.c:438
-msgid "Writing of cache data failed"
-msgstr "ij½¬ µ¥ÀÌŸ ¾²±â°¡ ½ÇÆÐ"
+#: timezone/zic.c:476
+#, c-format
+msgid ""
+"%s: usage is %s [ --version ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+"\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+msgstr ""
+"%s: »ç¿ë¹ýÀº %s [ --version ] [ -v ] [ -l Áö¿ª½Ã°¢ ] [ -p POSIX±ÔÄ¢ ] \\\n"
+"\t[ -d µð·ºÅ丮 ] [ -L À±ÃÊ ] [ -y  ¿¬µµÀÇÇüÅ ] [ ÆÄÀÏÀ̸§ ... ]\n"
 
-#: elf/cache.c:442
-msgid "Writing of cache data failed."
-msgstr "ij½¬ µ¥ÀÌŸ ¾²±â°¡ ½ÇÆÐÇß½À´Ï´Ù."
+#: timezone/zic.c:511
+msgid "wild compilation-time specification of zic_t"
+msgstr "Á¦¸Ú´ë·ÎÀÎ zic_tÀÇ ÄÄÆÄÀÏ Å¸ÀÓ ¸í¼¼"
 
-#: elf/cache.c:449
+#: timezone/zic.c:528
 #, c-format
-msgid "Changing access rights of %s to %#o failed"
-msgstr "%sÀÇ Á¢±Ù±ÇÇÑÀ» to %#o·Î(À¸·Î) ¹Ù²Ù´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
+msgid "%s: More than one -d option specified\n"
+msgstr "%s: Çϳª ÀÌ»óÀÇ -d ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
 
-#: elf/cache.c:454
+#: timezone/zic.c:538
 #, c-format
-msgid "Renaming of %s to %s failed"
-msgstr "%s¿¡¼­ %sÀ¸·Î(·Î) À̸§À» ¹Ù²Ù´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
-
-#: elf/dl-close.c:128
-msgid "shared object not open"
-msgstr "°øÀ¯ ¿ÀºêÁ§Æ®°¡ ¿­¸®Áö ¾Ê¾Ò½À´Ï´Ù"
-
-#: elf/dl-close.c:531 elf/dl-open.c:454
-msgid "TLS generation counter wrapped!  Please send report with the 'glibcbug' script."
-msgstr "TLS ¸¸µé±â Ä«¿îÅÍ°¡ °ãÃƽÀ´Ï´Ù!  glibcbug ½ºÅ©¸³Æ®·Î ¸®Æ÷Æ®ÇØ ÁֽʽÿÀ."
-
-#: elf/dl-deps.c:111 elf/dl-open.c:183
-msgid "DST not allowed in SUID/SGID programs"
-msgstr "SUID/SGID ÇÁ·Î±×·¥¿¡ DST´Â »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-# ¹ø¿ª: ¹º ¼Ò¸®¾ß?
-#: elf/dl-deps.c:124
-msgid "empty dynamics string token substitution"
-msgstr "ºñ¾î ÀÖ´Â µ¿Àû ¹®ÀÚ¿­ ÅäÅ« ġȯ"
+msgid "%s: More than one -l option specified\n"
+msgstr "%s: Çϳª ÀÌ»óÀÇ -l ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
 
-# ¹ø¿ª: ¹º ¼Ò¸®¾ß?
-#: elf/dl-deps.c:130
+#: timezone/zic.c:548
 #, c-format
-msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
-msgstr "µ¿Àû ¹®ÀÚ¿­ ÅäÅ« ġȯÀÌ ºñ¾î Àֱ⠶§¹®¿¡ `%s' ºÎ°¡ µ¥ÀÌÅ͸¦ ÀоîµéÀÏ ¼ö ¾ø½À´Ï´Ù\n"
-
-#: elf/dl-deps.c:461
-msgid "cannot allocate dependency list"
-msgstr "ÀÇÁ¸¼º ¸®½ºÆ®¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-deps.c:494 elf/dl-deps.c:549
-msgid "cannot allocate symbol search list"
-msgstr "±âÈ£ ã±â ¸®½ºÆ®¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-deps.c:534
-msgid "Filters not supported with LD_TRACE_PRELINKING"
-msgstr "LD_TRACE_PRELINKINGÀ» »ç¿ëÇÒ °æ¿ì ÇÊÅÍ´Â Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
-
-#: elf/dl-error.c:75
-msgid "DYNAMIC LINKER BUG!!!"
-msgstr "µ¿Àû ¸µÄ¿ ¹ö±×!!!"
-
-#: elf/dl-error.c:108
-msgid "error while loading shared libraries"
-msgstr "µ¿Àû ¶óÀ̺귯¸®¸¦ ÀоîµéÀÌ´Â µ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù"
-
-#: elf/dl-load.c:347
-msgid "cannot allocate name record"
-msgstr "³×ÀÓ ·¹Äڵ带 ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: 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 "ã±â °æ·Î¿¡ ´ëÇÑ Ä³½¬¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:551
-msgid "cannot create RUNPATH/RPATH copy"
-msgstr "RUNPATH/RPATH Ä«ÇǸ¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:634
-msgid "cannot create search path array"
-msgstr "ã±â °æ·Î ¹è¿­À» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:830
-msgid "cannot stat shared object"
-msgstr "µ¿Àû ¿ÀºêÁ§Æ®¿¡ ´ëÇØ stat()ÀÌ ½ÇÆÐÇß½À´Ï´Ù"
-
-#: elf/dl-load.c:874
-msgid "cannot open zero fill device"
-msgstr "0À¸·Î ä¿î ÀåÄ¡¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:883 elf/dl-load.c:1929
-msgid "cannot create shared object descriptor"
-msgstr "°øÀ¯ ¿ÀºêÁ§Æ® ±â¼úÀÚ¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:902 elf/dl-load.c:1470 elf/dl-load.c:1553
-msgid "cannot read file data"
-msgstr "ÆÄÀÏ µ¥ÀÌŸ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:946
-msgid "ELF load command alignment not page-aligned"
-msgstr "ELF ·Îµå ¸í·ÉÀÇÀÇ alignÀÌ ÆäÀÌÁö¿¡ alignµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
-
-#: elf/dl-load.c:953
-msgid "ELF load command address/offset not properly aligned"
-msgstr "ELF ·Îµå ¸í·ÉÀÇ ÁÖ¼Ò/¿ÀÇÁ¼ÂÀÌ ¿Ã¹Ù¸£°Ô alignµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
-
-#: elf/dl-load.c:1037
-msgid "cannot allocate TLS data structures for initial thread"
-msgstr "ÃÖÃÊ ¾²·¹µå¿¡ TLS µ¥ÀÌÅÍ ±¸Á¶¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:1061
-msgid "cannot handle TLS data"
-msgstr "TLS µ¥ÀÌÅ͸¦ ó¸®ÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:1075
-msgid "object file has no loadable segments"
-msgstr "¿ÀºêÁ§Æ® ÆÄÀÏ¿¡ ÀоîµéÀÏ ¼ö ÀÖ´Â ¼½¼ÇÀÌ ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:1110
-msgid "failed to map segment from shared object"
-msgstr "µ¿Àû ¿ÀºêÁ§Æ®ÀÇ ¼¼±×¸ÕÆ®¸¦ ¸ÅÇÎÇÏ´Â ½ÇÆÐ"
-
-#: elf/dl-load.c:1135
-msgid "cannot dynamically load executable"
-msgstr "µ¿ÀûÀ¸·Î ½ÇÇàÆÄÀÏÀ» ·ÎµåÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:1191
-msgid "cannot change memory protections"
-msgstr "¸Þ¸ð¸® º¸È£¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:1210
-msgid "cannot map zero-fill pages"
-msgstr "0À¸·Î ä¿î ÆäÀÌÁö¸¦ ¸ÅÇÎÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:1228
-msgid "cannot allocate memory for program header"
-msgstr "ÇÁ·Î±×·¥ Çì´õ¿¡ ´ëÇÑ ¸Þ¸ð¸®¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:1259
-msgid "object file has no dynamic section"
-msgstr "¿ÀºêÁ§Æ® ÆÄÀÏ¿¡ µ¿Àû ¼½¼ÇÀÌ ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:1299
-msgid "shared object cannot be dlopen()ed"
-msgstr "µ¿Àû ¿ÀºêÁ§Æ®´Â dlopen()µÉ ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:1322
-msgid "cannot create searchlist"
-msgstr "ã±â¸®½ºÆ®¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:1352
-msgid "cannot enable executable stack as shared object requires"
-msgstr "½ÇÇàÇÒ ¼ö ÀÖ´Â ½ºÅÃÀ» °øÀ¯ ¿ÀºêÁ§Æ® Çʼö¿ä¼Ò·Î ¸¸µé ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-load.c:1470
-msgid "file too short"
-msgstr "ÆÄÀÏÀÌ ³Ê¹« ª½À´Ï´Ù"
-
-#: elf/dl-load.c:1493
-msgid "invalid ELF header"
-msgstr "À߸øµÈ ELF Çì´õ"
-
-#: elf/dl-load.c:1502
-msgid "ELF file data encoding not big-endian"
-msgstr "ELF ÆÄÀÏ µ¥ÀÌÅÍ ÀÎÄÚµùÀÌ ºòÀεð¾ÈÀÌ ¾Æ´Õ´Ï´Ù"
-
-#: elf/dl-load.c:1504
-msgid "ELF file data encoding not little-endian"
-msgstr "ELF ÆÄÀÏ µ¥ÀÌÅÍ ÀÎÄÚµùÀÌ ¸®Æ²Àεð¾ÈÀÌ ¾Æ´Õ´Ï´Ù"
-
-#: elf/dl-load.c:1508
-msgid "ELF file version ident does not match current one"
-msgstr "ELF ÆÄÀÏ ¹öÀü ident°¡ ÇöÀç ident¿Í ¸ÂÁö ¾Ê½À´Ï´Ù"
-
-#: elf/dl-load.c:1512
-msgid "ELF file OS ABI invalid"
-msgstr "ELF ÆÄÀÏ OS ABI°¡ À߸øµÇ¾ú½À´Ï´Ù"
-
-#: elf/dl-load.c:1514
-msgid "ELF file ABI version invalid"
-msgstr "ELF ÆÄÀÏ ABI ¹öÀüÀÌ À߸øµÇ¾ú½À´Ï´Ù"
-
-#: elf/dl-load.c:1517
-msgid "internal error"
-msgstr "³»ºÎ ¿À·ù"
+msgid "%s: More than one -p option specified\n"
+msgstr "%s: Çϳª ÀÌ»óÀÇ -p ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
 
-#: elf/dl-load.c:1524
-msgid "ELF file version does not match current one"
-msgstr "ELF ÆÄÀÏ ¹öÀüÀÌ ÇöÀç ¹öÀü°ú ¸ÂÁö ¾Ê½À´Ï´Ù"
+#: timezone/zic.c:558
+#, c-format
+msgid "%s: More than one -y option specified\n"
+msgstr "%s: Çϳª ÀÌ»óÀÇ -y ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
 
-#: elf/dl-load.c:1532
-msgid "ELF file's phentsize not the expected size"
-msgstr "ELF ÆÄÀÏÀÇ phentsize°¡ ¿¹»ó°ú ¸ÂÁö ¾Ê½À´Ï´Ù"
+#: timezone/zic.c:568
+#, c-format
+msgid "%s: More than one -L option specified\n"
+msgstr "%s: Çϳª ÀÌ»óÀÇ -L ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
 
-#: elf/dl-load.c:1538
-msgid "only ET_DYN and ET_EXEC can be loaded"
-msgstr "ET_DYN°ú ET_EXEC¸¸À» ÀоîµéÀÏ ¼ö ÀÖ½À´Ï´Ù"
+#: timezone/zic.c:617
+msgid "link to link"
+msgstr "¸µÅ©·Î ¸µÅ©"
 
-#: elf/dl-load.c:1944
-msgid "cannot open shared object file"
-msgstr "µ¿Àû ¿ÀºêÁ§Æ® ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:682
+msgid "hard link failed, symbolic link used"
+msgstr "ÇÏµå ¸µÅ© ½ÇÆÐ, ½Éº¼¸¯ ¸µÅ©¸¦ »ç¿ëÇÕ´Ï´Ù"
 
-#: elf/dl-lookup.c:265 elf/dl-lookup.c:443
-msgid "relocation error"
-msgstr "¸®·ÎÄÉÀÌ¼Ç ¿À·ù"
+#: timezone/zic.c:690
+#, c-format
+msgid "%s: Can't link from %s to %s: %s\n"
+msgstr "%s: %sÀ»(¸¦) %s(À¸)·Î ¸µÅ©ÇÒ ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: elf/dl-open.c:111
-msgid "cannot extend global scope"
-msgstr "Àü¿ª ½ºÄÚÇÁ¸¦ È®ÀåÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:762 timezone/zic.c:764
+msgid "same rule name in multiple files"
+msgstr "¿©·¯ ÆÄÀÏ¿¡ °°Àº À̸§ÀÇ ±ÔÄ¢ÀÌ ÀÖÀ½"
 
-# ¹ø¿ª: ¹º ¼Ò¸®¾ß?
-#: elf/dl-open.c:214
-msgid "empty dynamic string token substitution"
-msgstr "ºñ¾î ÀÖ´Â µ¿Àû ¹®ÀÚ¿­ ÅäÅ« ġȯ"
+#: timezone/zic.c:805
+msgid "unruly zone"
+msgstr "±ÔÄ¢¾ø´Â Áö¿ª"
 
-#: elf/dl-open.c:361 elf/dl-open.c:372
-msgid "cannot create scope list"
-msgstr "½ºÄÚÇÁ ¸ñ·ÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:812
+#, c-format
+msgid "%s in ruleless zone"
+msgstr "±ÔÄ¢¾ø´Â Áö¿ª¿¡ %s ÀÖÀ½"
 
-#: elf/dl-open.c:434
-msgid "cannot create TLS data structures"
-msgstr "TLS µ¥ÀÌÅÍ ±¸Á¶¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:833
+msgid "standard input"
+msgstr "Ç¥ÁØ ÀÔ·Â"
 
-#: elf/dl-open.c:496
-msgid "invalid mode for dlopen()"
-msgstr "dlopen()¿¡ À߸øµÈ ¸ðµå"
+#: timezone/zic.c:838
+#, c-format
+msgid "%s: Can't open %s: %s\n"
+msgstr "%s: %sÀ»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: elf/dl-reloc.c:57
-msgid "cannot allocate memory in static TLS block"
-msgstr "Á¤Àû TLS ºí·°¿¡´Â ¸Þ¸ð¸®¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:849
+msgid "line too long"
+msgstr "ÇàÀÌ ³Ê¹« ±é´Ï´Ù"
 
-#: elf/dl-reloc.c:176
-msgid "cannot make segment writable for relocation"
-msgstr "¸®·ÎÄÉÀ̼ÇÀ» À§ÇØ ¼¼±×¸ÕÆ®¸¦ ¾²±â °¡´ÉÇϵµ·Ï ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:869
+msgid "input line of unknown type"
+msgstr "¾Ë ¼ö ¾ø´Â ÇüÅÂÀÇ ÀÔ·ÂÇà"
 
-#: elf/dl-reloc.c:277
+#: timezone/zic.c:885
 #, c-format
-msgid "%s: profiler found no PLTREL in object %s\n"
-msgstr "%s: ÇÁ·ÎÆÄÀÏ·¯¿¡¼­ %s ¿ÀºêÁ§Æ®¿¡ PLTRELÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù\n"
+msgid "%s: Leap line in non leap seconds file %s\n"
+msgstr "%s: À±ÃÊ ÆÄÀÏÀÌ ¾Æ´Ñ %s ÆÄÀÏ¿¡ Leap ÁÙÀÌ ÀÖÀ½\n"
 
-# ¹«½¼ ¸»ÀÎÁö´Â ¾Ë°Ú´Âµ¥..  shadow¸¦ ¹¹¶ó°í ÇØ¾ß µÇÁö?
-#: elf/dl-reloc.c:289
+#: timezone/zic.c:892 timezone/zic.c:1329 timezone/zic.c:1351
 #, c-format
-msgid "%s: profiler out of memory shadowing PLTREL of %s\n"
-msgstr "%s: ÇÁ·ÎÆÄÀÏ·¯¿¡¼­ %sÀÇ PLTREC¸¦ ¼Îµµ¿ìÇÏ´Â µ¥ ÇÊ¿äÇÑ ¸Þ¸ð¸®°¡ ºÎÁ·ÇÕ´Ï´Ù\n"
-
-#: elf/dl-reloc.c:304
-msgid "cannot restore segment prot after reloc"
-msgstr "reloc ÈÄ¿¡ prot ¼¼±×¸ÕÆ®¸¦ º¹±¸ÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/dl-sym.c:74 elf/dl-sym.c:145
-msgid "RTLD_NEXT used in code not dynamically loaded"
-msgstr "µ¿ÀûÀ¸·Î ÀûÀçµÇÁö ¾ÊÀº Äڵ忡 RTLD_NEXT¸¦ »ç¿ëÇÔ"
-
-#: elf/dl-version.c:303
-msgid "cannot allocate version reference table"
-msgstr "¹öÀü ÂüÁ¶ Å×À̺íÀ» ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: elf/ldconfig.c:122
-msgid "Print cache"
-msgstr "ij½¬ Ç¥½Ã"
-
-#: elf/ldconfig.c:123
-msgid "Generate verbose messages"
-msgstr "´õ ¸¹Àº ¸Þ½ÃÁö Ç¥½Ã"
+msgid "%s: panic: Invalid l_value %d\n"
+msgstr "%s: ¹®Á¦»óÅÂ: À߸øµÈ Áº¯°ª %d\n"
 
-#: elf/ldconfig.c:124
-msgid "Don't build cache"
-msgstr "ij½¬¸¦ ¸¸µéÁö ¾ÊÀ½"
+#: timezone/zic.c:900
+#, c-format
+msgid "%s: Error reading %s\n"
+msgstr "%s: %sÀ»(¸¦) Àд µµÁß ¿À·ù ¹ß»ý\n"
 
-#: elf/ldconfig.c:125
-msgid "Don't generate links"
-msgstr "¸µÅ©¸¦ ¸¸µéÁö ¾ÊÀ½"
+#: timezone/zic.c:907
+#, c-format
+msgid "%s: Error closing %s: %s\n"
+msgstr "%s: %sÀ»(¸¦) ´Ý´Â µµÁß ¿À·ù ¹ß»ý: %s\n"
 
-#: elf/ldconfig.c:126
-msgid "Change to and use ROOT as root directory"
-msgstr "<·çÆ®>·Î À̵¿ÇÑ ´ÙÀ½ <·çÆ®>¸¦ ·çÆ® µð·ºÅ丮·Î »ç¿ëÇÕ´Ï´Ù"
+#: timezone/zic.c:912
+msgid "expected continuation line not found"
+msgstr "¿¹»óÇß´ø ¿¬¼Ó ÇàÀ» ãÁö ¸øÇßÀ½"
 
-#: elf/ldconfig.c:127
-msgid "Use CACHE as cache file"
-msgstr "ij½¬ ÆÄÀÏ·Î <ij½¬>¸¦ »ç¿ëÇÕ´Ï´Ù"
+#: timezone/zic.c:956 timezone/zic.c:2489 timezone/zic.c:2508
+msgid "time overflow"
+msgstr "½Ã°£ °ªÀÌ ³Ñ¾î°¨"
 
-#: elf/ldconfig.c:128
-msgid "Use CONF as configuration file"
-msgstr "¼³Á¤ ÆÄÀÏ·Î <¼³Á¤>À» »ç¿ëÇÕ´Ï´Ù"
+#: timezone/zic.c:960
+msgid "24:00 not handled by pre-1998 versions of zic"
+msgstr "24:00´Â 1998³â Àü ¹öÀüÀÇ zic´Â ó¸®ÇÏÁö ¸øÇÕ´Ï´Ù"
 
-#: elf/ldconfig.c:129
-msgid "Only process directories specified on the command line.  Don't build cache."
-msgstr "¸í·ÉÇà¿¡ ÁöÁ¤µÈ µð·ºÅ丮¸¸ ó¸®ÇÕ´Ï´Ù.  ij½¬¸¦ ¸¸µéÁö ¾Ê½À´Ï´Ù."
+#: timezone/zic.c:963
+msgid "values over 24 hours not handled by pre-2007 versions of zic"
+msgstr "24º¸´Ù Å« °ªÀº 2007³â Àü ¹öÀüÀÇ zic´Â ó¸®ÇÏÁö ¸øÇÕ´Ï´Ù"
 
-#: elf/ldconfig.c:130
-msgid "Manually link individual libraries."
-msgstr "¼öµ¿À¸·Î °¢°¢ÀÇ ¶óÀ̺귯¸®¸¦ ¸µÅ©ÇϽʽÿÀ."
+#: timezone/zic.c:976
+msgid "wrong number of fields on Rule line"
+msgstr "Rule ÁÙ¿¡ ÇʵåÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
 
-#: elf/ldconfig.c:131
-msgid "Format to use: new, old or compat (default)"
-msgstr "ÀÌ¿ëÇÒ Çü½Ä: new, old ȤÀº compat (±âº»°ª)"
+#: timezone/zic.c:980
+msgid "nameless rule"
+msgstr "À̸§¾ø´Â ±ÔÄ¢"
 
-#: elf/ldconfig.c:139
-msgid "Configure Dynamic Linker Run Time Bindings."
-msgstr "µ¿Àû ¸µÄ¿ÀÇ ·±Å¸ÀÓ ¹ÙÀεùÀ» ¼³Á¤ÇÕ´Ï´Ù."
+#: timezone/zic.c:985
+msgid "invalid saved time"
+msgstr "Àý¾à ½Ã°£ÀÌ ºÎÀûÀýÇÔ"
 
-#: elf/ldconfig.c:297
-#, c-format
-msgid "Path `%s' given more than once"
-msgstr "`%s' °æ·Î°¡ ¿©·¯¹ø ÁÖ¾îÁ³½À´Ï´Ù"
+#: timezone/zic.c:1006
+msgid "wrong number of fields on Zone line"
+msgstr "Zone ÁÙ¿¡ ÇʵåÀÇ °¹¼ö°¡ À߸øµÇ¾úÀ½"
 
-#: elf/ldconfig.c:341
+#: timezone/zic.c:1012
 #, c-format
-msgid "%s is not a known library type"
-msgstr "%sÀº(´Â) ¾Ë·ÁÁø ¶óÀ̺귯¸® ŸÀÔÀÌ ¾Æ´Õ´Ï´Ù"
+msgid "\"Zone %s\" line and -l option are mutually exclusive"
+msgstr "\"Áö¿ª %s\" Çà°ú -l ¿É¼ÇÀº »óÈ£ ¹èŸÀûÀÔ´Ï´Ù"
 
-#: elf/ldconfig.c:361
+#: timezone/zic.c:1020
 #, c-format
-msgid "Can't stat %s"
-msgstr "%s¿¡ stat()ÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgid "\"Zone %s\" line and -p option are mutually exclusive"
+msgstr "\"Áö¿ª %s\" Çà°ú -p ¿É¼ÇÀº »óÈ£ ¹èŸÀûÀÔ´Ï´Ù"
 
-#: elf/ldconfig.c:431
+#: timezone/zic.c:1032
 #, c-format
-msgid "Can't stat %s\n"
-msgstr "%s¿¡ stat()ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
+msgid "duplicate zone name %s (file \"%s\", line %d)"
+msgstr "Áö¿ª¸í %s (ÆÄÀÏ \"%s\", Çà %d) Áߺ¹µÇ¾î ÀÖ½À´Ï´Ù"
 
-#: elf/ldconfig.c:441
-#, c-format
-msgid "%s is not a symbolic link\n"
-msgstr "%sÀº(´Â) ½Éº¼¸¯ ¸µÅ©°¡ ¾Æ´Õ´Ï´Ù\n"
+#: timezone/zic.c:1048
+msgid "wrong number of fields on Zone continuation line"
+msgstr "Zone continuation ÁÙ¿¡ ÇʵåÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
 
-#: elf/ldconfig.c:460
-#, c-format
-msgid "Can't unlink %s"
-msgstr "%sÀ»(¸¦) Áö¿ï ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:1088
+msgid "invalid UTC offset"
+msgstr "UTC ¿É¼ÂÀÌ ºÎÀûÀýÇÔ"
 
-#: elf/ldconfig.c:466
-#, c-format
-msgid "Can't link %s to %s"
-msgstr "%sÀ»(¸¦) %s(À¸)·Î ¸µÅ©ÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:1091
+msgid "invalid abbreviation format"
+msgstr "¾à¾î Çü½ÄÀÌ ºÎÀûÀýÇÔ"
 
-#: elf/ldconfig.c:472
-msgid " (changed)\n"
-msgstr " (º¯°æµÊ)\n"
+#: timezone/zic.c:1120
+msgid "Zone continuation line end time is not after end time of previous line"
+msgstr "°è¼ÓµÇ´Â Zone ÁÙ¿¡ ÀÖ´Â ³¡ ½Ã°¢ÀÌ À­ ÁÙ¿¡ ÀÖ´Â ³¡½Ã°¢º¸´Ù ´ÊÀº ½Ã°¢ÀÌ ¾Æ´Õ´Ï´Ù"
 
-#: elf/ldconfig.c:474
-msgid " (SKIPPED)\n"
-msgstr " (Áö³ªÄ§)\n"
+#: timezone/zic.c:1148
+msgid "wrong number of fields on Leap line"
+msgstr "Leap ÁÙ¿¡ ÇʵåÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
 
-#: elf/ldconfig.c:529
-#, c-format
-msgid "Can't find %s"
-msgstr "%sÀ»(¸¦) ãÀ» ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:1157
+msgid "invalid leaping year"
+msgstr "ºÎÀûÀýÇÑ À±³â"
 
-#: elf/ldconfig.c:545
-#, c-format
-msgid "Can't lstat %s"
-msgstr "%s¿¡ lstat()ÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:1177 timezone/zic.c:1283
+msgid "invalid month name"
+msgstr "´Þ À̸§ÀÌ ºÎÀûÀýÇÔ"
 
-#: elf/ldconfig.c:552
-#, c-format
-msgid "Ignored file %s since it is not a regular file."
-msgstr "ÀÏ¹Ý ÆÄÀÏÀÌ ¾Æ´Ï¹Ç·Î %s ÆÄÀÏÀ» ¹«½ÃÇÕ´Ï´Ù."
+#: timezone/zic.c:1190 timezone/zic.c:1396 timezone/zic.c:1410
+msgid "invalid day of month"
+msgstr "´ÞÀÇ ³¯Â¥ ¼ö°¡ ºÎÀûÀýÇÔ"
 
-#: elf/ldconfig.c:560
-#, c-format
-msgid "No link created since soname could not be found for %s"
-msgstr "%s¿¡ ´ëÇÑ sonameÀ» ãÀ» ¼ö ¾øÀ¸¹Ç·Î ¸µÅ©¸¦ ¸¸µéÁö ¾Ê½À´Ï´Ù"
+#: timezone/zic.c:1195
+msgid "time before zero"
+msgstr "0 ÀÌÀüÀÇ ½Ã°£"
 
-#: elf/ldconfig.c:651
-#, c-format
-msgid "Can't open directory %s"
-msgstr "µð·ºÅ丮 %sÀ»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:1199
+msgid "time too small"
+msgstr "½Ã°£ °ªÀÌ ³Ê¹« ÀÛ½À´Ï´Ù"
 
-#: elf/ldconfig.c:706 elf/ldconfig.c:753
-#, c-format
-msgid "Cannot lstat %s"
-msgstr "%s¿¡ lstat()ÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:1203
+msgid "time too large"
+msgstr "½Ã°£ °ªÀÌ ³Ê¹« Å®´Ï´Ù"
 
-#: elf/ldconfig.c:718
-#, c-format
-msgid "Cannot stat %s"
-msgstr "%s¿¡ stat()ÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:1207 timezone/zic.c:1312
+msgid "invalid time of day"
+msgstr "ºÎÀûÀýÇÑ ÇÏ·çÁß ½Ã°¢"
 
-#: elf/ldconfig.c:775 elf/readlib.c:92
-#, c-format
-msgid "Input file %s not found.\n"
-msgstr "ÀÔ·Â ÆÄÀÏ %sÀ»(¸¦) ãÁö ¸øÇß½À´Ï´Ù.\n"
+#: timezone/zic.c:1226
+msgid "illegal CORRECTION field on Leap line"
+msgstr "Leap ÁÙ¿¡ À߸øµÈ CORRECTION Çʵå"
 
-#: elf/ldconfig.c:826
-#, c-format
-msgid "libc5 library %s in wrong directory"
-msgstr "libc5 library %sÀÌ(°¡) À߸øµÈ µð·ºÅ丮¿¡ ÀÖ½À´Ï´Ù"
+#: timezone/zic.c:1231
+msgid "illegal Rolling/Stationary field on Leap line"
+msgstr "Leap ÁÙ¿¡ À߸øµÈ Rolling/Stationary Çʵå"
 
-#: elf/ldconfig.c:829
-#, c-format
-msgid "libc6 library %s in wrong directory"
-msgstr "libc6 library %sÀÌ(°¡) À߸øµÈ µð·ºÅ丮¿¡ ÀÖ½À´Ï´Ù"
+#: timezone/zic.c:1247
+msgid "wrong number of fields on Link line"
+msgstr "Link ÁÙ¿¡ ÇʵåÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
 
-#: elf/ldconfig.c:832
-#, c-format
-msgid "libc4 library %s in wrong directory"
-msgstr "libc4 library %sÀÌ(°¡) À߸øµÈ µð·ºÅ丮¿¡ ÀÖ½À´Ï´Ù"
+#: timezone/zic.c:1251
+msgid "blank FROM field on Link line"
+msgstr "Link ÁÙ¿¡ FROM Çʵ尡 ¾øÀ½"
 
-#: elf/ldconfig.c:859
-#, c-format
-msgid "libraries %s and %s in directory %s have same soname but different type."
-msgstr "µð·ºÅ丮 %sÀÇ ¶óÀ̺귯¸® %s°ú(¿Í) %sÀÌ(°¡) °°Àº sonameÀ» °¡Áö°í ÀÖÁö¸¸ ŸÀÔÀÌ ´Ù¸¨´Ï´Ù."
+#: timezone/zic.c:1255
+msgid "blank TO field on Link line"
+msgstr "Link ÁÙ¿¡ TO Çʵ尡 ¾øÀ½"
 
-#: elf/ldconfig.c:962
-#, c-format
-msgid "Can't open configuration file %s"
-msgstr "¼³Á¤ ÆÄÀÏ `%s'À»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:1333
+msgid "invalid starting year"
+msgstr "½ÃÀÛÇÏ´Â ÇØ°¡ ºÎÀûÀýÇÔ"
 
-#: elf/ldconfig.c:1033
-#, c-format
-msgid "relative path `%s' used to build cache"
-msgstr "ij½Ã¸¦ ¸¸µå´Â µ¥ »ó´ë °æ·ÎÀÎ `%s' °æ·Î¸¦ »ç¿ëÇß½À´Ï´Ù"
+#: timezone/zic.c:1355
+msgid "invalid ending year"
+msgstr "³¡³ª´Â ÇØ°¡ ºÎÀûÀýÇÔ"
 
-#: elf/ldconfig.c:1057
-msgid "Can't chdir to /"
-msgstr "/·Î µð·ºÅ丮¸¦ À̵¿ÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:1359
+msgid "starting year greater than ending year"
+msgstr "½ÃÀÛÇÏ´Â ÇØ°¡ ³¡³ª´Â Çغ¸´Ù Å®´Ï´Ù"
 
-#: elf/ldconfig.c:1099
-#, c-format
-msgid "Can't open cache file directory %s\n"
-msgstr "ij½¬ ÆÄÀÏ µð·ºÅ丮 `%s'À»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù\n"
+#: timezone/zic.c:1366
+msgid "typed single year"
+msgstr "ÇÑ°³ÀÇ ¿¬µµ°¡ ŸÀÌÇÁµÇ¾ú½À´Ï´Ù"
 
-#: elf/readlib.c:98
-#, c-format
-msgid "Cannot fstat file %s.\n"
-msgstr "`%s'ÆÄÀÏ¿¡ fstat()À» ÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
+#: timezone/zic.c:1401
+msgid "invalid weekday name"
+msgstr "ºÎÀûÀýÇÑ ¿äÀÏ À̸§"
 
-#: elf/readlib.c:108
+#: timezone/zic.c:1579
 #, c-format
-msgid "File %s is too small, not checked."
-msgstr "ÆÄÀÏ %sÀÌ(°¡) ³Ê¹« À۾Ƽ­, üũÇÏÁö ¾Ê½À´Ï´Ù."
+msgid "%s: Can't remove %s: %s\n"
+msgstr "%s: %sÀ»(¸¦) Áö¿ï ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: elf/readlib.c:117
+#: timezone/zic.c:1589
 #, c-format
-msgid "Cannot mmap file %s.\n"
-msgstr "ÆÄÀÏ `%s'¿¡ mmap()ÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
+msgid "%s: Can't create %s: %s\n"
+msgstr "%s: %sÀ»(¸¦) ¸¸µé ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: elf/readlib.c:155
+#: timezone/zic.c:1739
 #, c-format
-msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
-msgstr "%sÀº(´Â) ELF ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù - ½ÃÀۺκÐÀÇ ¸ÅÁ÷ ¹ÙÀÌÆ®°¡ Ʋ·È½À´Ï´Ù.\n"
+msgid "%s: Error writing %s\n"
+msgstr "%s: %sÀ»(¸¦) ¾²´Â µµÁß ¿À·ù ¹ß»ý\n"
 
-#: elf/sprof.c:72
-msgid "Output selection:"
-msgstr "Ãâ·Â ¼±ÅÃ:"
+#: timezone/zic.c:2031
+msgid "no POSIX environment variable for zone"
+msgstr "Áö¿ª¿¡ ´ëÇØ POSIX ȯ°æ º¯¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: elf/sprof.c:74
-msgid "print list of count paths and their number of use"
-msgstr "´Ü°èÀÇ ¸ñ·Ï°ú ±× °¢ ´Ü°èÀÇ »ç¿ë Ƚ¼ö¸¦ Ç¥½Ã"
+#: timezone/zic.c:2185
+msgid "can't determine time zone abbreviation to use just after until time"
+msgstr "´ÜÁö Á¾·á½Ã°¢ ÀÌÈÄ¿¡ »ç¿ëÇϱâ À§ÇÑ ½Ã°£´ë ¾à¾î¸¦ °áÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: elf/sprof.c:76
-msgid "generate flat profile with counts and ticks"
-msgstr "Ƚ¼ö¿Í ƽ¼ö¸¦ ±â·ÏÇÑ Ç÷§ ÇÁ·ÎÆÄÀÏÀ» ¸¸µç´Ù"
+#: timezone/zic.c:2231
+msgid "too many transitions?!"
+msgstr "³Ê¹« ¸¹Àº ÀüÀÌ?!"
 
-#: elf/sprof.c:77
-msgid "generate call graph"
-msgstr "È£Ãâ ±×·¡ÇÁ¸¦ ¸¸µê"
+#: timezone/zic.c:2250
+msgid "internal error - addtype called with bad isdst"
+msgstr "³»ºÎ ¿À·ù - Ʋ¸° isdst·Î addtypeÀ» È£Ãâ"
 
-#: elf/sprof.c:84
-msgid "Read and display shared object profiling data"
-msgstr "µ¿Àû ¿ÀºêÁ§Æ® ÇÁ·ÎÆÄÀϸµ µ¥ÀÌŸ¸¦ Àаí Ç¥½Ã"
+#: timezone/zic.c:2254
+msgid "internal error - addtype called with bad ttisstd"
+msgstr "³»ºÎ ¿À·ù - Ʋ¸° ttisstd·Î addtypeÀ» È£Ãâ"
 
-#: elf/sprof.c:87
-msgid "SHOBJ [PROFDATA]"
-msgstr "SHOBJ [PROFDATA]"
+#: timezone/zic.c:2258
+msgid "internal error - addtype called with bad ttisgmt"
+msgstr "³»ºÎ ¿À·ù - Ʋ¸° ttisgmt·Î addtypeÀ» È£Ãâ"
 
-#: elf/sprof.c:398
-#, c-format
-msgid "failed to load shared object `%s'"
-msgstr "µ¿Àû ¿ÀºêÁ§Æ® `%s'À»(¸¦) Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù"
+#: timezone/zic.c:2277
+msgid "too many local time types"
+msgstr "Áö¿ª ½Ã°¢ÀÇ Á¾·ù°¡ ³Ê¹« ¸¹½À´Ï´Ù"
 
-#: elf/sprof.c:407
-msgid "cannot create internal descriptors"
-msgstr "³»ºÎÀû ±â¼úÀÚ¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:2281
+msgid "UTC offset out of range"
+msgstr "UTC ¿ÀÇÁ¼ÂÀÌ ¹üÀ§¸¦ ¹þ¾î³µ½À´Ï´Ù"
 
-#: elf/sprof.c:526
-#, c-format
-msgid "Reopening shared object `%s' failed"
-msgstr "µ¿Àû ¿ÀºêÁ§Æ® `%s'À»(¸¦) ´Ù½Ã ¿©´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
+#: timezone/zic.c:2309
+msgid "too many leap seconds"
+msgstr "À±ÃÊ°¡ ³Ê¹« ¸¹½À´Ï´Ù"
 
-#: elf/sprof.c:534
-msgid "mapping of section headers failed"
-msgstr "¼½¼Ç Çì´õ¸¦ ¸ÅÇÎÇÏ´Â µ¥ ½ÇÆÐ"
+#: timezone/zic.c:2315
+msgid "repeated leap second moment"
+msgstr "À±ÃÊÀÇ Å©±â°¡ Áߺ¹µÇ¾ú½À´Ï´Ù"
 
-#: elf/sprof.c:544
-msgid "mapping of section header string table failed"
-msgstr "¼½¼Ç Çì´õÀÇ ¹®ÀÚ¿­ Å×À̺íÀ» ¸ÅÇÎÇϴµ¥ ½ÇÆÐ"
+#: timezone/zic.c:2367
+msgid "Wild result from command execution"
+msgstr "¸í·É ½ÇÇà¿¡¼­ Á¦ ¸Ú´ë·ÎÀÇ °á°ú°¡ ³ª¿Ô½À´Ï´Ù"
 
-#: elf/sprof.c:564
+#: timezone/zic.c:2368
 #, c-format
-msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
-msgstr "*** `%s' ÆÄÀÏÀº µð¹ö±ëÁ¤º¸°¡ Á¦°ÅµÇ¾ú½À´Ï´Ù: ´õ ÀÚ¼¼ÇÑ ºÐ¼®Àº ºÒ°¡´ÉÇÕ´Ï´Ù\n"
+msgid "%s: command was '%s', result was %d\n"
+msgstr "%s: ¸í·ÉÀº '%s'¿´°í, °á°ú´Â %d¿´½À´Ï´Ù\n"
 
-#: elf/sprof.c:594
-msgid "failed to load symbol data"
-msgstr "±âÈ£ µ¥ÀÌŸ¸¦ Àд µ¥ ½ÇÆÐ"
+#: timezone/zic.c:2466
+msgid "Odd number of quotation marks"
+msgstr "µû¿ÈÇ¥ ¼ö°¡ Ȧ¼öÀÔ´Ï´Ù"
 
-#: elf/sprof.c:664
-msgid "cannot load profiling data"
-msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌŸ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:2555
+msgid "use of 2/29 in non leap-year"
+msgstr "Æò³â¿¡ 2¿ù 29ÀÏÀ» »ç¿ë"
 
-#: elf/sprof.c:673
-msgid "while stat'ing profiling data file"
-msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌŸ ÆÄÀÏÀ» ¾²´Â µ¿¾È"
+#: timezone/zic.c:2590
+msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic"
+msgstr "´ÞÀÇ ½ÃÀÛ/³¡À» ³Ñ¾î°¡´Â ±ÔÄ¢Àº 2004³â Àü ¹öÀüÀÇ zic¿¡¼­´Â µ¿ÀÛÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: elf/sprof.c:681
-#, c-format
-msgid "profiling data file `%s' does not match shared object `%s'"
-msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌŸ ÆÄÀÏ `%s'Àº(´Â) µ¿Àû ¿ÀºêÁ§Æ®`%s'¿Í ¸ÂÁö ¾Ê½À´Ï´Ù"
+#: timezone/zic.c:2622
+msgid "time zone abbreviation lacks alphabetic at start"
+msgstr "½Ã°£´ë ¾à¾î°¡ ¾ËÆĺªÀ¸·Î ½ÃÀÛÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: elf/sprof.c:692
-msgid "failed to mmap the profiling data file"
-msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌŸ ÆÄÀÏÀ» mmapÇÏ´Â µ¥ ½ÇÆÐ"
+#: timezone/zic.c:2624
+msgid "time zone abbreviation has more than 3 alphabetics"
+msgstr "½Ã°£´ë ¾à¾î°¡ ¾ËÆĺª 3ÀÚº¸´Ù ±é´Ï´Ù"
 
-#: elf/sprof.c:700
-msgid "error while closing the profiling data file"
-msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌŸ ÆÄÀÏÀ¸ ´Ý´Â µµÁß ¿À·ù ¹ß»ý"
+#: timezone/zic.c:2626
+msgid "time zone abbreviation has too many alphabetics"
+msgstr "½Ã°£´ë ¾à¾î¿¡ ¾ËÆĺªÀÌ ³Ê¹« ¸¹½À´Ï´Ù"
 
-#: elf/sprof.c:709 elf/sprof.c:779
-msgid "cannot create internal descriptor"
-msgstr "³»ºÎÀû ±â¼úÀÚ¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:2636
+msgid "time zone abbreviation differs from POSIX standard"
+msgstr "½Ã°£´ë ¾à¾î°¡ POSIX Ç¥ÁØ°ú ´Ù¸¨´Ï´Ù"
 
-#: elf/sprof.c:755
+#: timezone/zic.c:2648
+msgid "too many, or too long, time zone abbreviations"
+msgstr "³Ê¹« ¸¹°Å³ª ³Ê¹« ±ä ½Ã°£´ë ¾à¾î"
+
+#: timezone/zic.c:2689
 #, c-format
-msgid "`%s' is no correct profile data file for `%s'"
-msgstr "`%s'Àº(´Â) `%s'¿¡ ¸Â´Â ÇÁ·ÎÆÄÀÏ µ¥ÀÌŸ ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù"
+msgid "%s: Can't create directory %s: %s\n"
+msgstr "%s: %s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: elf/sprof.c:936 elf/sprof.c:988
-msgid "cannot allocate symbol data"
-msgstr "±âÈ£ µ¥ÀÌŸ¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
+#: timezone/zic.c:2711
+#, c-format
+msgid "%s: %d did not sign extend correctly\n"
+msgstr "%s: %dÀº(´Â) ºÎÈ£ È®ÀåÀ» Á¦´ë·Î ÇÏÁö ¾Ê¾Ò½À´Ï´Ù\n"
diff --git a/po/nl.po b/po/nl.po
index d4f4518bc8..7a8b439dcb 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,14 +1,14 @@
-# Translation of libc-2.6.1 to Dutch.
+# Translation of libc-2.7 to Dutch.
 # Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
+#
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
 # Benno Schulenberg <benno@vertaalt.nl>, 2006, 2007.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.6.1\n"
+"Project-Id-Version: libc-2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-04 11:37+0200\n"
-"PO-Revision-Date: 2007-08-15 22:44+0200\n"
+"POT-Creation-Date: 2007-10-15 21:18-0700\n"
+"PO-Revision-Date: 2007-11-14 21:31+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
@@ -138,7 +138,7 @@ msgstr ""
 "-o UITVOERBESTAND [INVOERBESTAND...]\n"
 "[UITVOERBESTAND [INVOERBESTAND...]]"
 
-#: catgets/gencat.c:232 debug/pcprofiledump.c:199 iconv/iconv_prog.c:411
+#: catgets/gencat.c:232 debug/pcprofiledump.c:204 iconv/iconv_prog.c:411
 #: iconv/iconvconfig.c:380 locale/programs/localedef.c:371
 #: login/programs/pt_chown.c:88 malloc/memusagestat.c:526 nss/makedb.c:231
 msgid ""
@@ -148,7 +148,7 @@ msgstr ""
 "Voor het rapporteren van fouten, zie:\n"
 "  <http://www.gnu.org/software/libc/bugs.html>.\n"
 
-#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:287
+#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:296
 #: elf/ldd.bash.in:39 elf/sprof.c:355 iconv/iconv_prog.c:426
 #: iconv/iconvconfig.c:395 locale/programs/locale.c:275
 #: locale/programs/localedef.c:387 login/programs/pt_chown.c:59
@@ -161,11 +161,11 @@ msgid ""
 "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"
+"Dit is vrije software; zie de programmatekst voor de kopieervoorwaarden.\n"
+"Er is GEEN garantie, zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID\n"
 "VOOR EEN BEPAALD DOEL.\n"
 
-#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:292 elf/sprof.c:361
+#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:301 elf/sprof.c:361
 #: iconv/iconv_prog.c:431 iconv/iconvconfig.c:400 locale/programs/locale.c:280
 #: locale/programs/localedef.c:392 malloc/memusage.sh:75 nscd/nscd.c:411
 #: nss/getent.c:88 nss/makedb.c:250 posix/getconf.c:1017
@@ -257,31 +257,31 @@ msgstr "conversiemodules zijn niet beschikbaar"
 msgid "cannot determine escape character"
 msgstr "kan niet bepalen wat het escapeteken is"
 
-#: debug/pcprofiledump.c:52
+#: debug/pcprofiledump.c:53
 msgid "Don't buffer output"
 msgstr "uitvoer niet bufferen"
 
-#: debug/pcprofiledump.c:57
+#: debug/pcprofiledump.c:58
 msgid "Dump information generated by PC profiling."
 msgstr ""
 "  \n"
 "Door prestatie-analyse gegenereerde informatie weergeven."
 
-#: debug/pcprofiledump.c:60
+#: debug/pcprofiledump.c:61
 msgid "[FILE]"
 msgstr "[BESTAND]"
 
-#: debug/pcprofiledump.c:100
+#: debug/pcprofiledump.c:104
 #, c-format
 msgid "cannot open input file"
 msgstr "kan invoerbestand niet openen"
 
-#: debug/pcprofiledump.c:106
+#: debug/pcprofiledump.c:111
 #, c-format
 msgid "cannot read header"
 msgstr "kan kop van bestand niet lezen"
 
-#: debug/pcprofiledump.c:170
+#: debug/pcprofiledump.c:175
 #, c-format
 msgid "invalid pointer size"
 msgstr "ongeldige pointergrootte"
@@ -365,60 +365,55 @@ msgstr "ongeldige modus"
 msgid "invalid mode parameter"
 msgstr "ongeldige modusparameter"
 
-#: elf/cache.c:68
+#: elf/cache.c:69
 msgid "unknown"
 msgstr "onbekend"
 
-#: elf/cache.c:111
+#: elf/cache.c:112
 msgid "Unknown OS"
 msgstr "onbekend besturingssysteem"
 
-#: elf/cache.c:116
+#: elf/cache.c:117
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", OS-ABI: %s %d.%d.%d"
 
-#: elf/cache.c:142 elf/ldconfig.c:1236
+#: elf/cache.c:134 elf/ldconfig.c:1270
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "Kan cachebestand %s niet openen\n"
 
-#: elf/cache.c:154
+#: elf/cache.c:148
 #, c-format
 msgid "mmap of cache file failed.\n"
 msgstr "mmap() van cachebestand is mislukt\n"
 
-#: elf/cache.c:158 elf/cache.c:168
+#: elf/cache.c:152 elf/cache.c:166
 #, c-format
 msgid "File is not a cache file.\n"
 msgstr "Bestand is geen cachebestand\n"
 
-#: elf/cache.c:201 elf/cache.c:211
+#: elf/cache.c:199 elf/cache.c:209
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "%d bibliotheken gevonden in cache '%s'\n"
 
-#: elf/cache.c:410
-#, c-format
-msgid "Can't remove old temporary cache file %s"
-msgstr "Kan oud tijdelijk cachebestand %s niet verwijderen"
-
-#: elf/cache.c:417
+#: elf/cache.c:403
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "Kan tijdelijk cachebestand %s niet aanmaken"
 
-#: elf/cache.c:425 elf/cache.c:435 elf/cache.c:439 elf/cache.c:443
+#: elf/cache.c:411 elf/cache.c:421 elf/cache.c:425 elf/cache.c:430
 #, c-format
 msgid "Writing of cache data failed"
 msgstr "Schrijven van cachegegevens is mislukt"
 
-#: elf/cache.c:450
+#: elf/cache.c:435
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "Wijzigen van toegangsrechten van %s naar %#o is mislukt"
 
-#: elf/cache.c:455
+#: elf/cache.c:440
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "Naamswijziging van %s naar %s is mislukt"
@@ -431,28 +426,28 @@ msgstr "kan lijst voor geldigheidsbereik niet aanmaken"
 msgid "shared object not open"
 msgstr "gedeeld object is niet open"
 
-#: elf/dl-deps.c:112
+#: elf/dl-deps.c:114
 msgid "DST not allowed in SUID/SGID programs"
 msgstr "DST is niet toegestaan in SUID/SGID-programma's"
 
-#: elf/dl-deps.c:125 elf/dl-open.c:282
+#: elf/dl-deps.c:127 elf/dl-open.c:282
 msgid "empty dynamic string token substitution"
 msgstr "lege vervanging van DST"
 
-#: elf/dl-deps.c:131
+#: elf/dl-deps.c:133
 #, 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
+#: elf/dl-deps.c:474
 msgid "cannot allocate dependency list"
 msgstr "kan geen geheugen reserveren voor afhankelijkhedenlijst"
 
-#: elf/dl-deps.c:505 elf/dl-deps.c:560
+#: elf/dl-deps.c:510 elf/dl-deps.c:565
 msgid "cannot allocate symbol search list"
 msgstr "kan geen geheugen reserveren voor symbolenzoeklijst"
 
-#: elf/dl-deps.c:545
+#: elf/dl-deps.c:550
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr "Met LD_TRACE_PRELINKING worden filters niet ondersteund"
 
@@ -628,11 +623,11 @@ msgstr "verkeerde ELF-klasse: ELFCLASS32"
 msgid "cannot open shared object file"
 msgstr "kan gedeeld objectbestand niet openen"
 
-#: elf/dl-lookup.c:261
+#: elf/dl-lookup.c:356
 msgid "relocation error"
 msgstr "verplaatsingsfout"
 
-#: elf/dl-lookup.c:289
+#: elf/dl-lookup.c:384
 msgid "symbol lookup error"
 msgstr "opzoekfout voor symbool"
 
@@ -684,11 +679,11 @@ msgstr "kan segmentbescherming niet herstellen na verplaatsing"
 msgid "cannot apply additional memory protection after relocation"
 msgstr "kan extra geheugenbescherming niet toepassen na verplaatsing"
 
-#: elf/dl-sym.c:161
+#: elf/dl-sym.c:162
 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:474 elf/dl-sysdep.c:486
+#: elf/dl-sysdep.c:469 elf/dl-sysdep.c:481
 msgid "cannot create capability list"
 msgstr "kan privilegeslijst niet aanmaken"
 
@@ -700,220 +695,224 @@ msgstr "kan TLS-gegevensstructuren niet aanmaken"
 msgid "cannot allocate version reference table"
 msgstr "kan geen geheugen reserveren voor tabel met versieverwijzingen"
 
-#: elf/ldconfig.c:135
+#: elf/ldconfig.c:138
 msgid "Print cache"
 msgstr "inhoud van de cache weergeven"
 
-#: elf/ldconfig.c:136
+#: elf/ldconfig.c:139
 msgid "Generate verbose messages"
 msgstr "breedsprakige uitvoer"
 
-#: elf/ldconfig.c:137
+#: elf/ldconfig.c:140
 msgid "Don't build cache"
 msgstr "geen cache opbouwen"
 
-#: elf/ldconfig.c:138
+#: elf/ldconfig.c:141
 msgid "Don't generate links"
 msgstr "geen koppelingen genereren"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "Change to and use ROOT as root directory"
 msgstr "naar deze map gaan en als hoofdmap gebruiken"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "ROOT"
 msgstr "BASISMAP"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "CACHE"
 msgstr "CACHE-BESTAND"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "Use CACHE as cache file"
 msgstr "dit cachebestand gebruiken"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "CONF"
 msgstr "CONFIG-BESTAND"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "Use CONF as configuration file"
 msgstr "dit configuratiebestand gebruiken"
 
-#: elf/ldconfig.c:142
+#: elf/ldconfig.c:145
 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:143
+#: elf/ldconfig.c:146
 msgid "Manually link individual libraries."
 msgstr "individuele bibliotheken handmatig koppelen"
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "FORMAT"
 msgstr "INDELING"
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "Format to use: new, old or compat (default)"
 msgstr "te gebruiken indeling: 'compat' (standaard), 'new', of 'old'"
 
-#: elf/ldconfig.c:152
+#: elf/ldconfig.c:148
+msgid "Ignore auxiliary cache file"
+msgstr "hulpcachebestand negeren"
+
+#: elf/ldconfig.c:156
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr ""
 "  \n"
 "Configureren van de dynamische linker."
 
-#: elf/ldconfig.c:310
+#: elf/ldconfig.c:319
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "Pad '%s' is meerdere malen opgegeven"
 
-#: elf/ldconfig.c:350
+#: elf/ldconfig.c:359
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s is geen bekende bibliotheeksoort"
 
-#: elf/ldconfig.c:375
+#: elf/ldconfig.c:384
 #, c-format
 msgid "Can't stat %s"
 msgstr "Kan status van %s niet opvragen"
 
-#: elf/ldconfig.c:449
+#: elf/ldconfig.c:458
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "Kan status van %s niet opvragen\n"
 
-#: elf/ldconfig.c:459
+#: elf/ldconfig.c:468
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s is geen symbolische koppeling\n"
 
-#: elf/ldconfig.c:478
+#: elf/ldconfig.c:487
 #, c-format
 msgid "Can't unlink %s"
 msgstr "Kan %s niet ontkoppelen"
 
-#: elf/ldconfig.c:484
+#: elf/ldconfig.c:493
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "Kan %s niet aan %s koppelen"
 
-#: elf/ldconfig.c:490
+#: elf/ldconfig.c:499
 msgid " (changed)\n"
 msgstr " (gewijzigd)\n"
 
-#: elf/ldconfig.c:492
+#: elf/ldconfig.c:501
 msgid " (SKIPPED)\n"
 msgstr " (OVERGESLAGEN)\n"
 
-#: elf/ldconfig.c:547
+#: elf/ldconfig.c:556
 #, c-format
 msgid "Can't find %s"
 msgstr "Kan %s niet vinden"
 
-#: elf/ldconfig.c:563 elf/ldconfig.c:737 elf/ldconfig.c:784
+#: elf/ldconfig.c:572 elf/ldconfig.c:745 elf/ldconfig.c:793 elf/ldconfig.c:827
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "Kan status van link %s niet opvragen"
 
-#: elf/ldconfig.c:570
+#: elf/ldconfig.c:579
 #, 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:578
+#: elf/ldconfig.c:588
 #, 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:669
+#: elf/ldconfig.c:671
 #, c-format
 msgid "Can't open directory %s"
 msgstr "Kan map %s niet openen"
 
-#: elf/ldconfig.c:749
+#: elf/ldconfig.c:759
 #, c-format
 msgid "Cannot stat %s"
 msgstr "Kan status van %s niet opvragen"
 
-#: elf/ldconfig.c:806 elf/readlib.c:91
+#: elf/ldconfig.c:814 elf/readlib.c:91
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "Kan invoerbestand %s niet vinden\n"
 
-#: elf/ldconfig.c:857
+#: elf/ldconfig.c:888
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5-bibliotheek %s zit in verkeerde map"
 
-#: elf/ldconfig.c:860
+#: elf/ldconfig.c:891
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc6-bibliotheek %s zit in verkeerde map"
 
-#: elf/ldconfig.c:863
+#: elf/ldconfig.c:894
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4-bibliotheek %s zit in verkeerde map"
 
-#: elf/ldconfig.c:890
+#: elf/ldconfig.c:922
 #, 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:997
+#: elf/ldconfig.c:1031
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr "Kan configuratiebestand %s niet openen"
 
-#: elf/ldconfig.c:1061
+#: elf/ldconfig.c:1095
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr "%s:%u: onjuiste syntax in 'hwcap'-regel"
 
-#: elf/ldconfig.c:1067
+#: elf/ldconfig.c:1101
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
 msgstr "%s:%u: 'hwcap'-index %lu overschrijdt maximum %u"
 
-#: elf/ldconfig.c:1074 elf/ldconfig.c:1082
+#: elf/ldconfig.c:1108 elf/ldconfig.c:1116
 #, 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:1085
+#: elf/ldconfig.c:1119
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
 msgstr "%s:%u: dubbele 'hwcap' %lu %s"
 
-#: elf/ldconfig.c:1107
+#: elf/ldconfig.c:1141
 #, 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:1114 locale/programs/xmalloc.c:70 malloc/obstack.c:434
+#: elf/ldconfig.c:1148 locale/programs/xmalloc.c:70 malloc/obstack.c:434
 #: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1163
 #, c-format
 msgid "memory exhausted"
 msgstr "onvoldoende geheugen beschikbaar"
 
-#: elf/ldconfig.c:1144
+#: elf/ldconfig.c:1178
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr "%s:%u: kan map %s niet lezen"
 
-#: elf/ldconfig.c:1189
+#: elf/ldconfig.c:1223
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr "relatief pad '%s' wordt gebruikt bij opbouwen van cache"
 
-#: elf/ldconfig.c:1215
+#: elf/ldconfig.c:1249
 #, c-format
 msgid "Can't chdir to /"
 msgstr "Kan niet naar hoofdmap ('/') gaan"
 
-#: elf/ldconfig.c:1257
+#: elf/ldconfig.c:1291
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "Kan map %s voor cachebestand niet openen\n"
@@ -1440,7 +1439,7 @@ msgstr "Onbekend .netrc-sleutelwoord %s"
 msgid "Character out of range for UTF-8"
 msgstr "Teken ligt buiten bereik voor UTF-8"
 
-#: locale/programs/charmap-dir.c:58
+#: locale/programs/charmap-dir.c:59
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "kan tekenskaartmap '%s' niet lezen"
@@ -1468,7 +1467,7 @@ 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:357 locale/programs/charmap.c:374
-#: locale/programs/repertoire.c:175
+#: locale/programs/repertoire.c:174
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "syntaxfout in proloog: %s"
@@ -1478,7 +1477,7 @@ msgid "invalid definition"
 msgstr "ongeldige definitie"
 
 #: locale/programs/charmap.c:375 locale/programs/locfile.c:126
-#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
+#: locale/programs/locfile.c:153 locale/programs/repertoire.c:175
 msgid "bad argument"
 msgstr "onjuist argument"
 
@@ -1497,7 +1496,7 @@ msgstr "waarde van <%s> moet groter of gelijk aan 1 zijn"
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "waarde van <%s> moet groter of gelijk aan de waarde van <%s> zijn"
 
-#: locale/programs/charmap.c:445 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "argument van <%s> moet een enkel teken zijn"
@@ -1515,7 +1514,7 @@ msgid "syntax error in %s definition: %s"
 msgstr "syntaxfout in definitie van %s: %s"
 
 #: locale/programs/charmap.c:499 locale/programs/charmap.c:679
-#: locale/programs/charmap.c:775 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
 msgid "no symbolic name given"
 msgstr "geen symbolische naam gegeven"
 
@@ -1532,19 +1531,19 @@ msgid "too many bytes in character encoding"
 msgstr "te veel bytes in tekencodering"
 
 #: locale/programs/charmap.c:586 locale/programs/charmap.c:734
-#: locale/programs/charmap.c:817 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:817 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:610 locale/programs/ld-address.c:600
-#: locale/programs/ld-collate.c:2677 locale/programs/ld-collate.c:3828
+#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3924
 #: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984
 #: locale/programs/ld-identification.c:452
 #: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
 #: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307
 #: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241
 #: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221
-#: 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'"
@@ -1564,14 +1563,14 @@ msgid "%s: error in state machine"
 msgstr "%s: **interne fout** in toestandsmachine"
 
 #: locale/programs/charmap.c:850 locale/programs/ld-address.c:616
-#: locale/programs/ld-collate.c:2674 locale/programs/ld-collate.c:3844
+#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4115
 #: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001
 #: locale/programs/ld-identification.c:468
 #: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
 #: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323
 #: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257
 #: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237
-#: locale/programs/locfile.c:826 locale/programs/repertoire.c:325
+#: locale/programs/locfile.c:826 locale/programs/repertoire.c:324
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s: voortijdig einde van bestand"
@@ -1586,21 +1585,21 @@ msgstr "onbekend teken '%s'"
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %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:993 locale/programs/ld-collate.c:2957
-#: locale/programs/repertoire.c:420
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3047
+#: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr "ongeldige namen voor tekenbereik"
 
-#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
 msgid "hexadecimal range format should use only capital characters"
 msgstr "hexadecimale bereikopgave mag alleen hoofdletters bevatten"
 
-#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:450
+#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
 msgstr "<%s> en <%s> zijn ongeldige namen voor een bereik"
 
-#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:457
+#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456
 msgid "upper limit in range is smaller than lower limit"
 msgstr "bovengrens in bereik is kleiner dan ondergrens"
 
@@ -1608,7 +1607,7 @@ msgstr "bovengrens in bereik is kleiner dan ondergrens"
 msgid "resulting bytes for range not representable."
 msgstr "resulterende bytes voor bereik zijn niet te representeren"
 
-#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1536
+#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1556
 #: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133
 #: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
@@ -1695,7 +1694,7 @@ msgstr "%s: het veld '%s' is meerdere keren gedeclareerd"
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: onbekend teken in het veld '%s'"
 
-#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3826
+#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3922
 #: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449
 #: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305
@@ -1705,12 +1704,13 @@ msgstr "%s: onbekend teken in het veld '%s'"
 msgid "%s: incomplete `END' line"
 msgstr "%s: onvolledige 'END'-regel"
 
-#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:522
-#: locale/programs/ld-collate.c:574 locale/programs/ld-collate.c:870
-#: locale/programs/ld-collate.c:883 locale/programs/ld-collate.c:2664
-#: locale/programs/ld-collate.c:3835 locale/programs/ld-ctype.c:1960
-#: locale/programs/ld-ctype.c:2219 locale/programs/ld-ctype.c:2806
-#: locale/programs/ld-ctype.c:2992 locale/programs/ld-identification.c:459
+#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:542
+#: locale/programs/ld-collate.c:594 locale/programs/ld-collate.c:890
+#: locale/programs/ld-collate.c:903 locale/programs/ld-collate.c:2733
+#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4105
+#: locale/programs/ld-ctype.c:1960 locale/programs/ld-ctype.c:2219
+#: locale/programs/ld-ctype.c:2806 locale/programs/ld-ctype.c:2992
+#: locale/programs/ld-identification.c:459
 #: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314
 #: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248
@@ -1719,247 +1719,267 @@ msgstr "%s: onvolledige 'END'-regel"
 msgid "%s: syntax error"
 msgstr "%s: syntaxfout"
 
-#: locale/programs/ld-collate.c:397
+#: locale/programs/ld-collate.c:417
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "'%.*s' is al gedefinieerd in tekenskaart"
 
-#: locale/programs/ld-collate.c:406
+#: locale/programs/ld-collate.c:426
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "`%.*s' is al gedefinieerd in repertoire"
 
-#: locale/programs/ld-collate.c:413
+#: locale/programs/ld-collate.c:433
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "'%.*s' is al gedefinieerd als sorteringssymbool"
 
-#: locale/programs/ld-collate.c:420
+#: locale/programs/ld-collate.c:440
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "'%.*s' is al gedefinieerd als sorteringselement"
 
-#: locale/programs/ld-collate.c:451 locale/programs/ld-collate.c:477
+#: locale/programs/ld-collate.c:471 locale/programs/ld-collate.c:497
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: 'forward' en 'backward' sluiten elkaar uit"
 
-#: locale/programs/ld-collate.c:461 locale/programs/ld-collate.c:487
-#: locale/programs/ld-collate.c:503
+#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507
+#: locale/programs/ld-collate.c:523
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: '%s' wordt meerdere keren genoemd in definitie van gewicht %d"
 
-#: locale/programs/ld-collate.c:559
+#: locale/programs/ld-collate.c:579
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: te veel voorschriften; het eerste item had er slechts %d"
 
-#: locale/programs/ld-collate.c:595
+#: locale/programs/ld-collate.c:615
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: niet genoeg sorteervoorschriften"
 
-#: locale/programs/ld-collate.c:760
+#: locale/programs/ld-collate.c:780
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: lege gewichtstekenreeks is niet toegestaan"
 
-#: locale/programs/ld-collate.c:855
+#: locale/programs/ld-collate.c:875
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: gewichten moeten hetzelfde beletselteken gebruiken als de naam"
 
-#: locale/programs/ld-collate.c:911
+#: locale/programs/ld-collate.c:931
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: te veel waarden"
 
-#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
+#: locale/programs/ld-collate.c:1051 locale/programs/ld-collate.c:1226
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "sorteervolgorde voor '%.*s' is al gedefinieerd in %s:%Zu"
 
-#: locale/programs/ld-collate.c:1081
+#: locale/programs/ld-collate.c:1101
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: het begin- en eindsymbool van een bereik moeten enkele tekens aanduiden"
 
-#: locale/programs/ld-collate.c:1108
+#: locale/programs/ld-collate.c:1128
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 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:1170
 #, c-format
 msgid "%s: byte sequence of first character of range is not lower than that of the last character"
 msgstr "%s: de bytereeks van het eerste bereikteken is niet kleiner dan die van het laatste"
 
-#: locale/programs/ld-collate.c:1275
+#: locale/programs/ld-collate.c:1295
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: beletselteken van symbolenbereik mag niet direct na 'order_start' staan"
 
-#: locale/programs/ld-collate.c:1279
+#: locale/programs/ld-collate.c:1299
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr "%s: beletselteken van symbolenbereik mag niet direct voor 'order_end' staan"
 
-#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1477
+#: locale/programs/ld-collate.c:1319 locale/programs/ld-ctype.c:1477
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "'%s' en '%.*s' zijn geen geldige namen voor een symbolenbereik"
 
-#: locale/programs/ld-collate.c:1349 locale/programs/ld-collate.c:3763
+#: locale/programs/ld-collate.c:1369 locale/programs/ld-collate.c:3858
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: sorteervolgorde van '%.*s' is al gedefinieerd in %s:%Zu"
 
-#: locale/programs/ld-collate.c:1358
+#: locale/programs/ld-collate.c:1378
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: '%s' moet een teken zijn"
 
-#: locale/programs/ld-collate.c:1552
+#: locale/programs/ld-collate.c:1573
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: 'position' moet voor een specifiek niveau gebruikt worden ofwel in alle secties ofwel in geen"
 
-#: locale/programs/ld-collate.c:1577
+#: locale/programs/ld-collate.c:1598
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "symbool '%s' is niet gedefinieerd"
 
-#: locale/programs/ld-collate.c:1653 locale/programs/ld-collate.c:1759
+#: locale/programs/ld-collate.c:1674 locale/programs/ld-collate.c:1780
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "symbool '%s' heeft dezelfde codering als"
 
-#: locale/programs/ld-collate.c:1657 locale/programs/ld-collate.c:1763
+#: locale/programs/ld-collate.c:1678 locale/programs/ld-collate.c:1784
 #, c-format
 msgid "symbol `%s'"
 msgstr "symbool '%s'"
 
-#: locale/programs/ld-collate.c:1805
+#: locale/programs/ld-collate.c:1826
 #, c-format
 msgid "no definition of `UNDEFINED'"
 msgstr "geen definitie van 'UNDEFINED'"
 
-#: locale/programs/ld-collate.c:1834
+#: locale/programs/ld-collate.c:1855
 #, c-format
 msgid "too many errors; giving up"
 msgstr "te veel fouten -- gestopt"
 
-#: locale/programs/ld-collate.c:2762
+#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4044
+#, c-format
+msgid "%s: nested conditionals not supported"
+msgstr "%s: geneste voorwaardelijke constructies worden niet ondersteund"
+
+#: locale/programs/ld-collate.c:2677
+#, c-format
+msgid "%s: more then one 'else'"
+msgstr "%s: meer dan één 'else'"
+
+#: locale/programs/ld-collate.c:2852
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: dubbele definitie van '%s'"
 
-#: locale/programs/ld-collate.c:2798
+#: locale/programs/ld-collate.c:2888
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: dubbele declaratie van sectie '%s'"
 
-#: locale/programs/ld-collate.c:2937
+#: locale/programs/ld-collate.c:3027
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: onbekend teken in naam van sorteringssymbool"
 
-#: locale/programs/ld-collate.c:3069
+#: locale/programs/ld-collate.c:3159
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: onbekend teken in naam van equivalentiedefinitie"
 
-#: locale/programs/ld-collate.c:3082
+#: locale/programs/ld-collate.c:3172
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: onbekend teken in waarde van equivalentiedefinitie"
 
-#: locale/programs/ld-collate.c:3092
+#: locale/programs/ld-collate.c:3182
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: onbekend symbool '%s' in equivalentiedefinitie"
 
-#: locale/programs/ld-collate.c:3101
+#: locale/programs/ld-collate.c:3191
 msgid "error while adding equivalent collating symbol"
 msgstr "fout bij toevoegen van equivalent sorteringssymbool"
 
-#: locale/programs/ld-collate.c:3131
+#: locale/programs/ld-collate.c:3221
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "dubbele definitie van script '%s'"
 
-#: locale/programs/ld-collate.c:3179
+#: locale/programs/ld-collate.c:3269
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr "%s: onbekende sectienaam '%.*s'"
 
-#: locale/programs/ld-collate.c:3208
+#: locale/programs/ld-collate.c:3298
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: meerdere sorteervolgorde-definities voor sectie '%s'"
 
-#: locale/programs/ld-collate.c:3233
+#: locale/programs/ld-collate.c:3326
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: ongeldig aantal sorteervoorschriften"
 
-#: locale/programs/ld-collate.c:3260
+#: locale/programs/ld-collate.c:3353
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: meerdere sorteervolgorde-definities voor naamloze sectie"
 
-#: locale/programs/ld-collate.c:3314 locale/programs/ld-collate.c:3442
-#: locale/programs/ld-collate.c:3804
+#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537
+#: locale/programs/ld-collate.c:3900
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: ontbrekend sleutelwoord 'order_end'"
 
-#: locale/programs/ld-collate.c:3375
+#: locale/programs/ld-collate.c:3470
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: sorteervolgorde voor symbool '%.*s' is nog niet gedefinieerd"
 
-#: locale/programs/ld-collate.c:3393
+#: locale/programs/ld-collate.c:3488
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: sorteervolgorde voor element '%.*s' is nog niet gedefinieerd"
 
-#: locale/programs/ld-collate.c:3404
+#: locale/programs/ld-collate.c:3499
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: kan niet herordenen na '%.*s': dit symbool is onbekend"
 
-#: locale/programs/ld-collate.c:3456 locale/programs/ld-collate.c:3816
+#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: ontbrekend sleutelwoord 'reorder-end'"
 
-#: locale/programs/ld-collate.c:3490 locale/programs/ld-collate.c:3688
+#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: sectie '%.*s' is onbekend"
 
-#: locale/programs/ld-collate.c:3555
+#: locale/programs/ld-collate.c:3650
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: onjuist symbool <%.*s>"
 
-#: locale/programs/ld-collate.c:3751
+#: locale/programs/ld-collate.c:3846
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: '%s' kan geen einde van bereik zijn"
 
-#: locale/programs/ld-collate.c:3800
+#: locale/programs/ld-collate.c:3896
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: lege categoriebeschrijving is niet toegestaan"
 
-#: locale/programs/ld-collate.c:3819
+#: locale/programs/ld-collate.c:3915
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: ontbrekend sleutelwoord 'reorder-sections-end'"
 
+#: locale/programs/ld-collate.c:4077
+#, c-format
+msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: '%s' zonder bijpassende 'ifdef' of 'ifndef'"
+
+#: locale/programs/ld-collate.c:4095
+#, c-format
+msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: 'endif' zonder bijpassende 'ifdef' of 'ifndef'"
+
 #: locale/programs/ld-ctype.c:439
 #, c-format
 msgid "No character set name specified in charmap"
@@ -2735,22 +2755,22 @@ msgstr "als 'copy' gebruikt wordt, zijn geen andere sleutelwoorden toegestaan"
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "%1$s: definitie eindigt niet met 'END %1$s'"
 
-#: 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 "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 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-kaart niet opslaan"
 
-#: locale/programs/repertoire.c:343
+#: locale/programs/repertoire.c:342
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr "kan repertoire-kaart '%s' niet vinden"
@@ -3572,12 +3592,12 @@ msgstr "yp_update: kan host niet converteren naar netnaam\n"
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: kan server-adres niet opvragen\n"
 
-#: nscd/aicache.c:77 nscd/hstcache.c:462
+#: nscd/aicache.c:77 nscd/hstcache.c:468
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "Item \"%s\" niet gevonden in hosts-cache!"
 
-#: nscd/aicache.c:79 nscd/hstcache.c:464
+#: nscd/aicache.c:79 nscd/hstcache.c:470
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr "Herladen van \"%s\" in hosts-cache!"
@@ -3591,7 +3611,7 @@ msgstr "toevoegen van nieuw item \"%s\" van type %s voor %s aan cache%s"
 msgid " (first)"
 msgstr " (eerste)"
 
-#: nscd/cache.c:256 nscd/connections.c:786
+#: nscd/cache.c:256 nscd/connections.c:810
 #, c-format
 msgid "cannot stat() file `%s': %s"
 msgstr "kan status van bestand '%s' niet opvragen: %s"
@@ -3606,188 +3626,188 @@ msgstr "snoeien van cache %s; tijd %ld"
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr "overwegen van %s-item \"%s\", tijdslimiet %<PRIu64>"
 
-#: nscd/connections.c:505 nscd/connections.c:517 nscd/connections.c:529
-#: nscd/connections.c:548
+#: nscd/connections.c:521 nscd/connections.c:533 nscd/connections.c:545
+#: nscd/connections.c:564
 #, c-format
 msgid "invalid persistent database file \"%s\": %s"
 msgstr "ongeldig persistent gegevensbestand '%s': %s"
 
-#: nscd/connections.c:519
+#: nscd/connections.c:535
 msgid "header size does not match"
 msgstr "grootte van de kop klopt niet"
 
-#: nscd/connections.c:531
+#: nscd/connections.c:547
 msgid "file size does not match"
 msgstr "bestandsgrootte klopt niet"
 
-#: nscd/connections.c:550
+#: nscd/connections.c:566
 msgid "verification failed"
 msgstr "gegevenscontrole is mislukt"
 
-#: nscd/connections.c:564
+#: nscd/connections.c:580
 #, 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"
 
-#: nscd/connections.c:574 nscd/connections.c:655
+#: nscd/connections.c:591 nscd/connections.c:673
 #, c-format
 msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr "kan geen alleen-lezen-descriptor voor '%s' aanmaken; geen mmap()"
 
-#: nscd/connections.c:634
+#: nscd/connections.c:652
 #, 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"
 
-#: nscd/connections.c:641
+#: nscd/connections.c:659
 #, c-format
 msgid "cannot create %s; no persistent database used"
 msgstr "kan %s niet aanmaken; geen persistent gegevensbestand gebruikt"
 
-#: nscd/connections.c:644
+#: nscd/connections.c:662
 #, c-format
 msgid "cannot create %s; no sharing possible"
 msgstr "kan %s niet aanmaken; bestandsdeling is niet mogelijk"
 
-#: nscd/connections.c:715
+#: nscd/connections.c:733
 #, c-format
 msgid "cannot write to database file %s: %s"
 msgstr "kan niet naar gegevensbestand %s schrijven: %s"
 
-#: nscd/connections.c:749
+#: nscd/connections.c:772
 #, 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"
 
-#: nscd/connections.c:799
+#: nscd/connections.c:823
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "kan socket niet openen: %s"
 
-#: nscd/connections.c:816
+#: nscd/connections.c:840
 #, c-format
 msgid "cannot change socket to nonblocking mode: %s"
 msgstr "kan socket niet omschakelen naar niet-blokkerende modus: %s"
 
-#: nscd/connections.c:824
+#: nscd/connections.c:848
 #, c-format
 msgid "cannot set socket to close on exec: %s"
 msgstr "kan socket niet op sluiten-bij-exec instellen: %s"
 
-#: nscd/connections.c:835
+#: nscd/connections.c:859
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "kan socket geen verbindingen laten accepteren: %s"
 
-#: nscd/connections.c:926
+#: nscd/connections.c:955
 #, c-format
 msgid "provide access to FD %d, for %s"
 msgstr "toegang verleend aan bestandsdescriptor %d, voor %s"
 
-#: nscd/connections.c:938
+#: nscd/connections.c:967
 #, 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"
 
-#: nscd/connections.c:980 nscd/connections.c:1033
+#: nscd/connections.c:1009 nscd/connections.c:1062
 #, c-format
 msgid "cannot write result: %s"
 msgstr "kan resultaat niet schrijven: %s"
 
-#: nscd/connections.c:1116
+#: nscd/connections.c:1145
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr "fout bij opvragen van ID van aanroeper: %s"
 
-#: nscd/connections.c:1175
+#: nscd/connections.c:1204
 #, c-format
 msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "kan '/proc/self/cmdline' niet openen: %s -- paranoia-modus is uitgeschakeld"
 
-#: nscd/connections.c:1189
+#: nscd/connections.c:1218
 #, c-format
 msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "kan '/proc/self/cmdline' niet openen: %s -- paranoia-modus wordt uitgeschakeld"
 
-#: nscd/connections.c:1229
+#: nscd/connections.c:1258
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr "kan niet overschakelen naar oude UID: %s -- paranoia-modus is uitgeschakeld"
 
-#: nscd/connections.c:1239
+#: nscd/connections.c:1268
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr "kan niet overschakelen naar oude GID: %s -- paranoia-modus is uitgeschakeld"
 
-#: nscd/connections.c:1252
+#: nscd/connections.c:1281
 #, 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"
 
-#: nscd/connections.c:1280
+#: nscd/connections.c:1310
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr "her-exec() is mislukt: %s -- paranoia-modus is uitgeschakeld"
 
-#: nscd/connections.c:1289
+#: nscd/connections.c:1319
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr "kan huidige werkmap niet overschakelen naar '/': %s"
 
-#: nscd/connections.c:1407
+#: nscd/connections.c:1437
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "te weinig gelezen bij lezen van verzoek: %s"
 
-#: nscd/connections.c:1438
+#: nscd/connections.c:1468
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "sleutellengte in verzoek is te lang: %d"
 
-#: nscd/connections.c:1451
+#: nscd/connections.c:1481
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "te weinig gelezen bij lezen van verzoeksleutel: %s"
 
-#: nscd/connections.c:1460
+#: nscd/connections.c:1490
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr "handle_request(): verzoek ontvangen (versie = %d) van PID %ld"
 
-#: nscd/connections.c:1465
+#: nscd/connections.c:1495
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request(): verzoek ontvangen (versie = %d)"
 
-#: nscd/connections.c:1826
+#: nscd/connections.c:1856
 #, c-format
 msgid "could only start %d threads; terminating"
 msgstr "kan slechts %d threads starten -- gestopt"
 
-#: nscd/connections.c:1874 nscd/connections.c:1875 nscd/connections.c:1892
-#: nscd/connections.c:1901 nscd/connections.c:1919 nscd/connections.c:1930
-#: nscd/connections.c:1941
+#: nscd/connections.c:1904 nscd/connections.c:1905 nscd/connections.c:1922
+#: nscd/connections.c:1931 nscd/connections.c:1949 nscd/connections.c:1960
+#: nscd/connections.c:1971
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "uitvoeren van nscd als gebruiker '%s' is mislukt"
 
-#: nscd/connections.c:1893
+#: nscd/connections.c:1923
 #, c-format
 msgid "initial getgrouplist failed"
 msgstr "eerste getgrouplist() is mislukt"
 
-#: nscd/connections.c:1902
+#: nscd/connections.c:1932
 #, c-format
 msgid "getgrouplist failed"
 msgstr "getgrouplist() is mislukt"
 
-#: nscd/connections.c:1920
+#: nscd/connections.c:1950
 #, c-format
 msgid "setgroups failed"
 msgstr "setgroups() is mislukt"
 
-#: nscd/grpcache.c:402 nscd/hstcache.c:412 nscd/initgrcache.c:412
-#: nscd/pwdcache.c:397 nscd/servicescache.c:342
+#: nscd/grpcache.c:402 nscd/hstcache.c:418 nscd/initgrcache.c:412
+#: nscd/pwdcache.c:397 nscd/servicescache.c:343
 #, c-format
 msgid "short write in %s: %s"
 msgstr "te weinig geschreven in %s: %s"
@@ -4200,12 +4220,12 @@ msgstr ""
 "%15u  CAV-peilingen\n"
 "%15u  CAV-missers\n"
 
-#: nscd/servicescache.c:389
+#: nscd/servicescache.c:390
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
 msgstr "Item \"%s\" niet gevonden in diensten-cache!"
 
-#: nscd/servicescache.c:391
+#: nscd/servicescache.c:392
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
 msgstr "Herladen van \"%s\" in diensten-cache!"
@@ -5370,7 +5390,7 @@ msgstr "Ongepaste ioctl() voor apparaat"
 #. 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"
+msgstr "Tekstbestand is in gebruik"
 
 #. TRANS File too big; the size of a file would be larger than allowed by the system.
 #: sysdeps/gnu/errlist.c:307
@@ -6282,7 +6302,7 @@ msgstr "invoerregel is van onbekende soort"
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: Schrikkelregel in niet-schrikkelbestand %s\n"
 
-#: timezone/zic.c:892 timezone/zic.c:1323 timezone/zic.c:1345
+#: timezone/zic.c:892 timezone/zic.c:1329 timezone/zic.c:1351
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: **interne fout** -- ongeldige regelcode %d\n"
@@ -6301,231 +6321,239 @@ msgstr "%s: Fout bij sluiten van %s: %s\n"
 msgid "expected continuation line not found"
 msgstr "verwachte regelcontinuering is niet gevonden"
 
-#: timezone/zic.c:956
+#: timezone/zic.c:956 timezone/zic.c:2489 timezone/zic.c:2508
+msgid "time overflow"
+msgstr "tijdsoverloop"
+
+#: timezone/zic.c:960
 msgid "24:00 not handled by pre-1998 versions of zic"
 msgstr "versies van 'zic' van voor 1998 kunnen '24:00' niet aan"
 
-#: timezone/zic.c:970
+#: timezone/zic.c:963
+msgid "values over 24 hours not handled by pre-2007 versions of zic"
+msgstr "versies van 'zic' van voor 2007 kunnen uren boven de 24 niet aan"
+
+#: timezone/zic.c:976
 msgid "wrong number of fields on Rule line"
 msgstr "verkeerd aantal velden op 'Rule'-regel"
 
-#: timezone/zic.c:974
+#: timezone/zic.c:980
 msgid "nameless rule"
 msgstr "naamloos voorschrift"
 
-#: timezone/zic.c:979
+#: timezone/zic.c:985
 msgid "invalid saved time"
 msgstr "ongeldige opgeslagen tijd"
 
-#: timezone/zic.c:1000
+#: timezone/zic.c:1006
 msgid "wrong number of fields on Zone line"
 msgstr "verkeerd aantal velden op 'Zone'-regel"
 
-#: timezone/zic.c:1006
+#: timezone/zic.c:1012
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "De regel \"Zone %s\" en optie -l sluiten elkaar uit"
 
-#: timezone/zic.c:1014
+#: timezone/zic.c:1020
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "De regel \"Zone %s\" en optie -p sluiten elkaar uit"
 
-#: timezone/zic.c:1026
+#: timezone/zic.c:1032
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "dubbele zonenaam '%s' (in bestand %s, regel %d)"
 
-#: timezone/zic.c:1042
+#: timezone/zic.c:1048
 msgid "wrong number of fields on Zone continuation line"
 msgstr "verkeerd aantal velden op 'Zone'-continueringsregel"
 
-#: timezone/zic.c:1082
+#: timezone/zic.c:1088
 msgid "invalid UTC offset"
 msgstr "ongeldige positie ten opzichte van UTC"
 
-#: timezone/zic.c:1085
+#: timezone/zic.c:1091
 msgid "invalid abbreviation format"
 msgstr "ongeldige opmaak voor afkorting"
 
-#: timezone/zic.c:1114
+#: timezone/zic.c:1120
 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"
 
-#: timezone/zic.c:1142
+#: timezone/zic.c:1148
 msgid "wrong number of fields on Leap line"
 msgstr "verkeerd aantal velden op 'Leap'-regel"
 
-#: timezone/zic.c:1151
+#: timezone/zic.c:1157
 msgid "invalid leaping year"
 msgstr "ongeldig schrikkeljaar"
 
-#: timezone/zic.c:1171 timezone/zic.c:1277
+#: timezone/zic.c:1177 timezone/zic.c:1283
 msgid "invalid month name"
 msgstr "ongeldige maandnaam"
 
-#: timezone/zic.c:1184 timezone/zic.c:1390 timezone/zic.c:1404
+#: timezone/zic.c:1190 timezone/zic.c:1396 timezone/zic.c:1410
 msgid "invalid day of month"
 msgstr "ongeldige dag van maand"
 
-#: timezone/zic.c:1189
+#: timezone/zic.c:1195
 msgid "time before zero"
 msgstr "tijdswaarde is kleiner dan nul"
 
-#: timezone/zic.c:1193
+#: timezone/zic.c:1199
 msgid "time too small"
 msgstr "tijdswaarde is te klein"
 
-#: timezone/zic.c:1197
+#: timezone/zic.c:1203
 msgid "time too large"
 msgstr "tijdswaarde is te groot"
 
-#: timezone/zic.c:1201 timezone/zic.c:1306
+#: timezone/zic.c:1207 timezone/zic.c:1312
 msgid "invalid time of day"
 msgstr "ongeldige tijd van de dag"
 
-#: timezone/zic.c:1220
+#: timezone/zic.c:1226
 msgid "illegal CORRECTION field on Leap line"
 msgstr "ongeldig CORRECTION-veld op 'Leap'-regel"
 
-#: timezone/zic.c:1225
+#: timezone/zic.c:1231
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "ongeldig 'Rolling'/'Stationary'-veld op 'Leap'-regel"
 
-#: timezone/zic.c:1241
+#: timezone/zic.c:1247
 msgid "wrong number of fields on Link line"
 msgstr "verkeerd aantal velden op 'Link'-regel"
 
-#: timezone/zic.c:1245
+#: timezone/zic.c:1251
 msgid "blank FROM field on Link line"
 msgstr "leeg FROM-veld op 'Link'-regel"
 
-#: timezone/zic.c:1249
+#: timezone/zic.c:1255
 msgid "blank TO field on Link line"
 msgstr "leeg TO-veld op 'Link'-regel"
 
-#: timezone/zic.c:1327
+#: timezone/zic.c:1333
 msgid "invalid starting year"
 msgstr "ongeldig beginjaar"
 
-#: timezone/zic.c:1349
+#: timezone/zic.c:1355
 msgid "invalid ending year"
 msgstr "ongeldig eindjaar"
 
-#: timezone/zic.c:1353
+#: timezone/zic.c:1359
 msgid "starting year greater than ending year"
 msgstr "beginjaar is groter dan eindjaar"
 
-#: timezone/zic.c:1360
+#: timezone/zic.c:1366
 msgid "typed single year"
 msgstr "begin- en eindjaar zijn gelijk"
 
-#: timezone/zic.c:1395
+#: timezone/zic.c:1401
 msgid "invalid weekday name"
 msgstr "ongeldige naam voor weekdag"
 
-#: timezone/zic.c:1573
+#: timezone/zic.c:1579
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s: Kan %s niet verwijderen: %s\n"
 
-#: timezone/zic.c:1583
+#: timezone/zic.c:1589
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: Kan %s niet aanmaken: %s\n"
 
-#: timezone/zic.c:1733
+#: timezone/zic.c:1739
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: Fout bij schrijven van %s\n"
 
-#: timezone/zic.c:2025
+#: timezone/zic.c:2031
 msgid "no POSIX environment variable for zone"
 msgstr "geen POSIX-omgevingsvariabele voor tijdzone"
 
-#: timezone/zic.c:2179
+#: timezone/zic.c:2185
 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"
 
-#: timezone/zic.c:2225
+#: timezone/zic.c:2231
 msgid "too many transitions?!"
 msgstr "te veel overgangen!?"
 
-#: timezone/zic.c:2244
+#: timezone/zic.c:2250
 msgid "internal error - addtype called with bad isdst"
 msgstr "**interne fout** -- addtype() aangeroepen met onjuiste 'isdst'"
 
-#: timezone/zic.c:2248
+#: timezone/zic.c:2254
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "**interne fout** -- addtype() aangeroepen met onjuiste 'ttisstd'"
 
-#: timezone/zic.c:2252
+#: timezone/zic.c:2258
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "**interne fout** -- addtype() aangeroepen met onjuiste 'ttisgmt'"
 
-#: timezone/zic.c:2271
+#: timezone/zic.c:2277
 msgid "too many local time types"
 msgstr "te veel soorten lokale tijd"
 
-#: timezone/zic.c:2299
+#: timezone/zic.c:2281
+msgid "UTC offset out of range"
+msgstr "Verschuiving ten opzichte van UTC valt buiten bereik"
+
+#: timezone/zic.c:2309
 msgid "too many leap seconds"
 msgstr "te veel schrikkelseconden"
 
-#: timezone/zic.c:2305
+#: timezone/zic.c:2315
 msgid "repeated leap second moment"
 msgstr "herhaald schrikkelseconde-moment"
 
-#: timezone/zic.c:2357
+#: timezone/zic.c:2367
 msgid "Wild result from command execution"
 msgstr "Vreemd resultaat van uitgevoerde opdracht"
 
-#: timezone/zic.c:2358
+#: timezone/zic.c:2368
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: opdracht was '%s', resultaat was %d\n"
 
-#: timezone/zic.c:2456
+#: timezone/zic.c:2466
 msgid "Odd number of quotation marks"
 msgstr "Oneven aantal aanhalingstekens"
 
-#: timezone/zic.c:2479 timezone/zic.c:2498
-msgid "time overflow"
-msgstr "tijdsoverloop"
-
-#: timezone/zic.c:2545
+#: timezone/zic.c:2555
 msgid "use of 2/29 in non leap-year"
 msgstr "'29-2' gebruikt in een niet-schrikkeljaar"
 
-#: timezone/zic.c:2580
+#: timezone/zic.c:2590
 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"
 
-#: timezone/zic.c:2612
+#: timezone/zic.c:2622
 msgid "time zone abbreviation lacks alphabetic at start"
 msgstr "tijdzone-afkorting begint niet met een letter"
 
-#: timezone/zic.c:2614
+#: timezone/zic.c:2624
 msgid "time zone abbreviation has more than 3 alphabetics"
 msgstr "tijdzone-afkorting heeft meer dan drie letters"
 
-#: timezone/zic.c:2616
+#: timezone/zic.c:2626
 msgid "time zone abbreviation has too many alphabetics"
 msgstr "tijdzone-afkorting heeft te veel letters"
 
-#: timezone/zic.c:2626
+#: timezone/zic.c:2636
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr "tijdzone-afkorting verschilt van de POSIX-standaard"
 
-#: timezone/zic.c:2638
+#: timezone/zic.c:2648
 msgid "too many, or too long, time zone abbreviations"
 msgstr "te veel of te lange tijdzone-afkortingen"
 
-#: timezone/zic.c:2679
+#: timezone/zic.c:2689
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: Kan map %s niet aanmaken: %s\n"
 
-#: timezone/zic.c:2701
+#: timezone/zic.c:2711
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: %d is niet correct omgezet naar een grotere precisie\n"
diff --git a/po/pl.po b/po/pl.po
index 316bbaaf2e..cba36a77ff 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.6.1\n"
-"POT-Creation-Date: 2007-08-04 11:37+0200\n"
-"PO-Revision-Date: 2007-08-04 12:50+0200\n"
+"Project-Id-Version: libc 2.7\n"
+"POT-Creation-Date: 2007-10-15 21:18-0700\n"
+"PO-Revision-Date: 2007-10-23 20:10+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -130,7 +130,7 @@ msgstr ""
 "-o PLIK-WY [PLIK-WE]...\n"
 "[PLIK-WY [PLIK-WE]...]"
 
-#: catgets/gencat.c:232 debug/pcprofiledump.c:199 iconv/iconv_prog.c:411
+#: catgets/gencat.c:232 debug/pcprofiledump.c:204 iconv/iconv_prog.c:411
 #: iconv/iconvconfig.c:380 locale/programs/localedef.c:371
 #: login/programs/pt_chown.c:88 malloc/memusagestat.c:526 nss/makedb.c:231
 msgid ""
@@ -140,7 +140,7 @@ msgstr ""
 "Instrukcje dotycz±ce zg³aszania b³êdów znajduj± siê pod adresem:\n"
 "<http://www.gnu.org/software/libc/bugs.html>.\n"
 
-#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:287
+#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:296
 #: elf/ldd.bash.in:39 elf/sprof.c:355 iconv/iconv_prog.c:426
 #: iconv/iconvconfig.c:395 locale/programs/locale.c:275
 #: locale/programs/localedef.c:387 login/programs/pt_chown.c:59
@@ -158,7 +158,7 @@ msgstr ""
 "SPRZEDA¯Y lub PRZYDATNO¦CI DO KONKRETNYCH ZASTOSOWAÑ.\n"
 
 # w %s wchodzi nazwisko autora danego programu/procedury -PK
-#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:292 elf/sprof.c:361
+#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:301 elf/sprof.c:361
 #: iconv/iconv_prog.c:431 iconv/iconvconfig.c:400 locale/programs/locale.c:280
 #: locale/programs/localedef.c:392 malloc/memusage.sh:75 nscd/nscd.c:411
 #: nss/getent.c:88 nss/makedb.c:250 posix/getconf.c:1017
@@ -250,29 +250,29 @@ msgstr "modu³y konwersji niedostêpny"
 msgid "cannot determine escape character"
 msgstr "nie mo¿na okre¶liæ znaku escape"
 
-#: debug/pcprofiledump.c:52
+#: debug/pcprofiledump.c:53
 msgid "Don't buffer output"
 msgstr "Nie buforowanie wyj¶cia"
 
-#: debug/pcprofiledump.c:57
+#: debug/pcprofiledump.c:58
 msgid "Dump information generated by PC profiling."
 msgstr "Zrzut informacji wygenerowanych przez profilowanie PC."
 
-#: debug/pcprofiledump.c:60
+#: debug/pcprofiledump.c:61
 msgid "[FILE]"
 msgstr "[PLIK]"
 
-#: debug/pcprofiledump.c:100
+#: debug/pcprofiledump.c:104
 #, c-format
 msgid "cannot open input file"
 msgstr "nie mo¿na otworzyæ pliku wej¶ciowego"
 
-#: debug/pcprofiledump.c:106
+#: debug/pcprofiledump.c:111
 #, c-format
 msgid "cannot read header"
 msgstr "nie mo¿na odczytaæ nag³ówka"
 
-#: debug/pcprofiledump.c:170
+#: debug/pcprofiledump.c:175
 #, c-format
 msgid "invalid pointer size"
 msgstr "nieprawid³owy rozmiar wska¼nika"
@@ -358,60 +358,55 @@ msgstr "niepoprawny tryb"
 msgid "invalid mode parameter"
 msgstr "niepoprawny parametr trybu"
 
-#: elf/cache.c:68
+#: elf/cache.c:69
 msgid "unknown"
 msgstr "nieznany"
 
-#: elf/cache.c:111
+#: elf/cache.c:112
 msgid "Unknown OS"
 msgstr "Nieznany system"
 
-#: elf/cache.c:116
+#: elf/cache.c:117
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", ABI systemu: %s %d.%d.%d"
 
-#: elf/cache.c:142 elf/ldconfig.c:1236
+#: elf/cache.c:134 elf/ldconfig.c:1270
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "Nie mo¿na otworzyæ pliku bufora %s\n"
 
-#: elf/cache.c:154
+#: elf/cache.c:148
 #, c-format
 msgid "mmap of cache file failed.\n"
 msgstr "mmap pliku bufora nie powiod³o siê.\n"
 
-#: elf/cache.c:158 elf/cache.c:168
+#: elf/cache.c:152 elf/cache.c:166
 #, c-format
 msgid "File is not a cache file.\n"
 msgstr "Plik nie jest plikiem bufora.\n"
 
-#: elf/cache.c:201 elf/cache.c:211
+#: elf/cache.c:199 elf/cache.c:209
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "Znaleziono %d bibliotek w buforze `%s'\n"
 
-#: elf/cache.c:410
-#, c-format
-msgid "Can't remove old temporary cache file %s"
-msgstr "Nie mo¿na usun±æ starego tymczasowego pliku bufora %s"
-
-#: elf/cache.c:417
+#: elf/cache.c:403
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "Nie mo¿na utworzyæ tymczasowego pliku bufora %s"
 
-#: elf/cache.c:425 elf/cache.c:435 elf/cache.c:439 elf/cache.c:443
+#: elf/cache.c:411 elf/cache.c:421 elf/cache.c:425 elf/cache.c:430
 #, c-format
 msgid "Writing of cache data failed"
 msgstr "Zapis danych bufora nie powiód³ siê"
 
-#: elf/cache.c:450
+#: elf/cache.c:435
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "Zmiana praw dostêpu %s na %#o nie powiod³a siê"
 
-#: elf/cache.c:455
+#: elf/cache.c:440
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "Zmiana nazwy %s na %s nie powiod³a siê"
@@ -424,28 +419,28 @@ msgstr "nie mo¿na utworzyæ listy zakresów"
 msgid "shared object not open"
 msgstr "obiekt dzielony nie jest otwarty"
 
-#: elf/dl-deps.c:112
+#: elf/dl-deps.c:114
 msgid "DST not allowed in SUID/SGID programs"
 msgstr "DST nie dozwolone dla programów SUID/SGID"
 
-#: elf/dl-deps.c:125 elf/dl-open.c:282
+#: elf/dl-deps.c:127 elf/dl-open.c:282
 msgid "empty dynamic string token substitution"
 msgstr "puste dynamiczne podstawienie znaku ³añcucha"
 
-#: elf/dl-deps.c:131
+#: elf/dl-deps.c:133
 #, c-format
 msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
 msgstr "nie mo¿na wczytaæ pomocniczego `%s' z powodu pustego dynamicznego podstawienia\n"
 
-#: elf/dl-deps.c:472
+#: elf/dl-deps.c:474
 msgid "cannot allocate dependency list"
 msgstr "nie mo¿na przydzieliæ pamiêci dla listy zale¿no¶ci"
 
-#: elf/dl-deps.c:505 elf/dl-deps.c:560
+#: elf/dl-deps.c:510 elf/dl-deps.c:565
 msgid "cannot allocate symbol search list"
 msgstr "nie mo¿na przydzieliæ pamiêci dla listy przeszukiwania symboli"
 
-#: elf/dl-deps.c:545
+#: elf/dl-deps.c:550
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr "Filtry nie s± obs³ugiwane z LD_TRACE_PRELINKING"
 
@@ -621,11 +616,11 @@ msgstr "niew³a¶ciwa klasa ELF: ELFCLASS32"
 msgid "cannot open shared object file"
 msgstr "nie mo¿na otworzyæ pliku obiektu dzielonego"
 
-#: elf/dl-lookup.c:261
+#: elf/dl-lookup.c:356
 msgid "relocation error"
 msgstr "b³±d relokacji"
 
-#: elf/dl-lookup.c:289
+#: elf/dl-lookup.c:384
 msgid "symbol lookup error"
 msgstr "b³±d poszukiwania symbolu"
 
@@ -675,11 +670,11 @@ msgstr "nie mo¿na odtworzyæ ochrony segmentu po relokacji"
 msgid "cannot apply additional memory protection after relocation"
 msgstr "nie mo¿na na³o¿yæ dodatkowej ochrony pamiêci po relokacji"
 
-#: elf/dl-sym.c:161
+#: elf/dl-sym.c:162
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "RTLD_NEXT wyst±pi³o w kodzie nie ³adowanym dynamicznie"
 
-#: elf/dl-sysdep.c:474 elf/dl-sysdep.c:486
+#: elf/dl-sysdep.c:469 elf/dl-sysdep.c:481
 msgid "cannot create capability list"
 msgstr "nie mo¿na utworzyæ listy uprawnieñ"
 
@@ -691,216 +686,220 @@ msgstr "nie mo¿na utworzyæ struktur danych TLS"
 msgid "cannot allocate version reference table"
 msgstr "nie mo¿na przydzieliæ tablicy odniesieñ do wersji"
 
-#: elf/ldconfig.c:135
+#: elf/ldconfig.c:138
 msgid "Print cache"
 msgstr "Wypisanie zawarto¶ci bufora"
 
-#: elf/ldconfig.c:136
+#: elf/ldconfig.c:139
 msgid "Generate verbose messages"
 msgstr "Wy¶wietlanie wiêkszej liczby komunikatów"
 
-#: elf/ldconfig.c:137
+#: elf/ldconfig.c:140
 msgid "Don't build cache"
 msgstr "Nie budowanie bufora"
 
-#: elf/ldconfig.c:138
+#: elf/ldconfig.c:141
 msgid "Don't generate links"
 msgstr "Nie tworzenie dowi±zañ"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "Change to and use ROOT as root directory"
 msgstr "Przej¶cie do i u¿ywanie KATALOGU jako g³ównego katalogu"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "ROOT"
 msgstr "KATALOG"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "CACHE"
 msgstr "BUFOR"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "Use CACHE as cache file"
 msgstr "U¿ycie BUFORA jako pliku bufora"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "CONF"
 msgstr "KONF"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "Use CONF as configuration file"
 msgstr "U¿ycie KONF jako pliku konfiguracyjnego"
 
-#: elf/ldconfig.c:142
+#: elf/ldconfig.c:145
 msgid "Only process directories specified on the command line.  Don't build cache."
 msgstr "Przetwarzanie wy³±cznie katalogów podanych z linii poleceñ; nie budowanie bufora."
 
-#: elf/ldconfig.c:143
+#: elf/ldconfig.c:146
 msgid "Manually link individual libraries."
 msgstr "Rêczne tworzenie dowi±zañ do pojedynczych bibliotek."
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "Format to use: new, old or compat (default)"
 msgstr "U¿ywany format: new, old lub compat (domy¶lny)"
 
-#: elf/ldconfig.c:152
+#: elf/ldconfig.c:148
+msgid "Ignore auxiliary cache file"
+msgstr "Ignorowanie dodatkowego pliku bufora"
+
+#: elf/ldconfig.c:156
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr "Konfiguracja powi±zañ dynamicznego linkera."
 
-#: elf/ldconfig.c:310
+#: elf/ldconfig.c:319
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "¦cie¿ka `%s' podana wiêcej ni¿ raz"
 
-#: elf/ldconfig.c:350
+#: elf/ldconfig.c:359
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s nie jest znanym rodzajem biblioteki"
 
-#: elf/ldconfig.c:375
+#: elf/ldconfig.c:384
 #, c-format
 msgid "Can't stat %s"
 msgstr "Nie mo¿na wykonaæ stat na %s"
 
-#: elf/ldconfig.c:449
+#: elf/ldconfig.c:458
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "Nie mo¿na wykonaæ stat na %s\n"
 
-#: elf/ldconfig.c:459
+#: elf/ldconfig.c:468
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s nie jest dowi±zaniem symbolicznym\n"
 
-#: elf/ldconfig.c:478
+#: elf/ldconfig.c:487
 #, c-format
 msgid "Can't unlink %s"
 msgstr "Nie mo¿na usun±æ %s"
 
-#: elf/ldconfig.c:484
+#: elf/ldconfig.c:493
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "Nie mo¿na dowi±zaæ %s do %s"
 
-#: elf/ldconfig.c:490
+#: elf/ldconfig.c:499
 msgid " (changed)\n"
 msgstr " (zmieniono)\n"
 
-#: elf/ldconfig.c:492
+#: elf/ldconfig.c:501
 msgid " (SKIPPED)\n"
 msgstr " (POMINIÊTO)\n"
 
-#: elf/ldconfig.c:547
+#: elf/ldconfig.c:556
 #, c-format
 msgid "Can't find %s"
 msgstr "Nie mo¿na znale¼æ %s"
 
-#: elf/ldconfig.c:563 elf/ldconfig.c:737 elf/ldconfig.c:784
+#: elf/ldconfig.c:572 elf/ldconfig.c:745 elf/ldconfig.c:793 elf/ldconfig.c:827
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "Nie mo¿na wykonaæ lstat na %s"
 
-#: elf/ldconfig.c:570
+#: elf/ldconfig.c:579
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "Zignorowano plik %s poniewa¿ nie jest zwyk³ym plikiem."
 
-#: elf/ldconfig.c:578
+#: elf/ldconfig.c:588
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "Nie utworzono dowi±zania poniewa¿ nie znaleziono soname dla %s"
 
-#: elf/ldconfig.c:669
+#: elf/ldconfig.c:671
 #, c-format
 msgid "Can't open directory %s"
 msgstr "Nie mo¿na otworzyæ katalogu %s"
 
-#: elf/ldconfig.c:749
+#: elf/ldconfig.c:759
 #, c-format
 msgid "Cannot stat %s"
 msgstr "Nie mo¿na wykonaæ stat na %s"
 
-#: elf/ldconfig.c:806 elf/readlib.c:91
+#: elf/ldconfig.c:814 elf/readlib.c:91
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "Nie znaleziono pliku wej¶ciowego %s.\n"
 
-#: elf/ldconfig.c:857
+#: elf/ldconfig.c:888
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "biblioteka libc5 %s w z³ym katalogu"
 
-#: elf/ldconfig.c:860
+#: elf/ldconfig.c:891
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "biblioteka libc6 %s w z³ym katalogu"
 
-#: elf/ldconfig.c:863
+#: elf/ldconfig.c:894
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "biblioteka libc4 %s w z³ym katalogu"
 
-#: elf/ldconfig.c:890
+#: elf/ldconfig.c:922
 #, c-format
 msgid "libraries %s and %s in directory %s have same soname but different type."
 msgstr "biblioteki %s i %s w katalogu %s maj± to samo soname ale inny rodzaj."
 
-#: elf/ldconfig.c:997
+#: elf/ldconfig.c:1031
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr "Nie mo¿na otworzyæ pliku konfiguracyjnego %s"
 
-#: elf/ldconfig.c:1061
+#: elf/ldconfig.c:1095
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr "%s:%u: b³êdna sk³adnia w linii hwcap"
 
-#: elf/ldconfig.c:1067
+#: elf/ldconfig.c:1101
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
 msgstr "%s:%u: indeks hwcap %lu powy¿ej maksymalnego %u"
 
-#: elf/ldconfig.c:1074 elf/ldconfig.c:1082
+#: elf/ldconfig.c:1108 elf/ldconfig.c:1116
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
 msgstr "%s:%u: indeks hwcap %lu ju¿ zdefiniowany jako %s"
 
-#: elf/ldconfig.c:1085
+#: elf/ldconfig.c:1119
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
 msgstr "%s:%u: powtórzony hwcap %lu %s"
 
-#: elf/ldconfig.c:1107
+#: elf/ldconfig.c:1141
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr "opcja -r wymaga bezwzglêdnej ¶cie¿ki pliku konfiguracyjnego"
 
-#: elf/ldconfig.c:1114 locale/programs/xmalloc.c:70 malloc/obstack.c:434
+#: elf/ldconfig.c:1148 locale/programs/xmalloc.c:70 malloc/obstack.c:434
 #: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1163
 #, c-format
 msgid "memory exhausted"
 msgstr "pamiêæ wyczerpana"
 
-#: elf/ldconfig.c:1144
+#: elf/ldconfig.c:1178
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr "%s:%u: nie mo¿na odczytaæ %s"
 
-#: elf/ldconfig.c:1189
+#: elf/ldconfig.c:1223
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr "u¿yto wzglêdnej ¶cie¿ki `%s' do utworzenia bufora"
 
-#: elf/ldconfig.c:1215
+#: elf/ldconfig.c:1249
 #, c-format
 msgid "Can't chdir to /"
 msgstr "Nie mo¿na przej¶æ do katalogu /"
 
-#: elf/ldconfig.c:1257
+#: elf/ldconfig.c:1291
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "Nie mo¿na otworzyæ katalogu pliku bufora %s\n"
@@ -1419,7 +1418,7 @@ msgstr "Nieznane s³owo kluczowe w .netrc: %s"
 msgid "Character out of range for UTF-8"
 msgstr "Znak spoza zakresu UTF-8"
 
-#: locale/programs/charmap-dir.c:58
+#: locale/programs/charmap-dir.c:59
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "nie mo¿na odczytaæ katalogu mapy znaków `%s'"
@@ -1445,7 +1444,7 @@ msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max> musi byæ wiêkszy ni¿ <mb_cur_min>\n"
 
 #: locale/programs/charmap.c:357 locale/programs/charmap.c:374
-#: locale/programs/repertoire.c:175
+#: locale/programs/repertoire.c:174
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "b³±d sk³adni w prologu: %s"
@@ -1455,7 +1454,7 @@ msgid "invalid definition"
 msgstr "niepoprawna definicja"
 
 #: locale/programs/charmap.c:375 locale/programs/locfile.c:126
-#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
+#: locale/programs/locfile.c:153 locale/programs/repertoire.c:175
 msgid "bad argument"
 msgstr "b³êdny argument"
 
@@ -1474,7 +1473,7 @@ msgstr "warto¶æ <%s> musi wynosiæ 1 lub wiêcej"
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "warto¶æ <%s> musi byæ wiêksza lub równa warto¶ci <%s>"
 
-#: locale/programs/charmap.c:445 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "argument <%s> musi byæ pojedynczym znakiem"
@@ -1492,7 +1491,7 @@ msgid "syntax error in %s definition: %s"
 msgstr "b³±d sk³adni w definicji %s: %s"
 
 #: locale/programs/charmap.c:499 locale/programs/charmap.c:679
-#: locale/programs/charmap.c:775 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
 msgid "no symbolic name given"
 msgstr "brak nazwy symbolicznej"
 
@@ -1509,19 +1508,19 @@ msgid "too many bytes in character encoding"
 msgstr "za du¿o bajtów w kodzie znaku"
 
 #: locale/programs/charmap.c:586 locale/programs/charmap.c:734
-#: locale/programs/charmap.c:817 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296
 msgid "no symbolic name given for end of range"
 msgstr "brak nazwy symbolicznej dla koñca przedzia³u"
 
 #: locale/programs/charmap.c:610 locale/programs/ld-address.c:600
-#: locale/programs/ld-collate.c:2677 locale/programs/ld-collate.c:3828
+#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3924
 #: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984
 #: locale/programs/ld-identification.c:452
 #: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
 #: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307
 #: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241
 #: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221
-#: 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: definicja nie koñczy siê przez `END %1$s'"
@@ -1543,14 +1542,14 @@ msgid "%s: error in state machine"
 msgstr "%s: b³±d w automacie skoñczonym"
 
 #: locale/programs/charmap.c:850 locale/programs/ld-address.c:616
-#: locale/programs/ld-collate.c:2674 locale/programs/ld-collate.c:3844
+#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4115
 #: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001
 #: locale/programs/ld-identification.c:468
 #: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
 #: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323
 #: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257
 #: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237
-#: locale/programs/locfile.c:826 locale/programs/repertoire.c:325
+#: locale/programs/locfile.c:826 locale/programs/repertoire.c:324
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s: przedwczesny koniec pliku"
@@ -1565,21 +1564,21 @@ msgstr "nieznany znak `%s'"
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
 msgstr "liczba bajtów dla sekwencji bajtów pocz±tku i koñca przedzia³u jest ró¿na: %d i %d"
 
-#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:2957
-#: locale/programs/repertoire.c:420
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3047
+#: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr "nieprawid³owe nazwy dla przedzia³u znaków"
 
-#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
 msgid "hexadecimal range format should use only capital characters"
 msgstr "w szesnastkowym formacie przedzia³u powinny byæ u¿ywane wielkie litery"
 
-#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:450
+#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
 msgstr "<%s> i <%s> s± niepoprawnymi nazwami dla przedzia³u"
 
-#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:457
+#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456
 msgid "upper limit in range is smaller than lower limit"
 msgstr "górna granica przedzia³u nie jest mniejsza ni¿ dolna"
 
@@ -1587,7 +1586,7 @@ msgstr "górna granica przedzia³u nie jest mniejsza ni¿ dolna"
 msgid "resulting bytes for range not representable."
 msgstr "wynikowe bajty dla przedzia³u nie mog± zostaæ wyra¿one."
 
-#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1536
+#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1556
 #: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133
 #: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
@@ -1674,7 +1673,7 @@ msgstr "%s: pole `%s' zadeklarowane wiêcej ni¿ raz"
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: nieznany znak w polu `%s'"
 
-#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3826
+#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3922
 #: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449
 #: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305
@@ -1684,12 +1683,13 @@ msgstr "%s: nieznany znak w polu `%s'"
 msgid "%s: incomplete `END' line"
 msgstr "%s: niekompletna linia `END'"
 
-#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:522
-#: locale/programs/ld-collate.c:574 locale/programs/ld-collate.c:870
-#: locale/programs/ld-collate.c:883 locale/programs/ld-collate.c:2664
-#: locale/programs/ld-collate.c:3835 locale/programs/ld-ctype.c:1960
-#: locale/programs/ld-ctype.c:2219 locale/programs/ld-ctype.c:2806
-#: locale/programs/ld-ctype.c:2992 locale/programs/ld-identification.c:459
+#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:542
+#: locale/programs/ld-collate.c:594 locale/programs/ld-collate.c:890
+#: locale/programs/ld-collate.c:903 locale/programs/ld-collate.c:2733
+#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4105
+#: locale/programs/ld-ctype.c:1960 locale/programs/ld-ctype.c:2219
+#: locale/programs/ld-ctype.c:2806 locale/programs/ld-ctype.c:2992
+#: locale/programs/ld-identification.c:459
 #: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314
 #: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248
@@ -1698,249 +1698,269 @@ msgstr "%s: niekompletna linia `END'"
 msgid "%s: syntax error"
 msgstr "%s: b³±d sk³adni"
 
-#: locale/programs/ld-collate.c:397
+#: locale/programs/ld-collate.c:417
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "`%.*s' ju¿ zdefiniowany w tablicy znaków"
 
-#: locale/programs/ld-collate.c:406
+#: locale/programs/ld-collate.c:426
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "`%.*s' ju¿ zdefiniowany w repertuarze"
 
-#: locale/programs/ld-collate.c:413
+#: locale/programs/ld-collate.c:433
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "`%.*s' ju¿ zdefiniowany jako symbol scalaj±cy"
 
-#: locale/programs/ld-collate.c:420
+#: locale/programs/ld-collate.c:440
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "`%.*s' ju¿ zdefiniowany jako element scalaj±cy"
 
-#: locale/programs/ld-collate.c:451 locale/programs/ld-collate.c:477
+#: locale/programs/ld-collate.c:471 locale/programs/ld-collate.c:497
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: porz±dki `forward' i `backward' wykluczaj± siê wzajemnie"
 
-#: locale/programs/ld-collate.c:461 locale/programs/ld-collate.c:487
-#: locale/programs/ld-collate.c:503
+#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507
+#: locale/programs/ld-collate.c:523
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: `%s' wyst±pi³o wiêcej ni¿ raz w definicji wagi %d"
 
-#: locale/programs/ld-collate.c:559
+#: locale/programs/ld-collate.c:579
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: zbyt du¿o regu³; pierwszy wpis mia³ tylko %d"
 
-#: locale/programs/ld-collate.c:595
+#: locale/programs/ld-collate.c:615
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: za ma³o regu³ sortowania"
 
-#: locale/programs/ld-collate.c:760
+#: locale/programs/ld-collate.c:780
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: pusty ³añcuch wagi jest niedozwolony"
 
 # ellipsis = wyrzutnia jezykowa - sprawdzilem. nawet pamietam ze cos takiego
 # istnieje ze szkoly, ale za cholere nie pamietam co to jest ;) -PK
-#: locale/programs/ld-collate.c:855
+#: locale/programs/ld-collate.c:875
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: wagi musz± u¿ywaæ jako nazwy tego samego symbolu wyrzutni"
 
-#: locale/programs/ld-collate.c:911
+#: locale/programs/ld-collate.c:931
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: zbyt du¿o warto¶ci"
 
-#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
+#: locale/programs/ld-collate.c:1051 locale/programs/ld-collate.c:1226
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "porz±dek dla `%.*s' zosta³ ju¿ zdefiniowany w %s:%Zu"
 
-#: locale/programs/ld-collate.c:1081
+#: locale/programs/ld-collate.c:1101
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: pocz±tkowy i koñcowy symbol przedzia³u musz± byæ znakami"
 
-#: locale/programs/ld-collate.c:1108
+#: locale/programs/ld-collate.c:1128
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: sekwencje bajtów pierwszego i ostatniego znaku musz± mieæ tê sam± d³ugo¶æ"
 
-#: locale/programs/ld-collate.c:1150
+#: locale/programs/ld-collate.c:1170
 #, c-format
 msgid "%s: byte sequence of first character of range is not lower than that of the last character"
 msgstr "%s: sekwencja bajtów pierwszego znaku przedzia³u nie jest mniejsza ni¿ sekwencja ostatniego znaku"
 
-#: locale/programs/ld-collate.c:1275
+#: locale/programs/ld-collate.c:1295
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: wyrzutnia symbolicznego przedzia³u nie mo¿e byæ bezpo¶rednio po `order_start'"
 
-#: locale/programs/ld-collate.c:1279
+#: locale/programs/ld-collate.c:1299
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr "%s: wyrzutnia symbolicznego przedzia³u nie mo¿e byæ bezpo¶rednio przed `order_end'"
 
-#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1477
+#: locale/programs/ld-collate.c:1319 locale/programs/ld-ctype.c:1477
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' i `%.*s' nie s± poprawnymi nazwami dla symbolicznego przedzia³u"
 
-#: locale/programs/ld-collate.c:1349 locale/programs/ld-collate.c:3763
+#: locale/programs/ld-collate.c:1369 locale/programs/ld-collate.c:3858
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: porz±dek dla `%.*s' zosta³ ju¿ zdefiniowany w %s:%Zu"
 
-#: locale/programs/ld-collate.c:1358
+#: locale/programs/ld-collate.c:1378
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: `%s' musi byæ znakiem"
 
-#: locale/programs/ld-collate.c:1552
+#: locale/programs/ld-collate.c:1573
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: `position' musi byæ u¿yte dla konkretnego poziomu we wszystkich sekcjach lub ¿adnej"
 
-#: locale/programs/ld-collate.c:1577
+#: locale/programs/ld-collate.c:1598
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "nie zdefiniowany symbol `%s'"
 
-#: locale/programs/ld-collate.c:1653 locale/programs/ld-collate.c:1759
+#: locale/programs/ld-collate.c:1674 locale/programs/ld-collate.c:1780
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "symbol `%s' ma to samo kodowanie co"
 
-#: locale/programs/ld-collate.c:1657 locale/programs/ld-collate.c:1763
+#: locale/programs/ld-collate.c:1678 locale/programs/ld-collate.c:1784
 #, c-format
 msgid "symbol `%s'"
 msgstr "symbol `%s'"
 
-#: locale/programs/ld-collate.c:1805
+#: locale/programs/ld-collate.c:1826
 #, c-format
 msgid "no definition of `UNDEFINED'"
 msgstr "brak definicji `UNDEFINED'"
 
-#: locale/programs/ld-collate.c:1834
+#: locale/programs/ld-collate.c:1855
 #, c-format
 msgid "too many errors; giving up"
 msgstr "zbyt du¿o b³êdów; poddajê siê"
 
-#: locale/programs/ld-collate.c:2762
+#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4044
+#, c-format
+msgid "%s: nested conditionals not supported"
+msgstr "%s: warunki zagnie¿d¿one nie s± obs³ugiwane"
+
+#: locale/programs/ld-collate.c:2677
+#, c-format
+msgid "%s: more then one 'else'"
+msgstr "%s: wiêcej ni¿ jedno 'else'"
+
+#: locale/programs/ld-collate.c:2852
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: powtórzona definicja `%s'"
 
-#: locale/programs/ld-collate.c:2798
+#: locale/programs/ld-collate.c:2888
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: powtórzona deklaracja sekcji `%s'"
 
-#: locale/programs/ld-collate.c:2937
+#: locale/programs/ld-collate.c:3027
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: nieznany znak w nazwie symbolu scalaj±cego"
 
-#: locale/programs/ld-collate.c:3069
+#: locale/programs/ld-collate.c:3159
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: nieznany znak w nazwie definicji równowa¿no¶ci"
 
-#: locale/programs/ld-collate.c:3082
+#: locale/programs/ld-collate.c:3172
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: nieznany znak w warto¶ci definicji równowa¿no¶ci"
 
-#: locale/programs/ld-collate.c:3092
+#: locale/programs/ld-collate.c:3182
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: nieznany symbol `%s' w definicji równowa¿no¶ci"
 
-#: locale/programs/ld-collate.c:3101
+#: locale/programs/ld-collate.c:3191
 msgid "error while adding equivalent collating symbol"
 msgstr "b³±d podczas dodawania równowa¿nego symbolu scalaj±cego"
 
-#: locale/programs/ld-collate.c:3131
+#: locale/programs/ld-collate.c:3221
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "powtórzona definicja skryptu `%s'"
 
-#: locale/programs/ld-collate.c:3179
+#: locale/programs/ld-collate.c:3269
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr "%s: nieznana nazwa sekcji `%.*s'"
 
-#: locale/programs/ld-collate.c:3208
+#: locale/programs/ld-collate.c:3298
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: wielokrotna definicja porz±dku dla sekcji `%s'"
 
-#: locale/programs/ld-collate.c:3233
+#: locale/programs/ld-collate.c:3326
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: b³êdna liczba regu³ sortowania"
 
-#: locale/programs/ld-collate.c:3260
+#: locale/programs/ld-collate.c:3353
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: wielokrotna definicja porz±dku dla nie nazwanej sekcji"
 
-#: locale/programs/ld-collate.c:3314 locale/programs/ld-collate.c:3442
-#: locale/programs/ld-collate.c:3804
+#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537
+#: locale/programs/ld-collate.c:3900
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: brak s³owa kluczowego `order_end'"
 
-#: locale/programs/ld-collate.c:3375
+#: locale/programs/ld-collate.c:3470
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: porz±dek dla symbolu scalaj±cego %.*s jeszcze nie zdefiniowany"
 
-#: locale/programs/ld-collate.c:3393
+#: locale/programs/ld-collate.c:3488
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: porz±dek dla elementu scalaj±cego %.*s jeszcze nie zdefiniowany"
 
-#: locale/programs/ld-collate.c:3404
+#: locale/programs/ld-collate.c:3499
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: nie mo¿na zmieniæ porz±dku po %.*s: nieznany symbol"
 
-#: locale/programs/ld-collate.c:3456 locale/programs/ld-collate.c:3816
+#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: brak s³owa kluczowego `reorder-end'"
 
-#: locale/programs/ld-collate.c:3490 locale/programs/ld-collate.c:3688
+#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: nieznana sekcja `%.*s'"
 
-#: locale/programs/ld-collate.c:3555
+#: locale/programs/ld-collate.c:3650
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: b³êdny symbol <%.*s>"
 
-#: locale/programs/ld-collate.c:3751
+#: locale/programs/ld-collate.c:3846
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: nie mo¿na u¿yæ `%s' jako koñca przedzia³u wyrzutni"
 
-#: locale/programs/ld-collate.c:3800
+#: locale/programs/ld-collate.c:3896
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: pusty opis kategorii niedozwolony"
 
-#: locale/programs/ld-collate.c:3819
+#: locale/programs/ld-collate.c:3915
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: brak s³owa kluczowego `reorder-sections-end'"
 
+#: locale/programs/ld-collate.c:4077
+#, c-format
+msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: '%s' bez odpowiadaj±cego mu 'ifdef' lub 'ifndef'"
+
+#: locale/programs/ld-collate.c:4095
+#, c-format
+msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: 'endif' bez odpowiadaj±cego mu 'ifdef' lub 'ifndef'"
+
 #: locale/programs/ld-ctype.c:439
 #, c-format
 msgid "No character set name specified in charmap"
@@ -2712,22 +2732,22 @@ msgstr "¿adne inne s³owo kluczowe nie powinno wystêpowaæ razem z `copy'"
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "definicja `%1$s' musi koñczyæ siê wyra¿eniem `END %1$s'"
 
-#: 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 "b³±d sk³adni w definicji tablicy repertuaru: %s"
 
-#: locale/programs/repertoire.c:272
+#: locale/programs/repertoire.c:271
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "nie podano ¿adnych warto¶ci <Uxxxx> lub <Uxxxxxxxx>"
 
-#: locale/programs/repertoire.c:332
+#: locale/programs/repertoire.c:331
 #, c-format
 msgid "cannot save new repertoire map"
 msgstr "nie mo¿na zachowaæ nowej tablicy repertuaru"
 
-#: locale/programs/repertoire.c:343
+#: locale/programs/repertoire.c:342
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr "nie znaleziono pliku tablicy repertuaru `%s'"
@@ -3544,12 +3564,12 @@ msgstr "yp_update: nie mo¿na przekonwertowaæ nazwy hosta na nazwê sieci\n"
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: nie mo¿na uzyskaæ adresu serwera\n"
 
-#: nscd/aicache.c:77 nscd/hstcache.c:462
+#: nscd/aicache.c:77 nscd/hstcache.c:468
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "Nie znaleziono \"%s\" w buforze hostów!"
 
-#: nscd/aicache.c:79 nscd/hstcache.c:464
+#: nscd/aicache.c:79 nscd/hstcache.c:470
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr "Prze³adowywanie \"%s\" w buforze hostów!"
@@ -3563,7 +3583,7 @@ msgstr "dodanie nowego wpisu \"%s\" typu %s dla %s do bufora%s"
 msgid " (first)"
 msgstr " (pierwszy)"
 
-#: nscd/cache.c:256 nscd/connections.c:786
+#: nscd/cache.c:256 nscd/connections.c:810
 #, c-format
 msgid "cannot stat() file `%s': %s"
 msgstr "znalezienie pliku bazy danych `%s' jest niemo¿liwe: %s"
@@ -3578,188 +3598,188 @@ msgstr "czyszczenie bufora %s; czas %ld"
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr "rozwa¿anie wpisu %s \"%s\", limit czasu %<PRIu64>"
 
-#: nscd/connections.c:505 nscd/connections.c:517 nscd/connections.c:529
-#: nscd/connections.c:548
+#: nscd/connections.c:521 nscd/connections.c:533 nscd/connections.c:545
+#: nscd/connections.c:564
 #, c-format
 msgid "invalid persistent database file \"%s\": %s"
 msgstr "nieprawid³owy plik trwa³ej bazy danych \"%s\": %s"
 
-#: nscd/connections.c:519
+#: nscd/connections.c:535
 msgid "header size does not match"
 msgstr "rozmiar nag³ówka siê nie zgadza"
 
-#: nscd/connections.c:531
+#: nscd/connections.c:547
 msgid "file size does not match"
 msgstr "rozmiar pliku siê nie zgadza"
 
-#: nscd/connections.c:550
+#: nscd/connections.c:566
 msgid "verification failed"
 msgstr "weryfikacja nie powiod³a siê"
 
-#: nscd/connections.c:564
+#: nscd/connections.c:580
 #, c-format
 msgid "suggested size of table for database %s larger than the persistent database's table"
 msgstr "sugerowany rozmiar tablicy dla bazy danych %s wiêkszy od bufora trwa³ej bazy danych"
 
-#: nscd/connections.c:574 nscd/connections.c:655
+#: nscd/connections.c:591 nscd/connections.c:673
 #, c-format
 msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr "nie mo¿na utworzyæ deskryptora tylko dla odczytu dla \"%s\"; brak mmap"
 
-#: nscd/connections.c:634
+#: nscd/connections.c:652
 #, c-format
 msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
 msgstr "baza danych dla %s uszkodzona lub jednocze¶nie u¿ywana; w razie potrzeby trzeba rêcznie usun±æ %s i zrestartowaæ"
 
-#: nscd/connections.c:641
+#: nscd/connections.c:659
 #, c-format
 msgid "cannot create %s; no persistent database used"
 msgstr "nie mo¿na utworzyæ %s; trwa³a baza danych nie u¿ywana"
 
-#: nscd/connections.c:644
+#: nscd/connections.c:662
 #, c-format
 msgid "cannot create %s; no sharing possible"
 msgstr "nie mo¿na utworzyæ %s; wspó³dzielenie niemo¿liwe"
 
-#: nscd/connections.c:715
+#: nscd/connections.c:733
 #, c-format
 msgid "cannot write to database file %s: %s"
 msgstr "nie mo¿na zapisaæ do pliku bazy danych %s: %s"
 
-#: nscd/connections.c:749
+#: nscd/connections.c:772
 #, c-format
 msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
 msgstr "nie mo¿na ustawiæ gniazda do zamkniêcia przy exec: %s; wy³±czono tryb paranoiczny"
 
-#: nscd/connections.c:799
+#: nscd/connections.c:823
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "nie mo¿na otworzyæ gniazda: %s"
 
-#: nscd/connections.c:816
+#: nscd/connections.c:840
 #, c-format
 msgid "cannot change socket to nonblocking mode: %s"
 msgstr "nie mo¿na przestawiæ gniazda w tryb nieblokuj±cy: %s"
 
-#: nscd/connections.c:824
+#: nscd/connections.c:848
 #, c-format
 msgid "cannot set socket to close on exec: %s"
 msgstr "nie mo¿na ustawiæ gniazda do zamkniêcia przy exec: %s"
 
-#: nscd/connections.c:835
+#: nscd/connections.c:859
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "nie mo¿na otworzyæ gniazda do przyjmowania po³±czeñ: %s"
 
-#: nscd/connections.c:926
+#: nscd/connections.c:955
 #, c-format
 msgid "provide access to FD %d, for %s"
 msgstr "udostêpnianie FD %d dla %s"
 
-#: nscd/connections.c:938
+#: nscd/connections.c:967
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "nie mo¿na obs³u¿yæ ¿±dañ w starej wersji %d; aktualna wersja to %d"
 
-#: nscd/connections.c:980 nscd/connections.c:1033
+#: nscd/connections.c:1009 nscd/connections.c:1062
 #, c-format
 msgid "cannot write result: %s"
 msgstr "nie mo¿na zapisaæ wyniku: %s"
 
-#: nscd/connections.c:1116
+#: nscd/connections.c:1145
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr "b³±d podczas pobierania identyfikatorów wywo³uj±cych: %s"
 
-#: nscd/connections.c:1175
+#: nscd/connections.c:1204
 #, c-format
 msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "nie mo¿na otworzyæ /proc/self/cmdline: %s; wy³±czono tryb paranoiczny"
 
-#: nscd/connections.c:1189
+#: nscd/connections.c:1218
 #, c-format
 msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "nie mo¿na odczytaæ /proc/self/cmdline: %s; wy³±czono tryb paranoiczny"
 
-#: nscd/connections.c:1229
+#: nscd/connections.c:1258
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr "nie mo¿na zmieniæ na stary UID: %s; wy³±czono tryb paranoiczny"
 
-#: nscd/connections.c:1239
+#: nscd/connections.c:1268
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr "nie mo¿na zmieniæ na stary GID: %s; wy³±czono tryb paranoiczny"
 
-#: nscd/connections.c:1252
+#: nscd/connections.c:1281
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr "nie mo¿na przej¶æ do starego katalog roboczego: %s; wy³±czono tryb paranoiczny"
 
-#: nscd/connections.c:1280
+#: nscd/connections.c:1310
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr "ponowne wywo³anie nie powiod³o siê: %s; wy³±czono tryb paranoiczny"
 
-#: nscd/connections.c:1289
+#: nscd/connections.c:1319
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr "nie mo¿na zmieniæ bie¿±cego katalogu na \"/\": %s"
 
-#: nscd/connections.c:1407
+#: nscd/connections.c:1437
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "skrócony odczyt podczas czytania ¿±dania: `%s'"
 
-#: nscd/connections.c:1438
+#: nscd/connections.c:1468
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "d³ugo¶æ klucza w ¿±daniu zbyt du¿a: %d"
 
-#: nscd/connections.c:1451
+#: nscd/connections.c:1481
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "skrócony odczyt podczas czytania klucza ¿±dania: %s"
 
-#: nscd/connections.c:1460
+#: nscd/connections.c:1490
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr "handle_request: odebrano ¿±danie (Wersja = %d) od procesu %ld"
 
-#: nscd/connections.c:1465
+#: nscd/connections.c:1495
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request: odebrano ¿±danie (Wersja = %d)"
 
-#: nscd/connections.c:1826
+#: nscd/connections.c:1856
 #, c-format
 msgid "could only start %d threads; terminating"
 msgstr "mo¿na uruchomiæ tylko %d w±tków; zakoñczenie"
 
-#: nscd/connections.c:1874 nscd/connections.c:1875 nscd/connections.c:1892
-#: nscd/connections.c:1901 nscd/connections.c:1919 nscd/connections.c:1930
-#: nscd/connections.c:1941
+#: nscd/connections.c:1904 nscd/connections.c:1905 nscd/connections.c:1922
+#: nscd/connections.c:1931 nscd/connections.c:1949 nscd/connections.c:1960
+#: nscd/connections.c:1971
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "Uruchomienie nscd jako u¿ytkownik '%s' nie powiod³o siê"
 
-#: nscd/connections.c:1893
+#: nscd/connections.c:1923
 #, c-format
 msgid "initial getgrouplist failed"
 msgstr "pocz±tkowe getgrouplist nie powiod³o siê"
 
-#: nscd/connections.c:1902
+#: nscd/connections.c:1932
 #, c-format
 msgid "getgrouplist failed"
 msgstr "getgrouplist nie powiod³o siê"
 
-#: nscd/connections.c:1920
+#: nscd/connections.c:1950
 #, c-format
 msgid "setgroups failed"
 msgstr "setgroups nie powiod³o siê"
 
-#: nscd/grpcache.c:402 nscd/hstcache.c:412 nscd/initgrcache.c:412
-#: nscd/pwdcache.c:397 nscd/servicescache.c:342
+#: nscd/grpcache.c:402 nscd/hstcache.c:418 nscd/initgrcache.c:412
+#: nscd/pwdcache.c:397 nscd/servicescache.c:343
 #, c-format
 msgid "short write in %s: %s"
 msgstr "b³±d zapisu w %s: %s"
@@ -4171,12 +4191,12 @@ msgstr ""
 "%15u  prób CAV\n"
 "%15u  CAV nie trafionych\n"
 
-#: nscd/servicescache.c:389
+#: nscd/servicescache.c:390
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
 msgstr "Nie znaleziono \"%s\" w buforze us³ug!"
 
-#: nscd/servicescache.c:391
+#: nscd/servicescache.c:392
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
 msgstr "Prze³adowywanie \"%s\" w buforze us³ug!"
@@ -6252,7 +6272,7 @@ msgstr "nieznany typ linii wej¶ciowej"
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: linia Leap nie znajduje siê w pliku sekund przestêpnych %s\n"
 
-#: timezone/zic.c:892 timezone/zic.c:1323 timezone/zic.c:1345
+#: timezone/zic.c:892 timezone/zic.c:1329 timezone/zic.c:1351
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: panika: B³êdna l-warto¶æ %d\n"
@@ -6271,232 +6291,240 @@ msgstr "%s: B³±d podczas zamykania %s: %s\n"
 msgid "expected continuation line not found"
 msgstr "brak spodziewanej linii kontynuacji"
 
-#: timezone/zic.c:956
+#: timezone/zic.c:956 timezone/zic.c:2489 timezone/zic.c:2508
+msgid "time overflow"
+msgstr "przepe³nienie czasu"
+
+#: timezone/zic.c:960
 msgid "24:00 not handled by pre-1998 versions of zic"
 msgstr "24:00 nie by³a obs³ugiwana przez wersje zic sprzed 1998 roku"
 
-#: timezone/zic.c:970
+#: timezone/zic.c:963
+msgid "values over 24 hours not handled by pre-2007 versions of zic"
+msgstr "warto¶ci wiêksze ni¿ 24 godziny nie by³y obs³ugiwane przez zic sprzed 2007 roku"
+
+#: timezone/zic.c:976
 msgid "wrong number of fields on Rule line"
 msgstr "z³a liczba pól w linii Rule"
 
-#: timezone/zic.c:974
+#: timezone/zic.c:980
 msgid "nameless rule"
 msgstr "bezimienna regu³a"
 
-#: timezone/zic.c:979
+#: timezone/zic.c:985
 msgid "invalid saved time"
 msgstr "b³êdny czas oszczêdno¶ci"
 
-#: timezone/zic.c:1000
+#: timezone/zic.c:1006
 msgid "wrong number of fields on Zone line"
 msgstr "z³a liczba pól w linii Zone"
 
-#: timezone/zic.c:1006
+#: timezone/zic.c:1012
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "Linia \"Zone %s\" i opcja -l wykluczaj± siê wzajemnie"
 
-#: timezone/zic.c:1014
+#: timezone/zic.c:1020
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "Linia \"Zone %s\" i opcja -p wykluczaj± siê wzajemnie"
 
-#: timezone/zic.c:1026
+#: timezone/zic.c:1032
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "powtórzona nazwa strefy %s (plik \"%s\", linia %d)"
 
-#: timezone/zic.c:1042
+#: timezone/zic.c:1048
 msgid "wrong number of fields on Zone continuation line"
 msgstr "z³a liczba pól w linii kontynuacji Zone"
 
-#: timezone/zic.c:1082
+#: timezone/zic.c:1088
 msgid "invalid UTC offset"
 msgstr "nieprawid³owe przesuniêcie UTC"
 
-#: timezone/zic.c:1085
+#: timezone/zic.c:1091
 msgid "invalid abbreviation format"
 msgstr "nieprawid³owy format skrótu"
 
-#: timezone/zic.c:1114
+#: timezone/zic.c:1120
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr "Czas koñcowy linii kontynuacji Zone nie jest po czasie koñcowym poprzedniej linii"
 
-#: timezone/zic.c:1142
+#: timezone/zic.c:1148
 msgid "wrong number of fields on Leap line"
 msgstr "z³a liczba pól w linii Leap"
 
-#: timezone/zic.c:1151
+#: timezone/zic.c:1157
 msgid "invalid leaping year"
 msgstr "nieprawid³owy rok przestêpny"
 
-#: timezone/zic.c:1171 timezone/zic.c:1277
+#: timezone/zic.c:1177 timezone/zic.c:1283
 msgid "invalid month name"
 msgstr "nieprawid³owa nazwa miesi±ca"
 
-#: timezone/zic.c:1184 timezone/zic.c:1390 timezone/zic.c:1404
+#: timezone/zic.c:1190 timezone/zic.c:1396 timezone/zic.c:1410
 msgid "invalid day of month"
 msgstr "nieprawid³owy dzieñ miesi±ca"
 
-#: timezone/zic.c:1189
+#: timezone/zic.c:1195
 msgid "time before zero"
 msgstr "czas przed zerem"
 
-#: timezone/zic.c:1193
+#: timezone/zic.c:1199
 msgid "time too small"
 msgstr "czas zbyt ma³y"
 
-#: timezone/zic.c:1197
+#: timezone/zic.c:1203
 msgid "time too large"
 msgstr "czas zbyt du¿y"
 
-#: timezone/zic.c:1201 timezone/zic.c:1306
+#: timezone/zic.c:1207 timezone/zic.c:1312
 msgid "invalid time of day"
 msgstr "nieprawid³owa pora dnia"
 
-#: timezone/zic.c:1220
+#: timezone/zic.c:1226
 msgid "illegal CORRECTION field on Leap line"
 msgstr "b³êdne pole CORRECTION w linii Leap"
 
-#: timezone/zic.c:1225
+#: timezone/zic.c:1231
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "b³êdne pole Rolling/Stationary w linii Leap"
 
-#: timezone/zic.c:1241
+#: timezone/zic.c:1247
 msgid "wrong number of fields on Link line"
 msgstr "z³a liczba pól w linii Link"
 
-#: timezone/zic.c:1245
+#: timezone/zic.c:1251
 msgid "blank FROM field on Link line"
 msgstr "puste pole FROM w linii Link"
 
-#: timezone/zic.c:1249
+#: timezone/zic.c:1255
 msgid "blank TO field on Link line"
 msgstr "puste pole TO w linii Link"
 
-#: timezone/zic.c:1327
+#: timezone/zic.c:1333
 msgid "invalid starting year"
 msgstr "nieprawid³owy rok pocz±tkowy"
 
-#: timezone/zic.c:1349
+#: timezone/zic.c:1355
 msgid "invalid ending year"
 msgstr "nieprawid³owy rok koñcowy"
 
-#: timezone/zic.c:1353
+#: timezone/zic.c:1359
 msgid "starting year greater than ending year"
 msgstr "rok pocz±tkowy jest pó¼niejszy ni¿ koñcowy"
 
-#: timezone/zic.c:1360
+#: timezone/zic.c:1366
 msgid "typed single year"
 msgstr "podano pojedynczy rok"
 
-#: timezone/zic.c:1395
+#: timezone/zic.c:1401
 msgid "invalid weekday name"
 msgstr "nieprawid³owa nazwa dnia tygodnia"
 
-#: timezone/zic.c:1573
+#: timezone/zic.c:1579
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s: Nie mo¿na usun±æ %s: %s\n"
 
-#: timezone/zic.c:1583
+#: timezone/zic.c:1589
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: Nie mo¿na utworzyæ %s: %s\n"
 
-#: timezone/zic.c:1733
+#: timezone/zic.c:1739
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: B³±d podczas zapisu do %s\n"
 
-#: timezone/zic.c:2025
+#: timezone/zic.c:2031
 msgid "no POSIX environment variable for zone"
 msgstr "brak zmiennej ¶rodowiskowej POSIX dla strefy"
 
 # jak ladnie przetlumaczyc ten until time? -PK
-#: timezone/zic.c:2179
+#: timezone/zic.c:2185
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr "nie mo¿na okre¶liæ skrótu strefy czasowej po koñcu przedzia³u czasu"
 
-#: timezone/zic.c:2225
+#: timezone/zic.c:2231
 msgid "too many transitions?!"
 msgstr "za du¿o konwersji?!"
 
-#: timezone/zic.c:2244
+#: timezone/zic.c:2250
 msgid "internal error - addtype called with bad isdst"
 msgstr "b³±d wewnêtrzny - addtype wywo³ane z b³êdnym isdst"
 
-#: timezone/zic.c:2248
+#: timezone/zic.c:2254
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "b³±d wewnêtrzny - addtype wywo³ane z b³êdnym ttisstd"
 
-#: timezone/zic.c:2252
+#: timezone/zic.c:2258
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "b³±d wewnêtrzny - addtype wywo³ane z b³êdnym ttisgmt"
 
-#: timezone/zic.c:2271
+#: timezone/zic.c:2277
 msgid "too many local time types"
 msgstr "za du¿o lokalnych typów czasu"
 
-#: timezone/zic.c:2299
+#: timezone/zic.c:2281
+msgid "UTC offset out of range"
+msgstr "przesuniêcie wzglêdem UTC poza zakresem"
+
+#: timezone/zic.c:2309
 msgid "too many leap seconds"
 msgstr "za du¿o sekund przestêpnych"
 
-#: timezone/zic.c:2305
+#: timezone/zic.c:2315
 msgid "repeated leap second moment"
 msgstr "powtórzona chwila wystêpowania sekund przestêpnych"
 
-#: timezone/zic.c:2357
+#: timezone/zic.c:2367
 msgid "Wild result from command execution"
 msgstr "Osobliwy wynik wykonania polecenia"
 
-#: timezone/zic.c:2358
+#: timezone/zic.c:2368
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: polecenie `%s' zwróci³o %d\n"
 
-#: timezone/zic.c:2456
+#: timezone/zic.c:2466
 msgid "Odd number of quotation marks"
 msgstr "Nieparzysta liczba cudzys³owów"
 
-#: timezone/zic.c:2479 timezone/zic.c:2498
-msgid "time overflow"
-msgstr "przepe³nienie czasu"
-
-#: timezone/zic.c:2545
+#: timezone/zic.c:2555
 msgid "use of 2/29 in non leap-year"
 msgstr "u¿ycie 2/29 w roku nieprzestêpnym"
 
-#: timezone/zic.c:2580
+#: timezone/zic.c:2590
 msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic"
 msgstr "regu³a przekracza pocz±tek/koniec miesi±ca - nie zadzia³a z wersjami zic sprzed 2004 roku"
 
-#: timezone/zic.c:2612
+#: timezone/zic.c:2622
 msgid "time zone abbreviation lacks alphabetic at start"
 msgstr "skrót nazwy strefy czasowej nie zaczyna siê od litery"
 
-#: timezone/zic.c:2614
+#: timezone/zic.c:2624
 msgid "time zone abbreviation has more than 3 alphabetics"
 msgstr "skrót nazwy strefy czasowej ma mniej ni¿ 3 litery"
 
-#: timezone/zic.c:2616
+#: timezone/zic.c:2626
 msgid "time zone abbreviation has too many alphabetics"
 msgstr "skrót nazwy strefy czasowej ma zbyt du¿o liter"
 
-#: timezone/zic.c:2626
+#: timezone/zic.c:2636
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr "skrót nazwy strefy czasowej ró¿ni siê od standardu POSIX"
 
-#: timezone/zic.c:2638
+#: timezone/zic.c:2648
 msgid "too many, or too long, time zone abbreviations"
 msgstr "za d³ugie lub za du¿o skrótów stref czasowych"
 
-#: timezone/zic.c:2679
+#: timezone/zic.c:2689
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: Nie mo¿na utworzyæ katalogu %s: %s\n"
 
-#: timezone/zic.c:2701
+#: timezone/zic.c:2711
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: %d niepoprawnie rozszerzy³ znak\n"
diff --git a/po/sv.po b/po/sv.po
index fca08f39a9..9464e5e6b4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,13 +1,13 @@
 # GNU libc message catalog for swedish
 # Copyright © 1996, 1998, 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 # Jan Djärv <jan.h.d@swipnet.se>, 1996, 1998, 2001, 2002, 2003, 2006, 2007.
-# Revision: 1.55
+# Revision: 1.57
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.6.1\n"
-"POT-Creation-Date: 2007-08-04 11:37+0200\n"
-"PO-Revision-Date: 2007-08-07 18:31+0200\n"
+"Project-Id-Version: libc 2.7\n"
+"POT-Creation-Date: 2007-10-15 21:18-0700\n"
+"PO-Revision-Date: 2007-11-14 21:01+0100\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -132,7 +132,7 @@ msgstr ""
 "-o UTFIL [INFIL]...\n"
 "[UTFIL [INFIL]...]"
 
-#: catgets/gencat.c:232 debug/pcprofiledump.c:199 iconv/iconv_prog.c:411
+#: catgets/gencat.c:232 debug/pcprofiledump.c:204 iconv/iconv_prog.c:411
 #: iconv/iconvconfig.c:380 locale/programs/localedef.c:371
 #: login/programs/pt_chown.c:88 malloc/memusagestat.c:526 nss/makedb.c:231
 msgid ""
@@ -143,7 +143,7 @@ msgstr ""
 "<http://www.gnu.org/software/libc/bugs.html>.\n"
 "Rapportera fel eller synpunkter på översättningen till <tp-sv@listor.tp-sv.se>.\n"
 
-#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:287
+#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:296
 #: elf/ldd.bash.in:39 elf/sprof.c:355 iconv/iconv_prog.c:426
 #: iconv/iconvconfig.c:395 locale/programs/locale.c:275
 #: locale/programs/localedef.c:387 login/programs/pt_chown.c:59
@@ -160,7 +160,7 @@ msgstr ""
 "INGEN garanti; inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT\n"
 "ÄNDAMÅL.\n"
 
-#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:292 elf/sprof.c:361
+#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:301 elf/sprof.c:361
 #: iconv/iconv_prog.c:431 iconv/iconvconfig.c:400 locale/programs/locale.c:280
 #: locale/programs/localedef.c:392 malloc/memusage.sh:75 nscd/nscd.c:411
 #: nss/getent.c:88 nss/makedb.c:250 posix/getconf.c:1017
@@ -252,29 +252,29 @@ msgstr "konverteringsmoduler inte tillgängliga"
 msgid "cannot determine escape character"
 msgstr "kan inte avgöra kontrolltecken"
 
-#: debug/pcprofiledump.c:52
+#: debug/pcprofiledump.c:53
 msgid "Don't buffer output"
 msgstr "Buffra inte resultatet"
 
-#: debug/pcprofiledump.c:57
+#: debug/pcprofiledump.c:58
 msgid "Dump information generated by PC profiling."
 msgstr "Visa information genererad av PC-profilering."
 
-#: debug/pcprofiledump.c:60
+#: debug/pcprofiledump.c:61
 msgid "[FILE]"
 msgstr "[FIL]"
 
-#: debug/pcprofiledump.c:100
+#: debug/pcprofiledump.c:104
 #, c-format
 msgid "cannot open input file"
 msgstr "kan inte öppna infil"
 
-#: debug/pcprofiledump.c:106
+#: debug/pcprofiledump.c:111
 #, c-format
 msgid "cannot read header"
 msgstr "kan inte läsa huvud"
 
-#: debug/pcprofiledump.c:170
+#: debug/pcprofiledump.c:175
 #, c-format
 msgid "invalid pointer size"
 msgstr "ogiltig pekarstorlek"
@@ -360,60 +360,55 @@ msgstr "ogiltigt läge"
 msgid "invalid mode parameter"
 msgstr "ogiltig lägesparameter"
 
-#: elf/cache.c:68
+#: elf/cache.c:69
 msgid "unknown"
 msgstr "okänt"
 
-#: elf/cache.c:111
+#: elf/cache.c:112
 msgid "Unknown OS"
 msgstr "Okänt OS"
 
-#: elf/cache.c:116
+#: elf/cache.c:117
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", OS ABI: %s %d.%d.%d"
 
-#: elf/cache.c:142 elf/ldconfig.c:1236
+#: elf/cache.c:134 elf/ldconfig.c:1270
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "Kan inte öppna cache-fil \"%s\"\n"
 
-#: elf/cache.c:154
+#: elf/cache.c:148
 #, c-format
 msgid "mmap of cache file failed.\n"
 msgstr "minnesmappning av cache-fil misslyckades.\n"
 
-#: elf/cache.c:158 elf/cache.c:168
+#: elf/cache.c:152 elf/cache.c:166
 #, c-format
 msgid "File is not a cache file.\n"
 msgstr "Filen är inte en cache-fil.\n"
 
-#: elf/cache.c:201 elf/cache.c:211
+#: elf/cache.c:199 elf/cache.c:209
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "%d bibliotek hittades i cache \"%s\"\n"
 
-#: elf/cache.c:410
-#, c-format
-msgid "Can't remove old temporary cache file %s"
-msgstr "Kan inte ta bort gammal temporär cache-fil %s"
-
-#: elf/cache.c:417
+#: elf/cache.c:403
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "Kan inte skapa temporär cache-fil \"%s\""
 
-#: elf/cache.c:425 elf/cache.c:435 elf/cache.c:439 elf/cache.c:443
+#: elf/cache.c:411 elf/cache.c:421 elf/cache.c:425 elf/cache.c:430
 #, c-format
 msgid "Writing of cache data failed"
 msgstr "Skrivning av cache-data misslyckades"
 
-#: elf/cache.c:450
+#: elf/cache.c:435
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "Misslyckades med att byta åtkomsträttigheter för %s till %#o"
 
-#: elf/cache.c:455
+#: elf/cache.c:440
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "Namnbyte på %s till %s misslyckades"
@@ -426,30 +421,30 @@ msgstr "kan inte skapa omfångslista"
 msgid "shared object not open"
 msgstr "delat objekt är inte öppnat"
 
-#: elf/dl-deps.c:112
+#: elf/dl-deps.c:114
 msgid "DST not allowed in SUID/SGID programs"
 msgstr "DST inte tillåten i SUID/SGID-program"
 
-#: elf/dl-deps.c:125 elf/dl-open.c:282
+#: elf/dl-deps.c:127 elf/dl-open.c:282
 msgid "empty dynamic string token substitution"
 msgstr "substitution av \"dynamic string token\" är tom"
 
-#: elf/dl-deps.c:131
+#: elf/dl-deps.c:133
 #, c-format
 msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
 msgstr ""
 "kan ite ladda extra \"%s\" på grund av att substitution av\n"
 "\"dynamic string token\" är tom\n"
 
-#: elf/dl-deps.c:472
+#: elf/dl-deps.c:474
 msgid "cannot allocate dependency list"
 msgstr "kan inte allokera beroendelista"
 
-#: elf/dl-deps.c:505 elf/dl-deps.c:560
+#: elf/dl-deps.c:510 elf/dl-deps.c:565
 msgid "cannot allocate symbol search list"
 msgstr "kan inte allokera söklista för symboler"
 
-#: elf/dl-deps.c:545
+#: elf/dl-deps.c:550
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr "Filter stöds ej med LD_TRACE_PRELINKING"
 
@@ -625,11 +620,11 @@ msgstr "fel ELF-klass: ELFCLASS32"
 msgid "cannot open shared object file"
 msgstr "kan inte öppna delad objektfil"
 
-#: elf/dl-lookup.c:261
+#: elf/dl-lookup.c:356
 msgid "relocation error"
 msgstr "fel vid relokering"
 
-#: elf/dl-lookup.c:289
+#: elf/dl-lookup.c:384
 msgid "symbol lookup error"
 msgstr "fel vid symboluppslagning"
 
@@ -679,11 +674,11 @@ msgstr "kan inte återställa segmenträttigheter efter relokering"
 msgid "cannot apply additional memory protection after relocation"
 msgstr "kan inte applicera extra minnesskydd efter relokering"
 
-#: elf/dl-sym.c:161
+#: elf/dl-sym.c:162
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "RTLD_NEXT används i kod som inte är dynamiskt laddad"
 
-#: elf/dl-sysdep.c:474 elf/dl-sysdep.c:486
+#: elf/dl-sysdep.c:469 elf/dl-sysdep.c:481
 msgid "cannot create capability list"
 msgstr "kan inte skapa egenskapslista"
 
@@ -695,216 +690,220 @@ msgstr "kan inte skapa datastrukturer för TLS"
 msgid "cannot allocate version reference table"
 msgstr "kan inte allokera tabell för versionsreferenser"
 
-#: elf/ldconfig.c:135
+#: elf/ldconfig.c:138
 msgid "Print cache"
 msgstr "Visa cache"
 
-#: elf/ldconfig.c:136
+#: elf/ldconfig.c:139
 msgid "Generate verbose messages"
 msgstr "Använd utförligare meddelanden"
 
-#: elf/ldconfig.c:137
+#: elf/ldconfig.c:140
 msgid "Don't build cache"
 msgstr "Bygg inte cache"
 
-#: elf/ldconfig.c:138
+#: elf/ldconfig.c:141
 msgid "Don't generate links"
 msgstr "Generera inte länkar"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "Change to and use ROOT as root directory"
 msgstr "Byt till och använd ROT som rotkatalog"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "ROOT"
 msgstr "ROT"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "CACHE"
 msgstr "CACHE"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "Use CACHE as cache file"
 msgstr "Använd CACHE som cache-fil"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "CONF"
 msgstr "CONF"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "Use CONF as configuration file"
 msgstr "Använd CONF som konfigurationsfil"
 
-#: elf/ldconfig.c:142
+#: elf/ldconfig.c:145
 msgid "Only process directories specified on the command line.  Don't build cache."
 msgstr "Behandla endast kataloger givna som argument.  Bygg inte cache."
 
-#: elf/ldconfig.c:143
+#: elf/ldconfig.c:146
 msgid "Manually link individual libraries."
 msgstr "Länka enskilda bibliotek manuellt."
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "Format to use: new, old or compat (default)"
 msgstr "Format att använda: \"new\", \"old\" eller \"compat\" (standardvärde)"
 
-#: elf/ldconfig.c:152
+#: elf/ldconfig.c:148
+msgid "Ignore auxiliary cache file"
+msgstr "Ignorera hjälpcachefilen"
+
+#: elf/ldconfig.c:156
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr "Konfigurera bindningar för den dynamiska länkaren."
 
-#: elf/ldconfig.c:310
+#: elf/ldconfig.c:319
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "Sökväg \"%s\" given mer än en gång"
 
-#: elf/ldconfig.c:350
+#: elf/ldconfig.c:359
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s är inte en känd bibliotekstyp"
 
-#: elf/ldconfig.c:375
+#: elf/ldconfig.c:384
 #, c-format
 msgid "Can't stat %s"
 msgstr "Kan inte ta status på %s"
 
-#: elf/ldconfig.c:449
+#: elf/ldconfig.c:458
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "Kan inte ta status på %s\n"
 
-#: elf/ldconfig.c:459
+#: elf/ldconfig.c:468
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s är inte en symbolisk länk\n"
 
-#: elf/ldconfig.c:478
+#: elf/ldconfig.c:487
 #, c-format
 msgid "Can't unlink %s"
 msgstr "Kan inte ta bort (unlink) %s"
 
-#: elf/ldconfig.c:484
+#: elf/ldconfig.c:493
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "Kan inte länka %s till %s"
 
-#: elf/ldconfig.c:490
+#: elf/ldconfig.c:499
 msgid " (changed)\n"
 msgstr " (ändrad)\n"
 
-#: elf/ldconfig.c:492
+#: elf/ldconfig.c:501
 msgid " (SKIPPED)\n"
 msgstr " (HOPPAR ÖVER)\n"
 
-#: elf/ldconfig.c:547
+#: elf/ldconfig.c:556
 #, c-format
 msgid "Can't find %s"
 msgstr "Kan inte hitta %s"
 
-#: elf/ldconfig.c:563 elf/ldconfig.c:737 elf/ldconfig.c:784
+#: elf/ldconfig.c:572 elf/ldconfig.c:745 elf/ldconfig.c:793 elf/ldconfig.c:827
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "Kan inte ta status (lstat) på %s"
 
-#: elf/ldconfig.c:570
+#: elf/ldconfig.c:579
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "Ignorerar fil %s eftersom den inte är en vanlig fil"
 
-#: elf/ldconfig.c:578
+#: elf/ldconfig.c:588
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "Ingen länk skapad eftersom \"soname\" inte hittades för %s"
 
-#: elf/ldconfig.c:669
+#: elf/ldconfig.c:671
 #, c-format
 msgid "Can't open directory %s"
 msgstr "Kan inte öppna katalog %s"
 
-#: elf/ldconfig.c:749
+#: elf/ldconfig.c:759
 #, c-format
 msgid "Cannot stat %s"
 msgstr "Kan inte ta status på %s"
 
-#: elf/ldconfig.c:806 elf/readlib.c:91
+#: elf/ldconfig.c:814 elf/readlib.c:91
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "Hittar inte infil %s.\n"
 
-#: elf/ldconfig.c:857
+#: elf/ldconfig.c:888
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5-bibliotek %s i fel katalog"
 
-#: elf/ldconfig.c:860
+#: elf/ldconfig.c:891
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc6-bibliotek %s i fel katalog"
 
-#: elf/ldconfig.c:863
+#: elf/ldconfig.c:894
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4-bibliotek %s i fel katalog"
 
-#: elf/ldconfig.c:890
+#: elf/ldconfig.c:922
 #, c-format
 msgid "libraries %s and %s in directory %s have same soname but different type."
 msgstr "bibliotek %s och %s i katalog %s har samma \"soname\" men olika typ."
 
-#: elf/ldconfig.c:997
+#: elf/ldconfig.c:1031
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr "Kan inte öppna konfigurationsfil %s"
 
-#: elf/ldconfig.c:1061
+#: elf/ldconfig.c:1095
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr "%s:%u: ogiltig syntax på hwcap-raden"
 
-#: elf/ldconfig.c:1067
+#: elf/ldconfig.c:1101
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
 msgstr "%s:%u: hwcap-index %lu är större än maximum %u"
 
-#: elf/ldconfig.c:1074 elf/ldconfig.c:1082
+#: elf/ldconfig.c:1108 elf/ldconfig.c:1116
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
 msgstr "%s:%u: hwcap-index %lu redan definierat som %s"
 
-#: elf/ldconfig.c:1085
+#: elf/ldconfig.c:1119
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
 msgstr "%s:%u: duplicerad hwcap %lu %s"
 
-#: elf/ldconfig.c:1107
+#: elf/ldconfig.c:1141
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr "behöver absolut filnamn för konfigurationsfil när -r används"
 
-#: elf/ldconfig.c:1114 locale/programs/xmalloc.c:70 malloc/obstack.c:434
+#: elf/ldconfig.c:1148 locale/programs/xmalloc.c:70 malloc/obstack.c:434
 #: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1163
 #, c-format
 msgid "memory exhausted"
 msgstr "minne slut"
 
-#: elf/ldconfig.c:1144
+#: elf/ldconfig.c:1178
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr "%s:%u: kan inte läsa katalog %s"
 
-#: elf/ldconfig.c:1189
+#: elf/ldconfig.c:1223
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr "relativ sökväg \"%s\" använd för att bygga cache"
 
-#: elf/ldconfig.c:1215
+#: elf/ldconfig.c:1249
 #, c-format
 msgid "Can't chdir to /"
 msgstr "Kan inte byta katalog till /"
 
-#: elf/ldconfig.c:1257
+#: elf/ldconfig.c:1291
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "Kan inte läsa cache-filkatalog \"%s\"\n"
@@ -1424,7 +1423,7 @@ msgstr "Okänt .netrc-nyckelord %s"
 msgid "Character out of range for UTF-8"
 msgstr "Tecken utanför intervallet för UTF-8"
 
-#: locale/programs/charmap-dir.c:58
+#: locale/programs/charmap-dir.c:59
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "kan inte läsa teckenuppsättningskatalog \"%s\""
@@ -1450,7 +1449,7 @@ msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max> måste vara större än <mb_cur_min>\n"
 
 #: locale/programs/charmap.c:357 locale/programs/charmap.c:374
-#: locale/programs/repertoire.c:175
+#: locale/programs/repertoire.c:174
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "syntaxfel i prolog: %s"
@@ -1460,7 +1459,7 @@ msgid "invalid definition"
 msgstr "ogiltig definition"
 
 #: locale/programs/charmap.c:375 locale/programs/locfile.c:126
-#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
+#: locale/programs/locfile.c:153 locale/programs/repertoire.c:175
 msgid "bad argument"
 msgstr "dåligt argument"
 
@@ -1479,7 +1478,7 @@ msgstr "värdet på <%s> måste vara 1 eller större"
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "värdet på <%s> måste vara större eller lika med värdet på <%s>"
 
-#: locale/programs/charmap.c:445 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "argumentet till <%s> måste vara ett enskilt tecken"
@@ -1497,7 +1496,7 @@ msgid "syntax error in %s definition: %s"
 msgstr "syntaxfel i definition av %s: %s"
 
 #: locale/programs/charmap.c:499 locale/programs/charmap.c:679
-#: locale/programs/charmap.c:775 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
 msgid "no symbolic name given"
 msgstr "inget symboliskt namn givet"
 
@@ -1514,19 +1513,19 @@ msgid "too many bytes in character encoding"
 msgstr "för många tecken i teckenkodning"
 
 #: locale/programs/charmap.c:586 locale/programs/charmap.c:734
-#: locale/programs/charmap.c:817 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296
 msgid "no symbolic name given for end of range"
 msgstr "inget symboliskt namn givet för slutet av intervallet"
 
 #: locale/programs/charmap.c:610 locale/programs/ld-address.c:600
-#: locale/programs/ld-collate.c:2677 locale/programs/ld-collate.c:3828
+#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3924
 #: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984
 #: locale/programs/ld-identification.c:452
 #: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
 #: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307
 #: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241
 #: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221
-#: 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: definition slutar inte med \"END %1$s\""
@@ -1546,14 +1545,14 @@ msgid "%s: error in state machine"
 msgstr "%s: fel i tillståndsmaskin"
 
 #: locale/programs/charmap.c:850 locale/programs/ld-address.c:616
-#: locale/programs/ld-collate.c:2674 locale/programs/ld-collate.c:3844
+#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4115
 #: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001
 #: locale/programs/ld-identification.c:468
 #: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
 #: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323
 #: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257
 #: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237
-#: locale/programs/locfile.c:826 locale/programs/repertoire.c:325
+#: locale/programs/locfile.c:826 locale/programs/repertoire.c:324
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s: för tidigt filslut"
@@ -1570,21 +1569,21 @@ msgstr ""
 "antal byte för bytesekvens angivet i början respektive slutet av intervallet\n"
 "skiljer sig: %d respektive %d"
 
-#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:2957
-#: locale/programs/repertoire.c:420
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3047
+#: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr "ogiltiga namn för teckenintervall"
 
-#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
 msgid "hexadecimal range format should use only capital characters"
 msgstr "hexadecimalt intervallformat bör endast använda versaler"
 
-#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:450
+#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
 msgstr "<%s> och <%s> är ogiltiga namn för intervall"
 
-#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:457
+#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456
 msgid "upper limit in range is smaller than lower limit"
 msgstr "övre gräns i intervall är mindre än undre gräns"
 
@@ -1592,7 +1591,7 @@ msgstr "övre gräns i intervall är mindre än undre gräns"
 msgid "resulting bytes for range not representable."
 msgstr "resulterande byte för intervall är inte representerbara."
 
-#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1536
+#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1556
 #: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133
 #: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
@@ -1679,7 +1678,7 @@ msgstr "%s: fält \"%s\" är deklarerad mer än en gång"
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: okänt tecken i fält \"%s\""
 
-#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3826
+#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3922
 #: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449
 #: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305
@@ -1689,12 +1688,13 @@ msgstr "%s: okänt tecken i fält \"%s\""
 msgid "%s: incomplete `END' line"
 msgstr "%s: ofullständig \"END\"-rad"
 
-#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:522
-#: locale/programs/ld-collate.c:574 locale/programs/ld-collate.c:870
-#: locale/programs/ld-collate.c:883 locale/programs/ld-collate.c:2664
-#: locale/programs/ld-collate.c:3835 locale/programs/ld-ctype.c:1960
-#: locale/programs/ld-ctype.c:2219 locale/programs/ld-ctype.c:2806
-#: locale/programs/ld-ctype.c:2992 locale/programs/ld-identification.c:459
+#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:542
+#: locale/programs/ld-collate.c:594 locale/programs/ld-collate.c:890
+#: locale/programs/ld-collate.c:903 locale/programs/ld-collate.c:2733
+#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4105
+#: locale/programs/ld-ctype.c:1960 locale/programs/ld-ctype.c:2219
+#: locale/programs/ld-ctype.c:2806 locale/programs/ld-ctype.c:2992
+#: locale/programs/ld-identification.c:459
 #: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314
 #: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248
@@ -1703,247 +1703,267 @@ msgstr "%s: ofullständig \"END\"-rad"
 msgid "%s: syntax error"
 msgstr "%s: syntaxfel"
 
-#: locale/programs/ld-collate.c:397
+#: locale/programs/ld-collate.c:417
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "\"%.*s\" redan definerad i teckenuppsättning"
 
-#: locale/programs/ld-collate.c:406
+#: locale/programs/ld-collate.c:426
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "\"%.*s\" redan definierad i repertoar"
 
-#: locale/programs/ld-collate.c:413
+#: locale/programs/ld-collate.c:433
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "\"%.*s\" redan definierad som ett kollationssymbol"
 
-#: locale/programs/ld-collate.c:420
+#: locale/programs/ld-collate.c:440
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "\"%.*s\" redan definierad som ett kollationselement"
 
-#: locale/programs/ld-collate.c:451 locale/programs/ld-collate.c:477
+#: locale/programs/ld-collate.c:471 locale/programs/ld-collate.c:497
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: sorteringsordning \"forward\" och \"backward\" är ömsesidigt uteslutande"
 
-#: locale/programs/ld-collate.c:461 locale/programs/ld-collate.c:487
-#: locale/programs/ld-collate.c:503
+#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507
+#: locale/programs/ld-collate.c:523
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: \"%s\" är nämnd fler än en gång i definitionen av vikt %d"
 
-#: locale/programs/ld-collate.c:559
+#: locale/programs/ld-collate.c:579
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: för många regler, första delen hade bara %d"
 
-#: locale/programs/ld-collate.c:595
+#: locale/programs/ld-collate.c:615
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: inte tillräckligt med sorteringsregler"
 
-#: locale/programs/ld-collate.c:760
+#: locale/programs/ld-collate.c:780
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: tomt viktnamn är inte tillåtet"
 
-#: locale/programs/ld-collate.c:855
+#: locale/programs/ld-collate.c:875
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: vikter måste använda samma intervallsymbol som namn"
 
-#: locale/programs/ld-collate.c:911
+#: locale/programs/ld-collate.c:931
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: för många värden"
 
-#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
+#: locale/programs/ld-collate.c:1051 locale/programs/ld-collate.c:1226
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "ordningsföljd för \"%.*s\" redan definierad vid %s:%Zu"
 
-#: locale/programs/ld-collate.c:1081
+#: locale/programs/ld-collate.c:1101
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: start- och slut-symbol i ett intervall måste representera tecken"
 
-#: locale/programs/ld-collate.c:1108
+#: locale/programs/ld-collate.c:1128
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: bytesekvens för första och sista tecknet måste ha samma längd"
 
-#: locale/programs/ld-collate.c:1150
+#: locale/programs/ld-collate.c:1170
 #, c-format
 msgid "%s: byte sequence of first character of range is not lower than that of the last character"
 msgstr "%s: bytesekvens för första tecknet i intervallet är inte mindre än den för sista tecknet"
 
-#: locale/programs/ld-collate.c:1275
+#: locale/programs/ld-collate.c:1295
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: symboliskt intervall får inte vara omedelbart efter \"order_start\""
 
-#: locale/programs/ld-collate.c:1279
+#: locale/programs/ld-collate.c:1299
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr "%s: symboliskt intervall får inte omedelbart följas av \"order_end\""
 
-#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1477
+#: locale/programs/ld-collate.c:1319 locale/programs/ld-ctype.c:1477
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "\"%s\" och \"%.*s\" är otillåtna namn för symboliskt intervall"
 
-#: locale/programs/ld-collate.c:1349 locale/programs/ld-collate.c:3763
+#: locale/programs/ld-collate.c:1369 locale/programs/ld-collate.c:3858
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: ordningsföljd för \"%.*s\" redan definierad i %s:%Zu"
 
-#: locale/programs/ld-collate.c:1358
+#: locale/programs/ld-collate.c:1378
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: \"%s\" måste vara ett enskilt tecken"
 
-#: locale/programs/ld-collate.c:1552
+#: locale/programs/ld-collate.c:1573
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: \"position\" måste användas för en given nivå i alla sektioner eller inte alls"
 
-#: locale/programs/ld-collate.c:1577
+#: locale/programs/ld-collate.c:1598
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "symbol \"%s\" inte definierad"
 
-#: locale/programs/ld-collate.c:1653 locale/programs/ld-collate.c:1759
+#: locale/programs/ld-collate.c:1674 locale/programs/ld-collate.c:1780
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "symbol \"%s\" har samma värde som"
 
-#: locale/programs/ld-collate.c:1657 locale/programs/ld-collate.c:1763
+#: locale/programs/ld-collate.c:1678 locale/programs/ld-collate.c:1784
 #, c-format
 msgid "symbol `%s'"
 msgstr "symbol \"%s\""
 
-#: locale/programs/ld-collate.c:1805
+#: locale/programs/ld-collate.c:1826
 #, c-format
 msgid "no definition of `UNDEFINED'"
 msgstr "ingen definition av \"UNDEFINED\""
 
-#: locale/programs/ld-collate.c:1834
+#: locale/programs/ld-collate.c:1855
 #, c-format
 msgid "too many errors; giving up"
 msgstr "för många fel, ger upp"
 
-#: locale/programs/ld-collate.c:2762
+#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4044
+#, c-format
+msgid "%s: nested conditionals not supported"
+msgstr "%s: nästlade villkor stöds inte"
+
+#: locale/programs/ld-collate.c:2677
+#, c-format
+msgid "%s: more then one 'else'"
+msgstr "%s: mer än en \"else\""
+
+#: locale/programs/ld-collate.c:2852
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: dubbla definitioner av \"%s\""
 
-#: locale/programs/ld-collate.c:2798
+#: locale/programs/ld-collate.c:2888
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: dubbla deklarationer för sektion \"%s\""
 
-#: locale/programs/ld-collate.c:2937
+#: locale/programs/ld-collate.c:3027
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: okänt tecken i namn för kollationssymbol"
 
-#: locale/programs/ld-collate.c:3069
+#: locale/programs/ld-collate.c:3159
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: okänt tecken i namnet i ekvivalensdefinitionen"
 
-#: locale/programs/ld-collate.c:3082
+#: locale/programs/ld-collate.c:3172
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: okänt tecken i värdet i ekvivalensdefinitionen"
 
-#: locale/programs/ld-collate.c:3092
+#: locale/programs/ld-collate.c:3182
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: okänd symbol \"%s\" i ekvivalensdefinition"
 
-#: locale/programs/ld-collate.c:3101
+#: locale/programs/ld-collate.c:3191
 msgid "error while adding equivalent collating symbol"
 msgstr "fel när ekvivalent kollationssymbol lades till"
 
-#: locale/programs/ld-collate.c:3131
+#: locale/programs/ld-collate.c:3221
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "dubblerad definition för skript \"%s\""
 
-#: locale/programs/ld-collate.c:3179
+#: locale/programs/ld-collate.c:3269
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr "%s: okänt sektionsnamn \"%.*s\""
 
-#: locale/programs/ld-collate.c:3208
+#: locale/programs/ld-collate.c:3298
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: dubbla definitioner av ordningsföljd i sektion \"%s\""
 
-#: locale/programs/ld-collate.c:3233
+#: locale/programs/ld-collate.c:3326
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: ogiltigt antal sorteringsregler"
 
-#: locale/programs/ld-collate.c:3260
+#: locale/programs/ld-collate.c:3353
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: flera definitioner av ordningsföljd i namnlös sektion"
 
-#: locale/programs/ld-collate.c:3314 locale/programs/ld-collate.c:3442
-#: locale/programs/ld-collate.c:3804
+#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537
+#: locale/programs/ld-collate.c:3900
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: nyckelord \"order_end\" saknas"
 
-#: locale/programs/ld-collate.c:3375
+#: locale/programs/ld-collate.c:3470
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: ordningsföljd för kollationssymbol %.*s är inte definierad ännu"
 
-#: locale/programs/ld-collate.c:3393
+#: locale/programs/ld-collate.c:3488
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: ordningsföljd för kollationselement %.*s är inte definierad ännu"
 
-#: locale/programs/ld-collate.c:3404
+#: locale/programs/ld-collate.c:3499
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: kan inte byta ordning efter %.*s: okänd symbol"
 
-#: locale/programs/ld-collate.c:3456 locale/programs/ld-collate.c:3816
+#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: nyckelord \"reorder-end\" saknas"
 
-#: locale/programs/ld-collate.c:3490 locale/programs/ld-collate.c:3688
+#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: sektion \"%.*s\" okänd"
 
-#: locale/programs/ld-collate.c:3555
+#: locale/programs/ld-collate.c:3650
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: ogiltig symbol: <%.*s>"
 
-#: locale/programs/ld-collate.c:3751
+#: locale/programs/ld-collate.c:3846
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: kan inte ha \"%s\" som ändpunkt på ellips"
 
-#: locale/programs/ld-collate.c:3800
+#: locale/programs/ld-collate.c:3896
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: tom kategoribeskrivning är inte tillåtet"
 
-#: locale/programs/ld-collate.c:3819
+#: locale/programs/ld-collate.c:3915
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: nyckelord \"reorder-sections-end\" saknas"
 
+#: locale/programs/ld-collate.c:4077
+#, c-format
+msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: \"%s\" utan matchande \"ifdef\" eller \"ifndef\""
+
+#: locale/programs/ld-collate.c:4095
+#, c-format
+msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: \"endif\" utan matchande \"ifdef\" eller \"ifndef\""
+
 #: locale/programs/ld-ctype.c:439
 #, c-format
 msgid "No character set name specified in charmap"
@@ -2716,22 +2736,22 @@ msgstr "inget annat nyckelord får anges när \"copy\" används"
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "definition av \"%1$s\" slutar inte med \"END %1$s\""
 
-#: 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 "syntaxfel i repertoartabellsdefinition: %s"
 
-#: locale/programs/repertoire.c:272
+#: locale/programs/repertoire.c:271
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "inget <Uxxxx> eller <Uxxxxxxxx> värde angivet"
 
-#: locale/programs/repertoire.c:332
+#: locale/programs/repertoire.c:331
 #, c-format
 msgid "cannot save new repertoire map"
 msgstr "kan inte spara ny repertoartabell"
 
-#: locale/programs/repertoire.c:343
+#: locale/programs/repertoire.c:342
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr "hittar inte repertoarfiltabell \"%s\""
@@ -3546,12 +3566,12 @@ msgstr "yp_update: kan inte omvandla värd till nätnamn\n"
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: kan inte hämta serveradress\n"
 
-#: nscd/aicache.c:77 nscd/hstcache.c:462
+#: nscd/aicache.c:77 nscd/hstcache.c:468
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "Hittar inte \"%s\" i värdcache!"
 
-#: nscd/aicache.c:79 nscd/hstcache.c:464
+#: nscd/aicache.c:79 nscd/hstcache.c:470
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr "Omladdar \"%s\" i värdcache!"
@@ -3565,7 +3585,7 @@ msgstr "lägg till ny post \"%s\" av typen %s för %s till cache%s"
 msgid " (first)"
 msgstr " (första)"
 
-#: nscd/cache.c:256 nscd/connections.c:786
+#: nscd/cache.c:256 nscd/connections.c:810
 #, c-format
 msgid "cannot stat() file `%s': %s"
 msgstr "kan inte ta status på fil \"%s\": %s"
@@ -3580,188 +3600,188 @@ msgstr "beskär %s cache; tid %ld"
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr "överväger %s-post \"%s\", tidsgräns %<PRIu64>"
 
-#: nscd/connections.c:505 nscd/connections.c:517 nscd/connections.c:529
-#: nscd/connections.c:548
+#: nscd/connections.c:521 nscd/connections.c:533 nscd/connections.c:545
+#: nscd/connections.c:564
 #, c-format
 msgid "invalid persistent database file \"%s\": %s"
 msgstr "ogiltig persistent databasfil \"%s\": %s"
 
-#: nscd/connections.c:519
+#: nscd/connections.c:535
 msgid "header size does not match"
 msgstr "huvudstorlek stämmer inte"
 
-#: nscd/connections.c:531
+#: nscd/connections.c:547
 msgid "file size does not match"
 msgstr "filstorlek stämmer inte"
 
-#: nscd/connections.c:550
+#: nscd/connections.c:566
 msgid "verification failed"
 msgstr "verifikation misslyckades"
 
-#: nscd/connections.c:564
+#: nscd/connections.c:580
 #, c-format
 msgid "suggested size of table for database %s larger than the persistent database's table"
 msgstr "föreslagen storlek på tabellen för databas %s är större än den persistenta databasens tabell"
 
-#: nscd/connections.c:574 nscd/connections.c:655
+#: nscd/connections.c:591 nscd/connections.c:673
 #, c-format
 msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr "kan inte skapa läsbar filidentifierare för \"%s\", ingen mmap"
 
-#: nscd/connections.c:634
+#: nscd/connections.c:652
 #, c-format
 msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
 msgstr "databas för %s korrupt eller använd av flera samtidigt; ta bort %s manuellt om det behövs och starta om"
 
-#: nscd/connections.c:641
+#: nscd/connections.c:659
 #, c-format
 msgid "cannot create %s; no persistent database used"
 msgstr "kan inte skapa %s; ingen persistent databas används"
 
-#: nscd/connections.c:644
+#: nscd/connections.c:662
 #, c-format
 msgid "cannot create %s; no sharing possible"
 msgstr "kan inte skapa %s; ingen delning möjlig"
 
-#: nscd/connections.c:715
+#: nscd/connections.c:733
 #, c-format
 msgid "cannot write to database file %s: %s"
 msgstr "kan inte skriva till databasfil %s: %s"
 
-#: nscd/connections.c:749
+#: nscd/connections.c:772
 #, c-format
 msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
 msgstr "kan inte sätta uttag (socket) att stängas vid programstart: %s; kopplar ur paranoialäge"
 
-#: nscd/connections.c:799
+#: nscd/connections.c:823
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "kan inte öppna uttag (socket): %s"
 
-#: nscd/connections.c:816
+#: nscd/connections.c:840
 #, c-format
 msgid "cannot change socket to nonblocking mode: %s"
 msgstr "kan inte ändra uttag (socket) till icke-blockerande: %s"
 
-#: nscd/connections.c:824
+#: nscd/connections.c:848
 #, c-format
 msgid "cannot set socket to close on exec: %s"
 msgstr "kan inte sätta uttag (socket) att stängas vid programstart: %s"
 
-#: nscd/connections.c:835
+#: nscd/connections.c:859
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "kan inte få uttag (socket) att acceptera förbindelser: %s"
 
-#: nscd/connections.c:926
+#: nscd/connections.c:955
 #, c-format
 msgid "provide access to FD %d, for %s"
 msgstr "ge åtkomst till FD %d, för %s"
 
-#: nscd/connections.c:938
+#: nscd/connections.c:967
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "kan inte hantera äldre förfrågansversion %d, nuvarande version är %d"
 
-#: nscd/connections.c:980 nscd/connections.c:1033
+#: nscd/connections.c:1009 nscd/connections.c:1062
 #, c-format
 msgid "cannot write result: %s"
 msgstr "kan inte skriva resultat: %s"
 
-#: nscd/connections.c:1116
+#: nscd/connections.c:1145
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr "kunde inte hämta anropandes identitet: %s"
 
-#: nscd/connections.c:1175
+#: nscd/connections.c:1204
 #, c-format
 msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "kan inte öppna /proc/slef/cmdline: %s, kopplar ur paranoialäge"
 
-#: nscd/connections.c:1189
+#: nscd/connections.c:1218
 #, c-format
 msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "kan inte läsa /proc/self/cmdline: %s, kopplar ur paranoialäge"
 
-#: nscd/connections.c:1229
+#: nscd/connections.c:1258
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr "kan inte byta till föregående UID: %s; kopplar ur paranoialäge"
 
-#: nscd/connections.c:1239
+#: nscd/connections.c:1268
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr "kan inte byta till föregående GID: %s; kopplar ur paranoialäge"
 
-#: nscd/connections.c:1252
+#: nscd/connections.c:1281
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr "kan inte byta till föregående arbetskatalog: %s; kopplar ur paranoialäge"
 
-#: nscd/connections.c:1280
+#: nscd/connections.c:1310
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr "återstart misslyckades: %s; kopplar ur paranoialäge"
 
-#: nscd/connections.c:1289
+#: nscd/connections.c:1319
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr "kan inte byta aktuell katalog to \"/\": %s"
 
-#: nscd/connections.c:1407
+#: nscd/connections.c:1437
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "fattas data vid läsning av begäran: %s"
 
-#: nscd/connections.c:1438
+#: nscd/connections.c:1468
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "nyckellängd i begäran för lång: %d"
 
-#: nscd/connections.c:1451
+#: nscd/connections.c:1481
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "fattas data vid läsning av begäransnyckel: %s"
 
-#: nscd/connections.c:1460
+#: nscd/connections.c:1490
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr "handle_request: begäran mottagen (Version = %d) från PID %ld"
 
-#: nscd/connections.c:1465
+#: nscd/connections.c:1495
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request: begäran mottagen (Version = %d)"
 
-#: nscd/connections.c:1826
+#: nscd/connections.c:1856
 #, c-format
 msgid "could only start %d threads; terminating"
 msgstr "kunde bara starta %d trådar; avslutar"
 
-#: nscd/connections.c:1874 nscd/connections.c:1875 nscd/connections.c:1892
-#: nscd/connections.c:1901 nscd/connections.c:1919 nscd/connections.c:1930
-#: nscd/connections.c:1941
+#: nscd/connections.c:1904 nscd/connections.c:1905 nscd/connections.c:1922
+#: nscd/connections.c:1931 nscd/connections.c:1949 nscd/connections.c:1960
+#: nscd/connections.c:1971
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "Misslyckades att köra nscd som användare \"%s\""
 
-#: nscd/connections.c:1893
+#: nscd/connections.c:1923
 #, c-format
 msgid "initial getgrouplist failed"
 msgstr "första getgrouplist misslyckades"
 
-#: nscd/connections.c:1902
+#: nscd/connections.c:1932
 #, c-format
 msgid "getgrouplist failed"
 msgstr "getgrouplist misslyckades"
 
-#: nscd/connections.c:1920
+#: nscd/connections.c:1950
 #, c-format
 msgid "setgroups failed"
 msgstr "setgroups misslyckades"
 
-#: nscd/grpcache.c:402 nscd/hstcache.c:412 nscd/initgrcache.c:412
-#: nscd/pwdcache.c:397 nscd/servicescache.c:342
+#: nscd/grpcache.c:402 nscd/hstcache.c:418 nscd/initgrcache.c:412
+#: nscd/pwdcache.c:397 nscd/servicescache.c:343
 #, c-format
 msgid "short write in %s: %s"
 msgstr "ofullständig skrivning i %s: %s"
@@ -4172,12 +4192,12 @@ msgstr ""
 "%15u  CAV-sonderingar\n"
 "%15u  CAV-missar\n"
 
-#: nscd/servicescache.c:389
+#: nscd/servicescache.c:390
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
 msgstr "Hittar inte \"%s\" i servicecache!"
 
-#: nscd/servicescache.c:391
+#: nscd/servicescache.c:392
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
 msgstr "Omladdar \"%s\" i servicecache!"
@@ -6247,7 +6267,7 @@ msgstr "inrad av okänd typ"
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: \"Leap\"-rad i fil %s som inte är skottsekundsfil\n"
 
-#: timezone/zic.c:892 timezone/zic.c:1323 timezone/zic.c:1345
+#: timezone/zic.c:892 timezone/zic.c:1329 timezone/zic.c:1351
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: panik: Ogiltigt l_value %d\n"
@@ -6266,231 +6286,239 @@ msgstr "%s: Fel vid stängning av %s: %s\n"
 msgid "expected continuation line not found"
 msgstr "förväntad fortsättningsrad inte funnen"
 
-#: timezone/zic.c:956
+#: timezone/zic.c:956 timezone/zic.c:2489 timezone/zic.c:2508
+msgid "time overflow"
+msgstr "för stort tidsvärde"
+
+#: timezone/zic.c:960
 msgid "24:00 not handled by pre-1998 versions of zic"
 msgstr "24:00 hanteras inte av zic-versioner före 1998"
 
-#: timezone/zic.c:970
+#: timezone/zic.c:963
+msgid "values over 24 hours not handled by pre-2007 versions of zic"
+msgstr "värden större än 24 timmar hanteras inte av zic-versioner före 2007"
+
+#: timezone/zic.c:976
 msgid "wrong number of fields on Rule line"
 msgstr "fel antal fält på \"Rule\"-rad"
 
-#: timezone/zic.c:974
+#: timezone/zic.c:980
 msgid "nameless rule"
 msgstr "namnlös regel"
 
-#: timezone/zic.c:979
+#: timezone/zic.c:985
 msgid "invalid saved time"
 msgstr "ogiltig sparad tid"
 
-#: timezone/zic.c:1000
+#: timezone/zic.c:1006
 msgid "wrong number of fields on Zone line"
 msgstr "fel antal fält på \"Zone\"-rad"
 
-#: timezone/zic.c:1006
+#: timezone/zic.c:1012
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "\"Zone %s\"-rad och flaggan -l är ömsesidigt uteslutande"
 
-#: timezone/zic.c:1014
+#: timezone/zic.c:1020
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "\"Zone %s\"-rad och flaggan -p är ömsesidigt uteslutande"
 
-#: timezone/zic.c:1026
+#: timezone/zic.c:1032
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "dubblerat zonnamn %s (fil \"%s\", rad %d)"
 
-#: timezone/zic.c:1042
+#: timezone/zic.c:1048
 msgid "wrong number of fields on Zone continuation line"
 msgstr "fel antal fält på \"Zone\"-fortsättningsrad"
 
-#: timezone/zic.c:1082
+#: timezone/zic.c:1088
 msgid "invalid UTC offset"
 msgstr "ogiltigt UTC-tillägg"
 
-#: timezone/zic.c:1085
+#: timezone/zic.c:1091
 msgid "invalid abbreviation format"
 msgstr "ogiltigt förkortningsformat"
 
-#: timezone/zic.c:1114
+#: timezone/zic.c:1120
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr "Zon-fortsättningsradens sluttid är inte efter sluttiden på föregående rad"
 
-#: timezone/zic.c:1142
+#: timezone/zic.c:1148
 msgid "wrong number of fields on Leap line"
 msgstr "fel antal fält på \"Leap\"-rad"
 
-#: timezone/zic.c:1151
+#: timezone/zic.c:1157
 msgid "invalid leaping year"
 msgstr "ogiltigt skottår"
 
-#: timezone/zic.c:1171 timezone/zic.c:1277
+#: timezone/zic.c:1177 timezone/zic.c:1283
 msgid "invalid month name"
 msgstr "ogiltigt månadsnamn"
 
-#: timezone/zic.c:1184 timezone/zic.c:1390 timezone/zic.c:1404
+#: timezone/zic.c:1190 timezone/zic.c:1396 timezone/zic.c:1410
 msgid "invalid day of month"
 msgstr "ogiltig dag i månaden"
 
-#: timezone/zic.c:1189
+#: timezone/zic.c:1195
 msgid "time before zero"
 msgstr "tid före noll"
 
-#: timezone/zic.c:1193
+#: timezone/zic.c:1199
 msgid "time too small"
 msgstr "tid för kort"
 
-#: timezone/zic.c:1197
+#: timezone/zic.c:1203
 msgid "time too large"
 msgstr "tid för lång"
 
-#: timezone/zic.c:1201 timezone/zic.c:1306
+#: timezone/zic.c:1207 timezone/zic.c:1312
 msgid "invalid time of day"
 msgstr "ogiltig tid på dagen"
 
-#: timezone/zic.c:1220
+#: timezone/zic.c:1226
 msgid "illegal CORRECTION field on Leap line"
 msgstr "otillåtet \"CORRECTION\"-fält på \"Leap\"-rad"
 
-#: timezone/zic.c:1225
+#: timezone/zic.c:1231
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "otillåtet \"Rolling/Stationary\"-fält på \"Leap\"-rad"
 
-#: timezone/zic.c:1241
+#: timezone/zic.c:1247
 msgid "wrong number of fields on Link line"
 msgstr "fel antal fält på \"Link\"-rad"
 
-#: timezone/zic.c:1245
+#: timezone/zic.c:1251
 msgid "blank FROM field on Link line"
 msgstr "tomt \"FROM\"-fält på \"Link\"-rad"
 
-#: timezone/zic.c:1249
+#: timezone/zic.c:1255
 msgid "blank TO field on Link line"
 msgstr "tomt \"TO\"-fält på \"Link\"-rad"
 
-#: timezone/zic.c:1327
+#: timezone/zic.c:1333
 msgid "invalid starting year"
 msgstr "ogiltigt startår"
 
-#: timezone/zic.c:1349
+#: timezone/zic.c:1355
 msgid "invalid ending year"
 msgstr "ogiltigt slutår"
 
-#: timezone/zic.c:1353
+#: timezone/zic.c:1359
 msgid "starting year greater than ending year"
 msgstr "startår är större än slutår"
 
-#: timezone/zic.c:1360
+#: timezone/zic.c:1366
 msgid "typed single year"
 msgstr "satte typ på endast ett år"
 
-#: timezone/zic.c:1395
+#: timezone/zic.c:1401
 msgid "invalid weekday name"
 msgstr "ogiltigt veckodagsnamn"
 
-#: timezone/zic.c:1573
+#: timezone/zic.c:1579
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s: Kan inte ta bort %s: %s\n"
 
-#: timezone/zic.c:1583
+#: timezone/zic.c:1589
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: Kan inte skapa %s: %s\n"
 
-#: timezone/zic.c:1733
+#: timezone/zic.c:1739
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: Fel vid skrivning till %s\n"
 
-#: timezone/zic.c:2025
+#: timezone/zic.c:2031
 msgid "no POSIX environment variable for zone"
 msgstr "ingen POSIX-miljövariabel för zon"
 
-#: timezone/zic.c:2179
+#: timezone/zic.c:2185
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr "kan inte avgöra tidszonsförkortning att använda just efter \"until\"-tid"
 
-#: timezone/zic.c:2225
+#: timezone/zic.c:2231
 msgid "too many transitions?!"
 msgstr "för många övergångar?!"
 
-#: timezone/zic.c:2244
+#: timezone/zic.c:2250
 msgid "internal error - addtype called with bad isdst"
 msgstr "internt fel - addtype anropad med felaktig isdst"
 
-#: timezone/zic.c:2248
+#: timezone/zic.c:2254
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "internt fel - addtype anropad med felaktig ttisstd"
 
-#: timezone/zic.c:2252
+#: timezone/zic.c:2258
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "internt fel - addtype anropad med felaktig ttisgmt"
 
-#: timezone/zic.c:2271
+#: timezone/zic.c:2277
 msgid "too many local time types"
 msgstr "för många lokala tidstyper"
 
-#: timezone/zic.c:2299
+#: timezone/zic.c:2281
+msgid "UTC offset out of range"
+msgstr "UTC-offset utanför giltigt intervall"
+
+#: timezone/zic.c:2309
 msgid "too many leap seconds"
 msgstr "för många skottsekunder"
 
-#: timezone/zic.c:2305
+#: timezone/zic.c:2315
 msgid "repeated leap second moment"
 msgstr "upprepat skottsekundstillfälle"
 
-#: timezone/zic.c:2357
+#: timezone/zic.c:2367
 msgid "Wild result from command execution"
 msgstr "Vilt resultat från kommandokörning"
 
-#: timezone/zic.c:2358
+#: timezone/zic.c:2368
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: kommandot var \"%s\", resultatet blev %d\n"
 
-#: timezone/zic.c:2456
+#: timezone/zic.c:2466
 msgid "Odd number of quotation marks"
 msgstr "Ojämnt antal citationstecken"
 
-#: timezone/zic.c:2479 timezone/zic.c:2498
-msgid "time overflow"
-msgstr "för stort tidsvärde"
-
-#: timezone/zic.c:2545
+#: timezone/zic.c:2555
 msgid "use of 2/29 in non leap-year"
 msgstr "använder 29/2 i icke-skottår"
 
-#: timezone/zic.c:2580
+#: timezone/zic.c:2590
 msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic"
 msgstr "regeln går utanför start/slut på månad, fungerar inte på zic-versioner före 2004"
 
-#: timezone/zic.c:2612
+#: timezone/zic.c:2622
 msgid "time zone abbreviation lacks alphabetic at start"
 msgstr "tidszonsförkortning saknar alfabetiskt tecken i början"
 
-#: timezone/zic.c:2614
+#: timezone/zic.c:2624
 msgid "time zone abbreviation has more than 3 alphabetics"
 msgstr "tidszonsförkortning har fler än 3 alafabetiska tecken"
 
-#: timezone/zic.c:2616
+#: timezone/zic.c:2626
 msgid "time zone abbreviation has too many alphabetics"
 msgstr "tidszonsförkortning har för många alabetiska tecken"
 
-#: timezone/zic.c:2626
+#: timezone/zic.c:2636
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr "tidszonsförkortning skiljer sig från POSIX-standarden"
 
-#: timezone/zic.c:2638
+#: timezone/zic.c:2648
 msgid "too many, or too long, time zone abbreviations"
 msgstr "för många eller för långa tidszonförkortningar"
 
-#: timezone/zic.c:2679
+#: timezone/zic.c:2689
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: Kan inte skapa katalog %s: %s\n"
 
-#: timezone/zic.c:2701
+#: timezone/zic.c:2711
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: %d teckenexpanderades inte korrekt\n"
diff --git a/po/tr.po b/po/tr.po
index 5a480d6fd8..e3801d6e9f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,9 +5,9 @@
 # Onur Tolga ÅžehitoÄŸlu <onur@lcsl.metu.edu.tr>, 1998.
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.6.1\n"
-"POT-Creation-Date: 2007-08-04 11:37+0200\n"
-"PO-Revision-Date: 2007-08-04 16:10+0300\n"
+"Project-Id-Version: libc 2.7\n"
+"POT-Creation-Date: 2007-10-15 21:18-0700\n"
+"PO-Revision-Date: 2007-11-19 11:17+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr "Daha fazla bilgi için `%s --help' veya `%s --usage' yazınız.\n"
 msgid "Report bugs to %s.\n"
 msgstr ""
 "Yazılım hatalarını %s adresine\n"
-"çeviri hatalarını <nilgun@belgeler.org> adresine bildiriniz.\n"
+"çeviri hatalarını <nilgun (at) buguner.name.tr> adresine bildiriniz.\n"
 
 #: argp/argp-parse.c:102
 msgid "Give this help list"
@@ -134,7 +134,7 @@ msgstr ""
 "-o ÇIKTI-DOSYASI [GİRDİ-DOSYASI]...\n"
 "[ÇIKTI-DOSYASI [GİRDİ-DOSYASI]...]"
 
-#: catgets/gencat.c:232 debug/pcprofiledump.c:199 iconv/iconv_prog.c:411
+#: catgets/gencat.c:232 debug/pcprofiledump.c:204 iconv/iconv_prog.c:411
 #: iconv/iconvconfig.c:380 locale/programs/localedef.c:371
 #: login/programs/pt_chown.c:88 malloc/memusagestat.c:526 nss/makedb.c:231
 msgid ""
@@ -143,9 +143,9 @@ msgid ""
 msgstr ""
 "Yazılım hatalarını raporlama işlemleri için,\n"
 "<http://www.gnu.org/software/libc/bugs.html> adresine bakınız.\n"
-"Çeviri hatalarını <nilgun@belgeler.org> adresine bildiriniz.\n"
+"Çeviri hatalarını <nilgun (at) buguner.name.tr> adresine bildiriniz.\n"
 
-#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:287
+#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:296
 #: elf/ldd.bash.in:39 elf/sprof.c:355 iconv/iconv_prog.c:426
 #: iconv/iconvconfig.c:395 locale/programs/locale.c:275
 #: locale/programs/localedef.c:387 login/programs/pt_chown.c:59
@@ -162,7 +162,7 @@ msgstr ""
 "HİÇBİR garanti yoktur; hatta SATILABİLİRLİĞİ veya ŞAHSİ KULLANIMINIZA\n"
 "UYGUNLUĞU için bile garanti verilmez.\n"
 
-#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:292 elf/sprof.c:361
+#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:301 elf/sprof.c:361
 #: iconv/iconv_prog.c:431 iconv/iconvconfig.c:400 locale/programs/locale.c:280
 #: locale/programs/localedef.c:392 malloc/memusage.sh:75 nscd/nscd.c:411
 #: nss/getent.c:88 nss/makedb.c:250 posix/getconf.c:1017
@@ -254,29 +254,29 @@ msgstr "dönüşüm modülleri yok"
 msgid "cannot determine escape character"
 msgstr "öncelem karakteri saptanamıyor"
 
-#: debug/pcprofiledump.c:52
+#: debug/pcprofiledump.c:53
 msgid "Don't buffer output"
 msgstr "Tampon çıktılanmaz"
 
-#: debug/pcprofiledump.c:57
+#: debug/pcprofiledump.c:58
 msgid "Dump information generated by PC profiling."
 msgstr "Ãœretilen PC profilini yazar."
 
-#: debug/pcprofiledump.c:60
+#: debug/pcprofiledump.c:61
 msgid "[FILE]"
 msgstr "[DOSYA]"
 
-#: debug/pcprofiledump.c:100
+#: debug/pcprofiledump.c:104
 #, c-format
 msgid "cannot open input file"
 msgstr "girdi dosyası açılamıyor"
 
-#: debug/pcprofiledump.c:106
+#: debug/pcprofiledump.c:111
 #, c-format
 msgid "cannot read header"
 msgstr "başlık okunamıyor"
 
-#: debug/pcprofiledump.c:170
+#: debug/pcprofiledump.c:175
 #, c-format
 msgid "invalid pointer size"
 msgstr "imleyici uzunluğu geçersiz"
@@ -321,7 +321,7 @@ msgstr ""
 "\n"
 "Yazılım hatalarını bildirme işlemleri için,\n"
 "<http://www.gnu.org/software/libc/bugs.html> adresine bakınız.\n"
-"Çeviri hatalarını <nilgun@belgeler.org> adresine bildiriniz.\\n"
+"Çeviri hatalarını <nilgun (at) buguner.name.tr> adresine bildiriniz.\\n"
 
 #: debug/xtrace.sh:125
 msgid "xtrace: unrecognized option \\`$1'\\n"
@@ -361,60 +361,55 @@ msgstr "geçersiz kip"
 msgid "invalid mode parameter"
 msgstr "kip parametresi geçersiz"
 
-#: elf/cache.c:68
+#: elf/cache.c:69
 msgid "unknown"
 msgstr "bilinmiyor"
 
-#: elf/cache.c:111
+#: elf/cache.c:112
 msgid "Unknown OS"
 msgstr "Bilinmeyen iÅŸletim sistemi"
 
-#: elf/cache.c:116
+#: elf/cache.c:117
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", OS ABI: %s %d.%d.%d"
 
-#: elf/cache.c:142 elf/ldconfig.c:1236
+#: elf/cache.c:134 elf/ldconfig.c:1270
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "Arabellek dosyası %s açılamıyor\n"
 
-#: elf/cache.c:154
+#: elf/cache.c:148
 #, c-format
 msgid "mmap of cache file failed.\n"
 msgstr "arabellek dosyasının mmap'lenmesi başarısız\n"
 
-#: elf/cache.c:158 elf/cache.c:168
+#: elf/cache.c:152 elf/cache.c:166
 #, c-format
 msgid "File is not a cache file.\n"
 msgstr "Bir arabellek dosyası değil.\n"
 
-#: elf/cache.c:201 elf/cache.c:211
+#: elf/cache.c:199 elf/cache.c:209
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "%d kitaplık, `%s' arabelleğinde bulundu\n"
 
-#: elf/cache.c:410
-#, c-format
-msgid "Can't remove old temporary cache file %s"
-msgstr "eski geçici arabellek dosyası %s silinemiyor"
-
-#: elf/cache.c:417
+#: elf/cache.c:403
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "Geçici arabellek dosyası %s oluşturulamıyor"
 
-#: elf/cache.c:425 elf/cache.c:435 elf/cache.c:439 elf/cache.c:443
+#: elf/cache.c:411 elf/cache.c:421 elf/cache.c:425 elf/cache.c:430
 #, c-format
 msgid "Writing of cache data failed"
 msgstr "Arabellek verisini yazmada hata"
 
-#: elf/cache.c:450
+#: elf/cache.c:435
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "%s erişim hakları %#o olarak değiştirilemedi"
 
-#: elf/cache.c:455
+#: elf/cache.c:440
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "%s'in ismi %s olarak deÄŸiÅŸtirilemedi"
@@ -427,28 +422,28 @@ msgstr "etki alanı listesi oluşturulamıyor"
 msgid "shared object not open"
 msgstr "paylaşımlı nesne açık değil"
 
-#: elf/dl-deps.c:112
+#: elf/dl-deps.c:114
 msgid "DST not allowed in SUID/SGID programs"
 msgstr "SUID/SGID programlarda DST'ye izin verilmez"
 
-#: elf/dl-deps.c:125 elf/dl-open.c:282
+#: elf/dl-deps.c:127 elf/dl-open.c:282
 msgid "empty dynamic string token substitution"
 msgstr "boÅŸ dinamik dizge simge ikamesi"
 
-#: elf/dl-deps.c:131
+#: elf/dl-deps.c:133
 #, c-format
 msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
 msgstr "boş dinamik dizge simgesi ikamesi yüzünden yardımcı `%s' yüklenemiyor\n"
 
-#: elf/dl-deps.c:472
+#: elf/dl-deps.c:474
 msgid "cannot allocate dependency list"
 msgstr "bağımlılık listesi ayrılamadı"
 
-#: elf/dl-deps.c:505 elf/dl-deps.c:560
+#: elf/dl-deps.c:510 elf/dl-deps.c:565
 msgid "cannot allocate symbol search list"
 msgstr "sembol arama listesi ayrılamadı"
 
-#: elf/dl-deps.c:545
+#: elf/dl-deps.c:550
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr "LD_TRACE_PRELINKING'li süzgeçler destenlenmez"
 
@@ -624,11 +619,11 @@ msgstr "yanlış ELF sınıfı: ELFCLASS32"
 msgid "cannot open shared object file"
 msgstr "paylaşımlı nesne dosyası açılamıyor"
 
-#: elf/dl-lookup.c:261
+#: elf/dl-lookup.c:356
 msgid "relocation error"
 msgstr "yeniden konumlama hatası"
 
-#: elf/dl-lookup.c:289
+#: elf/dl-lookup.c:384
 msgid "symbol lookup error"
 msgstr "simge arama hatası"
 
@@ -678,11 +673,11 @@ msgstr "reloc işleminden sonra prot segmanı eski haline getirilemedi"
 msgid "cannot apply additional memory protection after relocation"
 msgstr "yeniden ayırma işleminden sonra ek bellek koruması uygulanamaz"
 
-#: elf/dl-sym.c:161
+#: elf/dl-sym.c:162
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "RTLD_NEXT kullanılan kod dinamik olarak yüklenmedi"
 
-#: elf/dl-sysdep.c:474 elf/dl-sysdep.c:486
+#: elf/dl-sysdep.c:469 elf/dl-sysdep.c:481
 msgid "cannot create capability list"
 msgstr "yetenek listesi oluşturulamıyor"
 
@@ -694,216 +689,220 @@ msgstr "TLS veri yapıları oluşturulamıyor"
 msgid "cannot allocate version reference table"
 msgstr "sürüm başvuru tablosu ayrılamadı"
 
-#: elf/ldconfig.c:135
+#: elf/ldconfig.c:138
 msgid "Print cache"
 msgstr "Yazıcı ön belleği"
 
-#: elf/ldconfig.c:136
+#: elf/ldconfig.c:139
 msgid "Generate verbose messages"
 msgstr "Çok detaylı iletiler üretilir"
 
-#: elf/ldconfig.c:137
+#: elf/ldconfig.c:140
 msgid "Don't build cache"
 msgstr "Arabellek oluşturulamıyor"
 
-#: elf/ldconfig.c:138
+#: elf/ldconfig.c:141
 msgid "Don't generate links"
 msgstr "Bağlar üretilemiyor"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "Change to and use ROOT as root directory"
 msgstr "Dizine geçilir ve kök dizin olarak ROOT kullanır"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "ROOT"
 msgstr "KÖK"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "CACHE"
 msgstr "ARABELLEK"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "Use CACHE as cache file"
 msgstr "Arabellek dosyası olarak ARABELLEK kullanılır"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "CONF"
 msgstr "YAPL"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "Use CONF as configuration file"
 msgstr "Yapılandırma dosyası olarak YAPD kullanılır"
 
-#: elf/ldconfig.c:142
+#: elf/ldconfig.c:145
 msgid "Only process directories specified on the command line.  Don't build cache."
 msgstr "Komut satırında sadece süreç dizinleri belirtilmiş. Önbellek oluşturulamadı."
 
-#: elf/ldconfig.c:143
+#: elf/ldconfig.c:146
 msgid "Manually link individual libraries."
 msgstr "Her bir kitaplığı kendiniz bağlayın."
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "FORMAT"
 msgstr "BİÇİM"
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "Format to use: new, old or compat (default)"
 msgstr "Kullanılacak biçem: new, old ya da compat (öntanımlı)"
 
-#: elf/ldconfig.c:152
+#: elf/ldconfig.c:148
+msgid "Ignore auxiliary cache file"
+msgstr "Yardımcı arabellek dosyası yoksayılır"
+
+#: elf/ldconfig.c:156
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr "Dinamik Bağlayıcının İcra Zamanı Bağıntılarını Yapılandırır."
 
-#: elf/ldconfig.c:310
+#: elf/ldconfig.c:319
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "`%s' dosya yolu birden fazla verilmiÅŸ"
 
-#: elf/ldconfig.c:350
+#: elf/ldconfig.c:359
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s bilinen bir kitaplık türü değil"
 
-#: elf/ldconfig.c:375
+#: elf/ldconfig.c:384
 #, c-format
 msgid "Can't stat %s"
 msgstr "stat %s yapılamıyor"
 
-#: elf/ldconfig.c:449
+#: elf/ldconfig.c:458
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "stat %s yapılamıyor\n"
 
-#: elf/ldconfig.c:459
+#: elf/ldconfig.c:468
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s bir sembolik baÄŸ deÄŸil\n"
 
-#: elf/ldconfig.c:478
+#: elf/ldconfig.c:487
 #, c-format
 msgid "Can't unlink %s"
 msgstr "%s bağı kaldırılamadı"
 
-#: elf/ldconfig.c:484
+#: elf/ldconfig.c:493
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "%s den %s'e bağ yapılamıyor"
 
-#: elf/ldconfig.c:490
+#: elf/ldconfig.c:499
 msgid " (changed)\n"
 msgstr " (deÄŸiÅŸti)\n"
 
-#: elf/ldconfig.c:492
+#: elf/ldconfig.c:501
 msgid " (SKIPPED)\n"
 msgstr " (ATLANDI)\n"
 
-#: elf/ldconfig.c:547
+#: elf/ldconfig.c:556
 #, c-format
 msgid "Can't find %s"
 msgstr "%s bulunamıyor"
 
-#: elf/ldconfig.c:563 elf/ldconfig.c:737 elf/ldconfig.c:784
+#: elf/ldconfig.c:572 elf/ldconfig.c:745 elf/ldconfig.c:793 elf/ldconfig.c:827
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "lstat %s yapılamıyor"
 
-#: elf/ldconfig.c:570
+#: elf/ldconfig.c:579
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "Normal bir dosya olmadığından %s dosyası yoksayıldı"
 
-#: elf/ldconfig.c:578
+#: elf/ldconfig.c:588
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "%s için kitaplık ismi bulunamadığından bağ oluşturulmadı"
 
-#: elf/ldconfig.c:669
+#: elf/ldconfig.c:671
 #, c-format
 msgid "Can't open directory %s"
 msgstr "%s dizini açılamıyor"
 
-#: elf/ldconfig.c:749
+#: elf/ldconfig.c:759
 #, c-format
 msgid "Cannot stat %s"
 msgstr "stat %s yapılamıyor"
 
-#: elf/ldconfig.c:806 elf/readlib.c:91
+#: elf/ldconfig.c:814 elf/readlib.c:91
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "Girdi dosyası %s bulunamadı.\n"
 
-#: elf/ldconfig.c:857
+#: elf/ldconfig.c:888
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5 kitaplığı %s yanlış dizinde"
 
-#: elf/ldconfig.c:860
+#: elf/ldconfig.c:891
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc6 kitaplığı %s yanlış dizinde"
 
-#: elf/ldconfig.c:863
+#: elf/ldconfig.c:894
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4 kitaplığı %s yanlış dizinde"
 
-#: elf/ldconfig.c:890
+#: elf/ldconfig.c:922
 #, c-format
 msgid "libraries %s and %s in directory %s have same soname but different type."
 msgstr "%s ve %s kitaplıkları %s dizininde ve aynı isme sahip oldukları halde farklı türde."
 
-#: elf/ldconfig.c:997
+#: elf/ldconfig.c:1031
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr "Yapılandırma dosyası %s açılamıyor"
 
-#: elf/ldconfig.c:1061
+#: elf/ldconfig.c:1095
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr "%s:%u: hwcap satırında sözdizimi hatası"
 
-#: elf/ldconfig.c:1067
+#: elf/ldconfig.c:1101
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
 msgstr "%s:%u: hwcap indisi %lu > azami indis %u"
 
-#: elf/ldconfig.c:1074 elf/ldconfig.c:1082
+#: elf/ldconfig.c:1108 elf/ldconfig.c:1116
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
 msgstr "%s:%u: hwcap indisi %lu zaten %s olarak tanımlı"
 
-#: elf/ldconfig.c:1085
+#: elf/ldconfig.c:1119
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
 msgstr "%s:%u: hwcap %lu %s yinelenmiÅŸ"
 
-#: elf/ldconfig.c:1107
+#: elf/ldconfig.c:1141
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr "-r kullanılırken yapılandırma dosyası için soyut dosya ismi gerekir"
 
-#: elf/ldconfig.c:1114 locale/programs/xmalloc.c:70 malloc/obstack.c:434
+#: elf/ldconfig.c:1148 locale/programs/xmalloc.c:70 malloc/obstack.c:434
 #: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1163
 #, c-format
 msgid "memory exhausted"
 msgstr "bellek tükendi"
 
-#: elf/ldconfig.c:1144
+#: elf/ldconfig.c:1178
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr "%s:%u: %s dizini okunamıyor"
 
-#: elf/ldconfig.c:1189
+#: elf/ldconfig.c:1223
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr "arabelleğin oluşturulduğu göreli yol `%s'"
 
-#: elf/ldconfig.c:1215
+#: elf/ldconfig.c:1249
 #, c-format
 msgid "Can't chdir to /"
 msgstr "/ dizinine geçilemiyor"
 
-#: elf/ldconfig.c:1257
+#: elf/ldconfig.c:1291
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "Arabellek dosyasının dizini %s açılamıyor\n"
@@ -933,7 +932,7 @@ msgstr ""
 "  -v, --verbose           tüm bilgileri basar\n"
 "Yazılım hatalarını bildirme işlemleri için,\n"
 "<http://www.gnu.org/software/libc/bugs.html> adresine bakınız.\n"
-"Çeviri hatalarını <nilgun@belgeler.org> adresine bildiriniz."
+"Çeviri hatalarını <nilgun (at) buguner.name.tr> adresine bildiriniz."
 
 #: elf/ldd.bash.in:80
 msgid "ldd: option \\`$1' is ambiguous"
@@ -1057,7 +1056,7 @@ msgstr ""
 "Paylaşımlı nesne profili oluşturma verisini okur ve gösterir.\n"
 "Yazılım hatalarını bildirme işlemleri için,\n"
 "<http://www.gnu.org/software/libc/bugs.html> adresine bakınız.\n"
-"Çeviri hatalarını <nilgun@belgeler.org> adresine bildiriniz.\n"
+"Çeviri hatalarını <nilgun (at) buguner.name.tr> adresine bildiriniz.\n"
 
 #: elf/sprof.c:94
 msgid "SHOBJ [PROFDATA]"
@@ -1424,7 +1423,7 @@ msgstr "Bilinmeyen .netrc anahtar kelimesi %s"
 msgid "Character out of range for UTF-8"
 msgstr "UTF-8 için karakter kapsam dışı"
 
-#: locale/programs/charmap-dir.c:58
+#: locale/programs/charmap-dir.c:59
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "karakter eşlem dizini `%s' okunamıyor"
@@ -1450,7 +1449,7 @@ msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max>, <mb_cur_min> den daha büyük olmalı\n"
 
 #: locale/programs/charmap.c:357 locale/programs/charmap.c:374
-#: locale/programs/repertoire.c:175
+#: locale/programs/repertoire.c:174
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "prolog içinde sözdizimi hatası: %s"
@@ -1460,7 +1459,7 @@ msgid "invalid definition"
 msgstr "geçersiz atama"
 
 #: locale/programs/charmap.c:375 locale/programs/locfile.c:126
-#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
+#: locale/programs/locfile.c:153 locale/programs/repertoire.c:175
 msgid "bad argument"
 msgstr "argüman hatalı"
 
@@ -1479,7 +1478,7 @@ msgstr "<%s> için değer 1 ya da daha büyük olmalı"
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "<%s> değeri <%s> değerinden daha büyük ya da eşit olmalı"
 
-#: locale/programs/charmap.c:445 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "<%s>in argümanı bir tek karakter olmalı"
@@ -1497,7 +1496,7 @@ msgid "syntax error in %s definition: %s"
 msgstr "%s tanımında sözdizimi hatası: %s"
 
 #: locale/programs/charmap.c:499 locale/programs/charmap.c:679
-#: locale/programs/charmap.c:775 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
 msgid "no symbolic name given"
 msgstr "sembolik isim verilmemiÅŸ"
 
@@ -1514,19 +1513,19 @@ msgid "too many bytes in character encoding"
 msgstr "karakter kodlamada bayt sayısı çok fazla"
 
 #: locale/programs/charmap.c:586 locale/programs/charmap.c:734
-#: locale/programs/charmap.c:817 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296
 msgid "no symbolic name given for end of range"
 msgstr "kapsam sonu için sembolik isim verilmemiş"
 
 #: locale/programs/charmap.c:610 locale/programs/ld-address.c:600
-#: locale/programs/ld-collate.c:2677 locale/programs/ld-collate.c:3828
+#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3924
 #: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984
 #: locale/programs/ld-identification.c:452
 #: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
 #: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307
 #: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241
 #: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221
-#: 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: tanım `END %1$s' ile bitmiyor"
@@ -1546,14 +1545,14 @@ msgid "%s: error in state machine"
 msgstr "%s: durum motorunda hata"
 
 #: locale/programs/charmap.c:850 locale/programs/ld-address.c:616
-#: locale/programs/ld-collate.c:2674 locale/programs/ld-collate.c:3844
+#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4115
 #: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001
 #: locale/programs/ld-identification.c:468
 #: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
 #: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323
 #: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257
 #: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237
-#: locale/programs/locfile.c:826 locale/programs/repertoire.c:325
+#: locale/programs/locfile.c:826 locale/programs/repertoire.c:324
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s: dosya sonu erken geldi"
@@ -1568,21 +1567,21 @@ msgstr "`%s' karakteri bilinmiyor"
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
 msgstr "aralığın başındaki ve sonundaki bayt dizilerideki baytların sayısı aynı değil: %d ve %d"
 
-#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:2957
-#: locale/programs/repertoire.c:420
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3047
+#: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr "karakter kapsamı için geçersiz isimler"
 
-#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
 msgid "hexadecimal range format should use only capital characters"
 msgstr "onaltılık kapsam biçimi sadece büyük harfleri kullanacaktır"
 
-#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:450
+#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
 msgstr "<%s> ve <%s> kapsam için geçersiz isimler"
 
-#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:457
+#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456
 msgid "upper limit in range is smaller than lower limit"
 msgstr "aralığın üst sınırı alt sınırdan küçük"
 
@@ -1590,7 +1589,7 @@ msgstr "aralığın üst sınırı alt sınırdan küçük"
 msgid "resulting bytes for range not representable."
 msgstr "sonuçlanan baytlar kapsam için gösterilebilir değil."
 
-#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1536
+#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1556
 #: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133
 #: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
@@ -1677,7 +1676,7 @@ msgstr "%s: `%s' alanı bir kereden fazla bildirilmiş"
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: `%s' alanında bilinmeyen karakter"
 
-#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3826
+#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3922
 #: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449
 #: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305
@@ -1687,12 +1686,13 @@ msgstr "%s: `%s' alanında bilinmeyen karakter"
 msgid "%s: incomplete `END' line"
 msgstr "%s: tamamlanmamış `END' satırı"
 
-#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:522
-#: locale/programs/ld-collate.c:574 locale/programs/ld-collate.c:870
-#: locale/programs/ld-collate.c:883 locale/programs/ld-collate.c:2664
-#: locale/programs/ld-collate.c:3835 locale/programs/ld-ctype.c:1960
-#: locale/programs/ld-ctype.c:2219 locale/programs/ld-ctype.c:2806
-#: locale/programs/ld-ctype.c:2992 locale/programs/ld-identification.c:459
+#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:542
+#: locale/programs/ld-collate.c:594 locale/programs/ld-collate.c:890
+#: locale/programs/ld-collate.c:903 locale/programs/ld-collate.c:2733
+#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4105
+#: locale/programs/ld-ctype.c:1960 locale/programs/ld-ctype.c:2219
+#: locale/programs/ld-ctype.c:2806 locale/programs/ld-ctype.c:2992
+#: locale/programs/ld-identification.c:459
 #: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314
 #: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248
@@ -1701,247 +1701,267 @@ msgstr "%s: tamamlanmamış `END' satırı"
 msgid "%s: syntax error"
 msgstr "%s: sözdizimi hatası"
 
-#: locale/programs/ld-collate.c:397
+#: locale/programs/ld-collate.c:417
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "`%.*s' karakter eşlem olarak zaten atanmış"
 
-#: locale/programs/ld-collate.c:406
+#: locale/programs/ld-collate.c:426
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "`%.*s' repertuvar olarak zaten atanmış"
 
-#: locale/programs/ld-collate.c:413
+#: locale/programs/ld-collate.c:433
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "`%.*s' karşılaştırma sembolü olarak zaten atanmış"
 
-#: locale/programs/ld-collate.c:420
+#: locale/programs/ld-collate.c:440
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "`%.*s' karşılaştırma elemanı olarak zaten atanmış"
 
-#: locale/programs/ld-collate.c:451 locale/programs/ld-collate.c:477
+#: locale/programs/ld-collate.c:471 locale/programs/ld-collate.c:497
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: `forward' ve `backward' karşılıklı olarak bir diğerini dışlar"
 
-#: locale/programs/ld-collate.c:461 locale/programs/ld-collate.c:487
-#: locale/programs/ld-collate.c:503
+#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507
+#: locale/programs/ld-collate.c:523
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s:`%s' %d ağırlıklı tanımda bir kereden fazla anıldı"
 
-#: locale/programs/ld-collate.c:559
+#: locale/programs/ld-collate.c:579
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: çok fazla kural var; sadece ilk girdide kural sayısı %d"
 
-#: locale/programs/ld-collate.c:595
+#: locale/programs/ld-collate.c:615
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: sıralama kuralları yetersiz"
 
-#: locale/programs/ld-collate.c:760
+#: locale/programs/ld-collate.c:780
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: boş ağırlık dizgesine izin verilmez"
 
-#: locale/programs/ld-collate.c:855
+#: locale/programs/ld-collate.c:875
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: ağırlıklar isim olarak aynı elips sembolünü kullanmalıdır"
 
-#: locale/programs/ld-collate.c:911
+#: locale/programs/ld-collate.c:931
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: çok fazla değer var"
 
-#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
+#: locale/programs/ld-collate.c:1051 locale/programs/ld-collate.c:1226
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "`%.*s' için sıralama zaten %s:%Zu içinde atanmış"
 
-#: locale/programs/ld-collate.c:1081
+#: locale/programs/ld-collate.c:1101
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: bir kapsamın başlangıç ve bitiş sembolleri, karakterleri temsil etmelidir"
 
-#: locale/programs/ld-collate.c:1108
+#: locale/programs/ld-collate.c:1128
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: ilk ve son karakterin bayt serisi aynı uzunlukta olmalı"
 
-#: locale/programs/ld-collate.c:1150
+#: locale/programs/ld-collate.c:1170
 #, c-format
 msgid "%s: byte sequence of first character of range is not lower than that of the last character"
 msgstr "%s: aralığın ilk karakterinin bayt dizisi son karakterininkinden daha düşük değil"
 
-#: locale/programs/ld-collate.c:1275
+#: locale/programs/ld-collate.c:1295
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: sembolik kapsam elipsleri  `order_start' ın hemen ardından gelmemelidir"
 
-#: locale/programs/ld-collate.c:1279
+#: locale/programs/ld-collate.c:1299
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr "%s: sembolik kapsam elipslerinin hemen ardından `order_end' gelmemelidir"
 
-#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1477
+#: locale/programs/ld-collate.c:1319 locale/programs/ld-ctype.c:1477
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' ve `%.*s' simgesel aralık için geçerli isimler değil"
 
-#: locale/programs/ld-collate.c:1349 locale/programs/ld-collate.c:3763
+#: locale/programs/ld-collate.c:1369 locale/programs/ld-collate.c:3858
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: `%.*s' için abecesel sıra zaten %s:%Zu içinde atanmış"
 
-#: locale/programs/ld-collate.c:1358
+#: locale/programs/ld-collate.c:1378
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: `%s' bir karakter olmalı"
 
-#: locale/programs/ld-collate.c:1552
+#: locale/programs/ld-collate.c:1573
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: `position' tüm alt bölümlerde özel bir düzey için kullanılmış olmalı ya da hiç bulunmamalı"
 
-#: locale/programs/ld-collate.c:1577
+#: locale/programs/ld-collate.c:1598
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "`%s' sembolü atanmamış"
 
-#: locale/programs/ld-collate.c:1653 locale/programs/ld-collate.c:1759
+#: locale/programs/ld-collate.c:1674 locale/programs/ld-collate.c:1780
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "`%s' sembolü bununla aynı kodlamaya sahip:"
 
-#: locale/programs/ld-collate.c:1657 locale/programs/ld-collate.c:1763
+#: locale/programs/ld-collate.c:1678 locale/programs/ld-collate.c:1784
 #, c-format
 msgid "symbol `%s'"
 msgstr "`%s' sembolü"
 
-#: locale/programs/ld-collate.c:1805
+#: locale/programs/ld-collate.c:1826
 #, c-format
 msgid "no definition of `UNDEFINED'"
 msgstr "`UNDEFINED' tanımı yok"
 
-#: locale/programs/ld-collate.c:1834
+#: locale/programs/ld-collate.c:1855
 #, c-format
 msgid "too many errors; giving up"
 msgstr "çok fazla hata: bırakılıyor"
 
-#: locale/programs/ld-collate.c:2762
+#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4044
+#, c-format
+msgid "%s: nested conditionals not supported"
+msgstr "%s:  iç içe koşullu ifadeler desteklenmiyor"
+
+#: locale/programs/ld-collate.c:2677
+#, c-format
+msgid "%s: more then one 'else'"
+msgstr "%s: birden fazla 'else' belirtilmiÅŸ"
+
+#: locale/programs/ld-collate.c:2852
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: `%s' tanımı tekrarlanmış"
 
-#: locale/programs/ld-collate.c:2798
+#: locale/programs/ld-collate.c:2888
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: `%s' bölüm bildirimi tekrarlanmış"
 
-#: locale/programs/ld-collate.c:2937
+#: locale/programs/ld-collate.c:3027
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: karşılaştırma sembolü isminde bilinmeyen karakter"
 
-#: locale/programs/ld-collate.c:3069
+#: locale/programs/ld-collate.c:3159
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: eşdeğer tanımlama isminde bilinmeyen karakter"
 
-#: locale/programs/ld-collate.c:3082
+#: locale/programs/ld-collate.c:3172
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: eşdeğer tanımlama değerinde bilinmeyen karakter"
 
-#: locale/programs/ld-collate.c:3092
+#: locale/programs/ld-collate.c:3182
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: eşdeğer tanımlamada bilinmeyen sembol: `%s'"
 
-#: locale/programs/ld-collate.c:3101
+#: locale/programs/ld-collate.c:3191
 msgid "error while adding equivalent collating symbol"
 msgstr "eşdeğer karşılaştırma sembolünü eklerken hata"
 
-#: locale/programs/ld-collate.c:3131
+#: locale/programs/ld-collate.c:3221
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "`%s' betiğinin ataması tekrarlanmış"
 
-#: locale/programs/ld-collate.c:3179
+#: locale/programs/ld-collate.c:3269
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr "%s: bölüm ismi `%.*s' bilinmiyor"
 
-#: locale/programs/ld-collate.c:3208
+#: locale/programs/ld-collate.c:3298
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: `%s' alt bölümünde çok sayıda sıralama tanımı"
 
-#: locale/programs/ld-collate.c:3233
+#: locale/programs/ld-collate.c:3326
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: sıralama kurallarının sayısı geçersiz"
 
-#: locale/programs/ld-collate.c:3260
+#: locale/programs/ld-collate.c:3353
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: isimsiz alt bölümde çok sayıda sıralama tanımı"
 
-#: locale/programs/ld-collate.c:3314 locale/programs/ld-collate.c:3442
-#: locale/programs/ld-collate.c:3804
+#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537
+#: locale/programs/ld-collate.c:3900
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: `order_end' anahtar-sözcüğü kayıp"
 
-#: locale/programs/ld-collate.c:3375
+#: locale/programs/ld-collate.c:3470
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: karşılaştırma sembolü %.*s için abecesel sıra henüz atanmamış"
 
-#: locale/programs/ld-collate.c:3393
+#: locale/programs/ld-collate.c:3488
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: karşılaştırma elemanı %.*s için abecesel sıra henüz atanmamış"
 
-#: locale/programs/ld-collate.c:3404
+#: locale/programs/ld-collate.c:3499
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: %.*s sembolünden sonra tekrar sıralanamıyor: sembol bilinmiyor"
 
-#: locale/programs/ld-collate.c:3456 locale/programs/ld-collate.c:3816
+#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: `reorder_end' anahtar-sözcüğü kayıp"
 
-#: locale/programs/ld-collate.c:3490 locale/programs/ld-collate.c:3688
+#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: `%.*s' alt bölümü bilinmiyor"
 
-#: locale/programs/ld-collate.c:3555
+#: locale/programs/ld-collate.c:3650
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: hatalı sembol <%.*s>"
 
-#: locale/programs/ld-collate.c:3751
+#: locale/programs/ld-collate.c:3846
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: `%s' elips kapsamının sonu olamıyor"
 
-#: locale/programs/ld-collate.c:3800
+#: locale/programs/ld-collate.c:3896
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: boş kategori açıklamasına izin verilmez"
 
-#: locale/programs/ld-collate.c:3819
+#: locale/programs/ld-collate.c:3915
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: `reorder_section_end' anahtar-sözcüğü kayıp"
 
+#: locale/programs/ld-collate.c:4077
+#, c-format
+msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: 'ifdef' veya 'ifndef' ile eÅŸleÅŸmeyen '%s'"
+
+#: locale/programs/ld-collate.c:4095
+#, c-format
+msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: 'ifdef' veya 'ifndef' ile eÅŸleÅŸmeyen 'endif'"
+
 #: locale/programs/ld-ctype.c:439
 #, c-format
 msgid "No character set name specified in charmap"
@@ -2385,7 +2405,7 @@ msgstr ""
 "Yerele özgü bilgileri gösterir.\n"
 "Yazılım hatalarını bildirme işlemleri için,\n"
 "<http://www.gnu.org/software/libc/bugs.html> adresine bakınız.\n"
-"Çeviri hatalarını <nilgun@belgeler.org> adresine bildiriniz.\n"
+"Çeviri hatalarını <nilgun (at) buguner.name.tr> adresine bildiriniz.\n"
 
 #: locale/programs/locale.c:92
 msgid ""
@@ -2715,22 +2735,22 @@ msgstr "`copy' kullanıldığında belirtilmiş olacak diğer anahtar kelime yok
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "`%1$s' tanımı `END %1$s' ile bitmiyor"
 
-#: 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 "repertuar eşlem tanımı içinde sözdizimi hatası: %s"
 
-#: locale/programs/repertoire.c:272
+#: locale/programs/repertoire.c:271
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "<Uxxxx> ya da <Uxxxxxxxx> deÄŸeri verilmeliydi"
 
-#: locale/programs/repertoire.c:332
+#: locale/programs/repertoire.c:331
 #, c-format
 msgid "cannot save new repertoire map"
 msgstr "yeni repertuvar eÅŸlemi kaydedilemiyor"
 
-#: locale/programs/repertoire.c:343
+#: locale/programs/repertoire.c:342
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr "`%s' repertuar eşlem dosyası bulunamadı"
@@ -2846,7 +2866,7 @@ msgstr ""
 "\n"
 "Yazılım hatalarını bildirme işlemleri için,\n"
 "<http://www.gnu.org/software/libc/bugs.html> adresine bakınız.\n"
-"Çeviri hatalarını <nilgun@belgeler.org> adresine bildiriniz."
+"Çeviri hatalarını <nilgun (at) buguner.name.tr> adresine bildiriniz."
 
 #: malloc/memusage.sh:99
 msgid ""
@@ -3547,12 +3567,12 @@ msgstr "yp_update: makina ismi ağ ismine dönüştürülemiyor\n"
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: sunucu adresi alınamıyor\n"
 
-#: nscd/aicache.c:77 nscd/hstcache.c:462
+#: nscd/aicache.c:77 nscd/hstcache.c:468
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "\"%s\" makinalar arabelleÄŸinde yok!"
 
-#: nscd/aicache.c:79 nscd/hstcache.c:464
+#: nscd/aicache.c:79 nscd/hstcache.c:470
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr "\"%s\" hosts arabelleğine yeniden yükleniyor!"
@@ -3566,7 +3586,7 @@ msgstr "%3$s için %2$s türündeki yeni girdi \"%1$s\" %4$s arabelleğine eklen
 msgid " (first)"
 msgstr " (ilk)"
 
-#: nscd/cache.c:256 nscd/connections.c:786
+#: nscd/cache.c:256 nscd/connections.c:810
 #, c-format
 msgid "cannot stat() file `%s': %s"
 msgstr "`%s' dosyası stat() olamıyor: %s"
@@ -3581,188 +3601,188 @@ msgstr "%s arabelleği budanıyor; süre %ld"
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr "girdi \"%2$s\" %1$s olarak ele elınıyor, zamanaşımı %3$<PRIu64>"
 
-#: nscd/connections.c:505 nscd/connections.c:517 nscd/connections.c:529
-#: nscd/connections.c:548
+#: nscd/connections.c:521 nscd/connections.c:533 nscd/connections.c:545
+#: nscd/connections.c:564
 #, c-format
 msgid "invalid persistent database file \"%s\": %s"
 msgstr "kalıcı veritabanı dosyası \"%s\" geçersiz: %s"
 
-#: nscd/connections.c:519
+#: nscd/connections.c:535
 msgid "header size does not match"
 msgstr "başlık boyutu uyumsuz"
 
-#: nscd/connections.c:531
+#: nscd/connections.c:547
 msgid "file size does not match"
 msgstr "dosya boyutu uyumsuz"
 
-#: nscd/connections.c:550
+#: nscd/connections.c:566
 msgid "verification failed"
 msgstr "doğrulanamadı"
 
-#: nscd/connections.c:564
+#: nscd/connections.c:580
 #, c-format
 msgid "suggested size of table for database %s larger than the persistent database's table"
 msgstr "%s veritabanı için önerilen tablo boyutu kalıcı veritabanı tablosundan büyük"
 
-#: nscd/connections.c:574 nscd/connections.c:655
+#: nscd/connections.c:591 nscd/connections.c:673
 #, c-format
 msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr "\"%s\" için salt-okunur tanıtıcı oluşturulamıyor; mmap yok"
 
-#: nscd/connections.c:634
+#: nscd/connections.c:652
 #, c-format
 msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
 msgstr "%s için ya veritabanı yok ya da şu an kullanımda; gerekiyorsa %s'i kendiniz silip yeniden başlatın"
 
-#: nscd/connections.c:641
+#: nscd/connections.c:659
 #, c-format
 msgid "cannot create %s; no persistent database used"
 msgstr "%s oluşturulamıyor; kullanımda bir kalıcı veritabanı yok"
 
-#: nscd/connections.c:644
+#: nscd/connections.c:662
 #, c-format
 msgid "cannot create %s; no sharing possible"
 msgstr "%s oluşturulamıyor; paylaşım mümkün değil"
 
-#: nscd/connections.c:715
+#: nscd/connections.c:733
 #, c-format
 msgid "cannot write to database file %s: %s"
 msgstr "veritabanı dosyası %s yazılamıyor: %s"
 
-#: nscd/connections.c:749
+#: nscd/connections.c:772
 #, c-format
 msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
 msgstr "exec üzerinde kapatılacak soket atanamadı: %s; paranoya kipi iptal ediliyor"
 
-#: nscd/connections.c:799
+#: nscd/connections.c:823
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "soket açılamıyor: %s"
 
-#: nscd/connections.c:816
+#: nscd/connections.c:840
 #, c-format
 msgid "cannot change socket to nonblocking mode: %s"
 msgstr "engellenmeyen kipte soket deÄŸiÅŸtirilemez: %s"
 
-#: nscd/connections.c:824
+#: nscd/connections.c:848
 #, c-format
 msgid "cannot set socket to close on exec: %s"
 msgstr "exec üzerinde kapatılacak soket atanamadı: %s"
 
-#: nscd/connections.c:835
+#: nscd/connections.c:859
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "bağlantıları kabul etmek üzere soket etkinleştirilemiyor: %s"
 
-#: nscd/connections.c:926
+#: nscd/connections.c:955
 #, c-format
 msgid "provide access to FD %d, for %s"
 msgstr "%2$s için dosya tanıtıcı %1$d'ye erişim sağlar"
 
-#: nscd/connections.c:938
+#: nscd/connections.c:967
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "eski istem sürümü %d elde edilemedi; mevcut sürüm %d"
 
-#: nscd/connections.c:980 nscd/connections.c:1033
+#: nscd/connections.c:1009 nscd/connections.c:1062
 #, c-format
 msgid "cannot write result: %s"
 msgstr "sonuç yazılamıyor: %s"
 
-#: nscd/connections.c:1116
+#: nscd/connections.c:1145
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr "çağrıcı kimliği alınırken hata: %s"
 
-#: nscd/connections.c:1175
+#: nscd/connections.c:1204
 #, c-format
 msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "/proc/self/cmdline açılamadı: %s; paranoya kipi iptal ediliyor"
 
-#: nscd/connections.c:1189
+#: nscd/connections.c:1218
 #, c-format
 msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "/proc/self/cmdline okunamadı: %s; paranoya kipi iptal ediliyor"
 
-#: nscd/connections.c:1229
+#: nscd/connections.c:1258
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr "eski UID'e dönülemedi: %s; paranoya kipi iptal ediliyor"
 
-#: nscd/connections.c:1239
+#: nscd/connections.c:1268
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr "eski GID'e dönülemedi: %s; paranoya kipi iptal ediliyor"
 
-#: nscd/connections.c:1252
+#: nscd/connections.c:1281
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr "eski çalışma dizinine dönülemiyor: %s; paranoya kipi iptal ediliyor"
 
-#: nscd/connections.c:1280
+#: nscd/connections.c:1310
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr "re-exec başarısız: %s; paranoya kipi iptal ediliyor"
 
-#: nscd/connections.c:1289
+#: nscd/connections.c:1319
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr "çalışma dizini \"/\" yapılamadı: %s"
 
-#: nscd/connections.c:1407
+#: nscd/connections.c:1437
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "istenen okuma kısa: %s"
 
-#: nscd/connections.c:1438
+#: nscd/connections.c:1468
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "istenen anahtar/tuÅŸ uzunluÄŸu fazla: %d"
 
-#: nscd/connections.c:1451
+#: nscd/connections.c:1481
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "istenen anahtar/tuş okunurken kısa okuma: %s"
 
-#: nscd/connections.c:1460
+#: nscd/connections.c:1490
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr "handle_request: %2$ld numaralı süreçden istek alındı (Sürüm = %1$d)"
 
-#: nscd/connections.c:1465
+#: nscd/connections.c:1495
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request: istek alındı (Sürüm = %d)"
 
-#: nscd/connections.c:1826
+#: nscd/connections.c:1856
 #, c-format
 msgid "could only start %d threads; terminating"
 msgstr "sadece %d evre başlatılabilir; sonlanıyor"
 
-#: nscd/connections.c:1874 nscd/connections.c:1875 nscd/connections.c:1892
-#: nscd/connections.c:1901 nscd/connections.c:1919 nscd/connections.c:1930
-#: nscd/connections.c:1941
+#: nscd/connections.c:1904 nscd/connections.c:1905 nscd/connections.c:1922
+#: nscd/connections.c:1931 nscd/connections.c:1949 nscd/connections.c:1960
+#: nscd/connections.c:1971
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "nscd '%s' kullanıcısı olarak çalıştırılamadı"
 
-#: nscd/connections.c:1893
+#: nscd/connections.c:1923
 #, c-format
 msgid "initial getgrouplist failed"
 msgstr "ilk getgrouplist başarısız"
 
-#: nscd/connections.c:1902
+#: nscd/connections.c:1932
 #, c-format
 msgid "getgrouplist failed"
 msgstr "getgrouplist başarısız"
 
-#: nscd/connections.c:1920
+#: nscd/connections.c:1950
 #, c-format
 msgid "setgroups failed"
 msgstr "setgroups başarısız"
 
-#: nscd/grpcache.c:402 nscd/hstcache.c:412 nscd/initgrcache.c:412
-#: nscd/pwdcache.c:397 nscd/servicescache.c:342
+#: nscd/grpcache.c:402 nscd/hstcache.c:418 nscd/initgrcache.c:412
+#: nscd/pwdcache.c:397 nscd/servicescache.c:343
 #, c-format
 msgid "short write in %s: %s"
 msgstr "%s içinde kısa yazma: %s"
@@ -4173,12 +4193,12 @@ msgstr ""
 "%15u  vektör algılandı\n"
 "%15u  vektör kayıp\n"
 
-#: nscd/servicescache.c:389
+#: nscd/servicescache.c:390
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
 msgstr "\"%s\" services arabelleÄŸinde yok!"
 
-#: nscd/servicescache.c:391
+#: nscd/servicescache.c:392
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
 msgstr "\"%s\" services arabelleğine yeniden yükleniyor!"
@@ -4199,7 +4219,7 @@ msgstr ""
 "Yönetimsel veritabanındaki girdileri gösterir.\n"
 "Yazılım hatalarını bildirme işlemleri için,\n"
 "<http://www.gnu.org/software/libc/bugs.html> adresine bakınız.\n"
-"Çeviri hatalarını <nilgun@belgeler.org> adresine bildiriniz.\n"
+"Çeviri hatalarını <nilgun (at) buguner.name.tr> adresine bildiriniz.\n"
 
 #: nss/getent.c:145 nss/getent.c:394
 #, c-format
@@ -6252,7 +6272,7 @@ msgstr "girdi satırının türü bilinmiyor"
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: artık saniyeler olmayan %s dosyasında `Leap' satırı\n"
 
-#: timezone/zic.c:892 timezone/zic.c:1323 timezone/zic.c:1345
+#: timezone/zic.c:892 timezone/zic.c:1329 timezone/zic.c:1351
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: panik: sol değer (l_value) %d geçersiz\n"
@@ -6271,231 +6291,239 @@ msgstr "%s: %s kapatılırken hata: %s\n"
 msgid "expected continuation line not found"
 msgstr "gereken süreklilik satırı bulunamadı"
 
-#: timezone/zic.c:956
+#: timezone/zic.c:956 timezone/zic.c:2489 timezone/zic.c:2508
+msgid "time overflow"
+msgstr "zaman taşması"
+
+#: timezone/zic.c:960
 msgid "24:00 not handled by pre-1998 versions of zic"
 msgstr "zic'in 1998 öncesi sürümlerinde 24:00 elde edilemez"
 
-#: timezone/zic.c:970
+#: timezone/zic.c:963
+msgid "values over 24 hours not handled by pre-2007 versions of zic"
+msgstr "zic'in 2007 öncesi sürümlerinde 24 saatin üzerindeki değerlerle işlem yapılmaz"
+
+#: timezone/zic.c:976
 msgid "wrong number of fields on Rule line"
 msgstr "`Rule' satırının alanları eksik ya da fazla"
 
-#: timezone/zic.c:974
+#: timezone/zic.c:980
 msgid "nameless rule"
 msgstr "adsız kural"
 
-#: timezone/zic.c:979
+#: timezone/zic.c:985
 msgid "invalid saved time"
 msgstr "kazanılmış zaman geçersiz"
 
-#: timezone/zic.c:1000
+#: timezone/zic.c:1006
 msgid "wrong number of fields on Zone line"
 msgstr "`Zone' satırının alanları eksik ya da fazla"
 
-#: timezone/zic.c:1006
+#: timezone/zic.c:1012
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "\"Zone %s\" satırı ve -l seçeneği çelişiyor"
 
-#: timezone/zic.c:1014
+#: timezone/zic.c:1020
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "\"Zone %s\" satırı ve -p seçeneği çelişiyor"
 
-#: timezone/zic.c:1026
+#: timezone/zic.c:1032
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "dilim ismi %s tekrarlanmış (dosya \"%s\", satır %d)"
 
-#: timezone/zic.c:1042
+#: timezone/zic.c:1048
 msgid "wrong number of fields on Zone continuation line"
 msgstr "`Zone' devam satırının alanları eksik ya da fazla"
 
-#: timezone/zic.c:1082
+#: timezone/zic.c:1088
 msgid "invalid UTC offset"
 msgstr "UTC offset geçersiz"
 
-#: timezone/zic.c:1085
+#: timezone/zic.c:1091
 msgid "invalid abbreviation format"
 msgstr "kısaltma biçemi geçersiz"
 
-#: timezone/zic.c:1114
+#: timezone/zic.c:1120
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr "`Zone' devamlılık satırının bitiş zamanı önceki satırın bitiş zamanından sonra değil"
 
-#: timezone/zic.c:1142
+#: timezone/zic.c:1148
 msgid "wrong number of fields on Leap line"
 msgstr "`Leap' satırının alanları eksik ya da fazla"
 
-#: timezone/zic.c:1151
+#: timezone/zic.c:1157
 msgid "invalid leaping year"
 msgstr "artık yıl geçersiz"
 
-#: timezone/zic.c:1171 timezone/zic.c:1277
+#: timezone/zic.c:1177 timezone/zic.c:1283
 msgid "invalid month name"
 msgstr "ay ismi geçersiz"
 
-#: timezone/zic.c:1184 timezone/zic.c:1390 timezone/zic.c:1404
+#: timezone/zic.c:1190 timezone/zic.c:1396 timezone/zic.c:1410
 msgid "invalid day of month"
 msgstr "ayın günü geçersiz"
 
-#: timezone/zic.c:1189
+#: timezone/zic.c:1195
 msgid "time before zero"
 msgstr "sıfırdan önceki zaman"
 
-#: timezone/zic.c:1193
+#: timezone/zic.c:1199
 msgid "time too small"
 msgstr "süre çok kısa"
 
-#: timezone/zic.c:1197
+#: timezone/zic.c:1203
 msgid "time too large"
 msgstr "süre çok uzun"
 
-#: timezone/zic.c:1201 timezone/zic.c:1306
+#: timezone/zic.c:1207 timezone/zic.c:1312
 msgid "invalid time of day"
 msgstr "günün tarihi geçersiz"
 
-#: timezone/zic.c:1220
+#: timezone/zic.c:1226
 msgid "illegal CORRECTION field on Leap line"
 msgstr "`Leap' satırında kuraldışı CORRECTION alanı"
 
-#: timezone/zic.c:1225
+#: timezone/zic.c:1231
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "`Leap' satırında kuraldışı Rolling/Stationary alanı"
 
-#: timezone/zic.c:1241
+#: timezone/zic.c:1247
 msgid "wrong number of fields on Link line"
 msgstr "`Link' satırının alanları eksik ya da fazla"
 
-#: timezone/zic.c:1245
+#: timezone/zic.c:1251
 msgid "blank FROM field on Link line"
 msgstr "`Link' satırında FROM alanı boş"
 
-#: timezone/zic.c:1249
+#: timezone/zic.c:1255
 msgid "blank TO field on Link line"
 msgstr "`Link' satırında TO alanı boş"
 
-#: timezone/zic.c:1327
+#: timezone/zic.c:1333
 msgid "invalid starting year"
 msgstr "başlangıç yılı geçersiz"
 
-#: timezone/zic.c:1349
+#: timezone/zic.c:1355
 msgid "invalid ending year"
 msgstr "bitiş yılı geçersiz"
 
-#: timezone/zic.c:1353
+#: timezone/zic.c:1359
 msgid "starting year greater than ending year"
 msgstr "başlangıç yılı bitiş yılından büyük"
 
-#: timezone/zic.c:1360
+#: timezone/zic.c:1366
 msgid "typed single year"
 msgstr "türünde tek yıl"
 
-#: timezone/zic.c:1395
+#: timezone/zic.c:1401
 msgid "invalid weekday name"
 msgstr "gün ismi geçersiz"
 
-#: timezone/zic.c:1573
+#: timezone/zic.c:1579
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s: %s silinemiyor: %s\n"
 
-#: timezone/zic.c:1583
+#: timezone/zic.c:1589
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: %s oluşturulamıyor: %s\n"
 
-#: timezone/zic.c:1733
+#: timezone/zic.c:1739
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: %s yazılırken hata oluştu\n"
 
-#: timezone/zic.c:2025
+#: timezone/zic.c:2031
 msgid "no POSIX environment variable for zone"
 msgstr "zaman dilimi için POSIX ortam değişkeni yok"
 
-#: timezone/zic.c:2179
+#: timezone/zic.c:2185
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr "süreye değinden hemen sonra kullanılacak zaman dilimi kısaltması saptanamadı"
 
-#: timezone/zic.c:2225
+#: timezone/zic.c:2231
 msgid "too many transitions?!"
 msgstr "çok fazla geçiş?!"
 
-#: timezone/zic.c:2244
+#: timezone/zic.c:2250
 msgid "internal error - addtype called with bad isdst"
 msgstr "iç hata -- addtype hatalı isdst ile çağrıldı"
 
-#: timezone/zic.c:2248
+#: timezone/zic.c:2254
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "iç hata -- addtype hatalı ttisstd ile çağrıldı"
 
-#: timezone/zic.c:2252
+#: timezone/zic.c:2258
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "iç hata -- addtype hatalı ttisgmt ile çağrıldı"
 
-#: timezone/zic.c:2271
+#: timezone/zic.c:2277
 msgid "too many local time types"
 msgstr "yerel zaman türleri çok fazla"
 
-#: timezone/zic.c:2299
+#: timezone/zic.c:2281
+msgid "UTC offset out of range"
+msgstr "UTC'ye göre saat farkı aralık dışında"
+
+#: timezone/zic.c:2309
 msgid "too many leap seconds"
 msgstr "çok fazla artık saniye"
 
-#: timezone/zic.c:2305
+#: timezone/zic.c:2315
 msgid "repeated leap second moment"
 msgstr "tekrarlanan artık saniye anı"
 
-#: timezone/zic.c:2357
+#: timezone/zic.c:2367
 msgid "Wild result from command execution"
 msgstr "Komut icrasından alınan sonuç garip"
 
-#: timezone/zic.c:2358
+#: timezone/zic.c:2368
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: komut `%s' idi, sonuç %d oldu\n"
 
-#: timezone/zic.c:2456
+#: timezone/zic.c:2466
 msgid "Odd number of quotation marks"
 msgstr "Tırnak işaretleri tek sayıda"
 
-#: timezone/zic.c:2479 timezone/zic.c:2498
-msgid "time overflow"
-msgstr "zaman taşması"
-
-#: timezone/zic.c:2545
+#: timezone/zic.c:2555
 msgid "use of 2/29 in non leap-year"
 msgstr "artık olmayan yıl içinde 2/29 kullanımı"
 
-#: timezone/zic.c:2580
+#: timezone/zic.c:2590
 msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic"
 msgstr "ayın başına/sonuna giden kural zic'in 2004 öncesi sürümlerinde çalışmaz"
 
-#: timezone/zic.c:2612
+#: timezone/zic.c:2622
 msgid "time zone abbreviation lacks alphabetic at start"
 msgstr "zaman dilimi kısaltması bir harfle başlamıyor"
 
-#: timezone/zic.c:2614
+#: timezone/zic.c:2624
 msgid "time zone abbreviation has more than 3 alphabetics"
 msgstr "zaman dilimi kısaltmasında 3 harften az harf var"
 
-#: timezone/zic.c:2616
+#: timezone/zic.c:2626
 msgid "time zone abbreviation has too many alphabetics"
 msgstr "zaman dilimi kısaltmasında çok fazla harf var"
 
-#: timezone/zic.c:2626
+#: timezone/zic.c:2636
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr "zaman dilimi kısaltması POSIX standardından farklı"
 
-#: timezone/zic.c:2638
+#: timezone/zic.c:2648
 msgid "too many, or too long, time zone abbreviations"
 msgstr "çok fazla ya da çok uzun zaman dilimi kısaltmaları"
 
-#: timezone/zic.c:2679
+#: timezone/zic.c:2689
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: %s dizini oluşturulamıyor: %s\n"
 
-#: timezone/zic.c:2701
+#: timezone/zic.c:2711
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: %d ölçüyü tutturamadı\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a0c6150b6b..b42bef9db9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.6.1\n"
-"POT-Creation-Date: 2007-08-04 11:37+0200\n"
-"PO-Revision-Date: 2007-08-05 16:31+0800\n"
+"Project-Id-Version: libc 2.7\n"
+"POT-Creation-Date: 2007-10-15 21:18-0700\n"
+"PO-Revision-Date: 2007-11-18 12:34+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -128,7 +128,7 @@ msgstr ""
 "-o 输出文件 [输入文件]...\n"
 "[输出文件 [输入文件]...]"
 
-#: catgets/gencat.c:232 debug/pcprofiledump.c:199 iconv/iconv_prog.c:411
+#: catgets/gencat.c:232 debug/pcprofiledump.c:204 iconv/iconv_prog.c:411
 #: iconv/iconvconfig.c:380 locale/programs/localedef.c:371
 #: login/programs/pt_chown.c:88 malloc/memusagestat.c:526 nss/makedb.c:231
 msgid ""
@@ -136,7 +136,7 @@ msgid ""
 "<http://www.gnu.org/software/libc/bugs.html>.\n"
 msgstr ""
 
-#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:287
+#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:296
 #: elf/ldd.bash.in:39 elf/sprof.c:355 iconv/iconv_prog.c:426
 #: iconv/iconvconfig.c:395 locale/programs/locale.c:275
 #: locale/programs/localedef.c:387 login/programs/pt_chown.c:59
@@ -149,7 +149,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:292 elf/sprof.c:361
+#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:301 elf/sprof.c:361
 #: iconv/iconv_prog.c:431 iconv/iconvconfig.c:400 locale/programs/locale.c:280
 #: locale/programs/localedef.c:392 malloc/memusage.sh:75 nscd/nscd.c:411
 #: nss/getent.c:88 nss/makedb.c:250 posix/getconf.c:1017
@@ -241,29 +241,29 @@ msgstr "转æ¢æ¨¡å—ä¸å¯ç”¨"
 msgid "cannot determine escape character"
 msgstr "无法确定转义字符"
 
-#: debug/pcprofiledump.c:52
+#: debug/pcprofiledump.c:53
 msgid "Don't buffer output"
 msgstr "ä¸è¦å¯¹è¾“出进行缓冲"
 
-#: debug/pcprofiledump.c:57
+#: debug/pcprofiledump.c:58
 msgid "Dump information generated by PC profiling."
 msgstr ""
 
-#: debug/pcprofiledump.c:60
+#: debug/pcprofiledump.c:61
 msgid "[FILE]"
 msgstr "[文件]"
 
-#: debug/pcprofiledump.c:100
+#: debug/pcprofiledump.c:104
 #, c-format
 msgid "cannot open input file"
 msgstr "无法打开输入文件"
 
-#: debug/pcprofiledump.c:106
+#: debug/pcprofiledump.c:111
 #, c-format
 msgid "cannot read header"
 msgstr "无法读入头"
 
-#: debug/pcprofiledump.c:170
+#: debug/pcprofiledump.c:175
 #, c-format
 msgid "invalid pointer size"
 msgstr "无效的指针大å°"
@@ -335,60 +335,55 @@ msgstr "无效的模å¼"
 msgid "invalid mode parameter"
 msgstr "无效的模å¼å‚æ•°"
 
-#: elf/cache.c:68
+#: elf/cache.c:69
 msgid "unknown"
 msgstr "未知"
 
-#: elf/cache.c:111
+#: elf/cache.c:112
 msgid "Unknown OS"
 msgstr "未知的æ“作系统"
 
-#: elf/cache.c:116
+#: elf/cache.c:117
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", OS ABI: %s %d.%d.%d"
 
-#: elf/cache.c:142 elf/ldconfig.c:1236
+#: elf/cache.c:134 elf/ldconfig.c:1270
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "无法打开缓冲文件 %s\n"
 
-#: elf/cache.c:154
+#: elf/cache.c:148
 #, c-format
 msgid "mmap of cache file failed.\n"
 msgstr "缓冲文件的 mmap 失败。\n"
 
-#: elf/cache.c:158 elf/cache.c:168
+#: elf/cache.c:152 elf/cache.c:166
 #, c-format
 msgid "File is not a cache file.\n"
 msgstr "文件ä¸æ˜¯ç¼“冲区文件。\n"
 
-#: elf/cache.c:201 elf/cache.c:211
+#: elf/cache.c:199 elf/cache.c:209
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "在缓冲区“%2$sâ€ä¸­æ‰¾åˆ° %1$d 个库\n"
 
-#: elf/cache.c:410
-#, c-format
-msgid "Can't remove old temporary cache file %s"
-msgstr "无法删除旧临时缓冲文件 %s"
-
-#: elf/cache.c:417
+#: elf/cache.c:403
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "无法创建临时缓冲文件 %s"
 
-#: elf/cache.c:425 elf/cache.c:435 elf/cache.c:439 elf/cache.c:443
+#: elf/cache.c:411 elf/cache.c:421 elf/cache.c:425 elf/cache.c:430
 #, c-format
 msgid "Writing of cache data failed"
 msgstr "写缓冲数æ®å¤±è´¥"
 
-#: elf/cache.c:450
+#: elf/cache.c:435
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "å°† %s 的访问æƒé™æ”¹å˜ä¸º %#o 失败"
 
-#: elf/cache.c:455
+#: elf/cache.c:440
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "å°† %s 改å为 %s 失败"
@@ -401,28 +396,28 @@ msgstr "无法创建范围列表"
 msgid "shared object not open"
 msgstr "共享库未打开"
 
-#: elf/dl-deps.c:112
+#: elf/dl-deps.c:114
 msgid "DST not allowed in SUID/SGID programs"
 msgstr "在 SUID/SGID 程åºä¸­ä¸å…许 DST"
 
-#: elf/dl-deps.c:125 elf/dl-open.c:282
+#: elf/dl-deps.c:127 elf/dl-open.c:282
 msgid "empty dynamic string token substitution"
 msgstr "空动æ€å­—符串替æ¢"
 
-#: elf/dl-deps.c:131
+#: elf/dl-deps.c:133
 #, c-format
 msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
 msgstr ""
 
-#: elf/dl-deps.c:472
+#: elf/dl-deps.c:474
 msgid "cannot allocate dependency list"
 msgstr "无法分é…倚赖列表"
 
-#: elf/dl-deps.c:505 elf/dl-deps.c:560
+#: elf/dl-deps.c:510 elf/dl-deps.c:565
 msgid "cannot allocate symbol search list"
 msgstr "无法分é…符å·æœç´¢åˆ—表"
 
-#: elf/dl-deps.c:545
+#: elf/dl-deps.c:550
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr ""
 
@@ -598,11 +593,11 @@ msgstr "错误 ELF 类: ELFCLASS32"
 msgid "cannot open shared object file"
 msgstr "无法打开共享对象文件"
 
-#: elf/dl-lookup.c:261
+#: elf/dl-lookup.c:356
 msgid "relocation error"
 msgstr "é‡å®šä½é”™è¯¯"
 
-#: elf/dl-lookup.c:289
+#: elf/dl-lookup.c:384
 msgid "symbol lookup error"
 msgstr "符å·æŸ¥è¯¢é”™è¯¯"
 
@@ -652,11 +647,11 @@ msgstr "é‡å®šä½åŽæ— æ³•æ¢å¤æ®µ prot"
 msgid "cannot apply additional memory protection after relocation"
 msgstr "无法在é‡å®šä½åŽåº”用é¢å¤–的内存ä¿æŠ¤"
 
-#: elf/dl-sym.c:161
+#: elf/dl-sym.c:162
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr ""
 
-#: elf/dl-sysdep.c:474 elf/dl-sysdep.c:486
+#: elf/dl-sysdep.c:469 elf/dl-sysdep.c:481
 msgid "cannot create capability list"
 msgstr "无法创建功能列表"
 
@@ -668,216 +663,220 @@ msgstr "无法创建 TLS æ•°æ®ç»“æž„"
 msgid "cannot allocate version reference table"
 msgstr "无法分é…版本引用表格"
 
-#: elf/ldconfig.c:135
+#: elf/ldconfig.c:138
 msgid "Print cache"
 msgstr "打å°ç¼“冲区"
 
-#: elf/ldconfig.c:136
+#: elf/ldconfig.c:139
 msgid "Generate verbose messages"
 msgstr "生æˆè¯¦ç»†æ¶ˆæ¯"
 
-#: elf/ldconfig.c:137
+#: elf/ldconfig.c:140
 msgid "Don't build cache"
 msgstr "ä¸è¦åˆ›å»ºç¼“冲区"
 
-#: elf/ldconfig.c:138
+#: elf/ldconfig.c:141
 msgid "Don't generate links"
 msgstr "ä¸è¦ç”Ÿæˆè¿žæŽ¥"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "Change to and use ROOT as root directory"
 msgstr "进入 ROOT 目录并将其作为根目录"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "ROOT"
 msgstr "ROOT"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "CACHE"
 msgstr "CACHE"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "Use CACHE as cache file"
 msgstr "将 CACHE 用作缓冲区文件"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "CONF"
 msgstr "CONF"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "Use CONF as configuration file"
 msgstr "å°† CONF 用作é…置文件"
 
-#: elf/ldconfig.c:142
+#: elf/ldconfig.c:145
 msgid "Only process directories specified on the command line.  Don't build cache."
 msgstr "åªåœ¨å‘½ä»¤è¡Œä¸­ç»™å‡ºäº†è¿›ç¨‹ç›®å½•ã€‚未创建缓冲区。"
 
-#: elf/ldconfig.c:143
+#: elf/ldconfig.c:146
 msgid "Manually link individual libraries."
 msgstr "手工连接独立的库。"
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "Format to use: new, old or compat (default)"
 msgstr "采用的格å¼ï¼šæ–°ã€æ—§æˆ–兼容(默认)"
 
-#: elf/ldconfig.c:152
+#: elf/ldconfig.c:148
+msgid "Ignore auxiliary cache file"
+msgstr "忽略辅助缓存文件"
+
+#: elf/ldconfig.c:156
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr ""
 
-#: elf/ldconfig.c:310
+#: elf/ldconfig.c:319
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "多次给出路径“%sâ€"
 
-#: elf/ldconfig.c:350
+#: elf/ldconfig.c:359
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s ä¸æ˜¯å·²çŸ¥ç±»åž‹çš„库"
 
-#: elf/ldconfig.c:375
+#: elf/ldconfig.c:384
 #, c-format
 msgid "Can't stat %s"
 msgstr "无法对 %s 进行 stat æ“作"
 
-#: elf/ldconfig.c:449
+#: elf/ldconfig.c:458
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "无法对 %s 进行 stat æ“作\n"
 
-#: elf/ldconfig.c:459
+#: elf/ldconfig.c:468
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s ä¸æ˜¯ç¬¦å·è¿žæŽ¥\n"
 
-#: elf/ldconfig.c:478
+#: elf/ldconfig.c:487
 #, c-format
 msgid "Can't unlink %s"
 msgstr ""
 
-#: elf/ldconfig.c:484
+#: elf/ldconfig.c:493
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "无法将 %s 连接到 %s"
 
-#: elf/ldconfig.c:490
+#: elf/ldconfig.c:499
 msgid " (changed)\n"
 msgstr " (改å˜)\n"
 
-#: elf/ldconfig.c:492
+#: elf/ldconfig.c:501
 msgid " (SKIPPED)\n"
 msgstr " (跳过)\n"
 
-#: elf/ldconfig.c:547
+#: elf/ldconfig.c:556
 #, c-format
 msgid "Can't find %s"
 msgstr "无法找到 %s"
 
-#: elf/ldconfig.c:563 elf/ldconfig.c:737 elf/ldconfig.c:784
+#: elf/ldconfig.c:572 elf/ldconfig.c:745 elf/ldconfig.c:793 elf/ldconfig.c:827
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "无法对 %s 进行 lstat æ“作"
 
-#: elf/ldconfig.c:570
+#: elf/ldconfig.c:579
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "由于ä¸æ˜¯ä¸€ä¸ªæ™®é€šæ–‡ä»¶ï¼Œå¿½ç•¥æ–‡ä»¶ %s"
 
-#: elf/ldconfig.c:578
+#: elf/ldconfig.c:588
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "未创建链接,因为 %s 无法找到 soname"
 
-#: elf/ldconfig.c:669
+#: elf/ldconfig.c:671
 #, c-format
 msgid "Can't open directory %s"
 msgstr "无法打开目录 %s"
 
-#: elf/ldconfig.c:749
+#: elf/ldconfig.c:759
 #, c-format
 msgid "Cannot stat %s"
 msgstr "无法对 %s 进行 stat æ“作"
 
-#: elf/ldconfig.c:806 elf/readlib.c:91
+#: elf/ldconfig.c:814 elf/readlib.c:91
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "未找到输入文件 %s。\n"
 
-#: elf/ldconfig.c:857
+#: elf/ldconfig.c:888
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5 的库 %s 处于错误的目录中"
 
-#: elf/ldconfig.c:860
+#: elf/ldconfig.c:891
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc5 的库 %s 处于错误的目录中"
 
-#: elf/ldconfig.c:863
+#: elf/ldconfig.c:894
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4 的库 %s 处于错误的目录中"
 
-#: elf/ldconfig.c:890
+#: elf/ldconfig.c:922
 #, c-format
 msgid "libraries %s and %s in directory %s have same soname but different type."
 msgstr "目录 %3$s 中的 %1$s å’Œ %2$s çš„ so å称相åŒä½†ç±»åž‹ä¸åŒã€‚"
 
-#: elf/ldconfig.c:997
+#: elf/ldconfig.c:1031
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr "无法打开é…置文件 %s"
 
-#: elf/ldconfig.c:1061
+#: elf/ldconfig.c:1095
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr ""
 
-#: elf/ldconfig.c:1067
+#: elf/ldconfig.c:1101
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
 msgstr ""
 
-#: elf/ldconfig.c:1074 elf/ldconfig.c:1082
+#: elf/ldconfig.c:1108 elf/ldconfig.c:1116
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
 msgstr ""
 
-#: elf/ldconfig.c:1085
+#: elf/ldconfig.c:1119
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
 msgstr ""
 
-#: elf/ldconfig.c:1107
+#: elf/ldconfig.c:1141
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr ""
 
-#: elf/ldconfig.c:1114 locale/programs/xmalloc.c:70 malloc/obstack.c:434
+#: elf/ldconfig.c:1148 locale/programs/xmalloc.c:70 malloc/obstack.c:434
 #: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1163
 #, c-format
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: elf/ldconfig.c:1144
+#: elf/ldconfig.c:1178
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr "%s:%u: 无法读å–目录 %s"
 
-#: elf/ldconfig.c:1189
+#: elf/ldconfig.c:1223
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr ""
 
-#: elf/ldconfig.c:1215
+#: elf/ldconfig.c:1249
 #, c-format
 msgid "Can't chdir to /"
 msgstr "无法改å˜ç›®å½•åˆ° /"
 
-#: elf/ldconfig.c:1257
+#: elf/ldconfig.c:1291
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "无法打开缓冲文件目录 %s\n"
@@ -1378,7 +1377,7 @@ msgstr "未知的 .netrc 关键字 %s"
 msgid "Character out of range for UTF-8"
 msgstr "字符超出 UTF-8 的范围"
 
-#: locale/programs/charmap-dir.c:58
+#: locale/programs/charmap-dir.c:59
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "无法读入字æ¯æ˜ å°„目录“%sâ€"
@@ -1404,7 +1403,7 @@ msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s:<mb_cur_max> 必须大于 <mb_cur_min>\n"
 
 #: locale/programs/charmap.c:357 locale/programs/charmap.c:374
-#: locale/programs/repertoire.c:175
+#: locale/programs/repertoire.c:174
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "åºè¨€ä¸­è¯­æ³•é”™è¯¯ï¼š%s"
@@ -1414,7 +1413,7 @@ msgid "invalid definition"
 msgstr "无效的定义"
 
 #: locale/programs/charmap.c:375 locale/programs/locfile.c:126
-#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
+#: locale/programs/locfile.c:153 locale/programs/repertoire.c:175
 msgid "bad argument"
 msgstr "错误的å‚æ•°"
 
@@ -1433,7 +1432,7 @@ msgstr "<%s>的值必须是 1 或更大"
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "<%s> 的值必须大于等于 <%s> 的值"
 
-#: locale/programs/charmap.c:445 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "<%s>çš„å‚数必须是å•ä¸ªå­—符"
@@ -1451,7 +1450,7 @@ msgid "syntax error in %s definition: %s"
 msgstr "%s 的定义中的语法错误:%s"
 
 #: locale/programs/charmap.c:499 locale/programs/charmap.c:679
-#: locale/programs/charmap.c:775 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
 msgid "no symbolic name given"
 msgstr "没有给出符å·å"
 
@@ -1468,19 +1467,19 @@ msgid "too many bytes in character encoding"
 msgstr "字符编ç ä¸­å­—节数过多"
 
 #: locale/programs/charmap.c:586 locale/programs/charmap.c:734
-#: locale/programs/charmap.c:817 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296
 msgid "no symbolic name given for end of range"
 msgstr "没有为范围的结æŸç»™å‡ºç¬¦å·åŒ–çš„å称"
 
 #: locale/programs/charmap.c:610 locale/programs/ld-address.c:600
-#: locale/programs/ld-collate.c:2677 locale/programs/ld-collate.c:3828
+#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3924
 #: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984
 #: locale/programs/ld-identification.c:452
 #: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
 #: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307
 #: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241
 #: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221
-#: 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:定义ä¸ä»¥â€œEND %1$sâ€ç»“å°¾"
@@ -1500,14 +1499,14 @@ msgid "%s: error in state machine"
 msgstr "%s:状æ€æœºå‡ºé”™"
 
 #: locale/programs/charmap.c:850 locale/programs/ld-address.c:616
-#: locale/programs/ld-collate.c:2674 locale/programs/ld-collate.c:3844
+#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4115
 #: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001
 #: locale/programs/ld-identification.c:468
 #: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
 #: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323
 #: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257
 #: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237
-#: locale/programs/locfile.c:826 locale/programs/repertoire.c:325
+#: locale/programs/locfile.c:826 locale/programs/repertoire.c:324
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s:文件ä¸å®Œæ•´"
@@ -1522,21 +1521,21 @@ msgstr "未知的字符“%sâ€"
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
 msgstr ""
 
-#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:2957
-#: locale/programs/repertoire.c:420
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3047
+#: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr ""
 
-#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
 msgid "hexadecimal range format should use only capital characters"
 msgstr ""
 
-#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:450
+#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
 msgstr "<%s> å’Œ <%s> 是无效的范围å"
 
-#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:457
+#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456
 msgid "upper limit in range is smaller than lower limit"
 msgstr "范围的上é™å°äºŽä¸‹é™"
 
@@ -1544,7 +1543,7 @@ msgstr "范围的上é™å°äºŽä¸‹é™"
 msgid "resulting bytes for range not representable."
 msgstr ""
 
-#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1536
+#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1556
 #: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133
 #: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
@@ -1631,7 +1630,7 @@ msgstr "%s:多次声明域“%sâ€"
 msgid "%s: unknown character in field `%s'"
 msgstr "%s:域“%sâ€ä¸­å«æœ‰æœªçŸ¥å­—符"
 
-#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3826
+#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3922
 #: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449
 #: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305
@@ -1641,12 +1640,13 @@ msgstr "%s:域“%sâ€ä¸­å«æœ‰æœªçŸ¥å­—符"
 msgid "%s: incomplete `END' line"
 msgstr "%s:ä¸å®Œæ•´çš„“ENDâ€è¡Œ"
 
-#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:522
-#: locale/programs/ld-collate.c:574 locale/programs/ld-collate.c:870
-#: locale/programs/ld-collate.c:883 locale/programs/ld-collate.c:2664
-#: locale/programs/ld-collate.c:3835 locale/programs/ld-ctype.c:1960
-#: locale/programs/ld-ctype.c:2219 locale/programs/ld-ctype.c:2806
-#: locale/programs/ld-ctype.c:2992 locale/programs/ld-identification.c:459
+#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:542
+#: locale/programs/ld-collate.c:594 locale/programs/ld-collate.c:890
+#: locale/programs/ld-collate.c:903 locale/programs/ld-collate.c:2733
+#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4105
+#: locale/programs/ld-ctype.c:1960 locale/programs/ld-ctype.c:2219
+#: locale/programs/ld-ctype.c:2806 locale/programs/ld-ctype.c:2992
+#: locale/programs/ld-identification.c:459
 #: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314
 #: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248
@@ -1655,247 +1655,267 @@ msgstr "%s:ä¸å®Œæ•´çš„“ENDâ€è¡Œ"
 msgid "%s: syntax error"
 msgstr "%s:语法错误"
 
-#: locale/programs/ld-collate.c:397
+#: locale/programs/ld-collate.c:417
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "å·²ç»åœ¨å­—符映射表中定义了“%.*sâ€"
 
-#: locale/programs/ld-collate.c:406
+#: locale/programs/ld-collate.c:426
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "å·²ç»åœ¨æŒ‡ä»¤è¡¨ä¸­å®šä¹‰äº†â€œ%.*sâ€"
 
-#: locale/programs/ld-collate.c:413
+#: locale/programs/ld-collate.c:433
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr ""
 
-#: locale/programs/ld-collate.c:420
+#: locale/programs/ld-collate.c:440
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr ""
 
-#: locale/programs/ld-collate.c:451 locale/programs/ld-collate.c:477
+#: locale/programs/ld-collate.c:471 locale/programs/ld-collate.c:497
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s:“forwardâ€å’Œâ€œbackwardâ€æ˜¯äº’斥的"
 
-#: locale/programs/ld-collate.c:461 locale/programs/ld-collate.c:487
-#: locale/programs/ld-collate.c:503
+#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507
+#: locale/programs/ld-collate.c:523
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr ""
 
-#: locale/programs/ld-collate.c:559
+#: locale/programs/ld-collate.c:579
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s:规则过多;第一个æ¡ç›®åªå«æœ‰ %d"
 
-#: locale/programs/ld-collate.c:595
+#: locale/programs/ld-collate.c:615
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s:排åºè§„则ä¸è¶³"
 
-#: locale/programs/ld-collate.c:760
+#: locale/programs/ld-collate.c:780
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s:ä¸å…许空æƒå­—符串"
 
-#: locale/programs/ld-collate.c:855
+#: locale/programs/ld-collate.c:875
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr ""
 
-#: locale/programs/ld-collate.c:911
+#: locale/programs/ld-collate.c:931
 #, c-format
 msgid "%s: too many values"
 msgstr "%s:值过多"
 
-#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
+#: locale/programs/ld-collate.c:1051 locale/programs/ld-collate.c:1226
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1081
+#: locale/programs/ld-collate.c:1101
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1108
+#: locale/programs/ld-collate.c:1128
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s:字节åºåˆ—的第一个和最åŽä¸€ä¸ªå­—符的长度必须相åŒ"
 
-#: locale/programs/ld-collate.c:1150
+#: locale/programs/ld-collate.c:1170
 #, c-format
 msgid "%s: byte sequence of first character of range is not lower than that of the last character"
 msgstr "%s:范围的字节åºåˆ—的第一个字符ä¸å°äºŽæœ€åŽä¸€ä¸ªå­—符"
 
-#: locale/programs/ld-collate.c:1275
+#: locale/programs/ld-collate.c:1295
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1279
+#: locale/programs/ld-collate.c:1299
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1477
+#: locale/programs/ld-collate.c:1319 locale/programs/ld-ctype.c:1477
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "“%sâ€å’Œâ€œ%.*sâ€æ˜¯æ— æ•ˆçš„符å·èŒƒå›´å"
 
-#: locale/programs/ld-collate.c:1349 locale/programs/ld-collate.c:3763
+#: locale/programs/ld-collate.c:1369 locale/programs/ld-collate.c:3858
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1358
+#: locale/programs/ld-collate.c:1378
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s:“%sâ€å¿…须是一个字符"
 
-#: locale/programs/ld-collate.c:1552
+#: locale/programs/ld-collate.c:1573
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1577
+#: locale/programs/ld-collate.c:1598
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "符å·â€œ%sâ€æœªå®šä¹‰"
 
-#: locale/programs/ld-collate.c:1653 locale/programs/ld-collate.c:1759
+#: locale/programs/ld-collate.c:1674 locale/programs/ld-collate.c:1780
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1657 locale/programs/ld-collate.c:1763
+#: locale/programs/ld-collate.c:1678 locale/programs/ld-collate.c:1784
 #, c-format
 msgid "symbol `%s'"
 msgstr "符å·â€œ%sâ€"
 
-#: locale/programs/ld-collate.c:1805
+#: locale/programs/ld-collate.c:1826
 #, c-format
 msgid "no definition of `UNDEFINED'"
 msgstr "没有关于“UNDEFINIEDâ€çš„定义"
 
-#: locale/programs/ld-collate.c:1834
+#: locale/programs/ld-collate.c:1855
 #, c-format
 msgid "too many errors; giving up"
 msgstr "错误过多;放弃"
 
-#: locale/programs/ld-collate.c:2762
+#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4044
+#, c-format
+msgid "%s: nested conditionals not supported"
+msgstr "%s: ä¸æ”¯æŒåµŒå¥—æ¡ä»¶"
+
+#: locale/programs/ld-collate.c:2677
+#, c-format
+msgid "%s: more then one 'else'"
+msgstr "%s: 多于一个'else'"
+
+#: locale/programs/ld-collate.c:2852
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s:é‡å¤å®šä¹‰â€œ%sâ€"
 
-#: locale/programs/ld-collate.c:2798
+#: locale/programs/ld-collate.c:2888
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s:é‡å¤å£°æ˜ŽèŠ‚“%sâ€"
 
-#: locale/programs/ld-collate.c:2937
+#: locale/programs/ld-collate.c:3027
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3069
+#: locale/programs/ld-collate.c:3159
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s:等价定义å中未知的字符"
 
-#: locale/programs/ld-collate.c:3082
+#: locale/programs/ld-collate.c:3172
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s:等价定义值中未知的字符"
 
-#: locale/programs/ld-collate.c:3092
+#: locale/programs/ld-collate.c:3182
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s:等价定义中未知的符å·â€œ%sâ€"
 
-#: locale/programs/ld-collate.c:3101
+#: locale/programs/ld-collate.c:3191
 msgid "error while adding equivalent collating symbol"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3131
+#: locale/programs/ld-collate.c:3221
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "é‡å¤å®šä¹‰è„šæœ¬â€œ%sâ€"
 
-#: locale/programs/ld-collate.c:3179
+#: locale/programs/ld-collate.c:3269
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr "%s:未知的节å“%.*sâ€"
 
-#: locale/programs/ld-collate.c:3208
+#: locale/programs/ld-collate.c:3298
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s:关于“%sâ€èŠ‚出现多个顺åºå®šä¹‰"
 
-#: locale/programs/ld-collate.c:3233
+#: locale/programs/ld-collate.c:3326
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s:排åºè§„则的数é‡æ— æ•ˆ"
 
-#: locale/programs/ld-collate.c:3260
+#: locale/programs/ld-collate.c:3353
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s:关于未命å节出现多个顺åºå®šä¹‰"
 
-#: locale/programs/ld-collate.c:3314 locale/programs/ld-collate.c:3442
-#: locale/programs/ld-collate.c:3804
+#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537
+#: locale/programs/ld-collate.c:3900
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s:é—æ¼å…³é”®å­—“order_endâ€"
 
-#: locale/programs/ld-collate.c:3375
+#: locale/programs/ld-collate.c:3470
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3393
+#: locale/programs/ld-collate.c:3488
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3404
+#: locale/programs/ld-collate.c:3499
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3456 locale/programs/ld-collate.c:3816
+#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s:以åŽå…³é”®å­—“reorder-endâ€"
 
-#: locale/programs/ld-collate.c:3490 locale/programs/ld-collate.c:3688
+#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s:未知的节“%.*sâ€"
 
-#: locale/programs/ld-collate.c:3555
+#: locale/programs/ld-collate.c:3650
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3751
+#: locale/programs/ld-collate.c:3846
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3800
+#: locale/programs/ld-collate.c:3896
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s:ä¸å…许空范畴æè¿°"
 
-#: locale/programs/ld-collate.c:3819
+#: locale/programs/ld-collate.c:3915
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s:é—æ¼å…³é”®å­—“reorder-sections-endâ€"
 
+#: locale/programs/ld-collate.c:4077
+#, c-format
+msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
+msgstr ""
+
+#: locale/programs/ld-collate.c:4095
+#, c-format
+msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
+msgstr ""
+
 #: locale/programs/ld-ctype.c:439
 #, c-format
 msgid "No character set name specified in charmap"
@@ -2660,22 +2680,22 @@ msgstr "使用“copyâ€æ—¶ä¸åº”å†ä½¿ç”¨å…¶å®ƒå…³é”®å­—"
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "对“%1$sâ€çš„定义并ä¸ä»¥â€œEND %1%sâ€ç»“æŸ"
 
-#: 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 ""
 
-#: locale/programs/repertoire.c:272
+#: locale/programs/repertoire.c:271
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "å³æœªç»™å‡º <Uxxxx> 也未给出 <Uxxxxxxxx>"
 
-#: locale/programs/repertoire.c:332
+#: locale/programs/repertoire.c:331
 #, c-format
 msgid "cannot save new repertoire map"
 msgstr "无法ä¿å­˜æ–°çš„指令表"
 
-#: locale/programs/repertoire.c:343
+#: locale/programs/repertoire.c:342
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr ""
@@ -3455,12 +3475,12 @@ msgstr "yp_update:无法将主机å转æ¢ä¸ºç½‘å\n"
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update:无法获å–æœåŠ¡å™¨åœ°å€\n"
 
-#: nscd/aicache.c:77 nscd/hstcache.c:462
+#: nscd/aicache.c:77 nscd/hstcache.c:468
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "无法在主机缓冲区中找到“%sâ€ï¼"
 
-#: nscd/aicache.c:79 nscd/hstcache.c:464
+#: nscd/aicache.c:79 nscd/hstcache.c:470
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr "在主机缓冲区中é‡æ–°åŠ è½½â€œ%sâ€ï¼"
@@ -3474,7 +3494,7 @@ msgstr ""
 msgid " (first)"
 msgstr ""
 
-#: nscd/cache.c:256 nscd/connections.c:786
+#: nscd/cache.c:256 nscd/connections.c:810
 #, c-format
 msgid "cannot stat() file `%s': %s"
 msgstr "无法对文件“%sâ€è¿›è¡Œ stat() æ“作:%s"
@@ -3489,188 +3509,188 @@ msgstr ""
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr ""
 
-#: nscd/connections.c:505 nscd/connections.c:517 nscd/connections.c:529
-#: nscd/connections.c:548
+#: nscd/connections.c:521 nscd/connections.c:533 nscd/connections.c:545
+#: nscd/connections.c:564
 #, c-format
 msgid "invalid persistent database file \"%s\": %s"
 msgstr ""
 
-#: nscd/connections.c:519
+#: nscd/connections.c:535
 msgid "header size does not match"
 msgstr ""
 
-#: nscd/connections.c:531
+#: nscd/connections.c:547
 msgid "file size does not match"
 msgstr "文件大å°ä¸åŒ¹é…"
 
-#: nscd/connections.c:550
+#: nscd/connections.c:566
 msgid "verification failed"
 msgstr "验è¯å¤±è´¥"
 
-#: nscd/connections.c:564
+#: nscd/connections.c:580
 #, c-format
 msgid "suggested size of table for database %s larger than the persistent database's table"
 msgstr ""
 
-#: nscd/connections.c:574 nscd/connections.c:655
+#: nscd/connections.c:591 nscd/connections.c:673
 #, c-format
 msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr "无法为“%sâ€åˆ›å»ºåªè¯»æ述符;没有 mmap"
 
-#: nscd/connections.c:634
+#: nscd/connections.c:652
 #, c-format
 msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
 msgstr ""
 
-#: nscd/connections.c:641
+#: nscd/connections.c:659
 #, c-format
 msgid "cannot create %s; no persistent database used"
 msgstr "无法创建 %s; ä¸ä½¿ç”¨æŒä¹…æ•°æ®åº“"
 
-#: nscd/connections.c:644
+#: nscd/connections.c:662
 #, c-format
 msgid "cannot create %s; no sharing possible"
 msgstr "无法创建 %s; 无法共享"
 
-#: nscd/connections.c:715
+#: nscd/connections.c:733
 #, c-format
 msgid "cannot write to database file %s: %s"
 msgstr "无法写入数æ®åº“文件 %s: %s"
 
-#: nscd/connections.c:749
+#: nscd/connections.c:772
 #, c-format
 msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:799
+#: nscd/connections.c:823
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "无法打开套接字:%s"
 
-#: nscd/connections.c:816
+#: nscd/connections.c:840
 #, c-format
 msgid "cannot change socket to nonblocking mode: %s"
 msgstr "无法转æ¢å¥—接字到éžå µå¡žæ¨¡å¼: %s"
 
-#: nscd/connections.c:824
+#: nscd/connections.c:848
 #, c-format
 msgid "cannot set socket to close on exec: %s"
 msgstr "无法设定套接字为 exec 时关闭: %s"
 
-#: nscd/connections.c:835
+#: nscd/connections.c:859
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "无法å¯ç”¨å¥—接字以接å—连接:%s"
 
-#: nscd/connections.c:926
+#: nscd/connections.c:955
 #, c-format
 msgid "provide access to FD %d, for %s"
 msgstr ""
 
-#: nscd/connections.c:938
+#: nscd/connections.c:967
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "无法处ç†æ—§è¯·æ±‚版本 %d;当å‰ç‰ˆæœ¬ä¸º %d"
 
-#: nscd/connections.c:980 nscd/connections.c:1033
+#: nscd/connections.c:1009 nscd/connections.c:1062
 #, c-format
 msgid "cannot write result: %s"
 msgstr "无法写入结果:“%sâ€"
 
-#: nscd/connections.c:1116
+#: nscd/connections.c:1145
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr ""
 
-#: nscd/connections.c:1175
+#: nscd/connections.c:1204
 #, c-format
 msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1189
+#: nscd/connections.c:1218
 #, c-format
 msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1229
+#: nscd/connections.c:1258
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1239
+#: nscd/connections.c:1268
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1252
+#: nscd/connections.c:1281
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1280
+#: nscd/connections.c:1310
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1289
+#: nscd/connections.c:1319
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr ""
 
-#: nscd/connections.c:1407
+#: nscd/connections.c:1437
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "读å–请求时没有读入足够的数æ®ï¼š%s"
 
-#: nscd/connections.c:1438
+#: nscd/connections.c:1468
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "请求中的键过长:%d"
 
-#: nscd/connections.c:1451
+#: nscd/connections.c:1481
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "读入请求键的时候没有读入足够的数æ®ï¼š%s"
 
-#: nscd/connections.c:1460
+#: nscd/connections.c:1490
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr "处ç†è¯·æ±‚:已从进程ID %2$ld 收到请求 (版本 = %1$d)"
 
-#: nscd/connections.c:1465
+#: nscd/connections.c:1495
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "处ç†è¯·æ±‚:已收到请求 (版本 = %d)"
 
-#: nscd/connections.c:1826
+#: nscd/connections.c:1856
 #, c-format
 msgid "could only start %d threads; terminating"
 msgstr ""
 
-#: nscd/connections.c:1874 nscd/connections.c:1875 nscd/connections.c:1892
-#: nscd/connections.c:1901 nscd/connections.c:1919 nscd/connections.c:1930
-#: nscd/connections.c:1941
+#: nscd/connections.c:1904 nscd/connections.c:1905 nscd/connections.c:1922
+#: nscd/connections.c:1931 nscd/connections.c:1949 nscd/connections.c:1960
+#: nscd/connections.c:1971
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr ""
 
-#: nscd/connections.c:1893
+#: nscd/connections.c:1923
 #, c-format
 msgid "initial getgrouplist failed"
 msgstr "åˆå§‹åŒ– getgrouplist 失败"
 
-#: nscd/connections.c:1902
+#: nscd/connections.c:1932
 #, c-format
 msgid "getgrouplist failed"
 msgstr "getgrouplist 失败"
 
-#: nscd/connections.c:1920
+#: nscd/connections.c:1950
 #, c-format
 msgid "setgroups failed"
 msgstr "setgroups 失败"
 
-#: nscd/grpcache.c:402 nscd/hstcache.c:412 nscd/initgrcache.c:412
-#: nscd/pwdcache.c:397 nscd/servicescache.c:342
+#: nscd/grpcache.c:402 nscd/hstcache.c:418 nscd/initgrcache.c:412
+#: nscd/pwdcache.c:397 nscd/servicescache.c:343
 #, c-format
 msgid "short write in %s: %s"
 msgstr ""
@@ -4042,12 +4062,12 @@ msgid ""
 "%15u  CAV misses\n"
 msgstr ""
 
-#: nscd/servicescache.c:389
+#: nscd/servicescache.c:390
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
 msgstr "无法在æœåŠ¡ç¼“冲区中找到“%sâ€ï¼"
 
-#: nscd/servicescache.c:391
+#: nscd/servicescache.c:392
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
 msgstr "在æœåŠ¡ç¼“冲区中é‡æ–°åŠ è½½â€œ%sâ€ï¼"
@@ -6114,7 +6134,7 @@ msgstr "未知类型的输入行"
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr ""
 
-#: timezone/zic.c:892 timezone/zic.c:1323 timezone/zic.c:1345
+#: timezone/zic.c:892 timezone/zic.c:1329 timezone/zic.c:1351
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr ""
@@ -6133,235 +6153,246 @@ msgstr "%s:关闭 %s 错误:%s\n"
 msgid "expected continuation line not found"
 msgstr "找ä¸åˆ°åº”该出现的续行"
 
-#: timezone/zic.c:956
+#: timezone/zic.c:956 timezone/zic.c:2489 timezone/zic.c:2508
+msgid "time overflow"
+msgstr "时间溢出"
+
+#: timezone/zic.c:960
 msgid "24:00 not handled by pre-1998 versions of zic"
 msgstr ""
 
-#: timezone/zic.c:970
+#: timezone/zic.c:963
+msgid "values over 24 hours not handled by pre-2007 versions of zic"
+msgstr ""
+
+#: timezone/zic.c:976
 msgid "wrong number of fields on Rule line"
 msgstr "规则行中域的个数错误"
 
-#: timezone/zic.c:974
+#: timezone/zic.c:980
 msgid "nameless rule"
 msgstr "æ— å规则"
 
-#: timezone/zic.c:979
+#: timezone/zic.c:985
 msgid "invalid saved time"
 msgstr ""
 
-#: timezone/zic.c:1000
+#: timezone/zic.c:1006
 msgid "wrong number of fields on Zone line"
 msgstr "区域行中域的个数错误"
 
-#: timezone/zic.c:1006
+#: timezone/zic.c:1012
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr ""
 
-#: timezone/zic.c:1014
+#: timezone/zic.c:1020
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr ""
 
-#: timezone/zic.c:1026
+#: timezone/zic.c:1032
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "é‡å¤çš„区域å %s (文件“%sâ€ï¼Œè¡Œ %d)"
 
-#: timezone/zic.c:1042
+#: timezone/zic.c:1048
 msgid "wrong number of fields on Zone continuation line"
 msgstr ""
 
-#: timezone/zic.c:1082
+#: timezone/zic.c:1088
 msgid "invalid UTC offset"
 msgstr "无效的 UTC å移é‡"
 
-#: timezone/zic.c:1085
+#: timezone/zic.c:1091
 msgid "invalid abbreviation format"
 msgstr "无效的缩略格å¼"
 
-#: timezone/zic.c:1114
+#: timezone/zic.c:1120
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr ""
 
-#: timezone/zic.c:1142
+#: timezone/zic.c:1148
 msgid "wrong number of fields on Leap line"
 msgstr ""
 
-#: timezone/zic.c:1151
+#: timezone/zic.c:1157
 msgid "invalid leaping year"
 msgstr "无效的闰年"
 
-#: timezone/zic.c:1171 timezone/zic.c:1277
+#: timezone/zic.c:1177 timezone/zic.c:1283
 msgid "invalid month name"
 msgstr "无效的月å称"
 
-#: timezone/zic.c:1184 timezone/zic.c:1390 timezone/zic.c:1404
+#: timezone/zic.c:1190 timezone/zic.c:1396 timezone/zic.c:1410
 msgid "invalid day of month"
 msgstr "无效的日"
 
-#: timezone/zic.c:1189
+#: timezone/zic.c:1195
 msgid "time before zero"
 msgstr ""
 
-#: timezone/zic.c:1193
+#: timezone/zic.c:1199
 msgid "time too small"
 msgstr ""
 
-#: timezone/zic.c:1197
+#: timezone/zic.c:1203
 msgid "time too large"
 msgstr "时间过大"
 
-#: timezone/zic.c:1201 timezone/zic.c:1306
+#: timezone/zic.c:1207 timezone/zic.c:1312
 msgid "invalid time of day"
 msgstr "无效的时间"
 
-#: timezone/zic.c:1220
+#: timezone/zic.c:1226
 msgid "illegal CORRECTION field on Leap line"
 msgstr ""
 
-#: timezone/zic.c:1225
+#: timezone/zic.c:1231
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr ""
 
-#: timezone/zic.c:1241
+#: timezone/zic.c:1247
 msgid "wrong number of fields on Link line"
 msgstr "连接行中域的个数错误"
 
-#: timezone/zic.c:1245
+#: timezone/zic.c:1251
 msgid "blank FROM field on Link line"
 msgstr "Link 行中空白的 FROM 域"
 
-#: timezone/zic.c:1249
+#: timezone/zic.c:1255
 msgid "blank TO field on Link line"
 msgstr "Link 行中空白的 TO 域"
 
-#: timezone/zic.c:1327
+#: timezone/zic.c:1333
 msgid "invalid starting year"
 msgstr "无效的起始年份"
 
-#: timezone/zic.c:1349
+#: timezone/zic.c:1355
 msgid "invalid ending year"
 msgstr "无效的终止年份"
 
-#: timezone/zic.c:1353
+#: timezone/zic.c:1359
 msgid "starting year greater than ending year"
 msgstr "起始年份大于终止年份"
 
-#: timezone/zic.c:1360
+#: timezone/zic.c:1366
 msgid "typed single year"
 msgstr ""
 
-#: timezone/zic.c:1395
+#: timezone/zic.c:1401
 msgid "invalid weekday name"
 msgstr "无效的星期å"
 
-#: timezone/zic.c:1573
+#: timezone/zic.c:1579
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s:无法删除 %s:%s\n"
 
-#: timezone/zic.c:1583
+#: timezone/zic.c:1589
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s:无法创建 %s:%s\n"
 
-#: timezone/zic.c:1733
+#: timezone/zic.c:1739
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s:写 %s 错误\n"
 
-#: timezone/zic.c:2025
+#: timezone/zic.c:2031
 msgid "no POSIX environment variable for zone"
 msgstr ""
 
-#: timezone/zic.c:2179
+#: timezone/zic.c:2185
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr ""
 
-#: timezone/zic.c:2225
+#: timezone/zic.c:2231
 msgid "too many transitions?!"
 msgstr ""
 
-#: timezone/zic.c:2244
+#: timezone/zic.c:2250
 msgid "internal error - addtype called with bad isdst"
 msgstr "内部错误 - 以错误的 isdst 调用 addtype"
 
-#: timezone/zic.c:2248
+#: timezone/zic.c:2254
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "内部错误 - 以错误的 ttisstd 调用 addtype"
 
-#: timezone/zic.c:2252
+#: timezone/zic.c:2258
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "内部错误 - 以错误的 ttisgmt 调用 addtype"
 
-#: timezone/zic.c:2271
+#: timezone/zic.c:2277
 msgid "too many local time types"
 msgstr "过多的本地时间类型"
 
-#: timezone/zic.c:2299
+#: timezone/zic.c:2281
+msgid "UTC offset out of range"
+msgstr "UTC å移值超出范围"
+
+#: timezone/zic.c:2309
 msgid "too many leap seconds"
 msgstr ""
 
-#: timezone/zic.c:2305
+#: timezone/zic.c:2315
 msgid "repeated leap second moment"
 msgstr ""
 
-#: timezone/zic.c:2357
+#: timezone/zic.c:2367
 msgid "Wild result from command execution"
 msgstr ""
 
-#: timezone/zic.c:2358
+#: timezone/zic.c:2368
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s:命令为“%sâ€ï¼Œç»“果为 %d\n"
 
-#: timezone/zic.c:2456
+#: timezone/zic.c:2466
 msgid "Odd number of quotation marks"
 msgstr "奇数个引å·"
 
-#: timezone/zic.c:2479 timezone/zic.c:2498
-msgid "time overflow"
-msgstr "时间溢出"
-
-#: timezone/zic.c:2545
+#: timezone/zic.c:2555
 msgid "use of 2/29 in non leap-year"
 msgstr ""
 
-#: timezone/zic.c:2580
+#: timezone/zic.c:2590
 msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic"
 msgstr ""
 
-#: timezone/zic.c:2612
+#: timezone/zic.c:2622
 msgid "time zone abbreviation lacks alphabetic at start"
 msgstr ""
 
-#: timezone/zic.c:2614
+#: timezone/zic.c:2624
 msgid "time zone abbreviation has more than 3 alphabetics"
 msgstr ""
 
-#: timezone/zic.c:2616
+#: timezone/zic.c:2626
 msgid "time zone abbreviation has too many alphabetics"
 msgstr ""
 
-#: timezone/zic.c:2626
+#: timezone/zic.c:2636
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr ""
 
-#: timezone/zic.c:2638
+#: timezone/zic.c:2648
 msgid "too many, or too long, time zone abbreviations"
 msgstr "过多或过长的时区缩写"
 
-#: timezone/zic.c:2679
+#: timezone/zic.c:2689
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s:无法创建目录 %s:%s\n"
 
-#: timezone/zic.c:2701
+#: timezone/zic.c:2711
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr ""
 
+#~ msgid "Can't remove old temporary cache file %s"
+#~ msgstr "无法删除旧临时缓冲文件 %s"
+
 #~ msgid "Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"
 #~ msgstr "用“glibcbugâ€è„šæœ¬å°†é”™è¯¯æŠ¥å‘Šç»™ <bugs@gnu.org>。\n"
 
diff --git a/posix/Makefile b/posix/Makefile
index c9b61bb4e9..c0edce4d62 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -90,6 +90,7 @@ tests		:= tstgetopt testfnm runtests runptests	     \
 		   tst-execv1 tst-execv2 tst-execl1 tst-execl2 \
 		   tst-execve1 tst-execve2 tst-execle1 tst-execle2 \
 		   tst-execvp3 tst-execvp4 tst-rfc3484 tst-rfc3484-2 \
+		   tst-rfc3484-3 \
 		   tst-getaddrinfo3 tst-fnmatch2 tst-cpucount tst-cpuset
 xtests		:= bug-ga2
 ifeq (yes,$(build-shared))
diff --git a/posix/gai.conf b/posix/gai.conf
index 0e334ac2c5..b4abfc1f90 100644
--- a/posix/gai.conf
+++ b/posix/gai.conf
@@ -19,13 +19,14 @@
 #    Add another rule to the RFC 3484 label table.  See section 2.1 in
 #    RFC 3484.  The default is:
 #
-#label  ::1/128       0
-#label  ::/0          1
-#label  2002::/16     2
-#label ::/96          3
-#label ::ffff:0:0/96  4
-#label  fec0::/10     5
-#label  fc00::/7      6
+#label ::1/128       0
+#label ::/0          1
+#label 2002::/16     2
+#label ::/96         3
+#label ::ffff:0:0/96 4
+#label fec0::/10     5
+#label fc00::/7      6
+#label 2001:0::/32   7
 #
 #    This default differs from the tables given in RFC 3484 by handling
 #    (now obsolete) site-local IPv6 addresses and Unique Local Addresses.
@@ -35,10 +36,11 @@
 #    site-local IPv4 and IPv6 addresses a lookup for a global address would
 #    see the IPv6 be preferred.  The result is a long delay because the
 #    site-local IPv6 addresses cannot be used while the IPv4 address is
-#    (at least for the foreseeable future) NATed.
+#    (at least for the foreseeable future) NATed.  We also treat Teredo
+#    tunnels special.
 #
 # precedence  <mask>   <value>
-#    Add another rule the to RFC 3484 precedence table.  See section 2.1
+#    Add another rule to the RFC 3484 precedence table.  See section 2.1
 #    and 10.3 in RFC 3484.  The default is:
 #
 #precedence  ::1/128       50
@@ -50,3 +52,17 @@
 #    For sites which prefer IPv4 connections change the last line to
 #
 #precedence ::ffff:0:0/96  100
+
+#
+# scopev4  <mask>  <value>
+#    Add another rule to the RFC 3484 scope table for IPv4 addresses.
+#    By default the scope IDs described in section 3.2 in RFC 3484 are
+#    used.  Changing these defaults should hardly ever be necessary.
+#    The defaults are equivalent to:
+#
+#scopev4 ::ffff:169.254.0.0/112  2
+#scopev4 ::ffff:127.0.0.0/104    2
+#scopev4 ::ffff:10.0.0.0/104     5
+#scopev4 ::ffff:172.16.0.0/108   5
+#scopev4 ::ffff:192.168.0.0/112  5
+#scopev4 ::ffff:0.0.0.0          14
diff --git a/posix/regex.h b/posix/regex.h
index 807c404ec2..66f566e7b7 100644
--- a/posix/regex.h
+++ b/posix/regex.h
@@ -302,7 +302,7 @@ extern reg_syntax_t re_syntax_options;
    `re_error_msg' table in regex.c.  */
 typedef enum
 {
-#ifdef _XOPEN_SOURCE
+#if defined _XOPEN_SOURCE || defined __USE_XOPEN2K
   REG_ENOSYS = -1,	/* This will never happen for this implementation.  */
 #endif
 
diff --git a/posix/tst-rfc3484-2.c b/posix/tst-rfc3484-2.c
index f318523ed5..d29f0725cc 100644
--- a/posix/tst-rfc3484-2.c
+++ b/posix/tst-rfc3484-2.c
@@ -18,6 +18,12 @@ __check_pf (bool *p1, bool *p2, struct in6addrinfo **in6ai, size_t *in6ailen)
   *in6ai = NULL;
   *in6ailen = 0;
 }
+void
+attribute_hidden
+__check_native (uint32_t a1_index, int *a1_native,
+		uint32_t a2_index, int *a2_native)
+{
+}
 int
 __idna_to_ascii_lz (const char *input, char **output, int flags)
 {
@@ -60,6 +66,7 @@ do_test (void)
 {
   labels = default_labels;
   precedence = default_precedence;
+  scopes = default_scopes;
 
   struct sockaddr_in so1;
   so1.sin_family = AF_INET;
@@ -99,6 +106,8 @@ do_test (void)
   results[0].source_addr_len = sizeof (so1);
   results[0].source_addr_flags = 0;
   results[0].service_order = 0;
+  results[0].prefixlen = 16;
+  results[0].index = 0;
   memcpy (&results[0].source_addr, &so1, sizeof (so1));
 
   results[1].dest_addr = &ai2;
@@ -106,10 +115,13 @@ do_test (void)
   results[1].source_addr_len = sizeof (so2);
   results[1].source_addr_flags = 0;
   results[1].service_order = 1;
+  results[1].prefixlen = 16;
+  results[1].index = 0;
   memcpy (&results[1].source_addr, &so2, sizeof (so2));
 
 
-  qsort (results, 2, sizeof (results[0]), rfc3484_sort);
+  struct sort_result_combo combo = { .results = results, .nresults = 2 };
+  qsort_r (results, 2, sizeof (results[0]), rfc3484_sort, &combo);
 
   int result = 0;
   if (results[0].dest_addr->ai_family == AF_INET6)
@@ -125,6 +137,8 @@ do_test (void)
   results[1].source_addr_len = sizeof (so1);
   results[1].source_addr_flags = 0;
   results[1].service_order = 1;
+  results[1].prefixlen = 16;
+  results[1].index = 0;
   memcpy (&results[1].source_addr, &so1, sizeof (so1));
 
   results[0].dest_addr = &ai2;
@@ -132,10 +146,12 @@ do_test (void)
   results[0].source_addr_len = sizeof (so2);
   results[0].source_addr_flags = 0;
   results[0].service_order = 0;
+  results[0].prefixlen = 16;
+  results[0].index = 0;
   memcpy (&results[0].source_addr, &so2, sizeof (so2));
 
 
-  qsort (results, 2, sizeof (results[0]), rfc3484_sort);
+  qsort_r (results, 2, sizeof (results[0]), rfc3484_sort, &combo);
 
   if (results[0].dest_addr->ai_family == AF_INET6)
     {
diff --git a/posix/tst-rfc3484-3.c b/posix/tst-rfc3484-3.c
new file mode 100644
index 0000000000..4aede81ee3
--- /dev/null
+++ b/posix/tst-rfc3484-3.c
@@ -0,0 +1,137 @@
+#include <stdbool.h>
+#include <stdio.h>
+#include <ifaddrs.h>
+
+/* Internal definitions used in the libc code.  */
+#define __getservbyname_r getservbyname_r
+#define __socket socket
+#define __getsockname getsockname
+#define __inet_aton inet_aton
+#define __gethostbyaddr_r gethostbyaddr_r
+#define __gethostbyname2_r gethostbyname2_r
+
+void
+attribute_hidden
+__check_pf (bool *p1, bool *p2, struct in6addrinfo **in6ai, size_t *in6ailen)
+{
+  *p1 = *p2 = true;
+  *in6ai = NULL;
+  *in6ailen = 0;
+}
+void
+attribute_hidden
+__check_native (uint32_t a1_index, int *a1_native,
+		uint32_t a2_index, int *a2_native)
+{
+}
+int
+__idna_to_ascii_lz (const char *input, char **output, int flags)
+{
+  return 0;
+}
+int
+__idna_to_unicode_lzlz (const char *input, char **output, int flags)
+{
+  *output = NULL;
+  return 0;
+}
+
+#include "../sysdeps/posix/getaddrinfo.c"
+
+service_user *__nss_hosts_database attribute_hidden;
+
+
+/* This is the beginning of the real test code.  The above defines
+   (among other things) the function rfc3484_sort.  */
+
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+# define h(n) n
+#else
+# define h(n) __bswap_constant_32 (n)
+#endif
+
+struct sockaddr_in addrs[] =
+{
+  { .sin_family = AF_INET, .sin_addr = { h (0xa0a86d1d) } },
+  { .sin_family = AF_INET, .sin_addr = { h (0xa0a85d03) } },
+  { .sin_family = AF_INET, .sin_addr = { h (0xa0a82c3d) } },
+  { .sin_family = AF_INET, .sin_addr = { h (0xa0a86002) } },
+  { .sin_family = AF_INET, .sin_addr = { h (0xa0a802f3) } },
+  { .sin_family = AF_INET, .sin_addr = { h (0xa0a80810) } },
+  { .sin_family = AF_INET, .sin_addr = { h (0xa0a85e02) } },
+  { .sin_family = AF_INET, .sin_addr = { h (0xac162311) } },
+  { .sin_family = AF_INET, .sin_addr = { h (0x0a324572) } }
+};
+#define naddrs (sizeof (addrs) / sizeof (addrs[0]))
+static struct addrinfo ais[naddrs];
+static struct sort_result results[naddrs];
+
+static const int expected[naddrs] =
+  {
+    8, 0, 1, 2, 3, 4, 5, 6, 7
+  };
+
+static const struct scopeentry new_scopes[] =
+  {
+    { { { 169, 254, 0, 0 } }, h (0xffff0000), 2 },
+    { { { 127, 0, 0, 0 } }, h (0xff000000), 2 },
+    { { { 10, 0, 0, 0 } }, h (0xff000000), 5 },
+    { { { 192, 168, 0, 0 } }, h(0xffff0000), 5 },
+    { { { 0, 0, 0, 0 } }, h (0x00000000), 14 }
+  };
+
+
+ssize_t
+__getline (char **lineptr, size_t *n, FILE *s)
+{
+  *lineptr = NULL;
+  *n = 0;
+  return 0;
+}
+
+
+static int
+do_test (void)
+{
+  labels = default_labels;
+  precedence = default_precedence;
+  scopes= new_scopes;
+
+  struct sockaddr_in so;
+  so.sin_family = AF_INET;
+  so.sin_addr.s_addr = h (0x0aa85f19);
+
+  for (int i = 0; i < naddrs; ++i)
+    {
+      ais[i].ai_family = AF_INET;
+      ais[i].ai_addr = (struct sockaddr *) &addrs[i];
+      results[i].dest_addr = &ais[i];
+      results[i].got_source_addr = true;
+      memcpy(&results[i].source_addr, &so, sizeof (so));
+      results[i].source_addr_len = sizeof (so);
+      results[i].source_addr_flags = 0;
+      results[i].service_order = i;
+      results[i].prefixlen = 8;
+      results[i].index = 0;
+    }
+
+  struct sort_result_combo combo = { .results = results, .nresults = naddrs };
+  qsort_r (results, naddrs, sizeof (results[0]), rfc3484_sort, &combo);
+
+  int result = 0;
+  for (int i = 0; i < naddrs; ++i)
+    {
+      struct in_addr addr = ((struct sockaddr_in *) (results[i].dest_addr->ai_addr))->sin_addr;
+
+      int here = memcmp (&addr, &addrs[expected[i]].sin_addr,
+			 sizeof (struct in_addr));
+      printf ("[%d] = %s: %s\n", i, inet_ntoa (addr), here ? "FAIL" : "OK");
+      result |= here;
+    }
+
+  return result;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/posix/tst-rfc3484.c b/posix/tst-rfc3484.c
index 08d57a66ee..fe06255759 100644
--- a/posix/tst-rfc3484.c
+++ b/posix/tst-rfc3484.c
@@ -18,6 +18,12 @@ __check_pf (bool *p1, bool *p2, struct in6addrinfo **in6ai, size_t *in6ailen)
   *in6ai = NULL;
   *in6ailen = 0;
 }
+void
+attribute_hidden
+__check_native (uint32_t a1_index, int *a1_native,
+		uint32_t a2_index, int *a2_native)
+{
+}
 int
 __idna_to_ascii_lz (const char *input, char **output, int flags)
 {
@@ -79,6 +85,7 @@ do_test (void)
 {
   labels = default_labels;
   precedence = default_precedence;
+  scopes= default_scopes;
 
   struct sockaddr_in so;
   so.sin_family = AF_INET;
@@ -94,9 +101,12 @@ do_test (void)
       results[i].source_addr_len = sizeof (so);
       results[i].source_addr_flags = 0;
       results[i].service_order = i;
+      results[i].prefixlen = 8;
+      results[i].index = 0;
     }
 
-  qsort (results, naddrs, sizeof (results[0]), rfc3484_sort);
+  struct sort_result_combo combo = { .results = results, .nresults = naddrs };
+  qsort_r (results, naddrs, sizeof (results[0]), rfc3484_sort, &combo);
 
   int result = 0;
   for (int i = 0; i < naddrs; ++i)
diff --git a/posix/unistd.h b/posix/unistd.h
index 476c1f3cbc..01ac3f8b41 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -915,13 +915,13 @@ extern char *getpass (__const char *__prompt) __nonnull ((1));
 #endif /* Use BSD || X/Open.  */
 
 
-#if defined __USE_BSD || defined __USE_XOPEN
+#if defined __USE_BSD || defined __USE_XOPEN || defined __USE_XOPEN2K
 /* Make all changes done to FD actually appear on disk.
 
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 extern int fsync (int __fd);
-#endif /* Use BSD || X/Open.  */
+#endif /* Use BSD || X/Open || Unix98.  */
 
 
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
diff --git a/resolv/Versions b/resolv/Versions
index 5a350cae36..fc2111a1cb 100644
--- a/resolv/Versions
+++ b/resolv/Versions
@@ -88,6 +88,7 @@ libnss_dns {
     _nss_dns_gethostbyname3_r;
     _nss_dns_gethostbyname_r; _nss_dns_getnetbyaddr_r;
     _nss_dns_getnetbyname_r; _nss_dns_getcanonname_r;
+    _nss_dns_gethostbyaddr2_r;
   }
 }
 
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index 0e25564670..def44e9dbf 100644
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -255,10 +255,18 @@ _nss_dns_gethostbyname_r (const char *name, struct hostent *result,
 }
 
 
+extern enum nss_status _nss_dns_gethostbyaddr2_r (const void *addr,
+						  socklen_t len, int af,
+						  struct hostent *result,
+						  char *buffer, size_t buflen,
+						  int *errnop, int *h_errnop,
+						  int32_t *ttlp);
+hidden_proto (_nss_dns_gethostbyaddr2_r)
+
 enum nss_status
-_nss_dns_gethostbyaddr_r (const void *addr, socklen_t len, int af,
-			  struct hostent *result, char *buffer, size_t buflen,
-			  int *errnop, int *h_errnop)
+_nss_dns_gethostbyaddr2_r (const void *addr, socklen_t len, int af,
+			   struct hostent *result, char *buffer, size_t buflen,
+			   int *errnop, int *h_errnop, int32_t *ttlp)
 {
   static const u_char mapped[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0xff,0xff };
   static const u_char tunnelled[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0,0 };
@@ -374,7 +382,7 @@ _nss_dns_gethostbyaddr_r (const void *addr, socklen_t len, int af,
 
  got_it_already:
   status = getanswer_r (host_buffer.buf, n, qbuf, T_PTR, result, buffer, buflen,
-			errnop, h_errnop, 0 /* XXX */, NULL, NULL);
+			errnop, h_errnop, 0 /* XXX */, ttlp, NULL);
   if (host_buffer.buf != orig_host_buffer)
     free (host_buffer.buf);
   if (status != NSS_STATUS_SUCCESS)
@@ -408,6 +416,17 @@ _nss_dns_gethostbyaddr_r (const void *addr, socklen_t len, int af,
   *h_errnop = NETDB_SUCCESS;
   return NSS_STATUS_SUCCESS;
 }
+hidden_def (_nss_dns_gethostbyaddr2_r)
+
+
+enum nss_status
+_nss_dns_gethostbyaddr_r (const void *addr, socklen_t len, int af,
+			  struct hostent *result, char *buffer, size_t buflen,
+			  int *errnop, int *h_errnop)
+{
+  return _nss_dns_gethostbyaddr2_r (addr, len, af, result, buffer, buflen,
+				    errnop, h_errnop, NULL);
+}
 
 #ifdef RESOLVSORT
 static void addrsort (char **ap, int num);
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index c53b809ef7..25f7397927 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -377,9 +377,6 @@ static struct netaddr
   } u;
 } *ifaddrs);
 
-/* We need to protect the dynamic buffer handling.  */
-__libc_lock_define_initialized (static, lock);
-
 /* Reorder addresses returned in a hostent such that the first address
    is an address on the local subnet, if there is such an address.
    Otherwise, nothing is changed.
@@ -393,6 +390,8 @@ _res_hconf_reorder_addrs (struct hostent *hp)
   int i, j;
   /* Number of interfaces.  */
   static int num_ifs = -1;
+  /* We need to protect the dynamic buffer handling.  */
+  __libc_lock_define_initialized (static, lock);
 
   /* Only reorder if we're supposed to.  */
   if ((_res_hconf.flags & HCONF_FLAG_REORDER) == 0)
@@ -411,8 +410,6 @@ _res_hconf_reorder_addrs (struct hostent *hp)
 
       /* Initialize interface table.  */
 
-      num_ifs = 0;
-
       /* The SIOCGIFNETMASK ioctl will only work on an AF_INET socket.  */
       sd = __socket (AF_INET, SOCK_DGRAM, 0);
       if (sd < 0)
@@ -421,45 +418,56 @@ _res_hconf_reorder_addrs (struct hostent *hp)
       /* Get lock.  */
       __libc_lock_lock (lock);
 
-      /* Get a list of interfaces.  */
-      __ifreq (&ifr, &num, sd);
-      if (!ifr)
-	goto cleanup;
+      /* Recheck, somebody else might have done the work by done.  */
+      if (num_ifs <= 0)
+	{
+	  int new_num_ifs = 0;
 
-      ifaddrs = malloc (num * sizeof (ifaddrs[0]));
-      if (!ifaddrs)
-	goto cleanup1;
+	  /* Get a list of interfaces.  */
+	  __ifreq (&ifr, &num, sd);
+	  if (!ifr)
+	    goto cleanup;
 
-      /* Copy usable interfaces in ifaddrs structure.  */
-      for (cur_ifr = ifr, i = 0; i < num; cur_ifr = __if_nextreq (cur_ifr), ++i)
-	{
-	  if (cur_ifr->ifr_addr.sa_family != AF_INET)
-	    continue;
+	  ifaddrs = malloc (num * sizeof (ifaddrs[0]));
+	  if (!ifaddrs)
+	    goto cleanup1;
 
-	  ifaddrs[num_ifs].addrtype = AF_INET;
-	  ifaddrs[num_ifs].u.ipv4.addr =
-	    ((struct sockaddr_in *) &cur_ifr->ifr_addr)->sin_addr.s_addr;
+	  /* Copy usable interfaces in ifaddrs structure.  */
+	  for (cur_ifr = ifr, i = 0; i < num;
+	       cur_ifr = __if_nextreq (cur_ifr), ++i)
+	    {
+	      if (cur_ifr->ifr_addr.sa_family != AF_INET)
+		continue;
 
-	  if (__ioctl (sd, SIOCGIFNETMASK, cur_ifr) < 0)
-	    continue;
+	      ifaddrs[new_num_ifs].addrtype = AF_INET;
+	      ifaddrs[new_num_ifs].u.ipv4.addr =
+		((struct sockaddr_in *) &cur_ifr->ifr_addr)->sin_addr.s_addr;
 
-	  ifaddrs[num_ifs].u.ipv4.mask =
-	    ((struct sockaddr_in *) &cur_ifr->ifr_netmask)->sin_addr.s_addr;
+	      if (__ioctl (sd, SIOCGIFNETMASK, cur_ifr) < 0)
+		continue;
 
-	  /* Now we're committed to this entry.  */
-	  ++num_ifs;
-	}
-      /* Just keep enough memory to hold all the interfaces we want.  */
-      ifaddrs = realloc (ifaddrs, num_ifs * sizeof (ifaddrs[0]));
-      assert (ifaddrs != NULL);
+	      ifaddrs[new_num_ifs].u.ipv4.mask =
+		((struct sockaddr_in *) &cur_ifr->ifr_netmask)->sin_addr.s_addr;
 
-    cleanup1:
-      __if_freereq (ifr, num);
+	      /* Now we're committed to this entry.  */
+	      ++new_num_ifs;
+	    }
+	  /* Just keep enough memory to hold all the interfaces we want.  */
+	  ifaddrs = realloc (ifaddrs, new_num_ifs * sizeof (ifaddrs[0]));
+	  assert (ifaddrs != NULL);
+
+	cleanup1:
+	  __if_freereq (ifr, num);
+
+	cleanup:
+	  /* Release lock, preserve error value, and close socket.  */
+	  save = errno;
+
+	  num_ifs = new_num_ifs;
+
+	  __libc_lock_unlock (lock);
+	}
 
-    cleanup:
-      /* Release lock, preserve error value, and close socket.  */
-      save = errno;
-      __libc_lock_unlock (lock);
       __close (sd);
     }
 
diff --git a/scripts/config.sub b/scripts/config.sub
index ab2c16c0b7..51938d0f48 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -277,8 +277,8 @@ case $basic_machine in
 	| pyramid \
 	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc64v2 | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sparcv9v2 \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
@@ -361,9 +361,9 @@ case $basic_machine in
 	| romp-* | rs6000-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc64v2-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sparcv9v2-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
@@ -1129,7 +1129,7 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sparcv9v2)
 		basic_machine=sparc-sun
 		;;
 	cydra)
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index f87ac560aa..f9fc9da306 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -57,7 +57,7 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
 	 tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 bug15 \
 	 tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
 	 tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
-	 bug19 bug19a tst-popen2 scanf13 scanf14 scanf15
+	 bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22
 
 test-srcs = tst-unbputc tst-printf
 
diff --git a/stdio-common/bug20.c b/stdio-common/bug20.c
new file mode 100644
index 0000000000..385f6ffbe1
--- /dev/null
+++ b/stdio-common/bug20.c
@@ -0,0 +1,32 @@
+/* BZ #5225 */
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+
+static int
+do_test (void)
+{
+  wchar_t in[] = L"123,abc,321";
+  /* This is the critical part for this test.  format must be in
+     read-only memory.  */
+  static const wchar_t format[50] = L"%d,%[^,],%d";
+  int out_d1, out_d2;
+  char out_s[50];
+  printf ("in='%ls' format='%ls'\n", in, format);
+  if (swscanf (in, format, &out_d1, out_s, &out_d2) != 3)
+    {
+      puts ("swscanf did not return 3");
+      return 1;
+    }
+  printf ("in='%ls' format='%ls'\n", in, format);
+  printf ("out_d1=%d out_s='%s' out_d2=%d\n", out_d1, out_s, out_d2);
+  if (out_d1 != 123 || strcmp (out_s, "abc") != 0 || out_d2 != 321)
+    {
+      puts ("swscanf did not return the correct values");
+      return 1;
+    }
+  return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/stdio-common/bug21.c b/stdio-common/bug21.c
new file mode 100644
index 0000000000..d22b9c1a97
--- /dev/null
+++ b/stdio-common/bug21.c
@@ -0,0 +1,16 @@
+#include <stdio.h>
+
+static int
+do_test (void)
+{
+  static const char buf[] = " ";
+  char *str;
+
+  int r = sscanf (buf, "%as", &str);
+  printf ("%d %p\n", r, str);
+
+  return r != -1 || str != NULL;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/stdio-common/bug22.c b/stdio-common/bug22.c
new file mode 100644
index 0000000000..2228388b47
--- /dev/null
+++ b/stdio-common/bug22.c
@@ -0,0 +1,32 @@
+/* BZ #5424 */
+#include <stdio.h>
+
+#define N 2147483648
+
+#define STRINGIFY(S) #S
+#define MAKE_STR(S) STRINGIFY(S)
+
+#define SN MAKE_STR(N)
+
+static int
+do_test (void)
+{
+  int ret;
+
+  FILE *fp = fopen ("/dev/null", "w");
+  if (fp == NULL)
+    {
+      puts ("cannot open /dev/null");
+      return 1;
+    }
+
+  ret = fprintf (fp, "%" SN "d%" SN "d", 1, 1);
+
+  printf ("ret = %d\n", ret);
+
+  return ret != -1;
+}
+
+#define TIMEOUT 30
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index ae25ab6fc5..c65cfa9faa 100644
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -808,7 +808,7 @@ ___printf_fp (FILE *fp,
   {
     int width = info->width;
     wchar_t *wstartp, *wcp;
-    int chars_needed;
+    size_t chars_needed;
     int expscale;
     int intdig_max, intdig_no = 0;
     int fracdig_min;
@@ -823,7 +823,7 @@ ___printf_fp (FILE *fp,
 	type = info->spec;
 	intdig_max = 1;
 	fracdig_min = fracdig_max = info->prec < 0 ? 6 : info->prec;
-	chars_needed = 1 + 1 + fracdig_max + 1 + 1 + 4;
+	chars_needed = 1 + 1 + (size_t) fracdig_max + 1 + 1 + 4;
 	/*	       d   .	 ddd	     e	 +-  ddd  */
 	dig_max = INT_MAX;		/* Unlimited.  */
 	significant = 1;		/* Does not matter here.  */
@@ -838,12 +838,12 @@ ___printf_fp (FILE *fp,
 	  {
 	    intdig_max = exponent + 1;
 	    /* This can be really big!	*/  /* XXX Maybe malloc if too big? */
-	    chars_needed = exponent + 1 + 1 + fracdig_max;
+	    chars_needed = (size_t) exponent + 1 + 1 + (size_t) fracdig_max;
 	  }
 	else
 	  {
 	    intdig_max = 1;
-	    chars_needed = 1 + 1 + fracdig_max;
+	    chars_needed = 1 + 1 + (size_t) fracdig_max;
 	  }
       }
     else
@@ -858,7 +858,7 @@ ___printf_fp (FILE *fp,
 	      type = isupper (info->spec) ? 'E' : 'e';
 	    fracdig_max = dig_max - 1;
 	    intdig_max = 1;
-	    chars_needed = 1 + 1 + fracdig_max + 1 + 1 + 4;
+	    chars_needed = 1 + 1 + (size_t) fracdig_max + 1 + 1 + 4;
 	  }
 	else
 	  {
@@ -870,7 +870,7 @@ ___printf_fp (FILE *fp,
 	       zeros can be as many as would be required for
 	       exponential notation with a negative two-digit
 	       exponent, which is 4.  */
-	    chars_needed = dig_max + 1 + 4;
+	    chars_needed = (size_t) dig_max + 1 + 4;
 	  }
 	fracdig_min = info->alt ? fracdig_max : 0;
 	significant = 0;		/* We count significant digits.	 */
@@ -888,16 +888,17 @@ ___printf_fp (FILE *fp,
        it is possible that we need two more characters in front of all the
        other output.  If the amount of memory we have to allocate is too
        large use `malloc' instead of `alloca'.  */
+    size_t wbuffer_to_alloc = (2 + (size_t) chars_needed) * sizeof (wchar_t);
     buffer_malloced = ! __libc_use_alloca (chars_needed * 2 * sizeof (wchar_t));
     if (__builtin_expect (buffer_malloced, 0))
       {
-	wbuffer = (wchar_t *) malloc ((2 + chars_needed) * sizeof (wchar_t));
+	wbuffer = (wchar_t *) malloc (wbuffer_to_alloc);
 	if (wbuffer == NULL)
 	  /* Signal an error to the caller.  */
 	  return -1;
       }
     else
-      wbuffer = (wchar_t *) alloca ((2 + chars_needed) * sizeof (wchar_t));
+      wbuffer = (wchar_t *) alloca (wbuffer_to_alloc);
     wcp = wstartp = wbuffer + 2;	/* Let room for rounding.  */
 
     /* Do the real work: put digits in allocated buffer.  */
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index d1dc1aaf59..d10a5c6a13 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -64,6 +64,19 @@
     } while (0)
 #define UNBUFFERED_P(S) ((S)->_IO_file_flags & _IO_UNBUFFERED)
 
+#define done_add(val) \
+  do {									      \
+    unsigned int _val = val;						      \
+    assert ((unsigned int) done < (unsigned int) INT_MAX);		      \
+    if (__builtin_expect ((unsigned int) INT_MAX - (unsigned int) done	      \
+			  < _val, 0))					      \
+      {									      \
+	done = -1;							      \
+	goto all_done;							      \
+      }									      \
+    done += _val;							      \
+  } while (0)
+
 #ifndef COMPILE_WPRINTF
 # define vfprintf	_IO_vfprintf_internal
 # define CHAR_T		char
@@ -76,7 +89,7 @@
 # define PUT(F, S, N)	_IO_sputn ((F), (S), (N))
 # define PAD(Padchar) \
   if (width > 0)							      \
-    done += INTUSE(_IO_padn) (s, (Padchar), width)
+    done_add (INTUSE(_IO_padn) (s, (Padchar), width))
 # define PUTC(C, F)	_IO_putc_unlocked (C, F)
 # define ORIENT		if (_IO_vtable_offset (s) == 0 && _IO_fwide (s, -1) != -1)\
 			  return -1
@@ -95,7 +108,7 @@
 # define PUT(F, S, N)	_IO_sputn ((F), (S), (N))
 # define PAD(Padchar) \
   if (width > 0)							      \
-    done += _IO_wpadn (s, (Padchar), width)
+    done_add (_IO_wpadn (s, (Padchar), width))
 # define PUTC(C, F)	_IO_putwc_unlocked (C, F)
 # define ORIENT		if (_IO_fwide (s, 1) != 1) return -1
 
@@ -116,20 +129,21 @@
   do									      \
     {									      \
       register const INT_T outc = (Ch);					      \
-      if (PUTC (outc, s) == EOF)					      \
+      if (PUTC (outc, s) == EOF || done == INT_MAX)			      \
 	{								      \
 	  done = -1;							      \
 	  goto all_done;						      \
 	}								      \
-      else								      \
-	++done;								      \
+      ++done;								      \
     }									      \
   while (0)
 
 #define outstring(String, Len)						      \
   do									      \
     {									      \
-      if ((size_t) PUT (s, (String), (Len)) != (size_t) (Len))		      \
+      assert ((size_t) done <= (size_t) INT_MAX);			      \
+      if ((size_t) PUT (s, (String), (Len)) != (size_t) (Len)		      \
+	  || (size_t) INT_MAX - (size_t) done < (size_t) (Len))		      \
 	{								      \
 	  done = -1;							      \
 	  goto all_done;						      \
@@ -747,7 +761,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	    {								      \
 	      int temp = width;						      \
 	      width = prec;						      \
-	      PAD (L_('0'));;						      \
+	      PAD (L_('0'));						      \
 	      width = temp;						      \
 	    }								      \
 									      \
@@ -811,7 +825,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	    goto all_done;						      \
 	  }								      \
 									      \
-	done += function_done;						      \
+	done_add (function_done);					      \
       }									      \
       break;								      \
 									      \
@@ -865,7 +879,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	    goto all_done;						      \
 	  }								      \
 									      \
-	done += function_done;						      \
+	done_add (function_done);					      \
       }									      \
       break;								      \
 									      \
@@ -1499,18 +1513,24 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
       if (prec > width
 	  && prec + 32 > (int)(sizeof (work_buffer) / sizeof (work_buffer[0])))
 	{
-	  if (__libc_use_alloca ((prec + 32) * sizeof (CHAR_T)))
-	    workend = ((CHAR_T *) alloca ((prec + 32) * sizeof (CHAR_T)))
-		      + (prec + 32);
+	  if (__builtin_expect (prec > ~((size_t) 0) - 31, 0))
+	    {
+	      done = -1;
+	      goto all_done;
+	    }
+	  size_t needed = ((size_t) prec + 32) * sizeof (CHAR_T);
+
+	  if (__libc_use_alloca (needed))
+	    workend = (((CHAR_T *) alloca (needed)) + ((size_t) prec + 32));
 	  else
 	    {
-	      workstart = (CHAR_T *) malloc ((prec + 32) * sizeof (CHAR_T));
+	      workstart = (CHAR_T *) malloc (needed);
 	      if (workstart == NULL)
 		{
 		  done = -1;
 		  goto all_done;
 		}
-	      workend = workstart + (prec + 32);
+	      workend = workstart + ((size_t) prec + 32);
 	    }
 	}
       JUMP (*f, step2_jumps);
@@ -1887,7 +1907,7 @@ do_positional:
 		  goto all_done;
 		}
 
-	      done += function_done;
+	      done_add (function_done);
 	    }
 	    break;
 	  }
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index e4728d00c9..a03e19c4e3 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -272,7 +272,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
 	{								    \
 	  CHAR_T *old = wp;						    \
 	  wpmax = (UCHAR_MAX + 1 > 2 * wpmax ? UCHAR_MAX + 1 : 2 * wpmax);  \
-	  wp = (CHAR_T *) alloca (wpmax * sizeof (wchar_t));		    \
+	  wp = (CHAR_T *) alloca (wpmax * sizeof (CHAR_T));		    \
 	  if (old != NULL)						    \
 	    MEMCPY (wp, old, wpsize);					    \
 	}								    \
@@ -2314,7 +2314,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
 
 	  if (__builtin_expect (fc == L'\0', 0))
 	    conv_error ();
-	  wp = (wchar_t *) f - 1;
+	  wchar_t *twend = (wchar_t *) f - 1;
 #else
 	  /* Fill WP with byte flags indexed by character.
 	     We will use this flag map for matching input characters.  */
@@ -2365,9 +2365,10 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
 
 		  /* Test whether it's in the scanlist.  */
 		  runp = tw;
-		  while (runp < wp)
+		  while (runp < twend)
 		    {
-		      if (runp[0] == L'-' && runp[1] != '\0' && runp + 1 != wp
+		      if (runp[0] == L'-' && runp[1] != '\0'
+			  && runp + 1 != twend
 			  && runp != tw
 			  && (unsigned int) runp[-1] <= (unsigned int) runp[1])
 			{
@@ -2405,7 +2406,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
 			}
 		    }
 
-		  if (runp == wp && !not_in)
+		  if (runp == twend && !not_in)
 		    {
 		      ungetc (c, s);
 		      goto out;
@@ -2590,9 +2591,10 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
 
 		  /* Test whether it's in the scanlist.  */
 		  runp = tw;
-		  while (runp < wp)
+		  while (runp < twend)
 		    {
-		      if (runp[0] == L'-' && runp[1] != '\0' && runp + 1 != wp
+		      if (runp[0] == L'-' && runp[1] != '\0'
+			  && runp + 1 != twend
 			  && runp != tw
 			  && (unsigned int) runp[-1] <= (unsigned int) runp[1])
 			{
@@ -2630,7 +2632,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
 			}
 		    }
 
-		  if (runp == wp && !not_in)
+		  if (runp == twend && !not_in)
 		    {
 		      ungetc (c, s);
 		      goto out2;
@@ -2843,7 +2845,6 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
 		  *p->ptrs[cnt] = NULL;
 		}
 	      p = p->next;
-	      free (ptrs_to_free);
 	      ptrs_to_free = p;
 	    }
 	}
diff --git a/stdlib/Versions b/stdlib/Versions
index 9cc3b6d023..f4a90c9d69 100644
--- a/stdlib/Versions
+++ b/stdlib/Versions
@@ -94,6 +94,9 @@ libc {
     # Silent change in SUS.
     realpath;
   }
+  GLIBC_2.8 {
+    qsort_r;
+  }
   GLIBC_PRIVATE {
     # functions which have an additional interface since they are
     # are cancelable.
diff --git a/stdlib/msort.c b/stdlib/msort.c
index 3961e9e981..35cd4d0311 100644
--- a/stdlib/msort.c
+++ b/stdlib/msort.c
@@ -30,7 +30,8 @@ struct msort_param
 {
   size_t s;
   size_t var;
-  __compar_fn_t cmp;
+  __compar_d_fn_t cmp;
+  void *arg;
   char *t;
 };
 static void msort_with_tmp (const struct msort_param *p, void *b, size_t n);
@@ -54,13 +55,14 @@ msort_with_tmp (const struct msort_param *p, void *b, size_t n)
 
   char *tmp = p->t;
   const size_t s = p->s;
-  __compar_fn_t cmp = p->cmp;
+  __compar_d_fn_t cmp = p->cmp;
+  void *arg = p->arg;
   switch (p->var)
     {
     case 0:
       while (n1 > 0 && n2 > 0)
 	{
-	  if ((*cmp) (b1, b2) <= 0)
+	  if ((*cmp) (b1, b2, arg) <= 0)
 	    {
 	      *(uint32_t *) tmp = *(uint32_t *) b1;
 	      b1 += sizeof (uint32_t);
@@ -78,7 +80,7 @@ msort_with_tmp (const struct msort_param *p, void *b, size_t n)
     case 1:
       while (n1 > 0 && n2 > 0)
 	{
-	  if ((*cmp) (b1, b2) <= 0)
+	  if ((*cmp) (b1, b2, arg) <= 0)
 	    {
 	      *(uint64_t *) tmp = *(uint64_t *) b1;
 	      b1 += sizeof (uint64_t);
@@ -100,7 +102,7 @@ msort_with_tmp (const struct msort_param *p, void *b, size_t n)
 	  unsigned long *bl;
 
 	  tmp += s;
-	  if ((*cmp) (b1, b2) <= 0)
+	  if ((*cmp) (b1, b2, arg) <= 0)
 	    {
 	      bl = (unsigned long *) b1;
 	      b1 += s;
@@ -119,7 +121,7 @@ msort_with_tmp (const struct msort_param *p, void *b, size_t n)
     case 3:
       while (n1 > 0 && n2 > 0)
 	{
-	  if ((*cmp) (*(const void **) b1, *(const void **) b2) <= 0)
+	  if ((*cmp) (*(const void **) b1, *(const void **) b2, arg) <= 0)
 	    {
 	      *(void **) tmp = *(void **) b1;
 	      b1 += sizeof (void *);
@@ -137,7 +139,7 @@ msort_with_tmp (const struct msort_param *p, void *b, size_t n)
     default:
       while (n1 > 0 && n2 > 0)
 	{
-	  if ((*cmp) (b1, b2) <= 0)
+	  if ((*cmp) (b1, b2, arg) <= 0)
 	    {
 	      tmp = (char *) __mempcpy (tmp, b1, s);
 	      b1 += s;
@@ -158,8 +160,9 @@ msort_with_tmp (const struct msort_param *p, void *b, size_t n)
   memcpy (b, p->t, (n - n2) * s);
 }
 
+
 void
-qsort (void *b, size_t n, size_t s, __compar_fn_t cmp)
+qsort_r (void *b, size_t n, size_t s, __compar_d_fn_t cmp, void *arg)
 {
   size_t size = n * s;
   char *tmp = NULL;
@@ -207,7 +210,7 @@ qsort (void *b, size_t n, size_t s, __compar_fn_t cmp)
       /* If the memory requirements are too high don't allocate memory.  */
       if (size / pagesize > (size_t) phys_pages)
 	{
-	  _quicksort (b, n, s, cmp);
+	  _quicksort (b, n, s, cmp, arg);
 	  return;
 	}
 
@@ -219,15 +222,16 @@ qsort (void *b, size_t n, size_t s, __compar_fn_t cmp)
 	{
 	  /* Couldn't get space, so use the slower algorithm
 	     that doesn't need a temporary array.  */
-	  _quicksort (b, n, s, cmp);
+	  _quicksort (b, n, s, cmp, arg);
 	  return;
 	}
       p.t = tmp;
     }
 
   p.s = s;
-  p.cmp = cmp;
   p.var = 4;
+  p.cmp = cmp;
+  p.arg = arg;
 
   if (s > 32)
     {
@@ -269,7 +273,7 @@ qsort (void *b, size_t n, size_t s, __compar_fn_t cmp)
 	    while (kp != ip);
 
 	    tp[j] = jp;
-	    memcpy (jp, tmp_storage, s); 
+	    memcpy (jp, tmp_storage, s);
 	  }
     }
   else
@@ -291,4 +295,12 @@ qsort (void *b, size_t n, size_t s, __compar_fn_t cmp)
     }
   free (tmp);
 }
+libc_hidden_def (qsort_r)
+
+
+void
+qsort (void *b, size_t n, size_t s, __compar_fn_t cmp)
+{
+  return qsort_r (b, n, s, (__compar_d_fn_t) cmp, NULL);
+}
 libc_hidden_def (qsort)
diff --git a/stdlib/qsort.c b/stdlib/qsort.c
index 6a33c52f39..b19e86ece1 100644
--- a/stdlib/qsort.c
+++ b/stdlib/qsort.c
@@ -88,7 +88,7 @@ typedef struct
 
 void
 _quicksort (void *const pbase, size_t total_elems, size_t size,
-	    __compar_fn_t cmp)
+	    __compar_d_fn_t cmp, void *arg)
 {
   register char *base_ptr = (char *) pbase;
 
@@ -120,13 +120,13 @@ _quicksort (void *const pbase, size_t total_elems, size_t size,
 
 	  char *mid = lo + size * ((hi - lo) / size >> 1);
 
-	  if ((*cmp) ((void *) mid, (void *) lo) < 0)
+	  if ((*cmp) ((void *) mid, (void *) lo, arg) < 0)
 	    SWAP (mid, lo, size);
-	  if ((*cmp) ((void *) hi, (void *) mid) < 0)
+	  if ((*cmp) ((void *) hi, (void *) mid, arg) < 0)
 	    SWAP (mid, hi, size);
 	  else
 	    goto jump_over;
-	  if ((*cmp) ((void *) mid, (void *) lo) < 0)
+	  if ((*cmp) ((void *) mid, (void *) lo, arg) < 0)
 	    SWAP (mid, lo, size);
 	jump_over:;
 
@@ -138,10 +138,10 @@ _quicksort (void *const pbase, size_t total_elems, size_t size,
 	     that this algorithm runs much faster than others. */
 	  do
 	    {
-	      while ((*cmp) ((void *) left_ptr, (void *) mid) < 0)
+	      while ((*cmp) ((void *) left_ptr, (void *) mid, arg) < 0)
 		left_ptr += size;
 
-	      while ((*cmp) ((void *) mid, (void *) right_ptr) < 0)
+	      while ((*cmp) ((void *) mid, (void *) right_ptr, arg) < 0)
 		right_ptr -= size;
 
 	      if (left_ptr < right_ptr)
@@ -214,7 +214,7 @@ _quicksort (void *const pbase, size_t total_elems, size_t size,
        and the operation speeds up insertion sort's inner loop. */
 
     for (run_ptr = tmp_ptr + size; run_ptr <= thresh; run_ptr += size)
-      if ((*cmp) ((void *) run_ptr, (void *) tmp_ptr) < 0)
+      if ((*cmp) ((void *) run_ptr, (void *) tmp_ptr, arg) < 0)
         tmp_ptr = run_ptr;
 
     if (tmp_ptr != base_ptr)
@@ -226,7 +226,7 @@ _quicksort (void *const pbase, size_t total_elems, size_t size,
     while ((run_ptr += size) <= end_ptr)
       {
 	tmp_ptr = run_ptr - size;
-	while ((*cmp) ((void *) run_ptr, (void *) tmp_ptr) < 0)
+	while ((*cmp) ((void *) run_ptr, (void *) tmp_ptr, arg) < 0)
 	  tmp_ptr -= size;
 
 	tmp_ptr += size;
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 3c2ea72a53..732e7d65d2 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -673,6 +673,9 @@ typedef int (*__compar_fn_t) (__const void *, __const void *);
 typedef __compar_fn_t comparison_fn_t;
 # endif
 #endif
+#ifdef __USE_GNU
+typedef int (*__compar_d_fn_t) (__const void *, __const void *, void *);
+#endif
 
 __BEGIN_NAMESPACE_STD
 /* Do a binary search for KEY in BASE, which consists of NMEMB elements
@@ -685,6 +688,11 @@ extern void *bsearch (__const void *__key, __const void *__base,
    using COMPAR to perform the comparisons.  */
 extern void qsort (void *__base, size_t __nmemb, size_t __size,
 		   __compar_fn_t __compar) __nonnull ((1, 4));
+#ifdef __USE_GNU
+extern void qsort_r (void *__base, size_t __nmemb, size_t __size,
+		     __compar_d_fn_t __compar, void *__arg)
+  __nonnull ((1, 4));
+#endif
 
 
 /* Return the absolute value of X.  */
diff --git a/stdlib/tst-setcontext.c b/stdlib/tst-setcontext.c
index e8b1e22671..28bf230264 100644
--- a/stdlib/tst-setcontext.c
+++ b/stdlib/tst-setcontext.c
@@ -123,9 +123,26 @@ test_stack(volatile int a, volatile int b,
 
 volatile int global;
 
+
+static int back_in_main;
+
+
+static void
+check_called (void)
+{
+  if (back_in_main == 0)
+    {
+      puts ("program did no reach main again");
+      _exit (1);
+    }
+}
+
+
 int
 main (void)
 {
+  atexit (check_called);
+
   char st1[32768];
 
   puts ("making contexts");
@@ -185,6 +202,7 @@ main (void)
       exit (1);
     }
   puts ("back at main program");
+  back_in_main = 1;
 
   if (was_in_f1 == 0)
     {
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index 8c24677c83..70ee0eae88 100644
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -413,7 +413,7 @@ send_again:
 	{
 	  fromlen = sizeof (struct sockaddr);
 	  inlen = __recvfrom (cu->cu_sock, cu->cu_inbuf,
-			      (int) cu->cu_recvsz, 0,
+			      (int) cu->cu_recvsz, MSG_DONTWAIT,
 			      (struct sockaddr *) &from, &fromlen);
 	}
       while (inlen < 0 && errno == EINTR);
diff --git a/sunrpc/netname.c b/sunrpc/netname.c
index 07cddb7c38..07ff768e6a 100644
--- a/sunrpc/netname.c
+++ b/sunrpc/netname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2002, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
 
@@ -176,7 +176,7 @@ netname2user (const char netname[MAXNETNAMELEN + 1], uid_t * uidp, gid_t * gidp,
     {
       status = (*fct.f) (netname, uidp, gidp, gidlenp, gidlist);
 
-      no_more = __nss_next (&nip, "netname2user", &fct.ptr, status, 0);
+      no_more = __nss_next2 (&nip, "netname2user", NULL, &fct.ptr, status, 0);
     }
 
   return status == NSS_STATUS_SUCCESS;
diff --git a/sunrpc/publickey.c b/sunrpc/publickey.c
index 5b95edf632..dbadacaecd 100644
--- a/sunrpc/publickey.c
+++ b/sunrpc/publickey.c
@@ -1,5 +1,5 @@
 /* Get public or secret key from key server.
-   Copyright (C) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999,2002,2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -71,7 +71,7 @@ getpublickey (const char *name, char *key)
     {
       status = (*fct.f) (name, key, &errno);
 
-      no_more = __nss_next (&nip, "getpublickey", &fct.ptr, status, 0);
+      no_more = __nss_next2 (&nip, "getpublickey", NULL, &fct.ptr, status, 0);
     }
 
   return status == NSS_STATUS_SUCCESS;
@@ -114,7 +114,7 @@ getsecretkey (const char *name, char *key, const char *passwd)
     {
       status = (*fct.f) (name, key, passwd, &errno);
 
-      no_more = __nss_next (&nip, "getsecretkey", &fct.ptr, status, 0);
+      no_more = __nss_next2 (&nip, "getsecretkey", NULL, &fct.ptr, status, 0);
     }
 
   return status == NSS_STATUS_SUCCESS;
diff --git a/sysdeps/i386/backtrace.c b/sysdeps/i386/backtrace.c
index 8b61913dde..cf3b2719b9 100644
--- a/sysdeps/i386/backtrace.c
+++ b/sysdeps/i386/backtrace.c
@@ -1,5 +1,5 @@
 /* Return backtrace of current program state.
-   Copyright (C) 1998, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000, 2003-2005, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -36,21 +36,26 @@ static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *);
 static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *);
 static _Unwind_Ptr (*unwind_getcfa) (struct _Unwind_Context *);
 static _Unwind_Ptr (*unwind_getgr) (struct _Unwind_Context *, int);
+static void *libgcc_handle;
 
 static void
 init (void)
 {
-  void *handle = __libc_dlopen ("libgcc_s.so.1");
+  libgcc_handle = __libc_dlopen ("libgcc_s.so.1");
 
-  if (handle == NULL)
+  if (libgcc_handle == NULL)
     return;
 
-  unwind_backtrace = __libc_dlsym (handle, "_Unwind_Backtrace");
-  unwind_getip = __libc_dlsym (handle, "_Unwind_GetIP");
-  unwind_getcfa = __libc_dlsym (handle, "_Unwind_GetCFA");
-  unwind_getgr = __libc_dlsym (handle, "_Unwind_GetGR");
+  unwind_backtrace = __libc_dlsym (libgcc_handle, "_Unwind_Backtrace");
+  unwind_getip = __libc_dlsym (libgcc_handle, "_Unwind_GetIP");
+  unwind_getcfa = __libc_dlsym (libgcc_handle, "_Unwind_GetCFA");
+  unwind_getgr = __libc_dlsym (libgcc_handle, "_Unwind_GetGR");
   if (unwind_getip == NULL || unwind_getgr == NULL || unwind_getcfa == NULL)
-    unwind_backtrace = NULL;
+    {
+      unwind_backtrace = NULL;
+      __libc_dlclose (libgcc_handle);
+      libgcc_handle = NULL;
+    }
 }
 #else
 # define unwind_backtrace _Unwind_Backtrace
@@ -142,3 +147,17 @@ __backtrace (array, size)
 }
 weak_alias (__backtrace, backtrace)
 libc_hidden_def (__backtrace)
+
+
+#ifdef SHARED
+/* Free all resources if necessary.  */
+libc_freeres_fn (free_mem)
+{
+  unwind_backtrace = NULL;
+  if (libgcc_handle != NULL)
+    {
+      __libc_dlclose (libgcc_handle);
+      libgcc_handle = NULL;
+    }
+}
+#endif
diff --git a/sysdeps/i386/i586/memcpy_chk.S b/sysdeps/i386/i586/memcpy_chk.S
new file mode 100644
index 0000000000..ab8a95c9b4
--- /dev/null
+++ b/sysdeps/i386/i586/memcpy_chk.S
@@ -0,0 +1 @@
+#include <sysdeps/i386/i686/memcpy_chk.S>
diff --git a/sysdeps/i386/i586/mempcpy_chk.S b/sysdeps/i386/i586/mempcpy_chk.S
new file mode 100644
index 0000000000..9a1de1dfe3
--- /dev/null
+++ b/sysdeps/i386/i586/mempcpy_chk.S
@@ -0,0 +1 @@
+#include <sysdeps/i386/i686/mempcpy_chk.S>
diff --git a/sysdeps/i386/i586/memset_chk.S b/sysdeps/i386/i586/memset_chk.S
new file mode 100644
index 0000000000..09f9d42e0d
--- /dev/null
+++ b/sysdeps/i386/i586/memset_chk.S
@@ -0,0 +1 @@
+#include <sysdeps/i386/i686/memset_chk.S>
diff --git a/sysdeps/ia64/backtrace.c b/sysdeps/ia64/backtrace.c
index 3f2b75ec03..423fed80a8 100644
--- a/sysdeps/ia64/backtrace.c
+++ b/sysdeps/ia64/backtrace.c
@@ -1,5 +1,5 @@
 /* Return backtrace of current program state.
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
 
@@ -33,17 +33,18 @@ struct trace_arg
 #ifdef SHARED
 static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *);
 static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *);
+static void *libgcc_handle;
 
 static void
 init (void)
 {
-  void *handle = __libc_dlopen ("libgcc_s.so.1");
+  libgcc_handle = __libc_dlopen ("libgcc_s.so.1");
 
-  if (handle == NULL)
+  if (libgcc_handle == NULL)
     return;
 
-  unwind_backtrace = __libc_dlsym (handle, "_Unwind_Backtrace");
-  unwind_getip = __libc_dlsym (handle, "_Unwind_GetIP");
+  unwind_backtrace = __libc_dlsym (libgcc_handle, "_Unwind_Backtrace");
+  unwind_getip = __libc_dlsym (libgcc_handle, "_Unwind_GetIP");
   if (unwind_getip == NULL)
     unwind_backtrace = NULL;
 }
@@ -91,3 +92,17 @@ __backtrace (array, size)
 }
 weak_alias (__backtrace, backtrace)
 libc_hidden_def (__backtrace)
+
+
+#ifdef SHARED
+/* Free all resources if necessary.  */
+libc_freeres_fn (free_mem)
+{
+  unwind_backtrace = NULL;
+  if (libgcc_handle != NULL)
+    {
+      __libc_dlclose (libgcc_handle);
+      libgcc_handle = NULL;
+    }
+}
+#endif
diff --git a/sysdeps/ieee754/dbl-64/sincos.tbl b/sysdeps/ieee754/dbl-64/sincos.tbl
index 9dd5502841..9343f24163 100644
--- a/sysdeps/ieee754/dbl-64/sincos.tbl
+++ b/sysdeps/ieee754/dbl-64/sincos.tbl
@@ -1,7 +1,7 @@
 /*
  * IBM Accurate Mathematical Library
  * Written by International Business Machines Corp.
- * Copyright (C) 2001 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2007 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -24,7 +24,7 @@
 
 
 #ifdef BIG_ENDI
-static const union {int4 i[880]; double x[40];}sincos = { .i = {
+static const union {int4 i[880]; double x[440];}sincos = { .i = {
 /**/                   0x00000000, 0x00000000,
 /**/                   0x00000000, 0x00000000,
 /**/                   0x3FF00000, 0x00000000,
diff --git a/sysdeps/mach/hurd/bits/fcntl.h b/sysdeps/mach/hurd/bits/fcntl.h
index 34e6baa049..2f890c1b65 100644
--- a/sysdeps/mach/hurd/bits/fcntl.h
+++ b/sysdeps/mach/hurd/bits/fcntl.h
@@ -71,7 +71,6 @@
 #define O_SYNC		O_FSYNC
 #ifdef __USE_GNU
 # define O_NOATIME	0x0800	/* Don't set access time on read (owner).  */
-# define O_CLOEXEC	0x00010000 /* Set FD_CLOEXEC.  */
 #endif
 #ifdef	__USE_MISC
 # define O_SHLOCK	0x00020000 /* Open with shared file lock.  */
@@ -118,6 +117,9 @@
    once the file has been opened.  */
 
 #define	O_TRUNC		0x00010000 /* Truncate file to zero length.  */
+#ifdef __USE_GNU
+# define O_CLOEXEC	0x00400000 /* Set FD_CLOEXEC.  */
+#endif
 
 
 /* Controlling terminal flags.  These are understood only by `open',
@@ -163,6 +165,11 @@
 #define	F_SETLK		8	/* Set record locking info (non-blocking).  */
 #define	F_SETLKW	9	/* Set record locking info (blocking).  */
 
+#ifdef __USE_GNU
+# define F_DUPFD_CLOEXEC 1030	/* Duplicate, set FD_CLOEXEC on new one.  */
+#endif
+
+
 /* File descriptor flags used with F_GETFD and F_SETFD.  */
 #define	FD_CLOEXEC	1	/* Close on exec.  */
 
diff --git a/sysdeps/mach/hurd/fcntl.c b/sysdeps/mach/hurd/fcntl.c
index d4e4aa5da1..470614b360 100644
--- a/sysdeps/mach/hurd/fcntl.c
+++ b/sysdeps/mach/hurd/fcntl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-1997,1999,2000,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1992-1997,1999,2000,2002,2007 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
@@ -50,6 +50,7 @@ __libc_fcntl (int fd, int cmd, ...)
       /* First the descriptor-based commands, which do no RPCs.  */
 
     case F_DUPFD:		/* Duplicate the file descriptor.  */
+    case F_DUPFD_CLOEXEC:
       {
 	struct hurd_fd *new;
 	io_t port, ctty;
@@ -64,6 +65,12 @@ __libc_fcntl (int fd, int cmd, ...)
 	ctty = _hurd_port_get (&d->ctty, &ctty_ulink);
 	port = _hurd_port_locked_get (&d->port, &ulink); /* Unlocks D.  */
 
+	if (cmd == F_DUPFD_CLOEXEC)
+	  flags |= FD_CLOEXEC;
+	else
+	  /* Duplication clears the FD_CLOEXEC flag.  */
+	  flags &= ~FD_CLOEXEC;
+
 	/* Get a new file descriptor.  The third argument to __fcntl is the
 	   minimum file descriptor number for it.  */
 	new = _hurd_alloc_fd (&result, va_arg (ap, int));
@@ -82,8 +89,7 @@ __libc_fcntl (int fd, int cmd, ...)
 	    /* Install the ports and flags in the new descriptor.  */
 	    if (ctty != MACH_PORT_NULL)
 	      _hurd_port_set (&new->ctty, ctty);
-	    /* Duplication clears the FD_CLOEXEC flag.  */
-	    new->flags = flags & ~FD_CLOEXEC;
+	    new->flags = flags;
 	    _hurd_port_locked_set (&new->port, port); /* Unlocks NEW.  */
 	  }
 
diff --git a/sysdeps/mach/hurd/kernel-features.h b/sysdeps/mach/hurd/kernel-features.h
new file mode 100644
index 0000000000..ad159aace8
--- /dev/null
+++ b/sysdeps/mach/hurd/kernel-features.h
@@ -0,0 +1,31 @@
+/* Set flags signalling availability of certain operating system features.
+   Copyright (C) 2007 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/* This file can define __ASSUME_* macros checked by certain source files.
+   Almost none of these are used outside of sysdeps/unix/sysv/linux code.
+   But those referring to POSIX-level features like O_* flags can be.  */
+
+#include <fcntl.h>
+
+/* If a system defines the O_CLOEXEC constant but it is sometimes ignored,
+   it must override this file to define __ASSUME_O_CLOEXEC conditionally
+   (or not at all) to indicate when O_CLOEXEC actually works.  */
+#ifdef O_CLOEXEC
+# define __ASSUME_O_CLOEXEC	1
+#endif
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 8cf9c6bdfe..e8f4099b7f 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -61,10 +61,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <nscd/nscd-client.h>
 #include <nscd/nscd_proto.h>
 
-#ifdef HAVE_NETLINK_ROUTE
-# include <kernel-features.h>
-#endif
-
 #ifdef HAVE_LIBIDN
 extern int __idna_to_ascii_lz (const char *input, char **output, int flags);
 extern int __idna_to_unicode_lzlz (const char *input, char **output,
@@ -1006,9 +1002,50 @@ struct sort_result
   uint8_t source_addr_len;
   bool got_source_addr;
   uint8_t source_addr_flags;
+  uint8_t prefixlen;
+  uint32_t index;
+  int32_t native;
+};
+
+struct sort_result_combo
+{
+  struct sort_result *results;
+  int nresults;
 };
 
 
+#if __BYTE_ORDER == __BIG_ENDIAN
+# define htonl_c(n) n
+#else
+# define htonl_c(n) __bswap_constant_32 (n)
+#endif
+
+static const struct scopeentry
+{
+  union
+  {
+    char addr[4];
+    uint32_t addr32;
+  };
+  uint32_t netmask;
+  int32_t scope;
+} default_scopes[] =
+  {
+    /* Link-local addresses: scope 2.  */
+    { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 },
+    { { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 },
+    /* Site-local addresses: scope 5.  */
+    { { { 10, 0, 0, 0 } }, htonl_c (0xff000000), 5 },
+    { { { 172, 16, 0, 0 } }, htonl_c (0xfff00000), 5 },
+    { { { 192, 168, 0, 0 } }, htonl_c (0xffff0000), 5 },
+    /* Default: scope 14.  */
+    { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 }
+  };
+
+/* The label table.  */
+static const struct scopeentry *scopes;
+
+
 static int
 get_scope (const struct sockaddr_storage *ss)
 {
@@ -1033,17 +1070,17 @@ get_scope (const struct sockaddr_storage *ss)
   else if (ss->ss_family == PF_INET)
     {
       const struct sockaddr_in *in = (const struct sockaddr_in *) ss;
-      const uint8_t *addr = (const uint8_t *) &in->sin_addr;
-
-      /* RFC 3484 specifies how to map IPv6 addresses to scopes.
-	 169.254/16 and 127/8 are link-local.  */
-      if ((addr[0] == 169 && addr[1] == 254) || addr[0] == 127)
-	scope = 2;
-      else if (addr[0] == 10 || (addr[0] == 172 && (addr[1] & 0xf0) == 16)
-	       || (addr[0] == 192 && addr[1] == 168))
-	scope = 5;
-      else
-	scope = 14;
+
+      size_t cnt = 0;
+      while (1)
+	{
+	  if ((in->sin_addr.s_addr & scopes[cnt].netmask)
+	      == scopes[cnt].addr32)
+	    return scopes[cnt].scope;
+
+	  ++cnt;
+	}
+      /* NOTREACHED */
     }
   else
     /* XXX What is a good default?  */
@@ -1099,6 +1136,7 @@ static const struct prefixentry default_labels[] =
 	= { .u6_addr8 = { 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 			  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
       7, 6 },
+    /* Additional rule for Teredo tunnels.  */
     { { .in6_u
 	= { .u6_addr8 = { 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 			  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
@@ -1223,7 +1261,7 @@ static int
 fls (uint32_t a)
 {
   uint32_t mask;
-  int n = 0;
+  int n;
   for (n = 0, mask = 1 << 31; n < 32; mask >>= 1, ++n)
     if ((a & mask) != 0)
       break;
@@ -1232,10 +1270,11 @@ fls (uint32_t a)
 
 
 static int
-rfc3484_sort (const void *p1, const void *p2)
+rfc3484_sort (const void *p1, const void *p2, void *arg)
 {
   const struct sort_result *a1 = (const struct sort_result *) p1;
   const struct sort_result *a2 = (const struct sort_result *) p2;
+  struct sort_result_combo *src = (struct sort_result_combo *) arg;
 
   /* Rule 1: Avoid unusable destinations.
      We have the got_source_addr flag set if the destination is reachable.  */
@@ -1320,14 +1359,34 @@ rfc3484_sort (const void *p1, const void *p2)
   /* Rule 7: Prefer native transport.  */
   if (a1->got_source_addr)
     {
-      if (!(a1->source_addr_flags & in6ai_temporary)
-	  && (a2->source_addr_flags & in6ai_temporary))
-	return -1;
-      if ((a1->source_addr_flags & in6ai_temporary)
-	  && !(a2->source_addr_flags & in6ai_temporary))
-	return 1;
+      /* The same interface index means the same interface which means
+	 there is no difference in transport.  This should catch many
+	 (most?) cases.  */
+      if (a1->index != a2->index)
+	{
+	  if (a1->native == -1 || a2->native == -1)
+	    {
+	      /* If we do not have the information use 'native' as the
+		 default.  */
+	      int a1_native = 0;
+	      int a2_native = 0;
+	      __check_native (a1->index, &a1_native, a2->index, &a2_native);
+
+	      /* Fill in the results in all the records.  */
+	      for (int i = 0; i < src->nresults; ++i)
+		{
+		  if (a1->native == -1 && src->results[i].index == a1->index)
+		    src->results[i].native = a1_native;
+		  if (a2->native == -1 && src->results[i].index == a2->index)
+		    src->results[i].native = a2_native;
+		}
+	    }
 
-      /* XXX Do we need to check anything beside temporary addresses?  */
+	  if (a1->native && !a2->native)
+	    return -1;
+	  if (!a1->native && a2->native)
+	    return 1;
+	}
     }
 
 
@@ -1350,20 +1409,31 @@ rfc3484_sort (const void *p1, const void *p2)
 	  assert (a1->source_addr.ss_family == PF_INET);
 	  assert (a2->source_addr.ss_family == PF_INET);
 
-	  struct sockaddr_in *in1_dst;
-	  struct sockaddr_in *in1_src;
-	  struct sockaddr_in *in2_dst;
-	  struct sockaddr_in *in2_src;
-
-	  in1_dst = (struct sockaddr_in *) a1->dest_addr->ai_addr;
-	  in1_src = (struct sockaddr_in *) &a1->source_addr;
-	  in2_dst = (struct sockaddr_in *) a2->dest_addr->ai_addr;
-	  in2_src = (struct sockaddr_in *) &a2->source_addr;
-
-	  bit1 = fls (ntohl (in1_dst->sin_addr.s_addr
-			     ^ in1_src->sin_addr.s_addr));
-	  bit2 = fls (ntohl (in2_dst->sin_addr.s_addr
-			     ^ in2_src->sin_addr.s_addr));
+	  /* Outside of subnets, as defined by the network masks,
+	     common address prefixes for IPv4 addresses make no sense.
+	     So, define a non-zero value only if source and
+	     destination address are on the same subnet.  */
+	  struct sockaddr_in *in1_dst
+	    = (struct sockaddr_in *) a1->dest_addr->ai_addr;
+	  in_addr_t in1_dst_addr = ntohl (in1_dst->sin_addr.s_addr);
+	  struct sockaddr_in *in1_src
+	    = (struct sockaddr_in *) &a1->source_addr;
+	  in_addr_t in1_src_addr = ntohl (in1_src->sin_addr.s_addr);
+	  in_addr_t netmask1 = 0xffffffffu << (32 - a1->prefixlen);
+
+	  if ((in1_src_addr & netmask1) == (in1_dst_addr & netmask1))
+	    bit1 = fls (in1_dst_addr ^ in1_src_addr);
+
+	  struct sockaddr_in *in2_dst
+	    = (struct sockaddr_in *) a2->dest_addr->ai_addr;
+	  in_addr_t in2_dst_addr = ntohl (in2_dst->sin_addr.s_addr);
+	  struct sockaddr_in *in2_src
+	    = (struct sockaddr_in *) &a2->source_addr;
+	  in_addr_t in2_src_addr = ntohl (in2_src->sin_addr.s_addr);
+	  in_addr_t netmask2 = 0xffffffffu << (32 - a2->prefixlen);
+
+	  if ((in2_src_addr & netmask2) == (in2_dst_addr & netmask2))
+	    bit2 = fls (in2_dst_addr ^ in2_src_addr);
 	}
       else if (a1->dest_addr->ai_family == PF_INET6)
 	{
@@ -1452,6 +1522,13 @@ libc_freeres_fn(fini)
       precedence = default_precedence;
       free ((void *) old);
     }
+
+  if (scopes != default_scopes)
+    {
+      const struct scopeentry *old = scopes;
+      scopes = default_scopes;
+      free ((void *) old);
+    }
 }
 
 
@@ -1462,6 +1539,13 @@ struct prefixlist
 };
 
 
+struct scopelist
+{
+  struct scopeentry entry;
+  struct scopelist *next;
+};
+
+
 static void
 free_prefixlist (struct prefixlist *list)
 {
@@ -1474,6 +1558,18 @@ free_prefixlist (struct prefixlist *list)
 }
 
 
+static void
+free_scopelist (struct scopelist *list)
+{
+  while (list != NULL)
+    {
+      struct scopelist *oldp = list;
+      list = list->next;
+      free (oldp);
+    }
+}
+
+
 static int
 prefixcmp (const void *p1, const void *p2)
 {
@@ -1488,6 +1584,20 @@ prefixcmp (const void *p1, const void *p2)
 }
 
 
+static int
+scopecmp (const void *p1, const void *p2)
+{
+  const struct scopeentry *e1 = (const struct scopeentry *) p1;
+  const struct scopeentry *e2 = (const struct scopeentry *) p2;
+
+  if (e1->netmask > e2->netmask)
+    return -1;
+  if (e1->netmask == e2->netmask)
+    return 0;
+  return 1;
+}
+
+
 static void
 gaiconf_init (void)
 {
@@ -1497,6 +1607,9 @@ gaiconf_init (void)
   struct prefixlist *precedencelist = NULL;
   size_t nprecedencelist = 0;
   bool precedencelist_nullbits = false;
+  struct scopelist *scopelist =  NULL;
+  size_t nscopelist = 0;
+  bool scopelist_nullbits = false;
 
   FILE *fp = fopen (GAICONF_FNAME, "rc");
   if (fp != NULL)
@@ -1587,7 +1700,7 @@ gaiconf_init (void)
 			  || (bits = strtoul (cp, &endp, 10)) != ULONG_MAX
 			  || errno != ERANGE)
 		      && *endp == '\0'
-		      && bits <= INT_MAX
+		      && bits <= 128
 		      && ((val = strtoul (val2, &endp, 10)) != ULONG_MAX
 			  || errno != ERANGE)
 		      && *endp == '\0'
@@ -1621,6 +1734,73 @@ gaiconf_init (void)
 		}
 	      break;
 
+	    case 7:
+	      if (strcmp (cmd, "scopev4") == 0)
+		{
+		  struct in6_addr prefix;
+		  unsigned long int bits;
+		  unsigned long int val;
+		  char *endp;
+
+		  bits = 32;
+		  __set_errno (0);
+		  cp = strchr (val1, '/');
+		  if (cp != NULL)
+		    *cp++ = '\0';
+		  if (inet_pton (AF_INET6, val1, &prefix))
+		    {
+		      if (IN6_IS_ADDR_V4MAPPED (&prefix)
+			  && (cp == NULL
+			      || (bits = strtoul (cp, &endp, 10)) != ULONG_MAX
+			      || errno != ERANGE)
+			  && *endp == '\0'
+			  && bits >= 96
+			  && bits <= 128
+			  && ((val = strtoul (val2, &endp, 10)) != ULONG_MAX
+			      || errno != ERANGE)
+			  && *endp == '\0'
+			  && val <= INT_MAX)
+			{
+			  struct scopelist *newp;
+			new_scope:
+			  newp = malloc (sizeof (*newp));
+			  if (newp == NULL)
+			    {
+			      free (line);
+			      fclose (fp);
+			      goto no_file;
+			    }
+
+			  newp->entry.netmask = htonl (bits != 96
+						       ? (0xffffffff
+							  << (128 - bits))
+						       : 0);
+			  newp->entry.addr32 = (prefix.s6_addr32[3]
+						& newp->entry.netmask);
+			  newp->entry.scope = val;
+			  newp->next = scopelist;
+			  scopelist = newp;
+			  ++nscopelist;
+			  scopelist_nullbits |= bits == 96;
+			}
+		    }
+		  else if (inet_pton (AF_INET, val1, &prefix.s6_addr32[3])
+			   && (cp == NULL
+			       || (bits = strtoul (cp, &endp, 10)) != ULONG_MAX
+			       || errno != ERANGE)
+			   && *endp == '\0'
+			   && bits <= 32
+			   && ((val = strtoul (val2, &endp, 10)) != ULONG_MAX
+			       || errno != ERANGE)
+			   && *endp == '\0'
+			   && val <= INT_MAX)
+		    {
+		      bits += 96;
+		      goto new_scope;
+		    }
+		}
+	      break;
+
 	    case 10:
 	      if (strcmp (cmd, "precedence") == 0)
 		{
@@ -1704,12 +1884,52 @@ gaiconf_init (void)
 
 	  /* Sort the entries so that the most specific ones are at
 	     the beginning.  */
-	  qsort (new_precedence, nprecedencelist, sizeof (*new_labels),
+	  qsort (new_precedence, nprecedencelist, sizeof (*new_precedence),
 		 prefixcmp);
 	}
       else
 	new_precedence = (struct prefixentry *) default_precedence;
 
+      struct scopeentry *new_scopes;
+      if (nscopelist > 0)
+	{
+	  if (!scopelist_nullbits)
+	    ++nscopelist;
+	  new_scopes = malloc (nscopelist * sizeof (*new_scopes));
+	  if (new_scopes == NULL)
+	    {
+	      if (new_labels != default_labels)
+		free (new_labels);
+	      if (new_precedence != default_precedence)
+		free (new_precedence);
+	      goto no_file;
+	    }
+
+	  int i = nscopelist;
+	  if (!scopelist_nullbits)
+	    {
+	      --i;
+	      new_scopes[i].addr32 = 0;
+	      new_scopes[i].netmask = 0;
+	      new_scopes[i].scope = 14;
+	    }
+
+	  struct scopelist *l = scopelist;
+	  while (i-- > 0)
+	    {
+	      new_scopes[i] = l->entry;
+	      l = l->next;
+	    }
+	  free_scopelist (scopelist);
+
+	  /* Sort the entries so that the most specific ones are at
+	     the beginning.  */
+	  qsort (new_scopes, nscopelist, sizeof (*new_scopes),
+		 scopecmp);
+	}
+      else
+	new_scopes = (struct scopeentry *) default_scopes;
+
       /* Now we are ready to replace the values.  */
       const struct prefixentry *old = labels;
       labels = new_labels;
@@ -1721,6 +1941,11 @@ gaiconf_init (void)
       if (old != default_precedence)
 	free ((void *) old);
 
+      const struct scopeentry *oldscope = scopes;
+      scopes = new_scopes;
+      if (oldscope != default_scopes)
+	free ((void *) oldscope);
+
       gaiconf_mtime = st.st_mtim;
     }
   else
@@ -1728,6 +1953,7 @@ gaiconf_init (void)
     no_file:
       free_prefixlist (labellist);
       free_prefixlist (precedencelist);
+      free_scopelist (scopelist);
 
       /* If we previously read the file but it is gone now, free the
 	 old data and use the builtin one.  Leave the reload flag
@@ -1747,16 +1973,6 @@ gaiconf_reload (void)
 }
 
 
-#if HAVE_NETLINK_ROUTE
-# if __ASSUME_NETLINK_SUPPORT == 0
-/* Defined in ifaddrs.c.  */
-extern int __no_netlink_support attribute_hidden;
-# else
-#  define __no_netlink_support 0
-# endif
-#endif
-
-
 int
 getaddrinfo (const char *name, const char *service,
 	     const struct addrinfo *hints, struct addrinfo **pai)
@@ -1795,71 +2011,12 @@ getaddrinfo (const char *name, const char *service,
   size_t in6ailen = 0;
   bool seen_ipv4 = false;
   bool seen_ipv6 = false;
-#ifdef HAVE_NETLINK_ROUTE
-  int sockfd = -1;
-  pid_t nl_pid;
-#endif
-  /* We might need information about what kind of interfaces are available.
-     But even if AI_ADDRCONFIG is not used, if the user requested IPv6
-     addresses we have to know whether an address is deprecated or
-     temporary.  */
-  if ((hints->ai_flags & AI_ADDRCONFIG) || hints->ai_family == PF_UNSPEC
-      || hints->ai_family == PF_INET6)
-    {
-      /* Determine whether we have IPv4 or IPv6 interfaces or both.  We
-	 cannot cache the results since new interfaces could be added at
-	 any time.  */
-      __check_pf (&seen_ipv4, &seen_ipv6, &in6ai, &in6ailen);
-#ifdef HAVE_NETLINK_ROUTE
-      if (! __no_netlink_support)
-	{
-	  sockfd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-
-	  struct sockaddr_nl nladdr;
-	  memset (&nladdr, '\0', sizeof (nladdr));
-	  nladdr.nl_family = AF_NETLINK;
-
-	  socklen_t addr_len = sizeof (nladdr);
-
-	  if (sockfd >= 0
-	      && __bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
-	      && __getsockname (sockfd, (struct sockaddr *) &nladdr,
-				&addr_len) == 0
-	      && make_request (sockfd, nladdr.nl_pid, &seen_ipv4, &seen_ipv6,
-			       in6ai, in6ailen) == 0)
-	    {
-	      /* It worked.  */
-	      nl_pid = nladdr.nl_pid;
-	      goto got_netlink_socket;
-	    }
-
-	  if (sockfd >= 0)
-	    close_not_cancel_no_status (sockfd);
-
-#if __ASSUME_NETLINK_SUPPORT == 0
-	  /* Remember that there is no netlink support.  */
-	  if (errno != EMFILE && errno != ENFILE)
-	    __no_netlink_support = 1;
-#else
-	  else
-	    {
-	      if (errno != EMFILE && errno != ENFILE)
-		sockfd = -2;
-
-	      /* We cannot determine what interfaces are available.  Be
-		 pessimistic.  */
-	      seen_ipv4 = true;
-	      seen_ipv6 = true;
-	      return;
-	    }
-#endif
-	}
-#endif
-    }
+  /* We might need information about what interfaces are available.
+     Also determine whether we have IPv4 or IPv6 interfaces or both.  We
+     cannot cache the results since new interfaces could be added at
+     any time.  */
+  __check_pf (&seen_ipv4, &seen_ipv6, &in6ai, &in6ailen);
 
-#ifdef HAVE_NETLINK_ROUTE
- got_netlink_socket:
-#endif
   if (hints->ai_flags & AI_ADDRCONFIG)
     {
       /* Now make a decision on what we return, if anything.  */
@@ -1947,7 +2104,7 @@ getaddrinfo (const char *name, const char *service,
       struct addrinfo *last = NULL;
       char *canonname = NULL;
 
-      /* If we have information about deprecated and temporary address
+      /* If we have information about deprecated and temporary addresses
 	 sort the array now.  */
       if (in6ai != NULL)
 	qsort (in6ai, in6ailen, sizeof (*in6ai), in6aicmp);
@@ -1958,8 +2115,8 @@ getaddrinfo (const char *name, const char *service,
       for (i = 0, q = p; q != NULL; ++i, last = q, q = q->ai_next)
 	{
 	  results[i].dest_addr = q;
-	  results[i].got_source_addr = false;
 	  results[i].service_order = i;
+	  results[i].native = -1;
 
 	  /* If we just looked up the address for a different
 	     protocol, reuse the result.  */
@@ -1971,10 +2128,15 @@ getaddrinfo (const char *name, const char *service,
 	      results[i].source_addr_len = results[i - 1].source_addr_len;
 	      results[i].got_source_addr = results[i - 1].got_source_addr;
 	      results[i].source_addr_flags = results[i - 1].source_addr_flags;
+	      results[i].prefixlen = results[i - 1].prefixlen;
+	      results[i].index = results[i - 1].index;
 	    }
 	  else
 	    {
+	      results[i].got_source_addr = false;
 	      results[i].source_addr_flags = 0;
+	      results[i].prefixlen = 0;
+	      results[i].index = 0xffffffffu;
 
 	      /* We overwrite the type with SOCK_DGRAM since we do not
 		 want connect() to connect to the other side.  If we
@@ -2005,22 +2167,40 @@ getaddrinfo (const char *name, const char *service,
 		  results[i].source_addr_len = sl;
 		  results[i].got_source_addr = true;
 
-		  if (q->ai_family == AF_INET6 && in6ai != NULL)
+		  if (in6ai != NULL)
 		    {
 		      /* See whether the source address is on the list of
 			 deprecated or temporary addresses.  */
 		      struct in6addrinfo tmp;
-		      struct sockaddr_in6 *sin6p
-			= (struct sockaddr_in6 *) &results[i].source_addr;
-		      memcpy (tmp.addr, &sin6p->sin6_addr, IN6ADDRSZ);
+
+		      if (q->ai_family == AF_INET && af == AF_INET)
+			{
+			  struct sockaddr_in *sinp
+			    = (struct sockaddr_in *) &results[i].source_addr;
+			  tmp.addr[0] = 0;
+			  tmp.addr[1] = 0;
+			  tmp.addr[2] = htonl (0xffff);
+			  tmp.addr[3] = sinp->sin_addr.s_addr;
+			}
+		      else
+			{
+			  struct sockaddr_in6 *sin6p
+			    = (struct sockaddr_in6 *) &results[i].source_addr;
+			  memcpy (tmp.addr, &sin6p->sin6_addr, IN6ADDRSZ);
+			}
 
 		      struct in6addrinfo *found
 			= bsearch (&tmp, in6ai, in6ailen, sizeof (*in6ai),
 				   in6aicmp);
 		      if (found != NULL)
-			results[i].source_addr_flags = found->flags;
+			{
+			  results[i].source_addr_flags = found->flags;
+			  results[i].prefixlen = found->prefixlen;
+			  results[i].index = found->index;
+			}
 		    }
-		  else if (q->ai_family == AF_INET && af == AF_INET6)
+
+		  if (q->ai_family == AF_INET && af == AF_INET6)
 		    {
 		      /* We have to convert the address.  The socket is
 			 IPv6 and the request is for IPv4.  */
@@ -2029,10 +2209,17 @@ getaddrinfo (const char *name, const char *service,
 		      struct sockaddr_in *sin
 			= (struct sockaddr_in *) &results[i].source_addr;
 		      assert (IN6_IS_ADDR_V4MAPPED (sin6->sin6_addr.s6_addr32));
+		      sin->sin_family = AF_INET;
+		      /* We do not have to initialize sin_port since this
+			 fields has the same position and size in the IPv6
+			 structure.  */
+		      assert (offsetof (struct sockaddr_in, sin_port)
+			      == offsetof (struct sockaddr_in6, sin6_port));
+		      assert (sizeof (sin->sin_port)
+			      == sizeof (sin6->sin6_port));
 		      memcpy (&sin->sin_addr,
 			      &sin6->sin6_addr.s6_addr32[3], INADDRSZ);
-		      results[i].source_addr_len = INADDRSZ;
-		      sin->sin_family = AF_INET;
+		      results[i].source_addr_len = sizeof (struct sockaddr_in);
 		    }
 		}
 	      else if (errno == EAFNOSUPPORT && af == AF_INET6
@@ -2059,6 +2246,8 @@ getaddrinfo (const char *name, const char *service,
 
       /* We got all the source addresses we can get, now sort using
 	 the information.  */
+      struct sort_result_combo src
+	= { .results = results, .nresults = nresults };
       if (__builtin_expect (gaiconf_reload_flag_ever_set, 0))
 	{
 	  __libc_lock_define_initialized (static, lock);
@@ -2066,11 +2255,11 @@ getaddrinfo (const char *name, const char *service,
 	  __libc_lock_lock (lock);
 	  if (old_once && gaiconf_reload_flag)
 	    gaiconf_reload ();
-	  qsort (results, nresults, sizeof (results[0]), rfc3484_sort);
+	  qsort_r (results, nresults, sizeof (results[0]), rfc3484_sort, &src);
 	  __libc_lock_unlock (lock);
 	}
       else
-	qsort (results, nresults, sizeof (results[0]), rfc3484_sort);
+	qsort_r (results, nresults, sizeof (results[0]), rfc3484_sort, &src);
 
       /* Queue the results up as they come out of sorting.  */
       q = p = results[0].dest_addr;
diff --git a/sysdeps/pthread/aio_misc.c b/sysdeps/pthread/aio_misc.c
index 3e1dbe9c63..fd3fcbb755 100644
--- a/sysdeps/pthread/aio_misc.c
+++ b/sysdeps/pthread/aio_misc.c
@@ -1,5 +1,5 @@
 /* Handle general operations.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006, 2007
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -512,7 +512,8 @@ handle_fildes_io (void *arg)
 	     by signals.  */
 	  if ((aiocbp->aiocb.aio_lio_opcode & 127) == LIO_READ)
 	    {
-	      if (aiocbp->aiocb.aio_lio_opcode & 128)
+	      if (sizeof (off_t) != sizeof (off64_t)
+		  && aiocbp->aiocb.aio_lio_opcode & 128)
 		aiocbp->aiocb.__return_value =
 		  TEMP_FAILURE_RETRY (__pread64 (fildes, (void *)
 						 aiocbp->aiocb64.aio_buf,
@@ -537,7 +538,8 @@ handle_fildes_io (void *arg)
 	    }
 	  else if ((aiocbp->aiocb.aio_lio_opcode & 127) == LIO_WRITE)
 	    {
-	      if (aiocbp->aiocb.aio_lio_opcode & 128)
+	      if (sizeof (off_t) != sizeof (off64_t)
+		  && aiocbp->aiocb.aio_lio_opcode & 128)
 		aiocbp->aiocb.__return_value =
 		  TEMP_FAILURE_RETRY (__pwrite64 (fildes, (const void *)
 						  aiocbp->aiocb64.aio_buf,
diff --git a/sysdeps/s390/bits/string.h b/sysdeps/s390/bits/string.h
index 87550c5f67..b2a3ba9c98 100644
--- a/sysdeps/s390/bits/string.h
+++ b/sysdeps/s390/bits/string.h
@@ -40,8 +40,10 @@
 
 #define _HAVE_STRING_ARCH_strlen 1
 #ifndef _FORCE_INLINES
+#define strlen(str) __strlen_g ((str))
+
 __STRING_INLINE size_t
-strlen (__const char *__str)
+__strlen_g (__const char *__str)
 {
     char *__ptr, *__tmp;
 
@@ -59,8 +61,10 @@ strlen (__const char *__str)
 /* Copy SRC to DEST.  */
 #define _HAVE_STRING_ARCH_strcpy 1
 #ifndef _FORCE_INLINES
+#define strcpy(dest, src) __strcpy_g ((dest), (src))
+
 __STRING_INLINE char *
-strcpy (char *__dest, __const char *__src)
+__strcpy_g (char *__dest, __const char *__src)
 {
     char *tmp = __dest;
 
@@ -75,8 +79,10 @@ strcpy (char *__dest, __const char *__src)
 
 #define _HAVE_STRING_ARCH_strncpy 1
 #ifndef _FORCE_INLINES
+#define strncpy(dest, src, n) __strncpy_g ((dest), (src), (n))
+
 __STRING_INLINE char *
-strncpy (char *__dest, __const char *__src, size_t __n)
+__strncpy_g (char *__dest, __const char *__src, size_t __n)
 {
     char *__ret = __dest;
     char *__ptr;
@@ -114,8 +120,10 @@ strncpy (char *__dest, __const char *__src, size_t __n)
 /* Append SRC onto DEST.  */
 #define _HAVE_STRING_ARCH_strcat 1
 #ifndef _FORCE_INLINES
+#define strcat(dest, src) __strcat_g ((dest), (src))
+
 __STRING_INLINE char *
-strcat(char *__dest, const char *__src)
+__strcat_g(char *__dest, const char *__src)
 {
     char *__ret = __dest;
     char *__ptr, *__tmp;
@@ -142,8 +150,10 @@ strcat(char *__dest, const char *__src)
 /* Append no more than N characters from SRC onto DEST.  */
 #define _HAVE_STRING_ARCH_strncat 1
 #ifndef _FORCE_INLINES
+#define strncat(dest, src, n) __strncat_g ((dest), (src), (n))
+
 __STRING_INLINE char *
-strncat (char *__dest, __const char *__src, size_t __n)
+__strncat_g (char *__dest, __const char *__src, size_t __n)
 {
     char *__ret = __dest;
     char *__ptr, *__tmp;
diff --git a/sysdeps/sparc/dl-procinfo.c b/sysdeps/sparc/dl-procinfo.c
index 875820fab3..db7e867468 100644
--- a/sysdeps/sparc/dl-procinfo.c
+++ b/sysdeps/sparc/dl-procinfo.c
@@ -47,10 +47,10 @@
 #if !defined PROCINFO_DECL && defined SHARED
   ._dl_sparc_cap_flags
 #else
-PROCINFO_CLASS const char _dl_sparc_cap_flags[7][7]
+PROCINFO_CLASS const char _dl_sparc_cap_flags[8][7]
 #endif
 #ifndef PROCINFO_DECL
-  = { "flush", "stbar", "swap", "muldiv", "v9", "ultra3", "v9v" }
+  = { "flush", "stbar", "swap", "muldiv", "v9", "ultra3", "v9v", "v9v2" }
 #endif
 #if !defined SHARED || defined PROCINFO_DECL
 ;
diff --git a/sysdeps/sparc/dl-procinfo.h b/sysdeps/sparc/dl-procinfo.h
index dde02b556c..04ebda751b 100644
--- a/sysdeps/sparc/dl-procinfo.h
+++ b/sysdeps/sparc/dl-procinfo.h
@@ -24,7 +24,7 @@
 
 #include <ldsodefs.h>
 
-#define _DL_HWCAP_COUNT 7
+#define _DL_HWCAP_COUNT 8
 
 static inline int
 __attribute__ ((unused))
@@ -66,7 +66,7 @@ _dl_string_hwcap (const char *str)
 #include <bits/wordsize.h>
 #define HWCAP_IMPORTANT_V9	(__WORDSIZE == 64 ? 0 : HWCAP_SPARC_V9)
 #define HWCAP_IMPORTANT		(HWCAP_IMPORTANT_V9 | HWCAP_SPARC_ULTRA3 \
-				 | HWCAP_SPARC_BLKINIT)
+				 | HWCAP_SPARC_BLKINIT | HWCAP_SPARC_N2)
 
 /* There are no different platforms defined.  */
 #define _dl_platform_string(idx) ""
diff --git a/sysdeps/sparc/sparc32/sparcv9/sparcv9v2/memcpy.S b/sysdeps/sparc/sparc32/sparcv9/sparcv9v2/memcpy.S
new file mode 100644
index 0000000000..7f4606037c
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/sparcv9v2/memcpy.S
@@ -0,0 +1,2 @@
+#define XCC icc
+#include <sparc64/sparcv9v2/memcpy.S>
diff --git a/sysdeps/sparc/sparc32/sparcv9/sparcv9v2/memset.S b/sysdeps/sparc/sparc32/sparcv9/sparcv9v2/memset.S
new file mode 100644
index 0000000000..72de7bb0cf
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/sparcv9v2/memset.S
@@ -0,0 +1,2 @@
+#define XCC icc
+#include <sparc64/sparcv9v2/memset.S>
diff --git a/sysdeps/sparc/sparc64/sparcv9v2/memcpy.S b/sysdeps/sparc/sparc64/sparcv9v2/memcpy.S
new file mode 100644
index 0000000000..d94dd4701e
--- /dev/null
+++ b/sysdeps/sparc/sparc64/sparcv9v2/memcpy.S
@@ -0,0 +1,743 @@
+/* Copy SIZE bytes from SRC to DEST.  For SUN4V Niagara-2.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by David S. Miller (davem@davemloft.net)
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdep.h>
+
+#define ASI_BLK_INIT_QUAD_LDD_P	0xe2
+#define ASI_BLK_P		0xf0
+#define ASI_P			0x80
+#define ASI_PNF			0x82
+
+#define FPRS_FEF		0x04
+
+#define VISEntryHalf			\
+	rd	%fprs, %o5;		\
+	wr	%g0, FPRS_FEF, %fprs
+
+#define VISExitHalf			\
+	and	%o5, FPRS_FEF, %o5;	\
+	wr	%o5, 0x0, %fprs
+
+#define STORE_ASI		ASI_BLK_INIT_QUAD_LDD_P
+
+#define LOAD(type,addr,dest)	type [addr], dest
+#define LOAD_BLK(addr,dest)	ldda [addr] ASI_BLK_P, dest
+#define STORE(type,src,addr)	type src, [addr]
+#define STORE_BLK(src,addr)	stda src, [addr] ASI_BLK_P
+#define STORE_INIT(src,addr)	stxa src, [addr] STORE_ASI
+
+#ifndef XCC
+#define USE_BPR
+#define XCC xcc
+#endif
+
+#define FREG_FROB(x0, x1, x2, x3, x4, x5, x6, x7, x8) \
+	faligndata	%x0, %x1, %f0; \
+	faligndata	%x1, %x2, %f2; \
+	faligndata	%x2, %x3, %f4; \
+	faligndata	%x3, %x4, %f6; \
+	faligndata	%x4, %x5, %f8; \
+	faligndata	%x5, %x6, %f10; \
+	faligndata	%x6, %x7, %f12; \
+	faligndata	%x7, %x8, %f14;
+
+#define FREG_MOVE_1(x0) \
+	fmovd		%x0, %f0;
+#define FREG_MOVE_2(x0, x1) \
+	fmovd		%x0, %f0; \
+	fmovd		%x1, %f2;
+#define FREG_MOVE_3(x0, x1, x2) \
+	fmovd		%x0, %f0; \
+	fmovd		%x1, %f2; \
+	fmovd		%x2, %f4;
+#define FREG_MOVE_4(x0, x1, x2, x3) \
+	fmovd		%x0, %f0; \
+	fmovd		%x1, %f2; \
+	fmovd		%x2, %f4; \
+	fmovd		%x3, %f6;
+#define FREG_MOVE_5(x0, x1, x2, x3, x4) \
+	fmovd		%x0, %f0; \
+	fmovd		%x1, %f2; \
+	fmovd		%x2, %f4; \
+	fmovd		%x3, %f6; \
+	fmovd		%x4, %f8;
+#define FREG_MOVE_6(x0, x1, x2, x3, x4, x5) \
+	fmovd		%x0, %f0; \
+	fmovd		%x1, %f2; \
+	fmovd		%x2, %f4; \
+	fmovd		%x3, %f6; \
+	fmovd		%x4, %f8; \
+	fmovd		%x5, %f10;
+#define FREG_MOVE_7(x0, x1, x2, x3, x4, x5, x6) \
+	fmovd		%x0, %f0; \
+	fmovd		%x1, %f2; \
+	fmovd		%x2, %f4; \
+	fmovd		%x3, %f6; \
+	fmovd		%x4, %f8; \
+	fmovd		%x5, %f10; \
+	fmovd		%x6, %f12;
+#define FREG_MOVE_8(x0, x1, x2, x3, x4, x5, x6, x7) \
+	fmovd		%x0, %f0; \
+	fmovd		%x1, %f2; \
+	fmovd		%x2, %f4; \
+	fmovd		%x3, %f6; \
+	fmovd		%x4, %f8; \
+	fmovd		%x5, %f10; \
+	fmovd		%x6, %f12; \
+	fmovd		%x7, %f14;
+#define FREG_LOAD_1(base, x0) \
+	LOAD(ldd, base + 0x00, %x0)
+#define FREG_LOAD_2(base, x0, x1) \
+	LOAD(ldd, base + 0x00, %x0); \
+	LOAD(ldd, base + 0x08, %x1);
+#define FREG_LOAD_3(base, x0, x1, x2) \
+	LOAD(ldd, base + 0x00, %x0); \
+	LOAD(ldd, base + 0x08, %x1); \
+	LOAD(ldd, base + 0x10, %x2);
+#define FREG_LOAD_4(base, x0, x1, x2, x3) \
+	LOAD(ldd, base + 0x00, %x0); \
+	LOAD(ldd, base + 0x08, %x1); \
+	LOAD(ldd, base + 0x10, %x2); \
+	LOAD(ldd, base + 0x18, %x3);
+#define FREG_LOAD_5(base, x0, x1, x2, x3, x4) \
+	LOAD(ldd, base + 0x00, %x0); \
+	LOAD(ldd, base + 0x08, %x1); \
+	LOAD(ldd, base + 0x10, %x2); \
+	LOAD(ldd, base + 0x18, %x3); \
+	LOAD(ldd, base + 0x20, %x4);
+#define FREG_LOAD_6(base, x0, x1, x2, x3, x4, x5) \
+	LOAD(ldd, base + 0x00, %x0); \
+	LOAD(ldd, base + 0x08, %x1); \
+	LOAD(ldd, base + 0x10, %x2); \
+	LOAD(ldd, base + 0x18, %x3); \
+	LOAD(ldd, base + 0x20, %x4); \
+	LOAD(ldd, base + 0x28, %x5);
+#define FREG_LOAD_7(base, x0, x1, x2, x3, x4, x5, x6) \
+	LOAD(ldd, base + 0x00, %x0); \
+	LOAD(ldd, base + 0x08, %x1); \
+	LOAD(ldd, base + 0x10, %x2); \
+	LOAD(ldd, base + 0x18, %x3); \
+	LOAD(ldd, base + 0x20, %x4); \
+	LOAD(ldd, base + 0x28, %x5); \
+	LOAD(ldd, base + 0x30, %x6);
+
+	.register	%g2,#scratch
+	.register	%g3,#scratch
+	.register	%g6,#scratch
+
+	.text
+	.align		32
+
+ENTRY(bcopy)
+	sub		%o1, %o0, %o4
+	mov		%o0, %g4
+	cmp		%o4, %o2
+	mov		%o1, %o0
+	bgeu,pt		%XCC, 100f
+	 mov		%g4, %o1
+#ifndef USE_BPR
+	srl		%o2, 0, %o2
+#endif
+	brnz,pn		%o2, 220f
+	 add		%o0, %o2, %o0
+	retl
+	 nop
+END(bcopy)
+
+	.align		32
+ENTRY(memcpy)
+100:	/* %o0=dst, %o1=src, %o2=len */
+	mov		%o0, %g5
+	cmp		%o2, 0
+	be,pn		%XCC, 85f
+218:	 or		%o0, %o1, %o3
+	cmp		%o2, 16
+	blu,a,pn	%XCC, 80f
+	 or		%o3, %o2, %o3
+
+	/* 2 blocks (128 bytes) is the minimum we can do the block
+	 * copy with.  We need to ensure that we'll iterate at least
+	 * once in the block copy loop.  At worst we'll need to align
+	 * the destination to a 64-byte boundary which can chew up
+	 * to (64 - 1) bytes from the length before we perform the
+	 * block copy loop.
+	 *
+	 * However, the cut-off point, performance wise, is around
+	 * 4 64-byte blocks.
+	 */
+	cmp		%o2, (4 * 64)
+	blu,pt		%XCC, 75f
+	 andcc		%o3, 0x7, %g0
+
+	/* %o0:	dst
+	 * %o1:	src
+	 * %o2:	len  (known to be >= 128)
+	 *
+	 * The block copy loops can use %o4, %g2, %g3 as
+	 * temporaries while copying the data.  %o5 must
+	 * be preserved between VISEntryHalf and VISExitHalf
+	 */
+
+	LOAD(prefetch, %o1 + 0x000, #one_read)
+	LOAD(prefetch, %o1 + 0x040, #one_read)
+	LOAD(prefetch, %o1 + 0x080, #one_read)
+
+	/* Align destination on 64-byte boundary.  */
+	andcc		%o0, (64 - 1), %o4
+	be,pt		%XCC, 2f
+	 sub		%o4, 64, %o4
+	sub		%g0, %o4, %o4	! bytes to align dst
+	sub		%o2, %o4, %o2
+1:	subcc		%o4, 1, %o4
+	LOAD(ldub, %o1, %g1)
+	STORE(stb, %g1, %o0)
+	add		%o1, 1, %o1
+	bne,pt		%XCC, 1b
+	add		%o0, 1, %o0
+
+2:
+	/* Clobbers o5/g1/g2/g3/g7/icc/xcc.  We must preserve
+	 * o5 from here until we hit VISExitHalf.
+	 */
+	VISEntryHalf
+
+	alignaddr	%o1, %g0, %g0
+
+	add		%o1, (64 - 1), %o4
+	andn		%o4, (64 - 1), %o4
+	andn		%o2, (64 - 1), %g1
+	sub		%o2, %g1, %o2
+
+	and		%o1, (64 - 1), %g2
+	add		%o1, %g1, %o1
+	sub		%o0, %o4, %g3
+	brz,pt		%g2, 190f
+	 cmp		%g2, 32
+	blu,a		5f
+	 cmp		%g2, 16
+	cmp		%g2, 48
+	blu,a		4f
+	 cmp		%g2, 40
+	cmp		%g2, 56
+	blu		170f
+	 nop
+	ba,a,pt		%xcc, 180f
+
+4:	/* 32 <= low bits < 48 */
+	blu		150f
+	 nop
+	ba,a,pt		%xcc, 160f
+5:	/* 0 < low bits < 32 */
+	blu,a		6f
+	 cmp		%g2, 8
+	cmp		%g2, 24
+	blu		130f
+	 nop
+	ba,a,pt		%xcc, 140f
+6:	/* 0 < low bits < 16 */
+	bgeu		120f
+	 nop
+	/* fall through for 0 < low bits < 8 */
+110:	sub		%o4, 64, %g2
+	LOAD_BLK(%g2, %f0)
+1:	STORE_INIT(%g0, %o4 + %g3)
+	LOAD_BLK(%o4, %f16)
+	FREG_FROB(f0, f2, f4, f6, f8, f10, f12, f14, f16)
+	STORE_BLK(%f0, %o4 + %g3)
+	FREG_MOVE_8(f16, f18, f20, f22, f24, f26, f28, f30)
+	subcc		%g1, 64, %g1
+	add		%o4, 64, %o4
+	bne,pt		%XCC, 1b
+	 LOAD(prefetch, %o4 + 64, #one_read)
+	ba,pt		%xcc, 195f
+	 nop
+
+120:	sub		%o4, 56, %g2
+	FREG_LOAD_7(%g2, f0, f2, f4, f6, f8, f10, f12)
+1:	STORE_INIT(%g0, %o4 + %g3)
+	LOAD_BLK(%o4, %f16)
+	FREG_FROB(f0, f2, f4, f6, f8, f10, f12, f16, f18)
+	STORE_BLK(%f0, %o4 + %g3)
+	FREG_MOVE_7(f18, f20, f22, f24, f26, f28, f30)
+	subcc		%g1, 64, %g1
+	add		%o4, 64, %o4
+	bne,pt		%XCC, 1b
+	 LOAD(prefetch, %o4 + 64, #one_read)
+	ba,pt		%xcc, 195f
+	 nop
+
+130:	sub		%o4, 48, %g2
+	FREG_LOAD_6(%g2, f0, f2, f4, f6, f8, f10)
+1:	STORE_INIT(%g0, %o4 + %g3)
+	LOAD_BLK(%o4, %f16)
+	FREG_FROB(f0, f2, f4, f6, f8, f10, f16, f18, f20)
+	STORE_BLK(%f0, %o4 + %g3)
+	FREG_MOVE_6(f20, f22, f24, f26, f28, f30)
+	subcc		%g1, 64, %g1
+	add		%o4, 64, %o4
+	bne,pt		%XCC, 1b
+	 LOAD(prefetch, %o4 + 64, #one_read)
+	ba,pt		%xcc, 195f
+	 nop
+
+140:	sub		%o4, 40, %g2
+	FREG_LOAD_5(%g2, f0, f2, f4, f6, f8)
+1:	STORE_INIT(%g0, %o4 + %g3)
+	LOAD_BLK(%o4, %f16)
+	FREG_FROB(f0, f2, f4, f6, f8, f16, f18, f20, f22)
+	STORE_BLK(%f0, %o4 + %g3)
+	FREG_MOVE_5(f22, f24, f26, f28, f30)
+	subcc		%g1, 64, %g1
+	add		%o4, 64, %o4
+	bne,pt		%XCC, 1b
+	 LOAD(prefetch, %o4 + 64, #one_read)
+	ba,pt		%xcc, 195f
+	 nop
+
+150:	sub		%o4, 32, %g2
+	FREG_LOAD_4(%g2, f0, f2, f4, f6)
+1:	STORE_INIT(%g0, %o4 + %g3)
+	LOAD_BLK(%o4, %f16)
+	FREG_FROB(f0, f2, f4, f6, f16, f18, f20, f22, f24)
+	STORE_BLK(%f0, %o4 + %g3)
+	FREG_MOVE_4(f24, f26, f28, f30)
+	subcc		%g1, 64, %g1
+	add		%o4, 64, %o4
+	bne,pt		%XCC, 1b
+	 LOAD(prefetch, %o4 + 64, #one_read)
+	ba,pt		%xcc, 195f
+	 nop
+
+160:	sub		%o4, 24, %g2
+	FREG_LOAD_3(%g2, f0, f2, f4)
+1:	STORE_INIT(%g0, %o4 + %g3)
+	LOAD_BLK(%o4, %f16)
+	FREG_FROB(f0, f2, f4, f16, f18, f20, f22, f24, f26)
+	STORE_BLK(%f0, %o4 + %g3)
+	FREG_MOVE_3(f26, f28, f30)
+	subcc		%g1, 64, %g1
+	add		%o4, 64, %o4
+	bne,pt		%XCC, 1b
+	 LOAD(prefetch, %o4 + 64, #one_read)
+	ba,pt		%xcc, 195f
+	 nop
+
+170:	sub		%o4, 16, %g2
+	FREG_LOAD_2(%g2, f0, f2)
+1:	STORE_INIT(%g0, %o4 + %g3)
+	LOAD_BLK(%o4, %f16)
+	FREG_FROB(f0, f2, f16, f18, f20, f22, f24, f26, f28)
+	STORE_BLK(%f0, %o4 + %g3)
+	FREG_MOVE_2(f28, f30)
+	subcc		%g1, 64, %g1
+	add		%o4, 64, %o4
+	bne,pt		%XCC, 1b
+	 LOAD(prefetch, %o4 + 64, #one_read)
+	ba,pt		%xcc, 195f
+	 nop
+
+180:	sub		%o4, 8, %g2
+	FREG_LOAD_1(%g2, f0)
+1:	STORE_INIT(%g0, %o4 + %g3)
+	LOAD_BLK(%o4, %f16)
+	FREG_FROB(f0, f16, f18, f20, f22, f24, f26, f28, f30)
+	STORE_BLK(%f0, %o4 + %g3)
+	FREG_MOVE_1(f30)
+	subcc		%g1, 64, %g1
+	add		%o4, 64, %o4
+	bne,pt		%XCC, 1b
+	 LOAD(prefetch, %o4 + 64, #one_read)
+	ba,pt		%xcc, 195f
+	 nop
+
+190:
+1:	STORE_INIT(%g0, %o4 + %g3)
+	subcc		%g1, 64, %g1
+	LOAD_BLK(%o4, %f0)
+	STORE_BLK(%f0, %o4 + %g3)
+	add		%o4, 64, %o4
+	bne,pt		%XCC, 1b
+	 LOAD(prefetch, %o4 + 64, #one_read)
+
+195:
+	add		%o4, %g3, %o0
+	membar		#Sync
+
+	VISExitHalf
+
+	/* %o2 contains any final bytes still needed to be copied
+	 * over. If anything is left, we copy it one byte at a time.
+	 */
+	brz,pt		%o2, 85f
+	 sub		%o0, %o1, %o3
+	ba,a,pt		%XCC, 90f
+
+	.align		64
+75: /* 16 < len <= 64 */
+	bne,pn		%XCC, 75f
+	 sub		%o0, %o1, %o3
+
+72:
+	andn		%o2, 0xf, %o4
+	and		%o2, 0xf, %o2
+1:	subcc		%o4, 0x10, %o4
+	LOAD(ldx, %o1, %o5)
+	add		%o1, 0x08, %o1
+	LOAD(ldx, %o1, %g1)
+	sub		%o1, 0x08, %o1
+	STORE(stx, %o5, %o1 + %o3)
+	add		%o1, 0x8, %o1
+	STORE(stx, %g1, %o1 + %o3)
+	bgu,pt		%XCC, 1b
+	 add		%o1, 0x8, %o1
+73:	andcc		%o2, 0x8, %g0
+	be,pt		%XCC, 1f
+	 nop
+	sub		%o2, 0x8, %o2
+	LOAD(ldx, %o1, %o5)
+	STORE(stx, %o5, %o1 + %o3)
+	add		%o1, 0x8, %o1
+1:	andcc		%o2, 0x4, %g0
+	be,pt		%XCC, 1f
+	 nop
+	sub		%o2, 0x4, %o2
+	LOAD(lduw, %o1, %o5)
+	STORE(stw, %o5, %o1 + %o3)
+	add		%o1, 0x4, %o1
+1:	cmp		%o2, 0
+	be,pt		%XCC, 85f
+	 nop
+	ba,pt		%xcc, 90f
+	 nop
+
+75:
+	andcc		%o0, 0x7, %g1
+	sub		%g1, 0x8, %g1
+	be,pn		%icc, 2f
+	 sub		%g0, %g1, %g1
+	sub		%o2, %g1, %o2
+
+1:	subcc		%g1, 1, %g1
+	LOAD(ldub, %o1, %o5)
+	STORE(stb, %o5, %o1 + %o3)
+	bgu,pt		%icc, 1b
+	 add		%o1, 1, %o1
+
+2:	add		%o1, %o3, %o0
+	andcc		%o1, 0x7, %g1
+	bne,pt		%icc, 8f
+	 sll		%g1, 3, %g1
+
+	cmp		%o2, 16
+	bgeu,pt		%icc, 72b
+	 nop
+	ba,a,pt		%xcc, 73b
+
+8:	mov		64, %o3
+	andn		%o1, 0x7, %o1
+	LOAD(ldx, %o1, %g2)
+	sub		%o3, %g1, %o3
+	andn		%o2, 0x7, %o4
+	sllx		%g2, %g1, %g2
+1:	add		%o1, 0x8, %o1
+	LOAD(ldx, %o1, %g3)
+	subcc		%o4, 0x8, %o4
+	srlx		%g3, %o3, %o5
+	or		%o5, %g2, %o5
+	STORE(stx, %o5, %o0)
+	add		%o0, 0x8, %o0
+	bgu,pt		%icc, 1b
+	 sllx		%g3, %g1, %g2
+
+	srl		%g1, 3, %g1
+	andcc		%o2, 0x7, %o2
+	be,pn		%icc, 85f
+	 add		%o1, %g1, %o1
+	ba,pt		%xcc, 90f
+	 sub		%o0, %o1, %o3
+
+	.align		64
+80: /* 0 < len <= 16 */
+	andcc		%o3, 0x3, %g0
+	bne,pn		%XCC, 90f
+	 sub		%o0, %o1, %o3
+
+1:
+	subcc		%o2, 4, %o2
+	LOAD(lduw, %o1, %g1)
+	STORE(stw, %g1, %o1 + %o3)
+	bgu,pt		%XCC, 1b
+	 add		%o1, 4, %o1
+
+85:	retl
+	 mov		%g5, %o0
+
+	.align		32
+90:
+	subcc		%o2, 1, %o2
+	LOAD(ldub, %o1, %g1)
+	STORE(stb, %g1, %o1 + %o3)
+	bgu,pt		%XCC, 90b
+	 add		%o1, 1, %o1
+	retl
+	 mov		%g5, %o0
+
+END(memcpy)
+
+#define RMOVE_BIGCHUNK(src, dst, offset, t0, t1, t2, t3)	\
+	ldx		[%src - offset - 0x20], %t0; 		\
+	ldx		[%src - offset - 0x18], %t1; 		\
+	ldx		[%src - offset - 0x10], %t2; 		\
+	ldx		[%src - offset - 0x08], %t3; 		\
+	stw		%t0, [%dst - offset - 0x1c]; 		\
+	srlx		%t0, 32, %t0;				\
+	stw		%t0, [%dst - offset - 0x20]; 		\
+	stw		%t1, [%dst - offset - 0x14]; 		\
+	srlx		%t1, 32, %t1;				\
+	stw		%t1, [%dst - offset - 0x18]; 		\
+	stw		%t2, [%dst - offset - 0x0c]; 		\
+	srlx		%t2, 32, %t2;				\
+	stw		%t2, [%dst - offset - 0x10]; 		\
+	stw		%t3, [%dst - offset - 0x04];		\
+	srlx		%t3, 32, %t3;				\
+	stw		%t3, [%dst - offset - 0x08];
+
+#define RMOVE_BIGALIGNCHUNK(src, dst, offset, t0, t1, t2, t3)	\
+	ldx		[%src - offset - 0x20], %t0; 		\
+	ldx		[%src - offset - 0x18], %t1; 		\
+	ldx		[%src - offset - 0x10], %t2; 		\
+	ldx		[%src - offset - 0x08], %t3; 		\
+	stx		%t0, [%dst - offset - 0x20]; 		\
+	stx		%t1, [%dst - offset - 0x18]; 		\
+	stx		%t2, [%dst - offset - 0x10]; 		\
+	stx		%t3, [%dst - offset - 0x08];		\
+	ldx		[%src - offset - 0x40], %t0; 		\
+	ldx		[%src - offset - 0x38], %t1; 		\
+	ldx		[%src - offset - 0x30], %t2; 		\
+	ldx		[%src - offset - 0x28], %t3; 		\
+	stx		%t0, [%dst - offset - 0x40]; 		\
+	stx		%t1, [%dst - offset - 0x38]; 		\
+	stx		%t2, [%dst - offset - 0x30]; 		\
+	stx		%t3, [%dst - offset - 0x28];
+
+#define RMOVE_LASTCHUNK(src, dst, offset, t0, t1, t2, t3)	\
+	ldx		[%src + offset + 0x00], %t0;		\
+	ldx		[%src + offset + 0x08], %t1; 		\
+	stw		%t0, [%dst + offset + 0x04]; 		\
+	srlx		%t0, 32, %t2;				\
+	stw		%t2, [%dst + offset + 0x00]; 		\
+	stw		%t1, [%dst + offset + 0x0c]; 		\
+	srlx		%t1, 32, %t3;				\
+	stw		%t3, [%dst + offset + 0x08];
+
+#define RMOVE_LASTALIGNCHUNK(src, dst, offset, t0, t1)		\
+	ldx		[%src + offset + 0x00], %t0; 		\
+	ldx		[%src + offset + 0x08], %t1; 		\
+	stx		%t0, [%dst + offset + 0x00]; 		\
+	stx		%t1, [%dst + offset + 0x08];
+
+	.align		32
+228:	andcc		%o2, 1, %g0
+	be,pt		%icc, 2f+4
+1:	 ldub		[%o1 - 1], %o5
+	sub		%o1, 1, %o1
+	sub		%o0, 1, %o0
+	subcc		%o2, 1, %o2
+	be,pn		%XCC, 229f
+	 stb		%o5, [%o0]
+2:	ldub		[%o1 - 1], %o5
+	sub		%o0, 2, %o0
+	ldub		[%o1 - 2], %g5
+	sub		%o1, 2, %o1
+	subcc		%o2, 2, %o2
+	stb		%o5, [%o0 + 1]
+	bne,pt		%XCC, 2b
+	 stb		%g5, [%o0]
+229:	retl
+	 mov		%g4, %o0
+out:	retl
+	 mov		%g5, %o0
+
+	.align		32
+ENTRY(memmove)
+	mov		%o0, %g5
+#ifndef USE_BPR
+	srl		%o2, 0, %o2
+#endif
+	brz,pn		%o2, out
+	 sub		%o0, %o1, %o4
+	cmp		%o4, %o2
+	bgeu,pt		%XCC, 218b
+	 mov		%o0, %g4
+	add		%o0, %o2, %o0
+220:	add		%o1, %o2, %o1
+	cmp		%o2, 15
+	bleu,pn		%XCC, 228b
+	 andcc		%o0, 7, %g2
+	sub		%o0, %o1, %g5
+	andcc		%g5, 3, %o5
+	bne,pn		%XCC, 232f
+	 andcc		%o1, 3, %g0
+	be,a,pt		%XCC, 236f
+	 andcc		%o1, 4, %g0
+	andcc		%o1, 1, %g0
+	be,pn		%XCC, 4f
+	 andcc		%o1, 2, %g0
+	ldub		[%o1 - 1], %g2
+	sub		%o1, 1, %o1
+	sub		%o0, 1, %o0
+	sub		%o2, 1, %o2
+	be,pn		%XCC, 5f
+	 stb		%g2, [%o0]
+4:	lduh		[%o1 - 2], %g2
+	sub		%o1, 2, %o1
+	sub		%o0, 2, %o0
+	sub		%o2, 2, %o2
+	sth		%g2, [%o0]
+5:	andcc		%o1, 4, %g0
+236:	be,a,pn		%XCC, 2f
+	 andcc		%o2, -128, %g6
+	lduw		[%o1 - 4], %g5
+	sub		%o1, 4, %o1
+	sub		%o0, 4, %o0
+	sub		%o2, 4, %o2
+	stw		%g5, [%o0]
+	andcc		%o2, -128, %g6
+2:	be,pn		%XCC, 235f
+	 andcc		%o0, 4, %g0
+	be,pn		%XCC, 282f + 4
+5:	RMOVE_BIGCHUNK(o1, o0, 0x00, g1, g3, g5, o5)
+	RMOVE_BIGCHUNK(o1, o0, 0x20, g1, g3, g5, o5)
+	RMOVE_BIGCHUNK(o1, o0, 0x40, g1, g3, g5, o5)
+	RMOVE_BIGCHUNK(o1, o0, 0x60, g1, g3, g5, o5)
+	subcc		%g6, 128, %g6
+	sub		%o1, 128, %o1
+	bne,pt		%XCC, 5b
+	 sub		%o0, 128, %o0
+235:	andcc		%o2, 0x70, %g6
+41:	be,pn		%XCC, 280f
+	 andcc		%o2, 8, %g0
+
+279:	rd		%pc, %o5
+	sll		%g6, 1, %g5
+	sub		%o1, %g6, %o1
+	sub		%o5, %g5, %o5
+	jmpl		%o5 + %lo(280f - 279b), %g0
+	 sub		%o0, %g6, %o0
+	RMOVE_LASTCHUNK(o1, o0, 0x60, g2, g3, g5, o5)
+	RMOVE_LASTCHUNK(o1, o0, 0x50, g2, g3, g5, o5)
+	RMOVE_LASTCHUNK(o1, o0, 0x40, g2, g3, g5, o5)
+	RMOVE_LASTCHUNK(o1, o0, 0x30, g2, g3, g5, o5)
+	RMOVE_LASTCHUNK(o1, o0, 0x20, g2, g3, g5, o5)
+	RMOVE_LASTCHUNK(o1, o0, 0x10, g2, g3, g5, o5)
+	RMOVE_LASTCHUNK(o1, o0, 0x00, g2, g3, g5, o5)
+280:	be,pt		%XCC, 281f
+	 andcc		%o2, 4, %g0
+	ldx		[%o1 - 8], %g2
+	sub		%o0, 8, %o0
+	stw		%g2, [%o0 + 4]
+	sub		%o1, 8, %o1
+	srlx		%g2, 32, %g2
+	stw		%g2, [%o0]
+281:	be,pt		%XCC, 1f
+	 andcc		%o2, 2, %g0
+	lduw		[%o1 - 4], %g2
+	sub		%o1, 4, %o1
+	stw		%g2, [%o0 - 4]
+	sub		%o0, 4, %o0
+1:	be,pt		%XCC, 1f
+	 andcc		%o2, 1, %g0
+	lduh		[%o1 - 2], %g2
+	sub		%o1, 2, %o1
+	sth		%g2, [%o0 - 2]
+	sub		%o0, 2, %o0
+1:	be,pt		%XCC, 211f
+	 nop
+	ldub		[%o1 - 1], %g2
+	stb		%g2, [%o0 - 1]
+211:	retl
+	 mov		%g4, %o0
+
+282:	RMOVE_BIGALIGNCHUNK(o1, o0, 0x00, g1, g3, g5, o5)
+	RMOVE_BIGALIGNCHUNK(o1, o0, 0x40, g1, g3, g5, o5)
+	subcc		%g6, 128, %g6
+	sub		%o1, 128, %o1
+	bne,pt		%XCC, 282b
+	 sub		%o0, 128, %o0
+	andcc		%o2, 0x70, %g6
+	be,pn		%XCC, 284f
+	 andcc		%o2, 8, %g0
+
+283:	rd		%pc, %o5
+	sub		%o1, %g6, %o1
+	sub		%o5, %g6, %o5
+	jmpl		%o5 + %lo(284f - 283b), %g0
+	 sub		%o0, %g6, %o0
+	RMOVE_LASTALIGNCHUNK(o1, o0, 0x60, g2, g3)
+	RMOVE_LASTALIGNCHUNK(o1, o0, 0x50, g2, g3)
+	RMOVE_LASTALIGNCHUNK(o1, o0, 0x40, g2, g3)
+	RMOVE_LASTALIGNCHUNK(o1, o0, 0x30, g2, g3)
+	RMOVE_LASTALIGNCHUNK(o1, o0, 0x20, g2, g3)
+	RMOVE_LASTALIGNCHUNK(o1, o0, 0x10, g2, g3)
+	RMOVE_LASTALIGNCHUNK(o1, o0, 0x00, g2, g3)
+284:	be,pt		%XCC, 285f
+	 andcc		%o2, 4, %g0
+	ldx		[%o1 - 8], %g2
+	sub		%o0, 8, %o0
+	sub		%o1, 8, %o1
+	stx		%g2, [%o0]
+285:	be,pt		%XCC, 1f
+	 andcc		%o2, 2, %g0
+	lduw		[%o1 - 4], %g2
+	sub		%o0, 4, %o0
+	sub		%o1, 4, %o1
+	stw		%g2, [%o0]
+1:	be,pt		%XCC, 1f
+	 andcc		%o2, 1, %g0
+	lduh		[%o1 - 2], %g2
+	sub		%o0, 2, %o0
+	sub		%o1, 2, %o1
+	sth		%g2, [%o0]
+1:	be,pt		%XCC, 1f
+	 nop
+	ldub		[%o1 - 1], %g2
+	stb		%g2, [%o0 - 1]
+1:	retl
+	 mov		%g4, %o0
+
+232:	ldub		[%o1 - 1], %g5
+	sub		%o1, 1, %o1
+	sub		%o0, 1, %o0
+	subcc		%o2, 1, %o2
+	bne,pt		%XCC, 232b
+	 stb		%g5, [%o0]
+234:	retl
+	 mov		%g4, %o0
+END(memmove)
+
+#ifdef USE_BPR
+weak_alias (memcpy, __align_cpy_1)
+weak_alias (memcpy, __align_cpy_2)
+weak_alias (memcpy, __align_cpy_4)
+weak_alias (memcpy, __align_cpy_8)
+weak_alias (memcpy, __align_cpy_16)
+#endif
+libc_hidden_builtin_def (memcpy)
+libc_hidden_builtin_def (memmove)
diff --git a/sysdeps/sparc/sparc64/sparcv9v2/memset.S b/sysdeps/sparc/sparc64/sparcv9v2/memset.S
new file mode 100644
index 0000000000..809d3ed9c6
--- /dev/null
+++ b/sysdeps/sparc/sparc64/sparcv9v2/memset.S
@@ -0,0 +1 @@
+#include <sparc64/sparcv9v/memset.S>
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 6ba3a25c84..5f32d1a4a9 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -25,7 +25,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
 		  sys/quota.h sys/fsuid.h \
 		  scsi/sg.h scsi/scsi.h scsi/scsi_ioctl.h sys/pci.h \
 		  sys/ultrasound.h sys/raw.h sys/personality.h sys/epoll.h \
-		  bits/a.out.h sys/inotify.h
+		  bits/a.out.h sys/inotify.h sys/signalfd.h sys/eventfd.h
 
 install-others += $(inst_includedir)/bits/syscall.h
 
@@ -122,7 +122,7 @@ ifeq ($(subdir),inet)
 sysdep_headers += netinet/if_fddi.h netinet/if_tr.h \
 		  netipx/ipx.h netash/ash.h netax25/ax25.h netatalk/at.h \
 		  netrom/netrom.h netpacket/packet.h netrose/rose.h \
-		  neteconet/ec.h
+		  neteconet/ec.h netiucv/iucv.h
 endif
 
 # Don't compile the ctype glue code, since there is no old non-GNU C library.
@@ -138,7 +138,7 @@ endif
 
 ifeq ($(subdir),io)
 sysdep_routines += xstatconv internal_statvfs internal_statvfs64 \
-		   sync_file_range open_2
+		   sync_file_range open_2 open64_2
 endif
 
 ifeq ($(subdir),elf)
diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c
index 38ef805cd5..202bb14485 100644
--- a/sysdeps/unix/sysv/linux/adjtime.c
+++ b/sysdeps/unix/sysv/linux/adjtime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 2002, 2004
+/* Copyright (C) 1995, 1996, 1997, 1998, 2002, 2004, 2007
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -22,6 +22,8 @@
 #include <sys/time.h>
 #include <sys/timex.h>
 
+#include <kernel-features.h>
+
 #define MAX_SEC	(INT_MAX / 1000000L - 2)
 #define MIN_SEC	(INT_MIN / 1000000L + 2)
 
@@ -69,13 +71,29 @@ ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv)
 	  return -1;
 	}
       tntx.offset = tmp.tv_usec + tmp.tv_sec * 1000000L;
+#ifdef ADJ_OFFSET_SS_READ
+      tntx.modes = ADJ_OFFSET_SS_READ;
+#else
       tntx.modes = ADJ_OFFSET_SINGLESHOT;
+#endif
     }
   else
     tntx.modes = 0;
 
-  if (ADJTIMEX (&tntx) < 0)
-    return -1;
+#if defined ADJ_OFFSET_SS_READ && !defined __ASSUME_ADJ_OFFSET_SS_READ
+ again:
+#endif
+  if (__builtin_expect (ADJTIMEX (&tntx) < 0, 0))
+    {
+#if defined ADJ_OFFSET_SS_READ && !defined __ASSUME_ADJ_OFFSET_SS_READ
+      if (itv && errno == EINVAL && tntx.modes == ADJ_OFFSET_SS_READ)
+	{
+	  tntx.modes = ADJ_OFFSET_SINGLESHOT;
+	  goto again;
+	}
+#endif
+      return -1;
+    }
 
   if (otv)
     {
diff --git a/sysdeps/unix/sysv/linux/bits/sched.h b/sysdeps/unix/sysv/linux/bits/sched.h
index 5eaa2fe528..5387b9cef0 100644
--- a/sysdeps/unix/sysv/linux/bits/sched.h
+++ b/sysdeps/unix/sysv/linux/bits/sched.h
@@ -132,17 +132,21 @@ typedef struct
   } while (0)
 # endif
 # define __CPU_SET_S(cpu, setsize, cpusetp) \
-  ({ size_t __cpu = (cpu);						      \
-     __cpu < 8 * (setsize)						      \
-     ? ((cpusetp)->__bits[__CPUELT (__cpu)] |= __CPUMASK (__cpu)) : 0; })
+  (__extension__							      \
+   ({ size_t __cpu = (cpu);						      \
+      __cpu < 8 * (setsize)						      \
+      ? ((cpusetp)->__bits[__CPUELT (__cpu)] |= __CPUMASK (__cpu)) : 0; }))
 # define __CPU_CLR_S(cpu, setsize, cpusetp) \
-  ({ size_t __cpu = (cpu);						      \
-     __cpu < 8 * (setsize)						      \
-     ? ((cpusetp)->__bits[__CPUELT (__cpu)] &= ~__CPUMASK (__cpu)) : 0; })
+  (__extension__							      \
+   ({ size_t __cpu = (cpu);						      \
+      __cpu < 8 * (setsize)						      \
+      ? ((cpusetp)->__bits[__CPUELT (__cpu)] &= ~__CPUMASK (__cpu)) : 0; }))
 # define __CPU_ISSET_S(cpu, setsize, cpusetp) \
-  ({ size_t __cpu = (cpu);						      \
-     __cpu < 8 * (setsize)						      \
-     ? (((cpusetp)->__bits[__CPUELT (__cpu)] & __CPUMASK (__cpu))) != 0 : 0; })
+  (__extension__							      \
+   ({ size_t __cpu = (cpu);						      \
+      __cpu < 8 * (setsize)						      \
+      ? (((cpusetp)->__bits[__CPUELT (__cpu)] & __CPUMASK (__cpu))) != 0      \
+      : 0; }))
 
 # define __CPU_COUNT_S(setsize, cpusetp) \
   __sched_cpucount (setsize, cpusetp)
@@ -152,25 +156,27 @@ typedef struct
   (__builtin_memcmp (cpusetp1, cpusetp2, setsize) == 0)
 # else
 #  define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
-  ({ cpu_set_t *__arr1 = (cpusetp1);					      \
-     cpu_set_t *__arr2 = (cpusetp2);					      \
-     size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
-     size_t __i;							      \
-     for (__i = 0; __i < __imax; ++__i)					      \
-       if (__arr1->__bits[__i] != __arr2->__bits[__i])			      \
-	 break;								      \
-     __i == __imax; })
+  (__extension__							      \
+   ({ cpu_set_t *__arr1 = (cpusetp1);					      \
+      cpu_set_t *__arr2 = (cpusetp2);					      \
+      size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
+      size_t __i;							      \
+      for (__i = 0; __i < __imax; ++__i)				      \
+	if (__arr1->__bits[__i] != __arr2->__bits[__i])			      \
+	  break;							      \
+      __i == __imax; }))
 # endif
 
 # define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \
-  ({ cpu_set_t *__dest = (destset);					      \
-     cpu_set_t *__arr1 = (srcset1);					      \
-     cpu_set_t *__arr2 = (srcset2);					      \
-     size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
-     size_t __i;							      \
-     for (__i = 0; __i < __imax; ++__i)					      \
-       __dest->__bits[__i] = __arr1->__bits[__i] op __arr2->__bits[__i];      \
-     __dest; })
+  (__extension__							      \
+   ({ cpu_set_t *__dest = (destset);					      \
+      cpu_set_t *__arr1 = (srcset1);					      \
+      cpu_set_t *__arr2 = (srcset2);					      \
+      size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
+      size_t __i;							      \
+      for (__i = 0; __i < __imax; ++__i)				      \
+	__dest->__bits[__i] = __arr1->__bits[__i] op __arr2->__bits[__i];     \
+      __dest; }))
 
 # define __CPU_ALLOC_SIZE(count) \
   ((((count) + __NCPUBITS - 1) / __NCPUBITS) * 8)
diff --git a/sysdeps/unix/sysv/linux/check_native.c b/sysdeps/unix/sysv/linux/check_native.c
new file mode 100644
index 0000000000..6e6624abe1
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/check_native.c
@@ -0,0 +1,172 @@
+/* Determine whether interfaces use native transport.  Linux version.
+   Copyright (C) 2007 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <assert.h>
+#include <errno.h>
+#include <ifaddrs.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <sys/ioctl.h>
+
+#include <asm/types.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+
+#include <not-cancel.h>
+
+
+void
+__check_native (uint32_t a1_index, int *a1_native,
+		uint32_t a2_index, int *a2_native)
+{
+  int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+
+  struct sockaddr_nl nladdr;
+  memset (&nladdr, '\0', sizeof (nladdr));
+  nladdr.nl_family = AF_NETLINK;
+
+  socklen_t addr_len = sizeof (nladdr);
+
+  if (fd < 0
+      || __bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) != 0
+      || __getsockname (fd, (struct sockaddr *) &nladdr, &addr_len) != 0)
+    return;
+
+  pid_t pid = nladdr.nl_pid;
+  struct req
+  {
+    struct nlmsghdr nlh;
+    struct rtgenmsg g;
+    /* struct rtgenmsg consists of a single byte.  This means there
+       are three bytes of padding included in the REQ definition.
+       We make them explicit here.  */
+    char pad[3];
+  } req;
+
+  req.nlh.nlmsg_len = sizeof (req);
+  req.nlh.nlmsg_type = RTM_GETLINK;
+  req.nlh.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST;
+  req.nlh.nlmsg_pid = 0;
+  req.nlh.nlmsg_seq = time (NULL);
+  req.g.rtgen_family = AF_UNSPEC;
+
+  assert (sizeof (req) - offsetof (struct req, pad) == 3);
+  memset (req.pad, '\0', sizeof (req.pad));
+
+  memset (&nladdr, '\0', sizeof (nladdr));
+  nladdr.nl_family = AF_NETLINK;
+
+#ifdef PAGE_SIZE
+  /* Help the compiler optimize out the malloc call if PAGE_SIZE
+     is constant and smaller or equal to PTHREAD_STACK_MIN/4.  */
+  const size_t buf_size = PAGE_SIZE;
+#else
+  const size_t buf_size = __getpagesize ();
+#endif
+  bool use_malloc = false;
+  char *buf;
+
+  if (__libc_use_alloca (buf_size))
+    buf = alloca (buf_size);
+  else
+    {
+      buf = malloc (buf_size);
+      if (buf != NULL)
+	use_malloc = true;
+      else
+	goto out_fail;
+    }
+
+  struct iovec iov = { buf, buf_size };
+
+  if (TEMP_FAILURE_RETRY (__sendto (fd, (void *) &req, sizeof (req), 0,
+				    (struct sockaddr *) &nladdr,
+				    sizeof (nladdr))) < 0)
+    goto out_fail;
+
+  bool done = false;
+  do
+    {
+      struct msghdr msg =
+	{
+	  (void *) &nladdr, sizeof (nladdr),
+	  &iov, 1,
+	  NULL, 0,
+	  0
+	};
+
+      ssize_t read_len = TEMP_FAILURE_RETRY (__recvmsg (fd, &msg, 0));
+      if (read_len < 0)
+	goto out_fail;
+
+      if (msg.msg_flags & MSG_TRUNC)
+	goto out_fail;
+
+      struct nlmsghdr *nlmh;
+      for (nlmh = (struct nlmsghdr *) buf;
+	   NLMSG_OK (nlmh, (size_t) read_len);
+	   nlmh = (struct nlmsghdr *) NLMSG_NEXT (nlmh, read_len))
+	{
+	  if (nladdr.nl_pid != 0 || (pid_t) nlmh->nlmsg_pid != pid
+	      || nlmh->nlmsg_seq != req.nlh.nlmsg_seq)
+	    continue;
+
+	  if (nlmh->nlmsg_type == RTM_NEWLINK)
+	    {
+	      struct ifinfomsg *ifim = (struct ifinfomsg *) NLMSG_DATA (nlmh);
+	      int native = (ifim->ifi_type != ARPHRD_TUNNEL6
+			    && ifim->ifi_type != ARPHRD_TUNNEL
+			    && ifim->ifi_type != ARPHRD_SIT);
+
+	      if (a1_index == ifim->ifi_index)
+		{
+		  *a1_native = native;
+		  a1_index = 0xffffffffu;
+		}
+	      if (a2_index == ifim->ifi_index)
+		{
+		  *a2_native = native;
+		  a2_index = 0xffffffffu;
+		}
+
+	      if (a1_index == 0xffffffffu
+		  && a2_index == 0xffffffffu)
+		goto out;
+	    }
+	  else if (nlmh->nlmsg_type == NLMSG_DONE)
+	    /* We found the end, leave the loop.  */
+	    done = true;
+	}
+    }
+  while (! done);
+
+ out:
+  close_not_cancel_no_status (fd);
+
+  return;
+
+out_fail:
+  if (use_malloc)
+    free (buf);
+}
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
index 06fb1891f0..d66f029ed9 100644
--- a/sysdeps/unix/sysv/linux/check_pf.c
+++ b/sysdeps/unix/sysv/linux/check_pf.c
@@ -32,9 +32,6 @@
 
 #include "netlinkaccess.h"
 
-#ifndef IFA_F_TEMPORARY
-# define IFA_F_TEMPORARY IFA_F_SECONDARY
-#endif
 #ifndef IFA_F_HOMEADDRESS
 # define IFA_F_HOMEADDRESS 0
 #endif
@@ -142,92 +139,67 @@ make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
 	      struct rtattr *rta = IFA_RTA (ifam);
 	      size_t len = nlmh->nlmsg_len - NLMSG_LENGTH (sizeof (*ifam));
 
-	      switch (ifam->ifa_family)
-		{
-		  const void *local;
-		  const void *address;
+	      if (ifam->ifa_family != AF_INET
+		  && ifam->ifa_family != AF_INET6)
+		continue;
 
-		case AF_INET:
-		  local = NULL;
-		  address = NULL;
-		  while (RTA_OK (rta, len))
+	      const void *local = NULL;
+	      const void *address = NULL;
+	      while (RTA_OK (rta, len))
+		{
+		  switch (rta->rta_type)
 		    {
-		      switch (rta->rta_type)
-			{
-			case IFA_LOCAL:
-			  local = RTA_DATA (rta);
-			  break;
-
-			case IFA_ADDRESS:
-			  address = RTA_DATA (rta);
-			  goto out_v4;
-			}
-
-		      rta = RTA_NEXT (rta, len);
+		    case IFA_LOCAL:
+		      local = RTA_DATA (rta);
+		      break;
+
+		    case IFA_ADDRESS:
+		      address = RTA_DATA (rta);
+		      goto out;
 		    }
 
-		  if (local != NULL)
+		  rta = RTA_NEXT (rta, len);
+		}
+
+	      if (local != NULL)
+		{
+		  address = local;
+		out:
+		  if (ifam->ifa_family != AF_INET)
 		    {
-		    out_v4:
-		      if (*(const in_addr_t *) (address ?: local)
+		      if (*(const in_addr_t *) address
 			  != htonl (INADDR_LOOPBACK))
 			*seen_ipv4 = true;
 		    }
-		  break;
-
-		case AF_INET6:
-		  local = NULL;
-		  address = NULL;
-		  while (RTA_OK (rta, len))
+		  else
 		    {
-		      switch (rta->rta_type)
-			{
-			case IFA_LOCAL:
-			  local = RTA_DATA (rta);
-			  break;
-
-			case IFA_ADDRESS:
-			  address = RTA_DATA (rta);
-			  goto out_v6;
-			}
-
-		      rta = RTA_NEXT (rta, len);
-		    }
-
-		  if (local != NULL)
-		    {
-		    out_v6:
-		      if (!IN6_IS_ADDR_LOOPBACK (address ?: local))
+		      if (!IN6_IS_ADDR_LOOPBACK (address))
 			*seen_ipv6 = true;
 		    }
+		}
 
-		  if (ifam->ifa_flags & (IFA_F_DEPRECATED
-					 | IFA_F_TEMPORARY
-					 | IFA_F_HOMEADDRESS
-					 | IFA_F_OPTIMISTIC))
-		    {
-		      struct in6ailist *newp = alloca (sizeof (*newp));
-		      newp->info.flags = (((ifam->ifa_flags
-					    & (IFA_F_DEPRECATED
-					       | IFA_F_OPTIMISTIC))
-					   ? in6ai_deprecated : 0)
-					  | ((ifam->ifa_flags
-					      & IFA_F_TEMPORARY)
-					     ? in6ai_temporary : 0)
-					  | ((ifam->ifa_flags
-					      & IFA_F_HOMEADDRESS)
-					     ? in6ai_homeaddress : 0));
-		      memcpy (newp->info.addr, address ?: local,
-			      sizeof (newp->info.addr));
-		      newp->next = in6ailist;
-		      in6ailist = newp;
-		      ++in6ailistlen;
-		    }
-		  break;
-		default:
-		  /* Ignore.  */
-		  break;
+	      struct in6ailist *newp = alloca (sizeof (*newp));
+	      newp->info.flags = (((ifam->ifa_flags
+				    & (IFA_F_DEPRECATED
+				       | IFA_F_OPTIMISTIC))
+				   ? in6ai_deprecated : 0)
+				  | ((ifam->ifa_flags
+				      & IFA_F_HOMEADDRESS)
+				     ? in6ai_homeaddress : 0));
+	      newp->info.prefixlen = ifam->ifa_prefixlen;
+	      newp->info.index = ifam->ifa_index;
+	      if (ifam->ifa_family == AF_INET)
+		{
+		  newp->info.addr[0] = 0;
+		  newp->info.addr[1] = 0;
+		  newp->info.addr[2] = htonl (0xffff);
+		  newp->info.addr[3] = *(const in_addr_t *) address;
 		}
+	      else
+		memcpy (newp->info.addr, address, sizeof (newp->info.addr));
+	      newp->next = in6ailist;
+	      in6ailist = newp;
+	      ++in6ailistlen;
 	    }
 	  else if (nlmh->nlmsg_type == NLMSG_DONE)
 	    /* We found the end, leave the loop.  */
diff --git a/sysdeps/unix/sysv/linux/i386/makecontext.S b/sysdeps/unix/sysv/linux/i386/makecontext.S
index 12ba4e2d67..89be1176f7 100644
--- a/sysdeps/unix/sysv/linux/i386/makecontext.S
+++ b/sysdeps/unix/sysv/linux/i386/makecontext.S
@@ -35,11 +35,6 @@ ENTRY(__makecontext)
 	movl	%ecx, oEIP(%eax)
 	addl	oSS_SIZE(%eax), %edx
 
-	/* Put the next context on the new stack (from the uc_link
-	   element).  */
-	movl	oLINK(%eax), %ecx
-	movl	%ecx, -4(%edx)
-
 	/* Remember the number of parameters for the exit handler since
 	   it has to remove them.  We store the number in the EBX register
 	   which the function we will call must preserve.  */
@@ -50,9 +45,20 @@ ENTRY(__makecontext)
 	negl	%ecx
 	leal	-8(%edx,%ecx,4), %edx
 	negl	%ecx
+
+	/* Align the stack.  */
+	addl	$16, %edx
+	andl	$0xfffffff0, %edx
+	subl	$4, %edx
+
 	/* Store the future stack pointer.  */
 	movl	%edx, oESP(%eax)
 
+	/* Put the next context on the new stack (from the uc_link
+	   element).  */
+	movl	oLINK(%eax), %eax
+	movl	%eax, 4(%edx,%ecx,4)
+
 	/* Copy all the parameters.  */
 	jecxz	2f
 1:	movl	12(%esp,%ecx,4), %eax
diff --git a/sysdeps/unix/sysv/linux/ia64/syscalls.list b/sysdeps/unix/sysv/linux/ia64/syscalls.list
index c55c70ef54..582492706e 100644
--- a/sysdeps/unix/sysv/linux/ia64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/ia64/syscalls.list
@@ -4,6 +4,9 @@ umount2		-	umount		2	__umount2	umount2
 
 getpriority	-	getpriority	i:ii	__getpriority	getpriority
 
+creat		-	creat		Ci:si	__libc_creat	creat creat64
+open		-	open		Ci:siv	__libc_open	__open open __open64 open64
+
 # semaphore and shm system calls
 msgctl		-	msgctl		i:iip	__msgctl	msgctl
 msgget		-	msgget		i:ii	__msgget	msgget
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index aab3df348e..01baab0903 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -487,3 +487,8 @@
 	|| (__LINUX_KERNEL_VERSION >= 0x020618 && defined __s390__))
 # define __ASSUME_FALLOCATE	1
 #endif
+
+/* Support for ADJ_OFFSET_SS_READ was added in 2.6.24.  */
+#if __LINUX_KERNEL_VERSION >= 0x020618
+# define __ASSUME_ADJ_OFFSET_SS_READ	1
+#endif
diff --git a/sysdeps/unix/sysv/linux/netiucv/iucv.h b/sysdeps/unix/sysv/linux/netiucv/iucv.h
new file mode 100644
index 0000000000..779ebffb10
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/netiucv/iucv.h
@@ -0,0 +1,39 @@
+/* Copyright (C) 2007 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef __NETIUCV_IUCV_H
+#define __NETIUCV_IUCV_H	1
+
+#include <features.h>
+#include <bits/sockaddr.h>
+
+__BEGIN_DECLS
+
+struct sockaddr_iucv
+  {
+    __SOCKADDR_COMMON (siucv_);
+    unsigned short	siucv_port;		/* Reserved */
+    unsigned int	siucv_addr;		/* Reserved */
+    char		siucv_nodeid[8];	/* Reserved */
+    char		siucv_user_id[8];	/* Guest User Id */
+    char		siucv_name[8];		/* Application Name */
+  };
+
+__END_DECLS
+
+#endif
diff --git a/sysdeps/unix/sysv/linux/nscd_setup_thread.c b/sysdeps/unix/sysv/linux/nscd_setup_thread.c
index 56e23dc831..c29f972339 100644
--- a/sysdeps/unix/sysv/linux/nscd_setup_thread.c
+++ b/sysdeps/unix/sysv/linux/nscd_setup_thread.c
@@ -23,7 +23,7 @@
 #include <sysdep.h>
 
 
-void
+int
 setup_thread (struct database_dyn *db)
 {
 #ifdef __NR_set_tid_address
@@ -31,7 +31,7 @@ setup_thread (struct database_dyn *db)
   char buf[100];
   if (confstr (_CS_GNU_LIBPTHREAD_VERSION, buf, sizeof (buf)) >= sizeof (buf)
       || strncmp (buf, "NPTL", 4) != 0)
-    return;
+    return 0;
 
   /* Do not try this at home, kids.  We play with the SETTID address
      even thought the process is multi-threaded.  This can only work
@@ -43,6 +43,8 @@ setup_thread (struct database_dyn *db)
     /* We know the kernel can reset this field when nscd terminates.
        So, set the field to a nonzero value which indicates that nscd
        is certainly running and clients can skip the test.  */
-    db->head->nscd_certainly_running = 1;
+    return db->head->nscd_certainly_running = 1;
 #endif
+
+  return 0;
 }
diff --git a/sysdeps/unix/sysv/linux/open64.c b/sysdeps/unix/sysv/linux/open64.c
index c52ce39db1..21b3d0b010 100644
--- a/sysdeps/unix/sysv/linux/open64.c
+++ b/sysdeps/unix/sysv/linux/open64.c
@@ -52,26 +52,3 @@ __libc_open64 (const char *file, int oflag, ...)
 weak_alias (__libc_open64, __open64)
 libc_hidden_weak (__open64)
 weak_alias (__libc_open64, open64)
-
-
-#ifndef PTW
-int
-__open64_2 (file, oflag)
-     const char *file;
-     int oflag;
-{
-  if (oflag & O_CREAT)
-    __fortify_fail ("invalid open64 call: O_CREAT without mode");
-
-  if (SINGLE_THREAD_P)
-    return INLINE_SYSCALL (open, 2, file, oflag | O_LARGEFILE);
-
-  int oldtype = LIBC_CANCEL_ASYNC ();
-
-  int result = INLINE_SYSCALL (open, 2, file, oflag | O_LARGEFILE);
-
-  LIBC_CANCEL_RESET (oldtype);
-
-  return result;
-}
-#endif
diff --git a/sysdeps/unix/sysv/linux/open64_2.c b/sysdeps/unix/sysv/linux/open64_2.c
new file mode 100644
index 0000000000..76b65e5217
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/open64_2.c
@@ -0,0 +1,32 @@
+/* Copyright (C) 2007 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <fcntl.h>
+#include <stdio.h>
+
+
+int
+__open64_2 (file, oflag)
+     const char *file;
+     int oflag;
+{
+  if (oflag & O_CREAT)
+    __fortify_fail ("invalid open64 call: O_CREAT without mode");
+
+  return __open64 (file, oflag);
+}
diff --git a/sysdeps/unix/sysv/linux/opensock.c b/sysdeps/unix/sysv/linux/opensock.c
index 2252980789..95559eb799 100644
--- a/sysdeps/unix/sysv/linux/opensock.c
+++ b/sysdeps/unix/sysv/linux/opensock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2001, 2002, 2007 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
@@ -53,7 +53,10 @@ __opensock (void)
       { AF_APPLETALK, "net/appletalk" },
       { AF_ECONET, "sys/net/econet" },
       { AF_ASH, "sys/net/ash" },
-      { AF_X25, "net/x25" }
+      { AF_X25, "net/x25" },
+#ifdef NEED_AF_IUCV
+      { AF_IUCV, "net/iucv" }
+#endif
     };
 #define nafs (sizeof (afs) / sizeof (afs[0]))
   char fname[sizeof "/proc/" + 14];
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list
index aee60bf9d5..320c40da64 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list
@@ -1,3 +1,5 @@
 # File name	Caller	Syscall name	# args	Strong name	Weak names
 
+creat		-	creat		Ci:si	__libc_creat	creat creat64
 getrlimit	-	ugetrlimit	i:ip	__getrlimit	getrlimit getrlimit64
+open		-	open		Ci:siv	__libc_open	__open open __open64 open64
diff --git a/sysdeps/unix/sysv/linux/readahead.c b/sysdeps/unix/sysv/linux/readahead.c
index dc628b2b2c..c280a479c2 100644
--- a/sysdeps/unix/sysv/linux/readahead.c
+++ b/sysdeps/unix/sysv/linux/readahead.c
@@ -1,5 +1,5 @@
 /* Provide kernel hint to read ahead.
-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2007 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
@@ -30,8 +30,10 @@
 ssize_t
 __readahead (int fd, off64_t offset, size_t count)
 {
-  return INLINE_SYSCALL (readahead, 4, fd, (off_t) (offset >> 32),
-			 (off_t) (offset & 0xffffffff), count);
+  return INLINE_SYSCALL (readahead, 4, fd,
+			 __LONG_LONG_PAIR ((off_t) (offset >> 32),
+					   (off_t) (offset & 0xffffffff)),
+			 count);
 }
 #else
 ssize_t
diff --git a/sysdeps/unix/sysv/linux/s390/opensock.c b/sysdeps/unix/sysv/linux/s390/opensock.c
new file mode 100644
index 0000000000..f099d651ff
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/opensock.c
@@ -0,0 +1,2 @@
+#define NEED_AF_IUCV 1
+#include "../opensock.c"
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
index 791ab9ba52..684999913b 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
@@ -2,6 +2,9 @@
 
 vfork		-	vfork		0	__vfork		vfork
 
+creat		-	creat		Ci:si	__libc_creat	creat creat64
+open		-	open		Ci:siv	__libc_open	__open open __open64 open64
+
 # semaphore and shm system calls
 msgctl		-	msgctl		i:iip	__msgctl	msgctl
 msgget		-	msgget		i:ii	__msgget	msgget
diff --git a/sysdeps/unix/sysv/linux/s390/sa_len.c b/sysdeps/unix/sysv/linux/s390/sa_len.c
new file mode 100644
index 0000000000..6575b83e9c
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/sa_len.c
@@ -0,0 +1,2 @@
+#define NEED_AF_IUCV 1
+#include "../sa_len.c"
diff --git a/sysdeps/unix/sysv/linux/sa_len.c b/sysdeps/unix/sysv/linux/sa_len.c
index ae5616bf45..1a89b276d4 100644
--- a/sysdeps/unix/sysv/linux/sa_len.c
+++ b/sysdeps/unix/sysv/linux/sa_len.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2002, 2007 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
@@ -26,6 +26,7 @@
 #include <netipx/ipx.h>
 #include <netpacket/packet.h>
 #include <netrose/rose.h>
+#include <netiucv/iucv.h>
 #include <sys/un.h>
 
 int
@@ -47,6 +48,10 @@ __libc_sa_len (sa_family_t af)
       return sizeof (struct sockaddr_in6);
     case AF_IPX:
       return sizeof (struct sockaddr_ipx);
+#ifdef NEED_AF_IUCV
+    case AF_IUCV:
+      return sizeof (struct sockaddr_iucv);
+#endif
     case AF_LOCAL:
       return sizeof (struct sockaddr_un);
     case AF_PACKET:
diff --git a/sysdeps/unix/sysv/linux/sys/epoll.h b/sysdeps/unix/sysv/linux/sys/epoll.h
index d8901f7d53..f4e8bda99a 100644
--- a/sysdeps/unix/sysv/linux/sys/epoll.h
+++ b/sysdeps/unix/sysv/linux/sys/epoll.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2006, 2007 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
@@ -53,6 +53,8 @@ enum EPOLL_EVENTS
 #define EPOLLERR EPOLLERR
     EPOLLHUP = 0x010,
 #define EPOLLHUP EPOLLHUP
+    EPOLLRDHUP = 0x2000,
+#define EPOLLRDHUP EPOLLRDHUP
     EPOLLONESHOT = (1 << 30),
 #define EPOLLONESHOT EPOLLONESHOT
     EPOLLET = (1 << 31)
diff --git a/sysdeps/unix/sysv/linux/sys/signalfd.h b/sysdeps/unix/sysv/linux/sys/signalfd.h
index 247b20b9d2..6649bc1d9c 100644
--- a/sysdeps/unix/sysv/linux/sys/signalfd.h
+++ b/sysdeps/unix/sysv/linux/sys/signalfd.h
@@ -51,7 +51,7 @@ __BEGIN_DECLS
 /* Request notification for delivery of signals in MASK to be
    performed using descriptor FD.*/
 extern int signalfd (int __fd, const sigset_t *__mask, int __flags)
-  __nonnull (2) __THROW;
+  __nonnull ((2)) __THROW;
 
 __END_DECLS
 
diff --git a/sysdeps/unix/sysv/linux/sys/timex.h b/sysdeps/unix/sysv/linux/sys/timex.h
index 773a5ab8d0..f7bd6e7929 100644
--- a/sysdeps/unix/sysv/linux/sys/timex.h
+++ b/sysdeps/unix/sysv/linux/sys/timex.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1999, 2007 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
@@ -69,6 +69,7 @@ struct timex
 #define ADJ_TIMECONST		0x0020	/* pll time constant */
 #define ADJ_TICK		0x4000	/* tick value */
 #define ADJ_OFFSET_SINGLESHOT	0x8001	/* old-fashioned adjtime */
+#define ADJ_OFFSET_SS_READ	0xa001	/* read-only adjtime */
 
 /* xntp 3.4 compatibility names */
 #define MOD_OFFSET	ADJ_OFFSET
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/aio_read.c b/sysdeps/unix/sysv/linux/wordsize-64/aio_read.c
new file mode 100644
index 0000000000..d10fc4320b
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/wordsize-64/aio_read.c
@@ -0,0 +1,7 @@
+#define aio_read64 __renamed_aio_read64
+
+#include "../../../../pthread/aio_read.c"
+
+#undef aio_read64
+
+weak_alias (aio_read, aio_read64)
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/aio_read64.c b/sysdeps/unix/sysv/linux/wordsize-64/aio_read64.c
new file mode 100644
index 0000000000..6a6a102c8d
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/wordsize-64/aio_read64.c
@@ -0,0 +1 @@
+/* Defined in aio_read.c.  */
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/aio_write.c b/sysdeps/unix/sysv/linux/wordsize-64/aio_write.c
new file mode 100644
index 0000000000..b0fb469cb2
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/wordsize-64/aio_write.c
@@ -0,0 +1,7 @@
+#define aio_write64 __renamed_aio_write64
+
+#include "../../../../pthread/aio_write.c"
+
+#undef aio_write64
+
+weak_alias (aio_write, aio_write64)
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/aio_write64.c b/sysdeps/unix/sysv/linux/wordsize-64/aio_write64.c
new file mode 100644
index 0000000000..ced07fa273
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/wordsize-64/aio_write64.c
@@ -0,0 +1 @@
+/* Defined in aio_write.c.  */
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/creat64.c b/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
new file mode 100644
index 0000000000..c106e2b362
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
@@ -0,0 +1 @@
+/* Defined as alias for the syscall.  */
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/getdirentries.c b/sysdeps/unix/sysv/linux/wordsize-64/getdirentries.c
new file mode 100644
index 0000000000..298d1e9e91
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/wordsize-64/getdirentries.c
@@ -0,0 +1,3 @@
+#include "../getdirentries.c"
+
+weak_alias (getdirentries, getdirentries64)
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/getdirentries64.c b/sysdeps/unix/sysv/linux/wordsize-64/getdirentries64.c
new file mode 100644
index 0000000000..622baf0c87
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/wordsize-64/getdirentries64.c
@@ -0,0 +1 @@
+/* Defined in getdirentries.c.  */
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/lio_listio.c b/sysdeps/unix/sysv/linux/wordsize-64/lio_listio.c
new file mode 100644
index 0000000000..25ee5a3507
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/wordsize-64/lio_listio.c
@@ -0,0 +1,13 @@
+#define lio_listio64 __renamed_lio_listio64
+
+#include "../../../../pthread/lio_listio.c"
+
+#undef lio_listio64
+
+#if SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_4)
+strong_alias (__lio_listio_21, __lio_listio64_21)
+compat_symbol (librt, __lio_listio64_21, lio_listio64, GLIBC_2_1);
+#endif
+
+strong_alias (__lio_listio_item_notify, __lio_listio64_item_notify)
+versioned_symbol (librt, __lio_listio64_item_notify, lio_listio64, GLIBC_2_4);
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/lio_listio64.c b/sysdeps/unix/sysv/linux/wordsize-64/lio_listio64.c
new file mode 100644
index 0000000000..1dabae3692
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/wordsize-64/lio_listio64.c
@@ -0,0 +1 @@
+/* Defined in lio_listio.c.  */
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/open64.c b/sysdeps/unix/sysv/linux/wordsize-64/open64.c
new file mode 100644
index 0000000000..0abe30ef62
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/wordsize-64/open64.c
@@ -0,0 +1 @@
+/* Defined in open syscall.  */
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/openat.c b/sysdeps/unix/sysv/linux/wordsize-64/openat.c
new file mode 100644
index 0000000000..4921fca335
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/wordsize-64/openat.c
@@ -0,0 +1,16 @@
+#define __openat64 __rename___openat64
+#define __openat64_2 __rename___openat64_2
+#define __openat64_nocancel __rename___openat64_nocancel
+#define openat64 __rename_openat64
+
+#include "../openat.c"
+
+#undef __openat64
+#undef __openat64_2
+#undef __openat64_nocancel
+#undef openat64
+
+weak_alias (__openat, __openat64)
+weak_alias (__openat_2, __openat64_2)
+weak_alias (__openat_nocancel, __openat64_nocancel)
+weak_alias (openat, openat64)
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/openat64.c b/sysdeps/unix/sysv/linux/wordsize-64/openat64.c
new file mode 100644
index 0000000000..b4a864b040
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/wordsize-64/openat64.c
@@ -0,0 +1 @@
+/* Defined in openat.c.  */
diff --git a/sysdeps/unix/sysv/linux/x86_64/syscalls.list b/sysdeps/unix/sysv/linux/x86_64/syscalls.list
index a9d40446db..a3d3d6cf92 100644
--- a/sysdeps/unix/sysv/linux/x86_64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/x86_64/syscalls.list
@@ -1,13 +1,13 @@
 # File name	Caller	Syscall name	# args	Strong name	Weak names
 
 arch_prctl	EXTRA	arch_prctl	i:ii	__arch_prctl	arch_prctl
+creat		-	creat		Ci:si	__libc_creat	creat creat64
 modify_ldt	EXTRA	modify_ldt	i:ipi	__modify_ldt	modify_ldt
-
-# semaphore and shm system calls
 msgctl		-	msgctl		i:iip	__msgctl	msgctl
 msgget		-	msgget		i:ii	__msgget	msgget
 msgrcv		-	msgrcv		Ci:ibnii __msgrcv	msgrcv
 msgsnd		-	msgsnd		Ci:ibni	__msgsnd	msgsnd
+open		-	open		Ci:siv	__libc_open	__open open __open64 open64
 shmat		-	shmat		i:ipi	__shmat		shmat
 shmctl		-	shmctl		i:iip	__shmctl	shmctl
 shmdt		-	shmdt		i:s	__shmdt		shmdt
diff --git a/sysdeps/wordsize-64/alphasort.c b/sysdeps/wordsize-64/alphasort.c
new file mode 100644
index 0000000000..5096166625
--- /dev/null
+++ b/sysdeps/wordsize-64/alphasort.c
@@ -0,0 +1,3 @@
+#include "../../dirent/alphasort.c"
+
+weak_alias (alphasort, alphasort64)
diff --git a/sysdeps/wordsize-64/alphasort64.c b/sysdeps/wordsize-64/alphasort64.c
new file mode 100644
index 0000000000..08509131b6
--- /dev/null
+++ b/sysdeps/wordsize-64/alphasort64.c
@@ -0,0 +1 @@
+/* Defined in alphasort.c.  */
diff --git a/sysdeps/wordsize-64/fseeko.c b/sysdeps/wordsize-64/fseeko.c
new file mode 100644
index 0000000000..692885a8be
--- /dev/null
+++ b/sysdeps/wordsize-64/fseeko.c
@@ -0,0 +1,3 @@
+#include "../../libio/fseeko.c"
+
+weak_alias (fseeko, fseeko64)
diff --git a/sysdeps/wordsize-64/fseeko64.c b/sysdeps/wordsize-64/fseeko64.c
new file mode 100644
index 0000000000..73e011afbb
--- /dev/null
+++ b/sysdeps/wordsize-64/fseeko64.c
@@ -0,0 +1 @@
+/* Defined in fseeko.c.  */
diff --git a/sysdeps/wordsize-64/ftello.c b/sysdeps/wordsize-64/ftello.c
new file mode 100644
index 0000000000..fa05cfcf02
--- /dev/null
+++ b/sysdeps/wordsize-64/ftello.c
@@ -0,0 +1,3 @@
+#include "../../libio/ftello.c"
+
+weak_alias (ftello, ftello64)
diff --git a/sysdeps/wordsize-64/ftello64.c b/sysdeps/wordsize-64/ftello64.c
new file mode 100644
index 0000000000..2cbbe6320a
--- /dev/null
+++ b/sysdeps/wordsize-64/ftello64.c
@@ -0,0 +1 @@
+/* Defined in ftello.c.  */
diff --git a/sysdeps/wordsize-64/ftw.c b/sysdeps/wordsize-64/ftw.c
new file mode 100644
index 0000000000..ca19903799
--- /dev/null
+++ b/sysdeps/wordsize-64/ftw.c
@@ -0,0 +1,16 @@
+#define ftw64 __rename_ftw64
+#define nftw64 __rename_nftw64
+
+#include "../../io/ftw.c"
+
+#undef ftw64
+#undef nftw64
+
+weak_alias (ftw, ftw64)
+strong_alias (__new_nftw, __new_nftw64)
+versioned_symbol (libc, __new_nftw64, nftw64, GLIBC_2_3_3);
+
+#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_3_3)
+strong_alias (__old_nftw, __old_nftw64)
+compat_symbol (libc, __old_nftw64, nftw64, GLIBC_2_1);
+#endif
diff --git a/sysdeps/wordsize-64/ftw64.c b/sysdeps/wordsize-64/ftw64.c
new file mode 100644
index 0000000000..1cfcaadfd1
--- /dev/null
+++ b/sysdeps/wordsize-64/ftw64.c
@@ -0,0 +1 @@
+/* Defined in ftw.c.  */
diff --git a/sysdeps/wordsize-64/iofgetpos.c b/sysdeps/wordsize-64/iofgetpos.c
new file mode 100644
index 0000000000..ba8df67c9b
--- /dev/null
+++ b/sysdeps/wordsize-64/iofgetpos.c
@@ -0,0 +1,12 @@
+#define _IO_new_fgetpos64 __renamed__IO_new_fgetpos64
+#define _IO_fgetpos64 __renamed__IO_fgetpos64
+
+#include "../../libio/iofgetpos.c"
+
+#undef _IO_new_fgetpos64
+#undef _IO_fgetpos64
+
+strong_alias (_IO_new_fgetpos, _IO_new_fgetpos64)
+strong_alias (_IO_new_fgetpos64, __new_fgetpos64)
+versioned_symbol (libc, _IO_new_fgetpos64, _IO_fgetpos64, GLIBC_2_2);
+versioned_symbol (libc, __new_fgetpos64, fgetpos64, GLIBC_2_2);
diff --git a/sysdeps/wordsize-64/iofgetpos64.c b/sysdeps/wordsize-64/iofgetpos64.c
new file mode 100644
index 0000000000..1748b810fb
--- /dev/null
+++ b/sysdeps/wordsize-64/iofgetpos64.c
@@ -0,0 +1 @@
+/* Defined in iofgetpos.c.  */
diff --git a/sysdeps/wordsize-64/iofopen.c b/sysdeps/wordsize-64/iofopen.c
new file mode 100644
index 0000000000..d8d92ca5ec
--- /dev/null
+++ b/sysdeps/wordsize-64/iofopen.c
@@ -0,0 +1,4 @@
+#include "../../libio/iofopen.c"
+
+weak_alias (_IO_new_fopen, _IO_fopen64)
+weak_alias (_IO_new_fopen, fopen64)
diff --git a/sysdeps/wordsize-64/iofopen64.c b/sysdeps/wordsize-64/iofopen64.c
new file mode 100644
index 0000000000..68315d857d
--- /dev/null
+++ b/sysdeps/wordsize-64/iofopen64.c
@@ -0,0 +1 @@
+/* Defined in iofopen.c.  */
diff --git a/sysdeps/wordsize-64/iofsetpos.c b/sysdeps/wordsize-64/iofsetpos.c
new file mode 100644
index 0000000000..f2bb8aec55
--- /dev/null
+++ b/sysdeps/wordsize-64/iofsetpos.c
@@ -0,0 +1,12 @@
+#define _IO_new_fsetpos64 __renamed__IO_new_fsetpos64
+#define _IO_fsetpos64 __renamed__IO_fsetpos64
+
+#include "../../libio/iofsetpos.c"
+
+#undef _IO_new_fsetpos64
+#undef _IO_fsetpos64
+
+strong_alias (_IO_new_fsetpos, _IO_new_fsetpos64)
+strong_alias (_IO_new_fsetpos64, __new_fsetpos64)
+versioned_symbol (libc, __new_fsetpos64, fsetpos64, GLIBC_2_2);
+versioned_symbol (libc, _IO_new_fsetpos64, _IO_fsetpos64, GLIBC_2_2);
diff --git a/sysdeps/wordsize-64/iofsetpos64.c b/sysdeps/wordsize-64/iofsetpos64.c
new file mode 100644
index 0000000000..5fbc7328b5
--- /dev/null
+++ b/sysdeps/wordsize-64/iofsetpos64.c
@@ -0,0 +1 @@
+/* Defined in iofsetpos.c.  */
diff --git a/sysdeps/wordsize-64/lockf.c b/sysdeps/wordsize-64/lockf.c
new file mode 100644
index 0000000000..502472d98b
--- /dev/null
+++ b/sysdeps/wordsize-64/lockf.c
@@ -0,0 +1,3 @@
+#include "../../io/lockf.c"
+
+weak_alias (lockf, lockf64)
diff --git a/sysdeps/wordsize-64/lockf64.c b/sysdeps/wordsize-64/lockf64.c
new file mode 100644
index 0000000000..8ef5fc6b46
--- /dev/null
+++ b/sysdeps/wordsize-64/lockf64.c
@@ -0,0 +1 @@
+/* Defined in lockf.c.  */
diff --git a/sysdeps/wordsize-64/mkostemp.c b/sysdeps/wordsize-64/mkostemp.c
new file mode 100644
index 0000000000..4f81fdf544
--- /dev/null
+++ b/sysdeps/wordsize-64/mkostemp.c
@@ -0,0 +1,3 @@
+#include "../../misc/mkostemp.c"
+
+weak_alias (mkostemp, mkostemp64)
diff --git a/sysdeps/wordsize-64/mkostemp64.c b/sysdeps/wordsize-64/mkostemp64.c
new file mode 100644
index 0000000000..14bb25023e
--- /dev/null
+++ b/sysdeps/wordsize-64/mkostemp64.c
@@ -0,0 +1 @@
+/* Defined in mkostemp.c.  */
diff --git a/sysdeps/wordsize-64/mkstemp.c b/sysdeps/wordsize-64/mkstemp.c
new file mode 100644
index 0000000000..bf6df18485
--- /dev/null
+++ b/sysdeps/wordsize-64/mkstemp.c
@@ -0,0 +1,3 @@
+#include "../../misc/mkstemp.c"
+
+weak_alias (mkstemp, mkstemp64)
diff --git a/sysdeps/wordsize-64/mkstemp64.c b/sysdeps/wordsize-64/mkstemp64.c
new file mode 100644
index 0000000000..e72bb46433
--- /dev/null
+++ b/sysdeps/wordsize-64/mkstemp64.c
@@ -0,0 +1 @@
+/* Defined in mkstemp.c.  */
diff --git a/sysdeps/wordsize-64/scandir.c b/sysdeps/wordsize-64/scandir.c
new file mode 100644
index 0000000000..9af7e9b386
--- /dev/null
+++ b/sysdeps/wordsize-64/scandir.c
@@ -0,0 +1,6 @@
+#define scandir64 scandir64_renamed
+
+#include "../../dirent/scandir.c"
+
+#undef scandir64
+weak_alias (scandir, scandir64)
diff --git a/sysdeps/wordsize-64/scandir64.c b/sysdeps/wordsize-64/scandir64.c
new file mode 100644
index 0000000000..3c2c4a1590
--- /dev/null
+++ b/sysdeps/wordsize-64/scandir64.c
@@ -0,0 +1 @@
+/* Defined in scandir.c.  */
diff --git a/sysdeps/wordsize-64/tmpfile.c b/sysdeps/wordsize-64/tmpfile.c
new file mode 100644
index 0000000000..449a222d98
--- /dev/null
+++ b/sysdeps/wordsize-64/tmpfile.c
@@ -0,0 +1,3 @@
+#include "../../stdio-common/tmpfile.c"
+
+weak_alias (__new_tmpfile, tmpfile64)
diff --git a/sysdeps/wordsize-64/tmpfile64.c b/sysdeps/wordsize-64/tmpfile64.c
new file mode 100644
index 0000000000..5c124c249b
--- /dev/null
+++ b/sysdeps/wordsize-64/tmpfile64.c
@@ -0,0 +1 @@
+/* Defined in tmpfile.c.  */
diff --git a/sysdeps/wordsize-64/versionsort.c b/sysdeps/wordsize-64/versionsort.c
new file mode 100644
index 0000000000..90365a4b25
--- /dev/null
+++ b/sysdeps/wordsize-64/versionsort.c
@@ -0,0 +1,3 @@
+#include "../../dirent/versionsort.c"
+
+weak_alias (versionsort, versionsort64)
diff --git a/sysdeps/wordsize-64/versionsort64.c b/sysdeps/wordsize-64/versionsort64.c
new file mode 100644
index 0000000000..ac6c3c702a
--- /dev/null
+++ b/sysdeps/wordsize-64/versionsort64.c
@@ -0,0 +1 @@
+/* Defined in versionsort.c.  */
diff --git a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S
index 84fe4724b1..3e2d182758 100644
--- a/sysdeps/x86_64/dl-trampoline.S
+++ b/sysdeps/x86_64/dl-trampoline.S
@@ -62,8 +62,8 @@ _dl_runtime_resolve:
 	.align 16
 	cfi_startproc
 _dl_runtime_profile:
-	subq $80, %rsp
-	cfi_adjust_cfa_offset(96) # Incorporate PLT
+	subq $88, %rsp
+	cfi_adjust_cfa_offset(104) # Incorporate PLT
 	movq %rax, (%rsp)	# Preserve registers otherwise clobbered.
 	movq %rdx, 8(%rsp)
 	movq %r8, 16(%rsp)
@@ -72,16 +72,16 @@ _dl_runtime_profile:
 	movq %rsi, 40(%rsp)
 	movq %rdi, 48(%rsp)
 	movq %rbp, 56(%rsp)	# Information for auditors.
-	leaq 96(%rsp), %rax
+	leaq 104(%rsp), %rax
 	movq %rax, 64(%rsp)
 	leaq 8(%rsp), %rcx
-	movq 96(%rsp), %rdx	# Load return address if needed
-	movq 88(%rsp), %rsi	# Copy args pushed by PLT in register.
+	movq 104(%rsp), %rdx	# Load return address if needed
+	movq 96(%rsp), %rsi	# Copy args pushed by PLT in register.
 	movq %rsi,%r11		# Multiply by 24
 	addq %r11,%rsi
 	addq %r11,%rsi
 	shlq $3, %rsi
-	movq 80(%rsp), %rdi	# %rdi: link_map, %rsi: reloc_offset
+	movq 88(%rsp), %rdi	# %rdi: link_map, %rsi: reloc_offset
 	leaq 72(%rsp), %r8
 	call _dl_profile_fixup	# Call resolver.
 	movq %rax, %r11		# Save return value
@@ -95,14 +95,15 @@ _dl_runtime_profile:
 	movq 32(%rsp), %rcx
 	movq 40(%rsp), %rsi
 	movq 48(%rsp), %rdi
-	addq $96,%rsp		# Adjust stack
-	cfi_adjust_cfa_offset (-96)
+	addq $104,%rsp		# Adjust stack
+	cfi_adjust_cfa_offset (-104)
 	jmp *%r11		# Jump to function address.
 
 	/*
-	    +96     return address
-	    +88     PLT2
-	    +80     PLT1
+	    +104     return address
+	    +96     PLT2
+	    +88     PLT1
+	    +80     free
 	    +72     free
 	    +64     %rsp
 	    +56     %rbp
@@ -112,14 +113,14 @@ _dl_runtime_profile:
 	    +24     %r9
 	    +16     %r8
 	    +8      %rdx
-	   %esp     %rax
+	   %rsp     %rax
 	*/
-	cfi_adjust_cfa_offset (96)
+	cfi_adjust_cfa_offset (104)
 1:	movq %rbx, 72(%rsp)
-	cfi_rel_offset (1, 72)
-	leaq 104(%rsp), %rsi
+	cfi_rel_offset (rbx, 72)
+	leaq 112(%rsp), %rsi
 	movq %rsp, %rbx
-	cfi_def_cfa_register (1)
+	cfi_def_cfa_register (%rbx)
 	movq %r10, %rcx
 	addq $8, %r10
 	andq $0xfffffffffffffff0, %r10
@@ -133,7 +134,7 @@ _dl_runtime_profile:
 	movq 48(%rbx), %rdi
 	call *%r11
 	movq %rbx, %rsp
-	cfi_def_cfa_register (7)
+	cfi_def_cfa_register (%rsp)
 	subq $72, %rsp
 	cfi_adjust_cfa_offset (72)
 	movq %rsp, %rcx
@@ -147,9 +148,10 @@ _dl_runtime_profile:
 	fstpt 48(%rcx)
 	fstpt 64(%rcx)
 	/*
-	    +168    return address
-	    +160    PLT2
-	    +152    PLT1
+	    +176    return address
+	    +168    PLT2
+	    +160    PLT1
+	    +152    free
 	    +144    free
 	    +136    %rsp
 	    +128    %rbp
@@ -164,17 +166,17 @@ _dl_runtime_profile:
 	    +32     %xmm1 result
 	    +16     %xmm0 result
 	    +8      %rdx result
-	   %esp     %rax result
+	   %rsp     %rax result
 	*/
 	leaq 80(%rsp), %rdx
 	movq 144(%rsp), %rbx
-	cfi_restore (1)
-	movq 160(%rsp), %rsi	# Copy args pushed by PLT in register.
+	cfi_restore (rbx)
+	movq 168(%rsp), %rsi	# Copy args pushed by PLT in register.
 	movq %rsi,%r11		# Multiply by 24
 	addq %r11,%rsi
 	addq %r11,%rsi
 	shlq $3, %rsi
-	movq 152(%rsp), %rdi	# %rdi: link_map, %rsi: reloc_offset
+	movq 160(%rsp), %rdi	# %rdi: link_map, %rsi: reloc_offset
 	call _dl_call_pltexit
 	movq (%rsp), %rax
 	movq 8(%rsp), %rdx
@@ -182,8 +184,8 @@ _dl_runtime_profile:
 	movups 32(%rsp), %xmm1
 	fldt 64(%rsp)
 	fldt 48(%rsp)
-	addq $168, %rsp
-	cfi_adjust_cfa_offset (-168)
+	addq $176, %rsp
+	cfi_adjust_cfa_offset (-176)
 	retq
 	cfi_endproc
 	.size _dl_runtime_profile, .-_dl_runtime_profile
diff --git a/sysdeps/x86_64/memset.S b/sysdeps/x86_64/memset.S
index db39b09c89..939240600d 100644
--- a/sysdeps/x86_64/memset.S
+++ b/sysdeps/x86_64/memset.S
@@ -30,11 +30,12 @@
 
         .text
 #ifndef NOT_IN_libc
-ENTRY(bzero)
+ENTRY(__bzero)
 	mov	%rsi,%rdx	/* Adjust parameter.  */
 	xorl	%esi,%esi	/* Fill with 0s.  */
 	jmp	L(memset_entry)
-END(bzero)
+END(__bzero)
+weak_alias (__bzero, bzero)
 #endif
 
 #if defined PIC && !defined NOT_IN_libc
@@ -126,6 +127,7 @@ L(memset_entry):
 	add	$0x40,%rcx
 	dec	%rax
 	jne	11b
+	sfence
 	jmp	4b
 
 END (memset)
diff --git a/time/Makefile b/time/Makefile
index 8ce34e4565..71d919d015 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -36,7 +36,7 @@ distribute := datemsk
 tests	:= test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
 	   tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \
 	   tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \
-	   tst-strptime3
+	   tst-strptime3 bug-getdate1
 
 include ../Rules
 
@@ -56,3 +56,5 @@ test_time-ARGS= EST5EDT CST
 
 tst-strptime-ENV = LOCPATH=${common-objpfx}localedata
 tst-ftime_l-ENV = LOCPATH=${common-objpfx}localedata
+
+bug-getdate1-ARGS = ${objpfx}bug-getdate1-fmt
diff --git a/time/bug-getdate1.c b/time/bug-getdate1.c
new file mode 100644
index 0000000000..7da88f4548
--- /dev/null
+++ b/time/bug-getdate1.c
@@ -0,0 +1,146 @@
+/* BZ #5451 */
+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+static char *templ_filename;
+
+// Writes template given as parameter to file,
+// specified as the argument
+static void
+output_to_template_file (const char *str)
+{
+  FILE *fd = fopen (templ_filename, "w");
+  if (fd == NULL)
+    {
+      printf ("Can not open file for writing\n");
+      exit (1);
+    }
+
+  fprintf (fd, "%s\n", str);
+  fclose (fd);
+}
+
+// Calls getdate() function with specified parameter,
+// specified as the argument, also checks the contents of
+// file with template and prints the result
+static int
+process_getdate_on (const char *str)
+{
+  struct tm *res;
+  char templ[1000];
+  FILE *fd = fopen (templ_filename, "r");
+
+  if (fd == NULL)
+    {
+      printf ("Can not open file for reading\n");
+      exit (1);
+    }
+
+  if (fgets (templ, 1000, fd) == NULL)
+    {
+      printf ("Can not read file\n");
+      exit (1);
+    }
+  fclose (fd);
+
+  res = getdate (str);
+  if (res == NULL)
+    {
+      printf ("Failed on getdate(\"%s\"), template is: %s", str, templ);
+      printf ("Error number: %d\n\n", getdate_err);
+      return 1;
+    }
+  printf ("Success on getdate(\"%s\"), template is: %s\n", str, templ);
+  printf ("Result is\n");
+  printf ("Seconds: %d\n", res->tm_sec);
+  printf ("Minutes: %d\n", res->tm_min);
+  printf ("Hour: %d\n", res->tm_hour);
+  printf ("Day of month: %d\n", res->tm_mday);
+  printf ("Month of year: %d\n", res->tm_mon);
+  printf ("Years since 1900: %d\n", res->tm_year);
+  printf ("Day of week: %d\n", res->tm_wday);
+  printf ("Day of year: %d\n", res->tm_yday);
+  printf ("Daylight Savings flag: %d\n\n", res->tm_isdst);
+  return 0;
+}
+
+static int
+do_test (int argc, char *argv[])
+{
+
+  templ_filename = argv[1];
+
+  setenv ("DATEMSK", templ_filename, 1);
+
+  /*
+   * The following 4 testcases reproduce the problem:
+   * 1. Templates "%S" and "%M" are not processed,
+   *    when used without "%H" template
+   */
+  int res = 0;
+  output_to_template_file ("%M");
+  res |= process_getdate_on ("1");
+
+  output_to_template_file ("%M %H");
+  res |= process_getdate_on ("1 2");
+
+  output_to_template_file ("%S");
+  res |= process_getdate_on ("1");
+
+  output_to_template_file ("%S %H");
+  res |= process_getdate_on ("1 2");
+
+  /*
+   * The following 9 testcases reproduce the problem:
+   * 2. Templates "%Y", "%y", "%d", "%C", "%C %y"
+   *    are not processed separately
+   */
+  output_to_template_file ("%Y");
+  process_getdate_on ("2001");
+
+  output_to_template_file ("%Y %m");
+  res |= process_getdate_on ("2001 3");
+
+  output_to_template_file ("%y");
+  res |= process_getdate_on ("70");
+
+  output_to_template_file ("%y %m");
+  res |= process_getdate_on ("70 3");
+
+  output_to_template_file ("%d");
+  res |= process_getdate_on ("06");
+
+  output_to_template_file ("%d %m");
+  res |= process_getdate_on ("25 3");
+
+  output_to_template_file ("%C");
+  res |= process_getdate_on ("98");
+
+  output_to_template_file ("%C %y %m");
+  res |= process_getdate_on ("98 3 2");
+
+  output_to_template_file ("%C %y");
+  res |= process_getdate_on ("21 5");
+
+  /*
+   * The following testcase reproduces the problem:
+   * 3. When template is "%Y %m", day of month is not set
+   *    to 1 as standard requires
+   */
+  output_to_template_file ("%Y %m");
+  res |= process_getdate_on ("2008 3");
+
+  return res;
+}
+
+#define PREPARE(argc, argv) \
+  if (argc < 2)								\
+    {									\
+      puts ("Command line: progname template_filename_full_path");	\
+      exit (1);								\
+    }									\
+  add_temp_file (argv[1])
+
+#define TEST_FUNCTION do_test (argc, argv)
+#include "../test-skeleton.c"
diff --git a/time/getdate.c b/time/getdate.c
index 851efacfd2..cbaa41dfd2 100644
--- a/time/getdate.c
+++ b/time/getdate.c
@@ -212,28 +212,31 @@ __getdate_r (const char *string, struct tm *tp)
       tp->tm_sec = tm.tm_sec;
     }
 
+  /* Fill in the gaps.  */
+  if (tp->tm_hour == INT_MIN)
+    tp->tm_hour = 0;
+  if (tp->tm_min == INT_MIN)
+    tp->tm_min = 0;
+  if (tp->tm_sec == INT_MIN)
+    tp->tm_sec = 0;
+
   /* If no date is given, today is assumed if the given hour is
      greater than the current hour and tomorrow is assumed if
      it is less.  */
   if (tp->tm_hour >= 0 && tp->tm_hour <= 23
-      && tp->tm_year == INT_MIN && tp->tm_mon == INT_MIN
+      && tp->tm_mon == INT_MIN
       && tp->tm_mday == INT_MIN && tp->tm_wday == INT_MIN)
     {
-      tp->tm_year = tm.tm_year;
       tp->tm_mon = tm.tm_mon;
       tp->tm_mday = tm.tm_mday + ((tp->tm_hour - tm.tm_hour) < 0 ? 1 : 0);
       mday_ok = 1;
     }
 
-  /* Fill in the gaps.  */
+  /* More fillers.  */
   if (tp->tm_year == INT_MIN)
     tp->tm_year = tm.tm_year;
-  if (tp->tm_hour == INT_MIN)
-    tp->tm_hour = 0;
-  if (tp->tm_min == INT_MIN)
-    tp->tm_min = 0;
-  if (tp->tm_sec == INT_MIN)
-    tp->tm_sec = 0;
+  if (tp->tm_mon == INT_MIN)
+    tp->tm_mon = tm.tm_mon;
 
   /* Check if the day of month is within range, and if the time can be
      represented in a time_t.  We make use of the fact that the mktime
diff --git a/time/tzfile.c b/time/tzfile.c
index d19b7e9b4f..970022379a 100644
--- a/time/tzfile.c
+++ b/time/tzfile.c
@@ -381,7 +381,7 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
       else
 	tzspec[tzspec_len - 1] = '\0';
     }
-  else if (sizeof (time_t) == 4 && tzhead.tzh_version != '\0')
+  else if (sizeof (time_t) == 4 && tzhead.tzh_version[0] != '\0')
     {
       /* Get the TZ string.  */
       if (__builtin_expect (fread_unlocked ((void *) &tzhead, sizeof (tzhead),
diff --git a/version.h b/version.h
index 5fa63ac5eb..9ac2ee7ad5 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
-#define RELEASE "stable"
-#define VERSION "2.7"
+#define RELEASE "development"
+#define VERSION "2.7.90"
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 885662b07b..0fd9e35440 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -31,7 +31,7 @@
 #ifdef _WCHAR_H
 /* Get FILE definition.  */
 # define __need___FILE
-# ifdef __USE_UNIX98
+# if defined __USE_UNIX98 || defined __USE_XOPEN2K
 #  define __need_FILE
 # endif
 # include <stdio.h>
@@ -839,4 +839,9 @@ __END_DECLS
 
 #endif	/* _WCHAR_H defined */
 
+/* Undefined all __need_* constants in case we are included to get those
+   constants but the whole file was already read.  */
+#undef __need_mbstate_t
+#undef __need_wint_t
+
 #endif /* wchar.h  */