From e86ff722e7f38c0ad5dce27190e18f5e8741b626 Mon Sep 17 00:00:00 2001 From: joseph Date: Fri, 22 Jun 2012 15:11:15 +0000 Subject: Merge changes between r19162 and r19234 from /fsf/trunk. git-svn-id: svn://svn.eglibc.org/trunk@19235 7b3dc134-2b1b-0410-93df-9e9f96275f8d --- libc/ChangeLog | 52 + libc/ChangeLog.16 | 2 +- libc/NEWS | 30 +- libc/bits/byteswap-16.h | 3 +- libc/bits/byteswap.h | 2 +- libc/elf/dl-deps.c | 8 +- libc/elf/dl-fini.c | 8 +- libc/elf/dl-open.c | 8 +- libc/intl/dcigettext.c | 15 +- libc/localedata/ChangeLog | 6 + libc/localedata/locales/mag_IN | 2 +- libc/localedata/locales/tr_CY | 2 - libc/nptl/ChangeLog | 10 + libc/nptl/Makefile | 2 +- libc/nptl/pthread_getattr_np.c | 9 +- libc/nptl/tst-pthread-getattr.c | 120 ++ libc/po/libc.pot | 2512 ++++++++++++---------- libc/scripts/list-sources.sh | 17 +- libc/sysdeps/i386/fpu_control.h | 101 - libc/sysdeps/i386/sysdep.h | 2 +- libc/sysdeps/ieee754/dbl-64/wordsize-64/e_cosh.c | 1 + libc/sysdeps/s390/bits/byteswap-16.h | 4 +- libc/sysdeps/s390/bits/byteswap.h | 4 +- libc/sysdeps/x86/fpu_control.h | 109 + libc/sysdeps/x86_64/fpu_control.h | 100 - 25 files changed, 1697 insertions(+), 1432 deletions(-) create mode 100644 libc/nptl/tst-pthread-getattr.c delete mode 100644 libc/sysdeps/i386/fpu_control.h create mode 100644 libc/sysdeps/x86/fpu_control.h delete mode 100644 libc/sysdeps/x86_64/fpu_control.h (limited to 'libc') diff --git a/libc/ChangeLog b/libc/ChangeLog index 3b7f98869..6f3676f78 100644 --- a/libc/ChangeLog +++ b/libc/ChangeLog @@ -1,3 +1,55 @@ +2012-06-21 Jeff Law + + [BZ #14277] + * intl/dcigettext.c (_nl_find_msg): Avoid use after potential + free. Simplify list management for _LIBC case. + +2012-06-21 Joseph Myers + + [BZ #14273] + * sysdeps/ieee754/dbl-64/wordsize-64/e_cosh.c (__ieee754_cosh): + Clear sign bit of 64-bit integer value before comparing against + overflow value. + + * sysdeps/mach/configure: Regenerated. + +2012-06-21 H.J. Lu + + [BZ #14278] + * sysdeps/i386/sysdep.h (SYSCALL_PIC_SETUP): Fix a typo. + +2012-06-21 Jeff Law + + [BZ #13882] + * elf/dl-deps.c (_dl_map_object_deps): Fix cycle detection. Use + uint16_t for elements in the "seen" array to avoid char overflows. + * elf/dl-fini.c (_dl_sort_fini): Likewise. + * elf/dl-open.c (dl_open_worker): Likewise. + +2012-06-21 Carlos O'Donell + + * scripts/list-sources.sh: Scan PORTS for translations. + * po/libc.pot: Regenerated. + +2012-06-21 Andreas Jaeger + + [BZ #12194] + * sysdeps/s390/bits/byteswap-16.h (__bswap_16): Avoid -Wconversion + warning. + * sysdeps/s390/bits/byteswap.h (__bswap_constant_16): Likewise. + * bits/byteswap-16.h (__bswap_16): Likewise. + * bits/byteswap.h (__bswap_constant_16): Likewise. + +2012-06-18 H.J. Lu + + [BZ #14117] + * sysdeps/i386/fpu_control.h: Removed. + * sysdeps/x86_64/fpu_control.h: Moved to ... + * sysdeps/x86/fpu_control.h: Here. + + * sysdeps/x86_64/fpu_control.h (_FPU_GETCW): Add __volatile__. + (_FPU_SETCW): Likewise. + 2012-06-15 H.J. Lu [BZ #14117] diff --git a/libc/ChangeLog.16 b/libc/ChangeLog.16 index d720779f3..292d3d169 100644 --- a/libc/ChangeLog.16 +++ b/libc/ChangeLog.16 @@ -12017,7 +12017,7 @@ * sysdeps/generic/bits/byteswap.h: Make sure result of all the functions and macros is unsigned. -2005-02-11 Barry deFrese +2005-02-11 Barry deFreese [BZ #722] * sysdeps/mach/hurd/setresgid.c: Use weak_alias. diff --git a/libc/NEWS b/libc/NEWS index b46122bc1..1ce8ee350 100644 --- a/libc/NEWS +++ b/libc/NEWS @@ -16,21 +16,21 @@ Version 2.16 6884, 6890, 6894, 6895, 6907, 6911, 6959, 7064, 9739, 9902, 10110, 10135, 10140, 10153, 10210, 10254, 10346, 10375, 10545, 10716, 10846, 11174, 11322, 11365, 11451, 11494, 11521, 11677, 11837, 11959, 12047, 12097, - 12193, 12297, 12298, 12301, 12340, 12354, 12416, 12495, 13058, 13223, - 13361, 13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532, 13533, - 13547, 13551, 13552, 13553, 13555, 13556, 13559, 13563, 13566, 13576, - 13583, 13592, 13594, 13613, 13618, 13637, 13656, 13658, 13673, 13691, - 13695, 13704, 13705, 13706, 13718, 13726, 13738, 13739, 13743, 13750, - 13758, 13760, 13761, 13775, 13786, 13787, 13792, 13806, 13824, 13840, - 13841, 13844, 13846, 13848, 13851, 13852, 13854, 13871, 13872, 13873, - 13879, 13883, 13884, 13885, 13886, 13892, 13895, 13908, 13910, 13911, - 13912, 13913, 13914, 13915, 13916, 13917, 13918, 13919, 13920, 13921, - 13922, 13923, 13924, 13926, 13927, 13928, 13938, 13941, 13942, 13954, - 13955, 13956, 13963, 13967, 13968, 13970, 13973, 13979, 13983, 13986, - 13996, 14012, 14027, 14033, 14034, 14036, 14040, 14043, 14044, 14048, - 14049, 14050, 14053, 14055, 14059, 14064, 14075, 14080, 14083, 14103, - 14104, 14109, 14112, 14117, 14122, 14123, 14134, 14153, 14183, 14188, - 14199, 14210, 14218, 14229, 14241 + 12193, 12194, 12297, 12298, 12301, 12340, 12354, 12416, 12495, 13058, + 13223, 13361, 13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532, + 13533, 13547, 13551, 13552, 13553, 13555, 13556, 13559, 13563, 13566, + 13576, 13583, 13592, 13594, 13613, 13618, 13637, 13656, 13658, 13673, + 13691, 13695, 13704, 13705, 13706, 13718, 13726, 13738, 13739, 13743, + 13750, 13758, 13760, 13761, 13775, 13786, 13787, 13792, 13806, 13824, + 13840, 13841, 13844, 13846, 13848, 13851, 13852, 13854, 13871, 13872, + 13873, 13879, 13882, 13883, 13884, 13885, 13886, 13892, 13895, 13908, + 13910, 13911, 13912, 13913, 13914, 13915, 13916, 13917, 13918, 13919, + 13920, 13921, 13922, 13923, 13924, 13926, 13927, 13928, 13938, 13941, + 13942, 13954, 13955, 13956, 13963, 13967, 13968, 13970, 13973, 13979, + 13983, 13986, 13996, 14012, 14027, 14033, 14034, 14036, 14040, 14043, + 14044, 14048, 14049, 14050, 14053, 14055, 14059, 14064, 14075, 14080, + 14083, 14103, 14104, 14109, 14112, 14117, 14122, 14123, 14134, 14153, + 14183, 14188, 14199, 14210, 14218, 14229, 14241, 14273, 14277, 14278 * Support for the x32 ABI on x86-64 added. The x32 target is selected by configuring glibc with: diff --git a/libc/bits/byteswap-16.h b/libc/bits/byteswap-16.h index 078dd0e17..6cc1d3093 100644 --- a/libc/bits/byteswap-16.h +++ b/libc/bits/byteswap-16.h @@ -23,7 +23,8 @@ #ifdef __GNUC__ # define __bswap_16(x) \ (__extension__ \ - ({ unsigned short int __bsx = (x); __bswap_constant_16 (__bsx); })) + ({ unsigned short int __bsx = (unsigned short int) (x); \ + __bswap_constant_16 (__bsx); })) #else static __inline unsigned short int __bswap_16 (unsigned short int __bsx) diff --git a/libc/bits/byteswap.h b/libc/bits/byteswap.h index d818293a4..3ca0ad698 100644 --- a/libc/bits/byteswap.h +++ b/libc/bits/byteswap.h @@ -27,7 +27,7 @@ /* Swap bytes in 16 bit value. */ #define __bswap_constant_16(x) \ - ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)) + ((unsigned short int)((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8))) /* Get __bswap_16. */ #include diff --git a/libc/elf/dl-deps.c b/libc/elf/dl-deps.c index e0b5ecb09..d7560e8e5 100644 --- a/libc/elf/dl-deps.c +++ b/libc/elf/dl-deps.c @@ -1,5 +1,5 @@ /* Load the dependencies of a mapped object. - Copyright (C) 1996-2003, 2004, 2005, 2006, 2007, 2010, 2011 + Copyright (C) 1996-2003, 2004-2007, 2010-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -632,7 +632,7 @@ Filters not supported with LD_TRACE_PRELINKING")); /* We can skip looking for the binary itself which is at the front of the search list. */ i = 1; - char seen[nlist]; + uint16_t seen[nlist]; memset (seen, 0, nlist * sizeof (seen[0])); while (1) { @@ -658,13 +658,13 @@ Filters not supported with LD_TRACE_PRELINKING")); (k - i) * sizeof (l_initfini[0])); l_initfini[k] = thisp; - if (seen[i + 1] > 1) + if (seen[i + 1] > nlist - i) { ++i; goto next_clear; } - char this_seen = seen[i]; + uint16_t this_seen = seen[i]; memmove (&seen[i], &seen[i + 1], (k - i) * sizeof (seen[0])); seen[k] = this_seen; diff --git a/libc/elf/dl-fini.c b/libc/elf/dl-fini.c index 5f40c87a7..717979c31 100644 --- a/libc/elf/dl-fini.c +++ b/libc/elf/dl-fini.c @@ -1,5 +1,5 @@ /* Call the termination functions of loaded shared objects. - Copyright (C) 1995,96,1998-2002,2004-2005,2009,2011 + Copyright (C) 1995, 1996, 1998-2002, 2004-2005, 2009, 2011-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -38,7 +38,7 @@ _dl_sort_fini (struct link_map **maps, size_t nmaps, char *used, Lmid_t ns) /* We can skip looking for the binary itself which is at the front of the search list for the main namespace. */ unsigned int i = ns == LM_ID_BASE; - char seen[nmaps]; + uint16_t seen[nmaps]; memset (seen, 0, nmaps * sizeof (seen[0])); while (1) { @@ -78,13 +78,13 @@ _dl_sort_fini (struct link_map **maps, size_t nmaps, char *used, Lmid_t ns) used[k] = here_used; } - if (seen[i + 1] > 1) + if (seen[i + 1] > nmaps - i) { ++i; goto next_clear; } - char this_seen = seen[i]; + uint16_t this_seen = seen[i]; memmove (&seen[i], &seen[i + 1], (k - i) * sizeof (seen[0])); seen[k] = this_seen; diff --git a/libc/elf/dl-open.c b/libc/elf/dl-open.c index 45a70aeaf..32ae5cffe 100644 --- a/libc/elf/dl-open.c +++ b/libc/elf/dl-open.c @@ -1,5 +1,5 @@ /* Load a shared object at runtime, relocate it, and run its initializer. - Copyright (C) 1996-2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2012 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 @@ -325,7 +325,7 @@ dl_open_worker (void *a) while (l != NULL); if (nmaps > 1) { - char seen[nmaps]; + uint16_t seen[nmaps]; memset (seen, '\0', nmaps); size_t i = 0; while (1) @@ -351,13 +351,13 @@ dl_open_worker (void *a) (k - i) * sizeof (maps[0])); maps[k] = thisp; - if (seen[i + 1] > 1) + if (seen[i + 1] > nmaps - i) { ++i; goto next_clear; } - char this_seen = seen[i]; + uint16_t this_seen = seen[i]; memmove (&seen[i], &seen[i + 1], (k - i) * sizeof (seen[0])); seen[k] = this_seen; diff --git a/libc/intl/dcigettext.c b/libc/intl/dcigettext.c index 2a393cadf..095081c44 100644 --- a/libc/intl/dcigettext.c +++ b/libc/intl/dcigettext.c @@ -1,5 +1,5 @@ /* Implementation of the internal dcigettext function. - Copyright (C) 1995-2005, 2006, 2007, 2008, 2009, 2011 + Copyright (C) 1995-2005, 2006, 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -1171,7 +1171,7 @@ _nl_find_msg (domain_file, domainbinding, msgid, convert, lengthp) freemem_size); # ifdef _LIBC if (newmem != NULL) - transmem_list = transmem_list->next; + transmem_list = newmem; else { struct transmem_list *old = transmem_list; @@ -1186,6 +1186,12 @@ _nl_find_msg (domain_file, domainbinding, msgid, convert, lengthp) malloc_count = 1; freemem_size = INITIAL_BLOCK_SIZE; newmem = (transmem_block_t *) malloc (freemem_size); +# ifdef _LIBC + /* Add the block to the list of blocks we have to free + at some point. */ + newmem->next = transmem_list; + transmem_list = newmem; +# endif } if (__builtin_expect (newmem == NULL, 0)) { @@ -1196,11 +1202,6 @@ _nl_find_msg (domain_file, domainbinding, msgid, convert, lengthp) } # ifdef _LIBC - /* Add the block to the list of blocks we have to free - at some point. */ - newmem->next = transmem_list; - transmem_list = newmem; - freemem = (unsigned char *) newmem->data; freemem_size -= offsetof (struct transmem_list, data); # else diff --git a/libc/localedata/ChangeLog b/libc/localedata/ChangeLog index 7af0cb8d7..248b0092a 100644 --- a/libc/localedata/ChangeLog +++ b/libc/localedata/ChangeLog @@ -1,3 +1,9 @@ +2012-06-20 Petr Baudis + + * locales/mag_IN: Fix comment character. + * locales/tr_CY (LC_TIME): Remove redundant first_weekday + and first_workday. + 2012-06-04 Petr Baudis [BZ#13996] diff --git a/libc/localedata/locales/mag_IN b/libc/localedata/locales/mag_IN index f4aff4556..69f319a23 100644 --- a/libc/localedata/locales/mag_IN +++ b/libc/localedata/locales/mag_IN @@ -2,7 +2,7 @@ comment_char % escape_char / % Magahi language locale for India. % Contributed by Chandan Kumar , -# Rajesh Ranjan +% Rajesh Ranjan % and Pravin Satpute LC_IDENTIFICATION diff --git a/libc/localedata/locales/tr_CY b/libc/localedata/locales/tr_CY index 0b90b375b..daeffc1b9 100644 --- a/libc/localedata/locales/tr_CY +++ b/libc/localedata/locales/tr_CY @@ -66,8 +66,6 @@ END LC_NUMERIC LC_TIME copy "tr_TR" -first_workday 2 -first_weekday 2 END LC_TIME LC_PAPER diff --git a/libc/nptl/ChangeLog b/libc/nptl/ChangeLog index 1ff8d978d..f53c2f282 100644 --- a/libc/nptl/ChangeLog +++ b/libc/nptl/ChangeLog @@ -1,3 +1,13 @@ +2012-06-20 Siddhesh Poyarekar + + [BZ #12416] + * Makefile (tests): Add test case. + * pthread_getattr_np.c (pthread_getattr_np): Deduct pages below + the __libc_stack_end page from stacksize. Truncate stacksize to + make it page aligned when it is computed from RLIMIT_STACK. + * tst-pthread-getattr.c: New test case. Verify that stackaddr is + accessible. + 2012-06-07 Carlos Sánchez de La Lama [BZ #14205] diff --git a/libc/nptl/Makefile b/libc/nptl/Makefile index b7ecef547..e8ca09188 100644 --- a/libc/nptl/Makefile +++ b/libc/nptl/Makefile @@ -249,7 +249,7 @@ tests = tst-typesizes \ tst-exec2 tst-exec3 tst-exec4 \ tst-exit1 tst-exit2 tst-exit3 \ tst-stdio1 tst-stdio2 \ - tst-stack1 tst-stack2 tst-stack3 \ + tst-stack1 tst-stack2 tst-stack3 tst-pthread-getattr \ tst-unload \ tst-dlsym1 \ tst-sysconf \ diff --git a/libc/nptl/pthread_getattr_np.c b/libc/nptl/pthread_getattr_np.c index 75d717bb1..7309185d1 100644 --- a/libc/nptl/pthread_getattr_np.c +++ b/libc/nptl/pthread_getattr_np.c @@ -120,8 +120,15 @@ pthread_getattr_np (thread_id, attr) && (uintptr_t) __libc_stack_end < to) { /* Found the entry. Now we have the info we need. */ - iattr->stacksize = rl.rlim_cur; iattr->stackaddr = stack_end; + iattr->stacksize = + rl.rlim_cur - (size_t) (to - (uintptr_t) stack_end); + + /* Cut it down to align it to page size since otherwise we + risk going beyond rlimit when the kernel rounds up the + stack extension request. */ + iattr->stacksize = (iattr->stacksize + & -(intptr_t) GLRO(dl_pagesize)); /* The limit might be too high. */ if ((size_t) iattr->stacksize diff --git a/libc/nptl/tst-pthread-getattr.c b/libc/nptl/tst-pthread-getattr.c new file mode 100644 index 000000000..6f2cfc651 --- /dev/null +++ b/libc/nptl/tst-pthread-getattr.c @@ -0,0 +1,120 @@ +/* Make sure that the stackaddr returned by pthread_getattr_np is + reachable. + + Copyright (C) 2012 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, see + . */ + +#include +#include +#include +#include +#include + +/* Move the stack pointer so that stackaddr is accessible and then check if it + really is accessible. This will segfault if it fails. */ +static void +allocate_and_test (void *stackaddr) +{ + void *mem = &mem; + /* FIXME: The difference will be negative for _STACK_GROWSUP. */ + mem = alloca ((size_t) (mem - stackaddr)); + *(int *)(mem) = 0; +} + +static int +get_self_pthread_attr (const char *id, void **stackaddr, size_t *stacksize) +{ + pthread_attr_t attr; + int ret; + pthread_t me = pthread_self (); + + if ((ret = pthread_getattr_np (me, &attr))) + { + printf ("%s: pthread_getattr_np failed: %s\n", id, strerror (ret)); + return 1; + } + + if ((ret = pthread_attr_getstack (&attr, stackaddr, stacksize))) + { + printf ("%s: pthread_attr_getstack returned error: %s\n", id, + strerror (ret)); + return 1; + } + + return 0; +} + +/* Verify that the stack size returned by pthread_getattr_np is usable when + the returned value is subject to rlimit. */ +static int +check_stack_top (void) +{ + struct rlimit stack_limit; + void *stackaddr; + size_t stacksize = 0; + int ret; + + puts ("Verifying that stack top is accessible"); + + ret = getrlimit (RLIMIT_STACK, &stack_limit); + if (ret) + { + perror ("getrlimit failed"); + return 1; + } + + if (get_self_pthread_attr ("check_stack_top", &stackaddr, &stacksize)) + return 1; + + /* Reduce the rlimit to a page less that what is currently being returned so + that we ensure that pthread_getattr_np uses rlimit. The figure is + intentionally unaligned so to verify that pthread_getattr_np returns an + aligned stacksize that correctly fits into the rlimit. We don't bother + about the case where the stack is limited by the vma below it and not by + the rlimit because the stacksize returned in that case is computed from + the end of that vma and is hence safe. */ + stack_limit.rlim_cur = stacksize - 4095; + printf ("Adjusting RLIMIT_STACK to %zu\n", stack_limit.rlim_cur); + if ((ret = setrlimit (RLIMIT_STACK, &stack_limit))) + { + perror ("setrlimit failed"); + return 1; + } + + if (get_self_pthread_attr ("check_stack_top2", &stackaddr, &stacksize)) + return 1; + + printf ("Adjusted rlimit: stacksize=%zu, stackaddr=%p\n", stacksize, + stackaddr); + allocate_and_test (stackaddr); + + puts ("Stack top tests done"); + + return 0; +} + +/* TODO: Similar check for thread stacks once the thread stack sizes are + fixed. */ +static int +do_test (void) +{ + return check_stack_top (); +} + + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/libc/po/libc.pot b/libc/po/libc.pot index c2d3e48d0..c029fdb3d 100644 --- a/libc/po/libc.pot +++ b/libc/po/libc.pot @@ -5,152 +5,153 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: libc 2.13.90\n" -"POT-Creation-Date: 2011-05-31 00:06-0400\n" +"Project-Id-Version: libc 2.15.90\n" +"POT-Creation-Date: 2012-06-21 07:51-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: argp/argp-help.c:228 +#: argp/argp-help.c:226 #, c-format msgid "%.*s: ARGP_HELP_FMT parameter requires a value" msgstr "" -#: argp/argp-help.c:238 +#: argp/argp-help.c:236 #, c-format msgid "%.*s: Unknown ARGP_HELP_FMT parameter" msgstr "" -#: argp/argp-help.c:251 +#: argp/argp-help.c:249 #, c-format msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "" -#: argp/argp-help.c:1215 +#: argp/argp-help.c:1213 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" -#: argp/argp-help.c:1601 +#: argp/argp-help.c:1599 msgid "Usage:" msgstr "" -#: argp/argp-help.c:1605 +#: argp/argp-help.c:1603 msgid " or: " msgstr "" -#: argp/argp-help.c:1617 +#: argp/argp-help.c:1615 msgid " [OPTION...]" msgstr "" -#: argp/argp-help.c:1644 +#: argp/argp-help.c:1642 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "" -#: argp/argp-help.c:1672 +#: argp/argp-help.c:1670 #, c-format msgid "Report bugs to %s.\n" msgstr "" -#: argp/argp-parse.c:102 +#: argp/argp-parse.c:101 msgid "Give this help list" msgstr "" -#: argp/argp-parse.c:103 +#: argp/argp-parse.c:102 msgid "Give a short usage message" msgstr "" -#: argp/argp-parse.c:104 +#: argp/argp-parse.c:103 msgid "Set the program name" msgstr "" -#: argp/argp-parse.c:106 +#: argp/argp-parse.c:105 msgid "Hang for SECS seconds (default 3600)" msgstr "" -#: argp/argp-parse.c:167 +#: argp/argp-parse.c:166 msgid "Print program version" msgstr "" -#: argp/argp-parse.c:183 +#: argp/argp-parse.c:182 msgid "(PROGRAM ERROR) No version known!?" msgstr "" -#: argp/argp-parse.c:623 +#: argp/argp-parse.c:622 #, c-format msgid "%s: Too many arguments\n" msgstr "" -#: argp/argp-parse.c:766 +#: argp/argp-parse.c:765 msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: assert/assert-perr.c:37 +#: assert/assert-perr.c:36 #, c-format msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n" msgstr "" -#: assert/assert.c:105 +#: assert/assert.c:101 #, c-format msgid "" "%s%s%s:%u: %s%sAssertion `%s' failed.\n" "%n" msgstr "" -#: catgets/gencat.c:110 catgets/gencat.c:114 nscd/nscd.c:100 nss/makedb.c:61 +#: catgets/gencat.c:109 catgets/gencat.c:113 nscd/nscd.c:115 nss/makedb.c:118 msgid "NAME" msgstr "" -#: catgets/gencat.c:111 +#: catgets/gencat.c:110 msgid "Create C header file NAME containing symbol definitions" msgstr "" -#: catgets/gencat.c:113 +#: catgets/gencat.c:112 msgid "Do not use existing catalog, force new output file" msgstr "" -#: catgets/gencat.c:114 nss/makedb.c:61 +#: catgets/gencat.c:113 nss/makedb.c:118 msgid "Write output to file NAME" msgstr "" -#: catgets/gencat.c:119 +#: catgets/gencat.c:118 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 "" -#: catgets/gencat.c:124 +#: catgets/gencat.c:123 msgid "" "-o OUTPUT-FILE [INPUT-FILE]...\n" "[OUTPUT-FILE [INPUT-FILE]...]" msgstr "" -#: catgets/gencat.c:232 debug/pcprofiledump.c:208 debug/xtrace.sh:58 -#: elf/ldconfig.c:302 elf/ldd.bash.in:56 elf/sln.c:86 elf/sotruss.ksh:49 -#: elf/sprof.c:371 iconv/iconv_prog.c:408 iconv/iconvconfig.c:380 -#: locale/programs/locale.c:278 locale/programs/localedef.c:371 -#: login/programs/pt_chown.c:92 malloc/memusage.sh:65 -#: malloc/memusagestat.c:539 nscd/nscd.c:415 nss/getent.c:918 nss/makedb.c:231 -#: posix/getconf.c:1122 sunrpc/rpc_main.c:1492 sunrpc/rpcinfo.c:691 -#: sysdeps/unix/sysv/linux/lddlibc4.c:62 +#: catgets/gencat.c:234 debug/pcprofiledump.c:207 debug/xtrace.sh:57 +#: elf/ldconfig.c:301 elf/ldd.bash.in:55 elf/pldd.c:56 elf/sln.c:85 +#: elf/sotruss.ksh:49 elf/sprof.c:370 iconv/iconv_prog.c:407 +#: iconv/iconvconfig.c:382 locale/programs/locale.c:278 +#: locale/programs/localedef.c:367 login/programs/pt_chown.c:91 +#: malloc/memusage.sh:64 malloc/memusagestat.c:538 nscd/nscd.c:456 +#: nss/getent.c:965 nss/makedb.c:369 posix/getconf.c:1121 +#: sunrpc/rpc_main.c:1446 sunrpc/rpcinfo.c:691 +#: sysdeps/unix/sysv/linux/lddlibc4.c:61 msgid "" "For bug reporting instructions, please see:\n" ".\n" msgstr "" -#: catgets/gencat.c:246 debug/pcprofiledump.c:222 debug/xtrace.sh:66 -#: elf/ldconfig.c:316 elf/ldd.bash.in:39 elf/sotruss.ksh:76 elf/sprof.c:386 -#: iconv/iconv_prog.c:423 iconv/iconvconfig.c:395 locale/programs/locale.c:293 -#: locale/programs/localedef.c:387 login/programs/pt_chown.c:63 -#: malloc/memusage.sh:73 malloc/memusagestat.c:557 nscd/nscd.c:429 -#: nss/getent.c:87 nss/makedb.c:245 posix/getconf.c:1104 -#: sysdeps/unix/sysv/linux/lddlibc4.c:69 +#: catgets/gencat.c:248 debug/pcprofiledump.c:221 debug/xtrace.sh:65 +#: elf/ldconfig.c:315 elf/ldd.bash.in:38 elf/pldd.c:220 elf/sotruss.ksh:76 +#: elf/sprof.c:385 iconv/iconv_prog.c:422 iconv/iconvconfig.c:397 +#: locale/programs/locale.c:293 locale/programs/localedef.c:383 +#: login/programs/pt_chown.c:62 malloc/memusage.sh:72 +#: malloc/memusagestat.c:556 nscd/nscd.c:470 nss/getent.c:86 nss/makedb.c:383 +#: posix/getconf.c:1103 sysdeps/unix/sysv/linux/lddlibc4.c:68 #, c-format msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -158,140 +159,141 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: catgets/gencat.c:251 debug/pcprofiledump.c:227 debug/xtrace.sh:70 -#: elf/ldconfig.c:321 elf/sprof.c:392 iconv/iconv_prog.c:428 -#: iconv/iconvconfig.c:400 locale/programs/locale.c:298 -#: locale/programs/localedef.c:392 malloc/memusage.sh:77 -#: malloc/memusagestat.c:562 nscd/nscd.c:434 nss/getent.c:92 nss/makedb.c:250 -#: posix/getconf.c:1109 +#: catgets/gencat.c:253 debug/pcprofiledump.c:226 debug/xtrace.sh:69 +#: elf/ldconfig.c:320 elf/pldd.c:225 elf/sprof.c:391 iconv/iconv_prog.c:427 +#: iconv/iconvconfig.c:402 locale/programs/locale.c:298 +#: locale/programs/localedef.c:388 malloc/memusage.sh:76 +#: malloc/memusagestat.c:561 nscd/nscd.c:475 nss/getent.c:91 nss/makedb.c:388 +#: posix/getconf.c:1108 #, c-format msgid "Written by %s.\n" msgstr "" -#: catgets/gencat.c:282 +#: catgets/gencat.c:284 msgid "*standard input*" msgstr "" -#: catgets/gencat.c:288 iconv/iconv_charmap.c:170 iconv/iconv_prog.c:294 -#: nss/makedb.c:170 +#: catgets/gencat.c:290 iconv/iconv_charmap.c:171 iconv/iconv_prog.c:293 +#: nss/makedb.c:247 #, c-format msgid "cannot open input file `%s'" msgstr "" -#: catgets/gencat.c:417 catgets/gencat.c:494 +#: catgets/gencat.c:419 catgets/gencat.c:494 msgid "illegal set number" msgstr "" -#: catgets/gencat.c:444 +#: catgets/gencat.c:446 msgid "duplicate set definition" msgstr "" -#: catgets/gencat.c:446 catgets/gencat.c:623 catgets/gencat.c:677 +#: catgets/gencat.c:448 catgets/gencat.c:620 catgets/gencat.c:672 msgid "this is the first definition" msgstr "" -#: catgets/gencat.c:522 +#: catgets/gencat.c:519 #, c-format msgid "unknown set `%s'" msgstr "" -#: catgets/gencat.c:563 +#: catgets/gencat.c:560 msgid "invalid quote character" msgstr "" -#: catgets/gencat.c:576 +#: catgets/gencat.c:573 #, c-format msgid "unknown directive `%s': line ignored" msgstr "" -#: catgets/gencat.c:621 +#: catgets/gencat.c:618 msgid "duplicated message number" msgstr "" -#: catgets/gencat.c:674 +#: catgets/gencat.c:669 msgid "duplicated message identifier" msgstr "" -#: catgets/gencat.c:731 +#: catgets/gencat.c:726 msgid "invalid character: message ignored" msgstr "" -#: catgets/gencat.c:774 +#: catgets/gencat.c:769 msgid "invalid line" msgstr "" -#: catgets/gencat.c:828 +#: catgets/gencat.c:823 msgid "malformed line ignored" msgstr "" -#: catgets/gencat.c:992 catgets/gencat.c:1033 nss/makedb.c:183 +#: catgets/gencat.c:987 catgets/gencat.c:1028 #, c-format msgid "cannot open output file `%s'" msgstr "" -#: catgets/gencat.c:1195 locale/programs/linereader.c:560 +#: catgets/gencat.c:1190 locale/programs/linereader.c:559 msgid "invalid escape sequence" msgstr "" -#: catgets/gencat.c:1217 +#: catgets/gencat.c:1212 msgid "unterminated message" msgstr "" -#: catgets/gencat.c:1241 +#: catgets/gencat.c:1236 #, c-format msgid "while opening old catalog file" msgstr "" -#: catgets/gencat.c:1332 +#: catgets/gencat.c:1327 #, c-format msgid "conversion modules not available" msgstr "" -#: catgets/gencat.c:1358 +#: catgets/gencat.c:1353 #, c-format msgid "cannot determine escape character" msgstr "" -#: debug/pcprofiledump.c:53 +#: debug/pcprofiledump.c:52 msgid "Don't buffer output" msgstr "" -#: debug/pcprofiledump.c:58 +#: debug/pcprofiledump.c:57 msgid "Dump information generated by PC profiling." msgstr "" -#: debug/pcprofiledump.c:61 +#: debug/pcprofiledump.c:60 msgid "[FILE]" msgstr "" -#: debug/pcprofiledump.c:108 +#: debug/pcprofiledump.c:107 #, c-format msgid "cannot open input file" msgstr "" -#: debug/pcprofiledump.c:115 +#: debug/pcprofiledump.c:114 #, c-format msgid "cannot read header" msgstr "" -#: debug/pcprofiledump.c:179 +#: debug/pcprofiledump.c:178 #, c-format msgid "invalid pointer size" msgstr "" -#: debug/xtrace.sh:27 debug/xtrace.sh:45 +#: debug/xtrace.sh:26 debug/xtrace.sh:44 msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n" msgstr "" -#: debug/xtrace.sh:33 malloc/memusage.sh:27 -msgid "Try \\`%s --help' or `%s --usage' for more information.\\n" +#: debug/xtrace.sh:32 elf/sotruss.ksh:57 elf/sotruss.ksh:68 +#: elf/sotruss.ksh:136 malloc/memusage.sh:26 +msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n" msgstr "" -#: debug/xtrace.sh:39 +#: debug/xtrace.sh:38 msgid "%s: option '%s' requires an argument.\\n" msgstr "" -#: debug/xtrace.sh:46 +#: debug/xtrace.sh:45 msgid "" "Trace execution of program by printing currently executed function.\n" "\n" @@ -308,102 +310,102 @@ msgid "" "\n" msgstr "" -#: debug/xtrace.sh:127 +#: debug/xtrace.sh:126 msgid "xtrace: unrecognized option \\`$1'\\n" msgstr "" -#: debug/xtrace.sh:140 +#: debug/xtrace.sh:139 msgid "No program name given\\n" msgstr "" -#: debug/xtrace.sh:148 +#: debug/xtrace.sh:147 #, sh-format msgid "executable \\`$program' not found\\n" msgstr "" -#: debug/xtrace.sh:152 +#: debug/xtrace.sh:151 #, sh-format msgid "\\`$program' is no executable\\n" msgstr "" -#: dlfcn/dlinfo.c:64 +#: dlfcn/dlinfo.c:63 msgid "RTLD_SELF used in code not dynamically loaded" msgstr "" -#: dlfcn/dlinfo.c:73 +#: dlfcn/dlinfo.c:72 msgid "unsupported dlinfo request" msgstr "" -#: dlfcn/dlmopen.c:64 +#: dlfcn/dlmopen.c:63 msgid "invalid namespace" msgstr "" -#: dlfcn/dlmopen.c:69 +#: dlfcn/dlmopen.c:68 msgid "invalid mode" msgstr "" -#: dlfcn/dlopen.c:65 +#: dlfcn/dlopen.c:64 msgid "invalid mode parameter" msgstr "" -#: elf/cache.c:69 +#: elf/cache.c:68 msgid "unknown" msgstr "" -#: elf/cache.c:112 +#: elf/cache.c:115 msgid "Unknown OS" msgstr "" -#: elf/cache.c:117 +#: elf/cache.c:120 #, c-format msgid ", OS ABI: %s %d.%d.%d" msgstr "" -#: elf/cache.c:134 elf/ldconfig.c:1305 +#: elf/cache.c:137 elf/ldconfig.c:1306 #, c-format msgid "Can't open cache file %s\n" msgstr "" -#: elf/cache.c:148 +#: elf/cache.c:151 #, c-format msgid "mmap of cache file failed.\n" msgstr "" -#: elf/cache.c:152 elf/cache.c:166 +#: elf/cache.c:155 elf/cache.c:169 #, c-format msgid "File is not a cache file.\n" msgstr "" -#: elf/cache.c:199 elf/cache.c:209 +#: elf/cache.c:202 elf/cache.c:212 #, c-format msgid "%d libs found in cache `%s'\n" msgstr "" -#: elf/cache.c:403 +#: elf/cache.c:406 #, c-format msgid "Can't create temporary cache file %s" msgstr "" -#: elf/cache.c:411 elf/cache.c:421 elf/cache.c:425 elf/cache.c:430 +#: elf/cache.c:414 elf/cache.c:424 elf/cache.c:428 elf/cache.c:433 #, c-format msgid "Writing of cache data failed" msgstr "" -#: elf/cache.c:435 +#: elf/cache.c:438 #, c-format msgid "Changing access rights of %s to %#o failed" msgstr "" -#: elf/cache.c:440 +#: elf/cache.c:443 #, c-format msgid "Renaming of %s to %s failed" msgstr "" -#: elf/dl-close.c:387 elf/dl-open.c:397 +#: elf/dl-close.c:386 elf/dl-open.c:460 msgid "cannot create scope list" msgstr "" -#: elf/dl-close.c:767 +#: elf/dl-close.c:773 msgid "shared object not open" msgstr "" @@ -422,219 +424,219 @@ msgid "" "substitution\n" msgstr "" -#: elf/dl-deps.c:474 +#: elf/dl-deps.c:486 msgid "cannot allocate dependency list" msgstr "" -#: elf/dl-deps.c:514 elf/dl-deps.c:574 +#: elf/dl-deps.c:522 elf/dl-deps.c:582 msgid "cannot allocate symbol search list" msgstr "" -#: elf/dl-deps.c:554 +#: elf/dl-deps.c:562 msgid "Filters not supported with LD_TRACE_PRELINKING" msgstr "" -#: elf/dl-error.c:77 +#: elf/dl-error.c:76 msgid "DYNAMIC LINKER BUG!!!" msgstr "" -#: elf/dl-error.c:124 +#: elf/dl-error.c:123 msgid "error while loading shared libraries" msgstr "" -#: elf/dl-fptr.c:88 +#: elf/dl-fptr.c:87 ports/sysdeps/hppa/dl-fptr.c:93 msgid "cannot map pages for fdesc table" msgstr "" -#: elf/dl-fptr.c:192 +#: elf/dl-fptr.c:191 ports/sysdeps/hppa/dl-fptr.c:206 msgid "cannot map pages for fptr table" msgstr "" -#: elf/dl-fptr.c:221 +#: elf/dl-fptr.c:220 ports/sysdeps/hppa/dl-fptr.c:235 msgid "internal error: symidx out of range of fptr table" msgstr "" -#: elf/dl-load.c:471 +#: elf/dl-load.c:470 msgid "cannot allocate name record" msgstr "" -#: elf/dl-load.c:548 elf/dl-load.c:664 elf/dl-load.c:749 elf/dl-load.c:862 +#: elf/dl-load.c:547 elf/dl-load.c:663 elf/dl-load.c:748 elf/dl-load.c:861 msgid "cannot create cache for search path" msgstr "" -#: elf/dl-load.c:639 +#: elf/dl-load.c:638 msgid "cannot create RUNPATH/RPATH copy" msgstr "" -#: elf/dl-load.c:735 +#: elf/dl-load.c:734 msgid "cannot create search path array" msgstr "" -#: elf/dl-load.c:931 +#: elf/dl-load.c:932 msgid "cannot stat shared object" msgstr "" -#: elf/dl-load.c:1009 +#: elf/dl-load.c:1010 msgid "cannot open zero fill device" msgstr "" -#: elf/dl-load.c:1055 elf/dl-load.c:2313 +#: elf/dl-load.c:1056 elf/dl-load.c:2317 msgid "cannot create shared object descriptor" msgstr "" -#: elf/dl-load.c:1074 elf/dl-load.c:1730 elf/dl-load.c:1833 +#: elf/dl-load.c:1075 elf/dl-load.c:1731 elf/dl-load.c:1834 msgid "cannot read file data" msgstr "" -#: elf/dl-load.c:1120 +#: elf/dl-load.c:1121 msgid "ELF load command alignment not page-aligned" msgstr "" -#: elf/dl-load.c:1127 +#: elf/dl-load.c:1128 msgid "ELF load command address/offset not properly aligned" msgstr "" -#: elf/dl-load.c:1210 +#: elf/dl-load.c:1211 msgid "cannot allocate TLS data structures for initial thread" msgstr "" -#: elf/dl-load.c:1233 +#: elf/dl-load.c:1234 msgid "cannot handle TLS data" msgstr "" -#: elf/dl-load.c:1252 +#: elf/dl-load.c:1253 msgid "object file has no loadable segments" msgstr "" -#: elf/dl-load.c:1288 +#: elf/dl-load.c:1289 msgid "failed to map segment from shared object" msgstr "" -#: elf/dl-load.c:1314 +#: elf/dl-load.c:1315 msgid "cannot dynamically load executable" msgstr "" -#: elf/dl-load.c:1376 +#: elf/dl-load.c:1377 msgid "cannot change memory protections" msgstr "" -#: elf/dl-load.c:1395 +#: elf/dl-load.c:1396 msgid "cannot map zero-fill pages" msgstr "" -#: elf/dl-load.c:1409 +#: elf/dl-load.c:1410 msgid "object file has no dynamic section" msgstr "" -#: elf/dl-load.c:1432 +#: elf/dl-load.c:1433 msgid "shared object cannot be dlopen()ed" msgstr "" -#: elf/dl-load.c:1445 +#: elf/dl-load.c:1446 msgid "cannot allocate memory for program header" msgstr "" -#: elf/dl-load.c:1462 elf/dl-open.c:180 +#: elf/dl-load.c:1463 elf/dl-open.c:178 msgid "invalid caller" msgstr "" -#: elf/dl-load.c:1501 +#: elf/dl-load.c:1502 msgid "cannot enable executable stack as shared object requires" msgstr "" -#: elf/dl-load.c:1514 +#: elf/dl-load.c:1515 msgid "cannot close file descriptor" msgstr "" -#: elf/dl-load.c:1730 +#: elf/dl-load.c:1731 msgid "file too short" msgstr "" -#: elf/dl-load.c:1766 +#: elf/dl-load.c:1767 msgid "invalid ELF header" msgstr "" -#: elf/dl-load.c:1778 +#: elf/dl-load.c:1779 msgid "ELF file data encoding not big-endian" msgstr "" -#: elf/dl-load.c:1780 +#: elf/dl-load.c:1781 msgid "ELF file data encoding not little-endian" msgstr "" -#: elf/dl-load.c:1784 +#: elf/dl-load.c:1785 msgid "ELF file version ident does not match current one" msgstr "" -#: elf/dl-load.c:1788 +#: elf/dl-load.c:1789 msgid "ELF file OS ABI invalid" msgstr "" -#: elf/dl-load.c:1791 +#: elf/dl-load.c:1792 msgid "ELF file ABI version invalid" msgstr "" -#: elf/dl-load.c:1794 +#: elf/dl-load.c:1795 msgid "nonzero padding in e_ident" msgstr "" -#: elf/dl-load.c:1797 +#: elf/dl-load.c:1798 msgid "internal error" msgstr "" -#: elf/dl-load.c:1804 +#: elf/dl-load.c:1805 msgid "ELF file version does not match current one" msgstr "" -#: elf/dl-load.c:1812 +#: elf/dl-load.c:1813 msgid "only ET_DYN and ET_EXEC can be loaded" msgstr "" -#: elf/dl-load.c:1818 +#: elf/dl-load.c:1819 msgid "ELF file's phentsize not the expected size" msgstr "" -#: elf/dl-load.c:2332 +#: elf/dl-load.c:2336 msgid "wrong ELF class: ELFCLASS64" msgstr "" -#: elf/dl-load.c:2333 +#: elf/dl-load.c:2337 msgid "wrong ELF class: ELFCLASS32" msgstr "" -#: elf/dl-load.c:2336 +#: elf/dl-load.c:2340 msgid "cannot open shared object file" msgstr "" -#: elf/dl-lookup.c:757 +#: elf/dl-lookup.c:756 ports/sysdeps/mips/dl-lookup.c:773 msgid "relocation error" msgstr "" -#: elf/dl-lookup.c:785 +#: elf/dl-lookup.c:785 ports/sysdeps/mips/dl-lookup.c:802 msgid "symbol lookup error" msgstr "" -#: elf/dl-open.c:115 +#: elf/dl-open.c:108 msgid "cannot extend global scope" msgstr "" -#: elf/dl-open.c:440 +#: elf/dl-open.c:510 msgid "TLS generation counter wrapped! Please report this." msgstr "" -#: elf/dl-open.c:462 +#: elf/dl-open.c:532 msgid "cannot load any more object with static TLS" msgstr "" -#: elf/dl-open.c:511 +#: elf/dl-open.c:581 msgid "invalid mode for dlopen()" msgstr "" -#: elf/dl-open.c:528 +#: elf/dl-open.c:598 msgid "no more namespaces available for dlmopen()" msgstr "" -#: elf/dl-open.c:547 +#: elf/dl-open.c:616 msgid "invalid target namespace in dlmopen()" msgstr "" @@ -642,25 +644,25 @@ msgstr "" msgid "cannot allocate memory in static TLS block" msgstr "" -#: elf/dl-reloc.c:212 +#: elf/dl-reloc.c:213 msgid "cannot make segment writable for relocation" msgstr "" -#: elf/dl-reloc.c:275 +#: elf/dl-reloc.c:276 #, c-format msgid "%s: no PLTREL found in object %s\n" msgstr "" -#: elf/dl-reloc.c:286 +#: elf/dl-reloc.c:287 #, c-format msgid "%s: out of memory to store relocation results for %s\n" msgstr "" -#: elf/dl-reloc.c:302 +#: elf/dl-reloc.c:303 msgid "cannot restore segment prot after reloc" msgstr "" -#: elf/dl-reloc.c:331 +#: elf/dl-reloc.c:332 msgid "cannot apply additional memory protection after relocation" msgstr "" @@ -672,243 +674,243 @@ msgstr "" msgid "cannot create capability list" msgstr "" -#: elf/dl-tls.c:861 +#: elf/dl-tls.c:872 msgid "cannot create TLS data structures" msgstr "" -#: elf/dl-version.c:172 +#: elf/dl-version.c:171 msgid "version lookup error" msgstr "" -#: elf/dl-version.c:303 +#: elf/dl-version.c:302 msgid "cannot allocate version reference table" msgstr "" -#: elf/ldconfig.c:141 +#: elf/ldconfig.c:140 msgid "Print cache" msgstr "" -#: elf/ldconfig.c:142 +#: elf/ldconfig.c:141 msgid "Generate verbose messages" msgstr "" -#: elf/ldconfig.c:143 +#: elf/ldconfig.c:142 msgid "Don't build cache" msgstr "" -#: elf/ldconfig.c:144 +#: elf/ldconfig.c:143 msgid "Don't generate links" msgstr "" -#: elf/ldconfig.c:145 +#: elf/ldconfig.c:144 msgid "Change to and use ROOT as root directory" msgstr "" -#: elf/ldconfig.c:145 +#: elf/ldconfig.c:144 msgid "ROOT" msgstr "" -#: elf/ldconfig.c:146 +#: elf/ldconfig.c:145 msgid "CACHE" msgstr "" -#: elf/ldconfig.c:146 +#: elf/ldconfig.c:145 msgid "Use CACHE as cache file" msgstr "" -#: elf/ldconfig.c:147 +#: elf/ldconfig.c:146 msgid "CONF" msgstr "" -#: elf/ldconfig.c:147 +#: elf/ldconfig.c:146 msgid "Use CONF as configuration file" msgstr "" -#: elf/ldconfig.c:148 +#: elf/ldconfig.c:147 msgid "" "Only process directories specified on the command line. Don't build cache." msgstr "" -#: elf/ldconfig.c:149 +#: elf/ldconfig.c:148 msgid "Manually link individual libraries." msgstr "" -#: elf/ldconfig.c:150 +#: elf/ldconfig.c:149 msgid "FORMAT" msgstr "" -#: elf/ldconfig.c:150 +#: elf/ldconfig.c:149 msgid "Format to use: new, old or compat (default)" msgstr "" -#: elf/ldconfig.c:151 +#: elf/ldconfig.c:150 msgid "Ignore auxiliary cache file" msgstr "" -#: elf/ldconfig.c:159 +#: elf/ldconfig.c:158 msgid "Configure Dynamic Linker Run Time Bindings." msgstr "" -#: elf/ldconfig.c:339 +#: elf/ldconfig.c:338 #, c-format msgid "Path `%s' given more than once" msgstr "" -#: elf/ldconfig.c:379 +#: elf/ldconfig.c:378 #, c-format msgid "%s is not a known library type" msgstr "" -#: elf/ldconfig.c:407 +#: elf/ldconfig.c:406 #, c-format msgid "Can't stat %s" msgstr "" -#: elf/ldconfig.c:481 +#: elf/ldconfig.c:480 #, c-format msgid "Can't stat %s\n" msgstr "" -#: elf/ldconfig.c:491 +#: elf/ldconfig.c:490 #, c-format msgid "%s is not a symbolic link\n" msgstr "" -#: elf/ldconfig.c:510 +#: elf/ldconfig.c:509 #, c-format msgid "Can't unlink %s" msgstr "" -#: elf/ldconfig.c:516 +#: elf/ldconfig.c:515 #, c-format msgid "Can't link %s to %s" msgstr "" -#: elf/ldconfig.c:522 +#: elf/ldconfig.c:521 msgid " (changed)\n" msgstr "" -#: elf/ldconfig.c:524 +#: elf/ldconfig.c:523 msgid " (SKIPPED)\n" msgstr "" -#: elf/ldconfig.c:579 +#: elf/ldconfig.c:578 #, c-format msgid "Can't find %s" msgstr "" -#: elf/ldconfig.c:595 elf/ldconfig.c:768 elf/ldconfig.c:827 elf/ldconfig.c:861 +#: elf/ldconfig.c:594 elf/ldconfig.c:767 elf/ldconfig.c:826 elf/ldconfig.c:860 #, c-format msgid "Cannot lstat %s" msgstr "" -#: elf/ldconfig.c:602 +#: elf/ldconfig.c:601 #, c-format msgid "Ignored file %s since it is not a regular file." msgstr "" -#: elf/ldconfig.c:611 +#: elf/ldconfig.c:610 #, c-format msgid "No link created since soname could not be found for %s" msgstr "" -#: elf/ldconfig.c:694 +#: elf/ldconfig.c:693 #, c-format msgid "Can't open directory %s" msgstr "" -#: elf/ldconfig.c:786 elf/ldconfig.c:848 elf/readlib.c:91 +#: elf/ldconfig.c:785 elf/ldconfig.c:847 elf/readlib.c:90 #, c-format msgid "Input file %s not found.\n" msgstr "" -#: elf/ldconfig.c:793 +#: elf/ldconfig.c:792 #, c-format msgid "Cannot stat %s" msgstr "" -#: elf/ldconfig.c:922 +#: elf/ldconfig.c:921 #, c-format msgid "libc5 library %s in wrong directory" msgstr "" -#: elf/ldconfig.c:925 +#: elf/ldconfig.c:924 #, c-format msgid "libc6 library %s in wrong directory" msgstr "" -#: elf/ldconfig.c:928 +#: elf/ldconfig.c:927 #, c-format msgid "libc4 library %s in wrong directory" msgstr "" -#: elf/ldconfig.c:956 +#: elf/ldconfig.c:955 #, c-format msgid "" "libraries %s and %s in directory %s have same soname but different type." msgstr "" -#: elf/ldconfig.c:1065 +#: elf/ldconfig.c:1064 #, c-format -msgid "Can't open configuration file %s" +msgid "Warning: ignoring configuration file that cannot be opened: %s" msgstr "" -#: elf/ldconfig.c:1129 +#: elf/ldconfig.c:1130 #, c-format msgid "%s:%u: bad syntax in hwcap line" msgstr "" -#: elf/ldconfig.c:1135 +#: elf/ldconfig.c:1136 #, c-format msgid "%s:%u: hwcap index %lu above maximum %u" msgstr "" -#: elf/ldconfig.c:1142 elf/ldconfig.c:1150 +#: elf/ldconfig.c:1143 elf/ldconfig.c:1151 #, c-format msgid "%s:%u: hwcap index %lu already defined as %s" msgstr "" -#: elf/ldconfig.c:1153 +#: elf/ldconfig.c:1154 #, c-format msgid "%s:%u: duplicate hwcap %lu %s" msgstr "" -#: elf/ldconfig.c:1175 +#: elf/ldconfig.c:1176 #, c-format msgid "need absolute file name for configuration file when using -r" msgstr "" -#: elf/ldconfig.c:1182 locale/programs/xmalloc.c:70 malloc/obstack.c:434 -#: malloc/obstack.c:436 posix/getconf.c:1077 posix/getconf.c:1297 +#: elf/ldconfig.c:1183 locale/programs/xmalloc.c:65 malloc/obstack.c:433 +#: malloc/obstack.c:435 posix/getconf.c:1076 posix/getconf.c:1296 #, c-format msgid "memory exhausted" msgstr "" -#: elf/ldconfig.c:1214 +#: elf/ldconfig.c:1215 #, c-format msgid "%s:%u: cannot read directory %s" msgstr "" -#: elf/ldconfig.c:1258 +#: elf/ldconfig.c:1259 #, c-format msgid "relative path `%s' used to build cache" msgstr "" -#: elf/ldconfig.c:1284 +#: elf/ldconfig.c:1285 #, c-format msgid "Can't chdir to /" msgstr "" -#: elf/ldconfig.c:1325 +#: elf/ldconfig.c:1326 #, c-format msgid "Can't open cache file directory %s\n" msgstr "" -#: elf/ldd.bash.in:43 +#: elf/ldd.bash.in:42 msgid "Written by %s and %s.\n" msgstr "" -#: elf/ldd.bash.in:48 +#: elf/ldd.bash.in:47 msgid "" "Usage: ldd [OPTION]... FILE...\n" " --help print this help and exit\n" @@ -919,156 +921,245 @@ msgid "" " -v, --verbose print all information\n" msgstr "" -#: elf/ldd.bash.in:82 +#: elf/ldd.bash.in:81 msgid "ldd: option \\`$1' is ambiguous" msgstr "" -#: elf/ldd.bash.in:89 +#: elf/ldd.bash.in:88 msgid "unrecognized option" msgstr "" -#: elf/ldd.bash.in:90 elf/ldd.bash.in:128 +#: elf/ldd.bash.in:89 elf/ldd.bash.in:127 msgid "Try \\`ldd --help' for more information." msgstr "" -#: elf/ldd.bash.in:127 +#: elf/ldd.bash.in:126 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:150 sysdeps/gnu/errlist.c:36 +#: elf/ldd.bash.in:149 sysdeps/gnu/errlist.c:36 msgid "No such file or directory" msgstr "" -#: elf/ldd.bash.in:153 inet/rcmd.c:488 +#: elf/ldd.bash.in:152 inet/rcmd.c:488 msgid "not regular file" msgstr "" -#: elf/ldd.bash.in:156 +#: elf/ldd.bash.in:155 msgid "warning: you do not have execution permission for" msgstr "" -#: elf/ldd.bash.in:185 +#: elf/ldd.bash.in:184 msgid "\tnot a dynamic executable" msgstr "" -#: elf/ldd.bash.in:193 +#: elf/ldd.bash.in:192 msgid "exited with unknown exit code" msgstr "" -#: elf/ldd.bash.in:198 +#: elf/ldd.bash.in:197 msgid "error: you do not have read permission for" msgstr "" -#: elf/readelflib.c:35 +#: elf/pldd-xx.c:105 +#, c-format +msgid "cannot find program header of process" +msgstr "" + +#: elf/pldd-xx.c:110 +#, c-format +msgid "cannot read program header" +msgstr "" + +#: elf/pldd-xx.c:135 +#, c-format +msgid "cannot read dynamic section" +msgstr "" + +#: elf/pldd-xx.c:147 +#, c-format +msgid "cannot read r_debug" +msgstr "" + +#: elf/pldd-xx.c:167 +#, c-format +msgid "cannot read program interpreter" +msgstr "" + +#: elf/pldd-xx.c:196 +#, c-format +msgid "cannot read link map" +msgstr "" + +#: elf/pldd-xx.c:207 +#, c-format +msgid "cannot read object name" +msgstr "" + +#: elf/pldd.c:67 +msgid "List dynamic shared objects loaded into process." +msgstr "" + +#: elf/pldd.c:71 +msgid "PID" +msgstr "" + +#: elf/pldd.c:102 +#, c-format +msgid "Exactly one parameter with process ID required.\n" +msgstr "" + +#: elf/pldd.c:114 +#, c-format +msgid "invalid process ID '%s'" +msgstr "" + +#: elf/pldd.c:122 +#, c-format +msgid "cannot open %s" +msgstr "" + +#: elf/pldd.c:147 +#, c-format +msgid "cannot open %s/task" +msgstr "" + +#: elf/pldd.c:150 +#, c-format +msgid "cannot prepare reading %s/task" +msgstr "" + +#: elf/pldd.c:163 +#, c-format +msgid "invalid thread ID '%s'" +msgstr "" + +#: elf/pldd.c:174 +#, c-format +msgid "cannot attach to process %lu" +msgstr "" + +#: elf/pldd.c:246 +#, c-format +msgid "cannot get information about process %lu" +msgstr "" + +#: elf/pldd.c:259 +#, c-format +msgid "process %lu is no ELF program" +msgstr "" + +#: elf/readelflib.c:34 #, c-format msgid "file %s is truncated\n" msgstr "" -#: elf/readelflib.c:67 +#: elf/readelflib.c:66 #, c-format msgid "%s is a 32 bit ELF file.\n" msgstr "" -#: elf/readelflib.c:69 +#: elf/readelflib.c:68 #, c-format msgid "%s is a 64 bit ELF file.\n" msgstr "" -#: elf/readelflib.c:71 +#: elf/readelflib.c:70 #, c-format msgid "Unknown ELFCLASS in file %s.\n" msgstr "" -#: elf/readelflib.c:78 +#: elf/readelflib.c:77 #, c-format msgid "%s is not a shared object file (Type: %d).\n" msgstr "" -#: elf/readelflib.c:109 +#: elf/readelflib.c:108 #, c-format msgid "more than one dynamic segment\n" msgstr "" -#: elf/readlib.c:97 +#: elf/readlib.c:96 #, c-format msgid "Cannot fstat file %s.\n" msgstr "" -#: elf/readlib.c:108 +#: elf/readlib.c:107 #, c-format msgid "File %s is empty, not checked." msgstr "" -#: elf/readlib.c:114 +#: elf/readlib.c:113 #, c-format msgid "File %s is too small, not checked." msgstr "" -#: elf/readlib.c:124 +#: elf/readlib.c:123 #, c-format msgid "Cannot mmap file %s.\n" msgstr "" -#: elf/readlib.c:162 +#: elf/readlib.c:161 #, c-format msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n" msgstr "" -#: elf/sln.c:85 +#: elf/sln.c:84 #, c-format msgid "" "Usage: sln src dest|file\n" "\n" msgstr "" -#: elf/sln.c:110 +#: elf/sln.c:109 #, c-format msgid "%s: file open error: %m\n" msgstr "" -#: elf/sln.c:147 +#: elf/sln.c:146 #, c-format msgid "No target in line %d\n" msgstr "" -#: elf/sln.c:179 +#: elf/sln.c:178 #, c-format msgid "%s: destination must not be a directory\n" msgstr "" -#: elf/sln.c:185 +#: elf/sln.c:184 #, c-format msgid "%s: failed to remove the old destination\n" msgstr "" -#: elf/sln.c:193 +#: elf/sln.c:192 #, c-format msgid "%s: invalid destination: %s\n" msgstr "" -#: elf/sln.c:208 elf/sln.c:217 +#: elf/sln.c:207 elf/sln.c:216 #, c-format msgid "Invalid link from \"%s\" to \"%s\": %s\n" msgstr "" -#: elf/sotruss.ksh:33 +#: elf/sotruss.ksh:32 #, sh-format msgid "" "Usage: sotruss [OPTION...] [--] EXECUTABLE [EXECUTABLE-OPTION...]\n" -" -F, --from FROMLIST trace calls from objects on FORMLIST\n" -" -T, --to TOLIST trace calls to objects on TOLIST\n" +" -F, --from FROMLIST Trace calls from objects on FROMLIST\n" +" -T, --to TOLIST Trace calls to objects on TOLIST\n" "\n" -" -e, --exit also show exits from the function calls\n" -" -f, --follow trace child processes\n" -" -o, --output FILENAME write output to FILENAME (or FILENAME.$PID in " +" -e, --exit Also show exits from the function calls\n" +" -f, --follow Trace child processes\n" +" -o, --output FILENAME Write output to FILENAME (or FILENAME.$PID in " "case\n" "\t\t\t -f is also used) instead of standard error\n" "\n" -" --help print this help and exit\n" -" --version print version information and exit" +" -?, --help Give this help list\n" +" --usage Give a short usage message\n" +" --version Print program version" msgstr "" #: elf/sotruss.ksh:46 @@ -1081,10 +1172,6 @@ msgstr "" msgid "%s: option requires an argument -- '%s'\\n" msgstr "" -#: elf/sotruss.ksh:57 elf/sotruss.ksh:68 elf/sotruss.ksh:134 -msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n" -msgstr "" - #: elf/sotruss.ksh:62 msgid "%s: option is ambiguous; possibilities:" msgstr "" @@ -1096,257 +1183,259 @@ msgstr "" #: elf/sotruss.ksh:87 msgid "" "Usage: %s [-ef] [-F FROMLIST] [-o FILENAME] [-T TOLIST] [--exit]\n" -"\t [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]\\n" +"\t [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]\n" +"\t [--help] [--usage] [--version] [--]\n" +"\t EXECUTABLE [EXECUTABLE-OPTION...]\\n" msgstr "" -#: elf/sotruss.ksh:133 +#: elf/sotruss.ksh:135 msgid "%s: unrecognized option '%c%s'\\n" msgstr "" -#: elf/sprof.c:77 +#: elf/sprof.c:76 msgid "Output selection:" msgstr "" -#: elf/sprof.c:79 +#: elf/sprof.c:78 msgid "print list of count paths and their number of use" msgstr "" -#: elf/sprof.c:81 +#: elf/sprof.c:80 msgid "generate flat profile with counts and ticks" msgstr "" -#: elf/sprof.c:82 +#: elf/sprof.c:81 msgid "generate call graph" msgstr "" -#: elf/sprof.c:89 +#: elf/sprof.c:88 msgid "Read and display shared object profiling data." msgstr "" -#: elf/sprof.c:94 +#: elf/sprof.c:93 msgid "SHOBJ [PROFDATA]" msgstr "" -#: elf/sprof.c:431 +#: elf/sprof.c:429 #, c-format msgid "failed to load shared object `%s'" msgstr "" -#: elf/sprof.c:440 +#: elf/sprof.c:438 #, c-format msgid "cannot create internal descriptors" msgstr "" -#: elf/sprof.c:559 +#: elf/sprof.c:550 #, c-format msgid "Reopening shared object `%s' failed" msgstr "" -#: elf/sprof.c:566 elf/sprof.c:660 +#: elf/sprof.c:557 elf/sprof.c:652 #, c-format msgid "reading of section headers failed" msgstr "" -#: elf/sprof.c:574 elf/sprof.c:668 +#: elf/sprof.c:565 elf/sprof.c:660 #, c-format msgid "reading of section header string table failed" msgstr "" -#: elf/sprof.c:600 +#: elf/sprof.c:591 #, c-format msgid "*** Cannot read debuginfo file name: %m\n" msgstr "" -#: elf/sprof.c:620 +#: elf/sprof.c:612 #, c-format msgid "cannot determine file name" msgstr "" -#: elf/sprof.c:653 +#: elf/sprof.c:645 #, c-format msgid "reading of ELF header failed" msgstr "" -#: elf/sprof.c:689 +#: elf/sprof.c:681 #, c-format msgid "*** The file `%s' is stripped: no detailed analysis possible\n" msgstr "" -#: elf/sprof.c:719 +#: elf/sprof.c:711 #, c-format msgid "failed to load symbol data" msgstr "" -#: elf/sprof.c:784 +#: elf/sprof.c:776 #, c-format msgid "cannot load profiling data" msgstr "" -#: elf/sprof.c:793 +#: elf/sprof.c:785 #, c-format msgid "while stat'ing profiling data file" msgstr "" -#: elf/sprof.c:801 +#: elf/sprof.c:793 #, c-format msgid "profiling data file `%s' does not match shared object `%s'" msgstr "" -#: elf/sprof.c:812 +#: elf/sprof.c:804 #, c-format msgid "failed to mmap the profiling data file" msgstr "" -#: elf/sprof.c:820 +#: elf/sprof.c:812 #, c-format msgid "error while closing the profiling data file" msgstr "" -#: elf/sprof.c:829 elf/sprof.c:927 +#: elf/sprof.c:821 elf/sprof.c:919 #, c-format msgid "cannot create internal descriptor" msgstr "" -#: elf/sprof.c:903 +#: elf/sprof.c:895 #, c-format msgid "`%s' is no correct profile data file for `%s'" msgstr "" -#: elf/sprof.c:1084 elf/sprof.c:1142 +#: elf/sprof.c:1076 elf/sprof.c:1134 #, c-format msgid "cannot allocate symbol data" msgstr "" -#: iconv/iconv_charmap.c:142 iconv/iconv_prog.c:446 +#: iconv/iconv_charmap.c:143 iconv/iconv_prog.c:445 #, c-format msgid "cannot open output file" msgstr "" -#: iconv/iconv_charmap.c:188 iconv/iconv_prog.c:312 +#: iconv/iconv_charmap.c:189 iconv/iconv_prog.c:311 #, c-format msgid "error while closing input `%s'" msgstr "" -#: iconv/iconv_charmap.c:462 +#: iconv/iconv_charmap.c:463 #, c-format msgid "illegal input sequence at position %Zd" msgstr "" -#: iconv/iconv_charmap.c:481 iconv/iconv_prog.c:537 +#: iconv/iconv_charmap.c:482 iconv/iconv_prog.c:536 #, c-format msgid "incomplete character or shift sequence at end of buffer" msgstr "" -#: iconv/iconv_charmap.c:526 iconv/iconv_charmap.c:562 iconv/iconv_prog.c:580 -#: iconv/iconv_prog.c:616 +#: iconv/iconv_charmap.c:527 iconv/iconv_charmap.c:563 iconv/iconv_prog.c:579 +#: iconv/iconv_prog.c:615 #, c-format msgid "error while reading the input" msgstr "" -#: iconv/iconv_charmap.c:544 iconv/iconv_prog.c:598 +#: iconv/iconv_charmap.c:545 iconv/iconv_prog.c:597 #, c-format msgid "unable to allocate buffer for input" msgstr "" -#: iconv/iconv_prog.c:60 +#: iconv/iconv_prog.c:59 msgid "Input/Output format specification:" msgstr "" -#: iconv/iconv_prog.c:61 +#: iconv/iconv_prog.c:60 msgid "encoding of original text" msgstr "" -#: iconv/iconv_prog.c:62 +#: iconv/iconv_prog.c:61 msgid "encoding for output" msgstr "" -#: iconv/iconv_prog.c:63 +#: iconv/iconv_prog.c:62 msgid "Information:" msgstr "" -#: iconv/iconv_prog.c:64 +#: iconv/iconv_prog.c:63 msgid "list all known coded character sets" msgstr "" -#: iconv/iconv_prog.c:65 locale/programs/localedef.c:127 +#: iconv/iconv_prog.c:64 locale/programs/localedef.c:126 msgid "Output control:" msgstr "" -#: iconv/iconv_prog.c:66 +#: iconv/iconv_prog.c:65 msgid "omit invalid characters from output" msgstr "" -#: iconv/iconv_prog.c:67 +#: iconv/iconv_prog.c:66 msgid "output file" msgstr "" -#: iconv/iconv_prog.c:68 +#: iconv/iconv_prog.c:67 msgid "suppress warnings" msgstr "" -#: iconv/iconv_prog.c:69 +#: iconv/iconv_prog.c:68 msgid "print progress information" msgstr "" -#: iconv/iconv_prog.c:74 +#: iconv/iconv_prog.c:73 msgid "Convert encoding of given files from one encoding to another." msgstr "" -#: iconv/iconv_prog.c:78 +#: iconv/iconv_prog.c:77 msgid "[FILE...]" msgstr "" -#: iconv/iconv_prog.c:234 +#: iconv/iconv_prog.c:233 #, c-format msgid "conversions from `%s' and to `%s' are not supported" msgstr "" -#: iconv/iconv_prog.c:239 +#: iconv/iconv_prog.c:238 #, c-format msgid "conversion from `%s' is not supported" msgstr "" -#: iconv/iconv_prog.c:246 +#: iconv/iconv_prog.c:245 #, c-format msgid "conversion to `%s' is not supported" msgstr "" -#: iconv/iconv_prog.c:250 +#: iconv/iconv_prog.c:249 #, c-format msgid "conversion from `%s' to `%s' is not supported" msgstr "" -#: iconv/iconv_prog.c:260 +#: iconv/iconv_prog.c:259 #, c-format msgid "failed to start conversion processing" msgstr "" -#: iconv/iconv_prog.c:358 +#: iconv/iconv_prog.c:357 #, c-format msgid "error while closing output file" msgstr "" -#: iconv/iconv_prog.c:456 +#: iconv/iconv_prog.c:455 #, c-format msgid "conversion stopped due to problem in writing the output" msgstr "" -#: iconv/iconv_prog.c:533 +#: iconv/iconv_prog.c:532 #, c-format msgid "illegal input sequence at position %ld" msgstr "" -#: iconv/iconv_prog.c:541 +#: iconv/iconv_prog.c:540 #, c-format msgid "internal error (illegal descriptor)" msgstr "" -#: iconv/iconv_prog.c:544 +#: iconv/iconv_prog.c:543 #, c-format msgid "unknown iconv() error %d" msgstr "" -#: iconv/iconv_prog.c:790 +#: iconv/iconv_prog.c:788 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" @@ -1356,44 +1445,44 @@ msgid "" " " msgstr "" -#: iconv/iconvconfig.c:110 +#: iconv/iconvconfig.c:109 msgid "Create fastloading iconv module configuration file." msgstr "" -#: iconv/iconvconfig.c:114 +#: iconv/iconvconfig.c:113 msgid "[DIR...]" msgstr "" -#: iconv/iconvconfig.c:127 +#: iconv/iconvconfig.c:126 msgid "Prefix used for all file accesses" msgstr "" -#: iconv/iconvconfig.c:128 +#: iconv/iconvconfig.c:127 msgid "" "Put output in FILE instead of installed location (--prefix does not apply to " "FILE)" msgstr "" -#: iconv/iconvconfig.c:132 +#: iconv/iconvconfig.c:131 msgid "Do not search standard directories, only those on the command line" msgstr "" -#: iconv/iconvconfig.c:301 +#: iconv/iconvconfig.c:303 #, c-format msgid "Directory arguments required when using --nostdlib" msgstr "" -#: iconv/iconvconfig.c:343 locale/programs/localedef.c:291 +#: iconv/iconvconfig.c:345 locale/programs/localedef.c:287 #, c-format msgid "no output file produced because warnings were issued" msgstr "" -#: iconv/iconvconfig.c:429 +#: iconv/iconvconfig.c:431 #, c-format msgid "while inserting in search tree" msgstr "" -#: iconv/iconvconfig.c:1238 +#: iconv/iconvconfig.c:1240 #, c-format msgid "cannot generate output file" msgstr "" @@ -1480,967 +1569,967 @@ msgstr "" msgid "Unknown .netrc keyword %s" msgstr "" -#: libidn/nfkc.c:464 +#: libidn/nfkc.c:462 msgid "Character out of range for UTF-8" msgstr "" -#: locale/programs/charmap-dir.c:59 +#: locale/programs/charmap-dir.c:58 #, c-format msgid "cannot read character map directory `%s'" msgstr "" -#: locale/programs/charmap.c:138 +#: locale/programs/charmap.c:137 #, c-format msgid "character map file `%s' not found" msgstr "" -#: locale/programs/charmap.c:195 +#: locale/programs/charmap.c:194 #, c-format msgid "default character map file `%s' not found" msgstr "" -#: locale/programs/charmap.c:258 +#: locale/programs/charmap.c:257 #, c-format msgid "" "character map `%s' is not ASCII compatible, locale not ISO C compliant\n" msgstr "" -#: locale/programs/charmap.c:337 +#: locale/programs/charmap.c:336 #, c-format msgid "%s: must be greater than \n" msgstr "" -#: locale/programs/charmap.c:357 locale/programs/charmap.c:374 -#: locale/programs/repertoire.c:174 +#: locale/programs/charmap.c:356 locale/programs/charmap.c:373 +#: locale/programs/repertoire.c:173 #, c-format msgid "syntax error in prolog: %s" msgstr "" -#: locale/programs/charmap.c:358 +#: locale/programs/charmap.c:357 msgid "invalid definition" msgstr "" -#: locale/programs/charmap.c:375 locale/programs/locfile.c:126 -#: locale/programs/locfile.c:153 locale/programs/repertoire.c:175 +#: locale/programs/charmap.c:374 locale/programs/locfile.c:125 +#: locale/programs/locfile.c:152 locale/programs/repertoire.c:174 msgid "bad argument" msgstr "" -#: locale/programs/charmap.c:403 +#: locale/programs/charmap.c:402 #, c-format msgid "duplicate definition of <%s>" msgstr "" -#: locale/programs/charmap.c:410 +#: locale/programs/charmap.c:409 #, c-format msgid "value for <%s> must be 1 or greater" msgstr "" -#: locale/programs/charmap.c:422 +#: locale/programs/charmap.c:421 #, c-format msgid "value of <%s> must be greater or equal than the value of <%s>" msgstr "" -#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183 +#: locale/programs/charmap.c:444 locale/programs/repertoire.c:182 #, c-format msgid "argument to <%s> must be a single character" msgstr "" -#: locale/programs/charmap.c:471 +#: locale/programs/charmap.c:470 msgid "character sets with locking states are not supported" msgstr "" -#: 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 +#: 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 #, c-format msgid "syntax error in %s definition: %s" msgstr "" -#: locale/programs/charmap.c:499 locale/programs/charmap.c:679 -#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230 +#: locale/programs/charmap.c:498 locale/programs/charmap.c:678 +#: locale/programs/charmap.c:774 locale/programs/repertoire.c:229 msgid "no symbolic name given" msgstr "" -#: locale/programs/charmap.c:553 +#: locale/programs/charmap.c:552 msgid "invalid encoding given" msgstr "" -#: locale/programs/charmap.c:562 +#: locale/programs/charmap.c:561 msgid "too few bytes in character encoding" msgstr "" -#: locale/programs/charmap.c:564 +#: locale/programs/charmap.c:563 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:296 +#: locale/programs/charmap.c:585 locale/programs/charmap.c:733 +#: locale/programs/charmap.c:816 locale/programs/repertoire.c:295 msgid "no symbolic name given for end of range" msgstr "" -#: locale/programs/charmap.c:610 locale/programs/ld-address.c:602 -#: locale/programs/ld-collate.c:2769 locale/programs/ld-collate.c:3927 -#: locale/programs/ld-ctype.c:2257 locale/programs/ld-ctype.c:3009 -#: 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 +#: locale/programs/charmap.c:609 locale/programs/ld-address.c:601 +#: locale/programs/ld-collate.c:2766 locale/programs/ld-collate.c:3924 +#: locale/programs/ld-ctype.c:2255 locale/programs/ld-ctype.c:3006 +#: locale/programs/ld-identification.c:451 +#: locale/programs/ld-measurement.c:237 locale/programs/ld-messages.c:331 +#: locale/programs/ld-monetary.c:942 locale/programs/ld-name.c:306 +#: locale/programs/ld-numeric.c:367 locale/programs/ld-paper.c:240 +#: locale/programs/ld-telephone.c:312 locale/programs/ld-time.c:1220 +#: locale/programs/repertoire.c:312 #, c-format msgid "%1$s: definition does not end with `END %1$s'" msgstr "" -#: locale/programs/charmap.c:643 +#: locale/programs/charmap.c:642 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition" msgstr "" -#: locale/programs/charmap.c:651 locale/programs/charmap.c:714 +#: locale/programs/charmap.c:650 locale/programs/charmap.c:713 #, c-format msgid "value for %s must be an integer" msgstr "" -#: locale/programs/charmap.c:842 +#: locale/programs/charmap.c:841 #, c-format msgid "%s: error in state machine" msgstr "" -#: locale/programs/charmap.c:850 locale/programs/ld-address.c:618 -#: locale/programs/ld-collate.c:2766 locale/programs/ld-collate.c:4120 -#: locale/programs/ld-ctype.c:2254 locale/programs/ld-ctype.c:3026 -#: 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 +#: locale/programs/charmap.c:849 locale/programs/ld-address.c:617 +#: locale/programs/ld-collate.c:2763 locale/programs/ld-collate.c:4117 +#: locale/programs/ld-ctype.c:2252 locale/programs/ld-ctype.c:3023 +#: locale/programs/ld-identification.c:467 +#: locale/programs/ld-measurement.c:253 locale/programs/ld-messages.c:347 +#: locale/programs/ld-monetary.c:958 locale/programs/ld-name.c:322 +#: locale/programs/ld-numeric.c:383 locale/programs/ld-paper.c:256 +#: locale/programs/ld-telephone.c:328 locale/programs/ld-time.c:1236 +#: locale/programs/locfile.c:825 locale/programs/repertoire.c:323 #, c-format msgid "%s: premature end of file" msgstr "" -#: locale/programs/charmap.c:869 locale/programs/charmap.c:880 +#: locale/programs/charmap.c:868 locale/programs/charmap.c:879 #, c-format msgid "unknown character `%s'" msgstr "" -#: locale/programs/charmap.c:888 +#: locale/programs/charmap.c:887 #, c-format msgid "" "number of bytes for byte sequence of beginning and end of range not the " "same: %d vs %d" msgstr "" -#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3046 -#: locale/programs/repertoire.c:419 +#: locale/programs/charmap.c:992 locale/programs/ld-collate.c:3043 +#: locale/programs/repertoire.c:418 msgid "invalid names for character range" msgstr "" -#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431 +#: locale/programs/charmap.c:1004 locale/programs/repertoire.c:430 msgid "hexadecimal range format should use only capital characters" msgstr "" -#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449 +#: locale/programs/charmap.c:1022 locale/programs/repertoire.c:448 #, c-format msgid "<%s> and <%s> are invalid names for range" msgstr "" -#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456 +#: locale/programs/charmap.c:1028 locale/programs/repertoire.c:455 msgid "upper limit in range is smaller than lower limit" msgstr "" -#: locale/programs/charmap.c:1087 +#: locale/programs/charmap.c:1086 msgid "resulting bytes for range not representable." msgstr "" -#: locale/programs/ld-address.c:135 locale/programs/ld-collate.c:1558 -#: locale/programs/ld-ctype.c:421 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 +#: locale/programs/ld-address.c:134 locale/programs/ld-collate.c:1557 +#: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:132 +#: locale/programs/ld-measurement.c:93 locale/programs/ld-messages.c:96 +#: locale/programs/ld-monetary.c:193 locale/programs/ld-name.c:93 +#: locale/programs/ld-numeric.c:97 locale/programs/ld-paper.c:90 +#: locale/programs/ld-telephone.c:93 locale/programs/ld-time.c:158 #, c-format msgid "No definition for %s category found" msgstr "" -#: locale/programs/ld-address.c:146 locale/programs/ld-address.c:184 -#: locale/programs/ld-address.c:202 locale/programs/ld-address.c:231 -#: locale/programs/ld-address.c:303 locale/programs/ld-address.c:322 -#: locale/programs/ld-address.c:335 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: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 +#: locale/programs/ld-address.c:145 locale/programs/ld-address.c:183 +#: locale/programs/ld-address.c:201 locale/programs/ld-address.c:230 +#: locale/programs/ld-address.c:302 locale/programs/ld-address.c:321 +#: locale/programs/ld-address.c:334 locale/programs/ld-identification.c:145 +#: locale/programs/ld-measurement.c:104 locale/programs/ld-monetary.c:205 +#: locale/programs/ld-monetary.c:249 locale/programs/ld-monetary.c:265 +#: locale/programs/ld-monetary.c:277 locale/programs/ld-name.c:104 +#: locale/programs/ld-name.c:141 locale/programs/ld-numeric.c:111 +#: locale/programs/ld-numeric.c:125 locale/programs/ld-paper.c:101 +#: locale/programs/ld-paper.c:110 locale/programs/ld-telephone.c:104 +#: locale/programs/ld-telephone.c:161 locale/programs/ld-time.c:174 +#: locale/programs/ld-time.c:195 #, c-format msgid "%s: field `%s' not defined" msgstr "" -#: locale/programs/ld-address.c:158 locale/programs/ld-address.c:210 -#: locale/programs/ld-address.c:240 locale/programs/ld-address.c:278 -#: locale/programs/ld-name.c:117 locale/programs/ld-telephone.c:117 +#: locale/programs/ld-address.c:157 locale/programs/ld-address.c:209 +#: locale/programs/ld-address.c:239 locale/programs/ld-address.c:277 +#: locale/programs/ld-name.c:116 locale/programs/ld-telephone.c:116 #, c-format msgid "%s: field `%s' must not be empty" msgstr "" -#: locale/programs/ld-address.c:170 +#: locale/programs/ld-address.c:169 #, c-format msgid "%s: invalid escape `%%%c' sequence in field `%s'" msgstr "" -#: locale/programs/ld-address.c:221 +#: locale/programs/ld-address.c:220 #, c-format msgid "%s: terminology language code `%s' not defined" msgstr "" -#: locale/programs/ld-address.c:246 +#: locale/programs/ld-address.c:245 #, c-format msgid "%s: field `%s' must not be defined" msgstr "" -#: locale/programs/ld-address.c:260 locale/programs/ld-address.c:289 +#: locale/programs/ld-address.c:259 locale/programs/ld-address.c:288 #, c-format msgid "%s: language abbreviation `%s' not defined" msgstr "" -#: locale/programs/ld-address.c:267 locale/programs/ld-address.c:295 -#: locale/programs/ld-address.c:329 locale/programs/ld-address.c:341 +#: locale/programs/ld-address.c:266 locale/programs/ld-address.c:294 +#: locale/programs/ld-address.c:328 locale/programs/ld-address.c:340 #, c-format msgid "%s: `%s' value does not match `%s' value" msgstr "" -#: locale/programs/ld-address.c:314 +#: locale/programs/ld-address.c:313 #, c-format msgid "%s: numeric country code `%d' not valid" msgstr "" -#: locale/programs/ld-address.c:510 locale/programs/ld-address.c:547 -#: locale/programs/ld-address.c:585 locale/programs/ld-ctype.c:2633 -#: 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 +#: locale/programs/ld-address.c:509 locale/programs/ld-address.c:546 +#: locale/programs/ld-address.c:584 locale/programs/ld-ctype.c:2630 +#: locale/programs/ld-identification.c:363 +#: locale/programs/ld-measurement.c:220 locale/programs/ld-messages.c:300 +#: locale/programs/ld-monetary.c:700 locale/programs/ld-monetary.c:735 +#: locale/programs/ld-monetary.c:776 locale/programs/ld-name.c:279 +#: locale/programs/ld-numeric.c:262 locale/programs/ld-paper.c:223 +#: locale/programs/ld-telephone.c:287 locale/programs/ld-time.c:1125 +#: locale/programs/ld-time.c:1167 #, c-format msgid "%s: field `%s' declared more than once" msgstr "" -#: locale/programs/ld-address.c:514 locale/programs/ld-address.c:552 -#: 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 +#: locale/programs/ld-address.c:513 locale/programs/ld-address.c:551 +#: locale/programs/ld-identification.c:367 locale/programs/ld-messages.c:310 +#: locale/programs/ld-monetary.c:704 locale/programs/ld-monetary.c:739 +#: locale/programs/ld-name.c:283 locale/programs/ld-numeric.c:266 +#: locale/programs/ld-telephone.c:291 locale/programs/ld-time.c:1019 +#: locale/programs/ld-time.c:1088 locale/programs/ld-time.c:1130 #, c-format msgid "%s: unknown character in field `%s'" msgstr "" -#: locale/programs/ld-address.c:599 locale/programs/ld-collate.c:3925 -#: locale/programs/ld-ctype.c:3006 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 +#: locale/programs/ld-address.c:598 locale/programs/ld-collate.c:3922 +#: locale/programs/ld-ctype.c:3003 locale/programs/ld-identification.c:448 +#: locale/programs/ld-measurement.c:234 locale/programs/ld-messages.c:329 +#: locale/programs/ld-monetary.c:940 locale/programs/ld-name.c:304 +#: locale/programs/ld-numeric.c:365 locale/programs/ld-paper.c:238 +#: locale/programs/ld-telephone.c:310 locale/programs/ld-time.c:1218 #, c-format msgid "%s: incomplete `END' line" msgstr "" -#: locale/programs/ld-address.c:609 locale/programs/ld-collate.c:544 -#: locale/programs/ld-collate.c:596 locale/programs/ld-collate.c:892 -#: locale/programs/ld-collate.c:905 locale/programs/ld-collate.c:2735 -#: locale/programs/ld-collate.c:2756 locale/programs/ld-collate.c:4110 -#: locale/programs/ld-ctype.c:1985 locale/programs/ld-ctype.c:2244 -#: locale/programs/ld-ctype.c:2831 locale/programs/ld-ctype.c:3017 -#: 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 +#: locale/programs/ld-address.c:608 locale/programs/ld-collate.c:543 +#: locale/programs/ld-collate.c:595 locale/programs/ld-collate.c:891 +#: locale/programs/ld-collate.c:904 locale/programs/ld-collate.c:2732 +#: locale/programs/ld-collate.c:2753 locale/programs/ld-collate.c:4107 +#: locale/programs/ld-ctype.c:1984 locale/programs/ld-ctype.c:2242 +#: locale/programs/ld-ctype.c:2828 locale/programs/ld-ctype.c:3014 +#: locale/programs/ld-identification.c:458 +#: locale/programs/ld-measurement.c:244 locale/programs/ld-messages.c:338 +#: locale/programs/ld-monetary.c:949 locale/programs/ld-name.c:313 +#: locale/programs/ld-numeric.c:374 locale/programs/ld-paper.c:247 +#: locale/programs/ld-telephone.c:319 locale/programs/ld-time.c:1227 #, c-format msgid "%s: syntax error" msgstr "" -#: locale/programs/ld-collate.c:419 +#: locale/programs/ld-collate.c:418 #, c-format msgid "`%.*s' already defined in charmap" msgstr "" -#: locale/programs/ld-collate.c:428 +#: locale/programs/ld-collate.c:427 #, c-format msgid "`%.*s' already defined in repertoire" msgstr "" -#: locale/programs/ld-collate.c:435 +#: locale/programs/ld-collate.c:434 #, c-format msgid "`%.*s' already defined as collating symbol" msgstr "" -#: locale/programs/ld-collate.c:442 +#: locale/programs/ld-collate.c:441 #, c-format msgid "`%.*s' already defined as collating element" msgstr "" -#: locale/programs/ld-collate.c:473 locale/programs/ld-collate.c:499 +#: locale/programs/ld-collate.c:472 locale/programs/ld-collate.c:498 #, c-format msgid "%s: `forward' and `backward' are mutually excluding each other" msgstr "" -#: locale/programs/ld-collate.c:483 locale/programs/ld-collate.c:509 -#: locale/programs/ld-collate.c:525 +#: locale/programs/ld-collate.c:482 locale/programs/ld-collate.c:508 +#: locale/programs/ld-collate.c:524 #, c-format msgid "%s: `%s' mentioned more than once in definition of weight %d" msgstr "" -#: locale/programs/ld-collate.c:581 +#: locale/programs/ld-collate.c:580 #, c-format msgid "%s: too many rules; first entry only had %d" msgstr "" -#: locale/programs/ld-collate.c:617 +#: locale/programs/ld-collate.c:616 #, c-format msgid "%s: not enough sorting rules" msgstr "" -#: locale/programs/ld-collate.c:782 +#: locale/programs/ld-collate.c:781 #, c-format msgid "%s: empty weight string not allowed" msgstr "" -#: locale/programs/ld-collate.c:877 +#: locale/programs/ld-collate.c:876 #, c-format msgid "%s: weights must use the same ellipsis symbol as the name" msgstr "" -#: locale/programs/ld-collate.c:933 +#: locale/programs/ld-collate.c:932 #, c-format msgid "%s: too many values" msgstr "" -#: locale/programs/ld-collate.c:1053 locale/programs/ld-collate.c:1228 +#: locale/programs/ld-collate.c:1052 locale/programs/ld-collate.c:1227 #, c-format msgid "order for `%.*s' already defined at %s:%Zu" msgstr "" -#: locale/programs/ld-collate.c:1103 +#: locale/programs/ld-collate.c:1102 #, c-format msgid "%s: the start and the end symbol of a range must stand for characters" msgstr "" -#: locale/programs/ld-collate.c:1130 +#: locale/programs/ld-collate.c:1129 #, c-format msgid "" "%s: byte sequences of first and last character must have the same length" msgstr "" -#: locale/programs/ld-collate.c:1172 +#: locale/programs/ld-collate.c:1171 #, c-format msgid "" "%s: byte sequence of first character of range is not lower than that of the " "last character" msgstr "" -#: locale/programs/ld-collate.c:1297 +#: locale/programs/ld-collate.c:1296 #, c-format msgid "%s: symbolic range ellipsis must not directly follow `order_start'" msgstr "" -#: locale/programs/ld-collate.c:1301 +#: locale/programs/ld-collate.c:1300 #, c-format msgid "" "%s: symbolic range ellipsis must not be directly followed by `order_end'" msgstr "" -#: locale/programs/ld-collate.c:1321 locale/programs/ld-ctype.c:1502 +#: locale/programs/ld-collate.c:1320 locale/programs/ld-ctype.c:1501 #, c-format msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "" -#: locale/programs/ld-collate.c:1371 locale/programs/ld-collate.c:3861 +#: locale/programs/ld-collate.c:1370 locale/programs/ld-collate.c:3858 #, c-format msgid "%s: order for `%.*s' already defined at %s:%Zu" msgstr "" -#: locale/programs/ld-collate.c:1380 +#: locale/programs/ld-collate.c:1379 #, c-format msgid "%s: `%s' must be a character" msgstr "" -#: locale/programs/ld-collate.c:1575 +#: locale/programs/ld-collate.c:1574 #, c-format msgid "" "%s: `position' must be used for a specific level in all sections or none" msgstr "" -#: locale/programs/ld-collate.c:1600 +#: locale/programs/ld-collate.c:1599 #, c-format msgid "symbol `%s' not defined" msgstr "" -#: locale/programs/ld-collate.c:1676 locale/programs/ld-collate.c:1782 +#: locale/programs/ld-collate.c:1675 locale/programs/ld-collate.c:1781 #, c-format msgid "symbol `%s' has the same encoding as" msgstr "" -#: locale/programs/ld-collate.c:1680 locale/programs/ld-collate.c:1786 +#: locale/programs/ld-collate.c:1679 locale/programs/ld-collate.c:1785 #, c-format msgid "symbol `%s'" msgstr "" -#: locale/programs/ld-collate.c:1828 +#: locale/programs/ld-collate.c:1827 #, c-format msgid "no definition of `UNDEFINED'" msgstr "" -#: locale/programs/ld-collate.c:1857 +#: locale/programs/ld-collate.c:1856 #, c-format msgid "too many errors; giving up" msgstr "" -#: locale/programs/ld-collate.c:2661 locale/programs/ld-collate.c:4049 +#: locale/programs/ld-collate.c:2658 locale/programs/ld-collate.c:4046 #, c-format msgid "%s: nested conditionals not supported" msgstr "" -#: locale/programs/ld-collate.c:2679 +#: locale/programs/ld-collate.c:2676 #, c-format msgid "%s: more then one 'else'" msgstr "" -#: locale/programs/ld-collate.c:2854 +#: locale/programs/ld-collate.c:2851 #, c-format msgid "%s: duplicate definition of `%s'" msgstr "" -#: locale/programs/ld-collate.c:2890 +#: locale/programs/ld-collate.c:2887 #, c-format msgid "%s: duplicate declaration of section `%s'" msgstr "" -#: locale/programs/ld-collate.c:3026 +#: locale/programs/ld-collate.c:3023 #, c-format msgid "%s: unknown character in collating symbol name" msgstr "" -#: locale/programs/ld-collate.c:3155 +#: locale/programs/ld-collate.c:3152 #, c-format msgid "%s: unknown character in equivalent definition name" msgstr "" -#: locale/programs/ld-collate.c:3166 +#: locale/programs/ld-collate.c:3163 #, c-format msgid "%s: unknown character in equivalent definition value" msgstr "" -#: locale/programs/ld-collate.c:3176 +#: locale/programs/ld-collate.c:3173 #, c-format msgid "%s: unknown symbol `%s' in equivalent definition" msgstr "" -#: locale/programs/ld-collate.c:3185 +#: locale/programs/ld-collate.c:3182 msgid "error while adding equivalent collating symbol" msgstr "" -#: locale/programs/ld-collate.c:3223 +#: locale/programs/ld-collate.c:3220 #, c-format msgid "duplicate definition of script `%s'" msgstr "" -#: locale/programs/ld-collate.c:3271 +#: locale/programs/ld-collate.c:3268 #, c-format msgid "%s: unknown section name `%.*s'" msgstr "" -#: locale/programs/ld-collate.c:3300 +#: locale/programs/ld-collate.c:3297 #, c-format msgid "%s: multiple order definitions for section `%s'" msgstr "" -#: locale/programs/ld-collate.c:3328 +#: locale/programs/ld-collate.c:3325 #, c-format msgid "%s: invalid number of sorting rules" msgstr "" -#: locale/programs/ld-collate.c:3355 +#: locale/programs/ld-collate.c:3352 #, c-format msgid "%s: multiple order definitions for unnamed section" msgstr "" -#: locale/programs/ld-collate.c:3410 locale/programs/ld-collate.c:3540 -#: locale/programs/ld-collate.c:3903 +#: 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 "" -#: locale/programs/ld-collate.c:3473 +#: locale/programs/ld-collate.c:3470 #, c-format msgid "%s: order for collating symbol %.*s not yet defined" msgstr "" -#: locale/programs/ld-collate.c:3491 +#: locale/programs/ld-collate.c:3488 #, c-format msgid "%s: order for collating element %.*s not yet defined" msgstr "" -#: locale/programs/ld-collate.c:3502 +#: locale/programs/ld-collate.c:3499 #, c-format msgid "%s: cannot reorder after %.*s: symbol not known" msgstr "" -#: locale/programs/ld-collate.c:3554 locale/programs/ld-collate.c:3915 +#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912 #, c-format msgid "%s: missing `reorder-end' keyword" msgstr "" -#: locale/programs/ld-collate.c:3588 locale/programs/ld-collate.c:3786 +#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783 #, c-format msgid "%s: section `%.*s' not known" msgstr "" -#: locale/programs/ld-collate.c:3653 +#: locale/programs/ld-collate.c:3650 #, c-format msgid "%s: bad symbol <%.*s>" msgstr "" -#: locale/programs/ld-collate.c:3849 +#: locale/programs/ld-collate.c:3846 #, c-format msgid "%s: cannot have `%s' as end of ellipsis range" msgstr "" -#: locale/programs/ld-collate.c:3899 +#: locale/programs/ld-collate.c:3896 #, c-format msgid "%s: empty category description not allowed" msgstr "" -#: locale/programs/ld-collate.c:3918 +#: locale/programs/ld-collate.c:3915 #, c-format msgid "%s: missing `reorder-sections-end' keyword" msgstr "" -#: locale/programs/ld-collate.c:4082 +#: locale/programs/ld-collate.c:4079 #, c-format msgid "%s: '%s' without matching 'ifdef' or 'ifndef'" msgstr "" -#: locale/programs/ld-collate.c:4100 +#: locale/programs/ld-collate.c:4097 #, c-format msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'" msgstr "" -#: locale/programs/ld-ctype.c:440 +#: locale/programs/ld-ctype.c:439 #, c-format msgid "No character set name specified in charmap" msgstr "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 " character not in class `%s'" msgstr "" -#: 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 " character must not be in class `%s'" msgstr "" -#: locale/programs/ld-ctype.c:600 +#: locale/programs/ld-ctype.c:599 #, c-format msgid "character not defined in character map" msgstr "" -#: locale/programs/ld-ctype.c:736 +#: locale/programs/ld-ctype.c:735 #, c-format msgid "`digit' category has not entries in groups of ten" msgstr "" -#: locale/programs/ld-ctype.c:785 +#: locale/programs/ld-ctype.c:784 #, c-format msgid "no input digits defined and none of the standard names in the charmap" msgstr "" -#: locale/programs/ld-ctype.c:850 +#: locale/programs/ld-ctype.c:849 #, c-format msgid "not all characters used in `outdigit' are available in the charmap" msgstr "" -#: locale/programs/ld-ctype.c:867 +#: locale/programs/ld-ctype.c:866 #, c-format msgid "not all characters used in `outdigit' are available in the repertoire" msgstr "" -#: locale/programs/ld-ctype.c:1270 +#: locale/programs/ld-ctype.c:1269 #, c-format msgid "character class `%s' already defined" msgstr "" -#: locale/programs/ld-ctype.c:1276 +#: locale/programs/ld-ctype.c:1275 #, c-format msgid "implementation limit: no more than %Zd character classes allowed" msgstr "" -#: locale/programs/ld-ctype.c:1302 +#: locale/programs/ld-ctype.c:1301 #, c-format msgid "character map `%s' already defined" msgstr "" -#: locale/programs/ld-ctype.c:1308 +#: locale/programs/ld-ctype.c:1307 #, c-format msgid "implementation limit: no more than %d character maps allowed" msgstr "" -#: locale/programs/ld-ctype.c:1573 locale/programs/ld-ctype.c:1698 -#: locale/programs/ld-ctype.c:1804 locale/programs/ld-ctype.c:2496 -#: locale/programs/ld-ctype.c:3492 +#: locale/programs/ld-ctype.c:1572 locale/programs/ld-ctype.c:1697 +#: locale/programs/ld-ctype.c:1803 locale/programs/ld-ctype.c:2493 +#: locale/programs/ld-ctype.c:3489 #, c-format msgid "%s: field `%s' does not contain exactly ten entries" msgstr "" -#: locale/programs/ld-ctype.c:1601 locale/programs/ld-ctype.c:2175 +#: locale/programs/ld-ctype.c:1600 locale/programs/ld-ctype.c:2174 #, c-format msgid "to-value of range is smaller than from-value " msgstr "" -#: locale/programs/ld-ctype.c:1728 +#: locale/programs/ld-ctype.c:1727 msgid "start and end character sequence of range must have the same length" msgstr "" -#: locale/programs/ld-ctype.c:1735 +#: locale/programs/ld-ctype.c:1734 msgid "to-value character sequence is smaller than from-value sequence" msgstr "" -#: locale/programs/ld-ctype.c:2095 locale/programs/ld-ctype.c:2146 +#: locale/programs/ld-ctype.c:2094 locale/programs/ld-ctype.c:2145 msgid "premature end of `translit_ignore' definition" msgstr "" -#: locale/programs/ld-ctype.c:2101 locale/programs/ld-ctype.c:2152 -#: locale/programs/ld-ctype.c:2194 +#: locale/programs/ld-ctype.c:2100 locale/programs/ld-ctype.c:2151 +#: locale/programs/ld-ctype.c:2193 msgid "syntax error" msgstr "" -#: locale/programs/ld-ctype.c:2328 +#: locale/programs/ld-ctype.c:2326 #, c-format msgid "%s: syntax error in definition of new character class" msgstr "" -#: locale/programs/ld-ctype.c:2343 +#: locale/programs/ld-ctype.c:2341 #, c-format msgid "%s: syntax error in definition of new character map" msgstr "" -#: locale/programs/ld-ctype.c:2518 +#: locale/programs/ld-ctype.c:2515 msgid "ellipsis range must be marked by two operands of same type" msgstr "" -#: locale/programs/ld-ctype.c:2527 +#: locale/programs/ld-ctype.c:2524 msgid "" "with symbolic name range values the absolute ellipsis `...' must not be used" msgstr "" -#: locale/programs/ld-ctype.c:2542 +#: locale/programs/ld-ctype.c:2539 msgid "" "with UCS range values one must use the hexadecimal symbolic ellipsis `..'" msgstr "" -#: locale/programs/ld-ctype.c:2556 +#: locale/programs/ld-ctype.c:2553 msgid "" "with character code range values one must use the absolute ellipsis `...'" msgstr "" -#: locale/programs/ld-ctype.c:2707 +#: locale/programs/ld-ctype.c:2704 #, c-format msgid "duplicated definition for mapping `%s'" msgstr "" -#: locale/programs/ld-ctype.c:2793 locale/programs/ld-ctype.c:2937 +#: locale/programs/ld-ctype.c:2790 locale/programs/ld-ctype.c:2934 #, c-format msgid "%s: `translit_start' section does not end with `translit_end'" msgstr "" -#: locale/programs/ld-ctype.c:2888 +#: locale/programs/ld-ctype.c:2885 #, c-format msgid "%s: duplicate `default_missing' definition" msgstr "" -#: locale/programs/ld-ctype.c:2893 +#: locale/programs/ld-ctype.c:2890 msgid "previous definition was here" msgstr "" -#: locale/programs/ld-ctype.c:2915 +#: locale/programs/ld-ctype.c:2912 #, c-format msgid "%s: no representable `default_missing' definition found" msgstr "" -#: locale/programs/ld-ctype.c:3068 locale/programs/ld-ctype.c:3152 -#: locale/programs/ld-ctype.c:3172 locale/programs/ld-ctype.c:3193 -#: locale/programs/ld-ctype.c:3214 locale/programs/ld-ctype.c:3235 -#: locale/programs/ld-ctype.c:3256 locale/programs/ld-ctype.c:3296 -#: locale/programs/ld-ctype.c:3317 locale/programs/ld-ctype.c:3384 -#: locale/programs/ld-ctype.c:3426 locale/programs/ld-ctype.c:3451 +#: locale/programs/ld-ctype.c:3065 locale/programs/ld-ctype.c:3149 +#: locale/programs/ld-ctype.c:3169 locale/programs/ld-ctype.c:3190 +#: locale/programs/ld-ctype.c:3211 locale/programs/ld-ctype.c:3232 +#: locale/programs/ld-ctype.c:3253 locale/programs/ld-ctype.c:3293 +#: locale/programs/ld-ctype.c:3314 locale/programs/ld-ctype.c:3381 +#: locale/programs/ld-ctype.c:3423 locale/programs/ld-ctype.c:3448 #, c-format msgid "%s: character `%s' not defined while needed as default value" msgstr "" -#: locale/programs/ld-ctype.c:3073 locale/programs/ld-ctype.c:3157 -#: locale/programs/ld-ctype.c:3177 locale/programs/ld-ctype.c:3198 -#: locale/programs/ld-ctype.c:3219 locale/programs/ld-ctype.c:3240 -#: locale/programs/ld-ctype.c:3261 locale/programs/ld-ctype.c:3301 -#: locale/programs/ld-ctype.c:3322 locale/programs/ld-ctype.c:3389 +#: locale/programs/ld-ctype.c:3070 locale/programs/ld-ctype.c:3154 +#: locale/programs/ld-ctype.c:3174 locale/programs/ld-ctype.c:3195 +#: locale/programs/ld-ctype.c:3216 locale/programs/ld-ctype.c:3237 +#: locale/programs/ld-ctype.c:3258 locale/programs/ld-ctype.c:3298 +#: locale/programs/ld-ctype.c:3319 locale/programs/ld-ctype.c:3386 #, c-format msgid "%s: character `%s' in charmap not representable with one byte" msgstr "" -#: locale/programs/ld-ctype.c:3433 locale/programs/ld-ctype.c:3458 +#: locale/programs/ld-ctype.c:3430 locale/programs/ld-ctype.c:3455 #, c-format msgid "" "%s: character `%s' needed as default value not representable with one byte" msgstr "" -#: locale/programs/ld-ctype.c:3514 +#: locale/programs/ld-ctype.c:3511 #, c-format msgid "no output digits defined and none of the standard names in the charmap" msgstr "" -#: locale/programs/ld-ctype.c:3805 +#: locale/programs/ld-ctype.c:3802 #, c-format msgid "%s: transliteration data from locale `%s' not available" msgstr "" -#: locale/programs/ld-ctype.c:3906 +#: locale/programs/ld-ctype.c:3903 #, c-format msgid "%s: table for class \"%s\": %lu bytes\n" msgstr "" -#: locale/programs/ld-ctype.c:3975 +#: locale/programs/ld-ctype.c:3972 #, c-format msgid "%s: table for map \"%s\": %lu bytes\n" msgstr "" -#: locale/programs/ld-ctype.c:4108 +#: locale/programs/ld-ctype.c:4105 #, c-format msgid "%s: table for width: %lu bytes\n" msgstr "" -#: locale/programs/ld-identification.c:170 +#: locale/programs/ld-identification.c:169 #, c-format msgid "%s: no identification for category `%s'" msgstr "" -#: locale/programs/ld-identification.c:435 +#: locale/programs/ld-identification.c:434 #, c-format msgid "%s: duplicate category version definition" msgstr "" -#: locale/programs/ld-measurement.c:113 +#: locale/programs/ld-measurement.c:112 #, c-format msgid "%s: invalid value for field `%s'" msgstr "" -#: locale/programs/ld-messages.c:114 locale/programs/ld-messages.c:148 +#: locale/programs/ld-messages.c:113 locale/programs/ld-messages.c:147 #, c-format msgid "%s: field `%s' undefined" msgstr "" -#: locale/programs/ld-messages.c:121 locale/programs/ld-messages.c:155 -#: locale/programs/ld-monetary.c:256 locale/programs/ld-numeric.c:118 +#: locale/programs/ld-messages.c:120 locale/programs/ld-messages.c:154 +#: locale/programs/ld-monetary.c:255 locale/programs/ld-numeric.c:117 #, c-format msgid "%s: value for field `%s' must not be an empty string" msgstr "" -#: locale/programs/ld-messages.c:137 locale/programs/ld-messages.c:171 +#: locale/programs/ld-messages.c:136 locale/programs/ld-messages.c:170 #, c-format msgid "%s: no correct regular expression for field `%s': %s" msgstr "" -#: locale/programs/ld-monetary.c:224 +#: locale/programs/ld-monetary.c:223 #, c-format msgid "%s: value of field `int_curr_symbol' has wrong length" msgstr "" -#: locale/programs/ld-monetary.c:237 +#: locale/programs/ld-monetary.c:236 #, c-format msgid "" "%s: value of field `int_curr_symbol' does not correspond to a valid name in " "ISO 4217" msgstr "" -#: locale/programs/ld-monetary.c:285 locale/programs/ld-monetary.c:315 +#: locale/programs/ld-monetary.c:284 locale/programs/ld-monetary.c:314 #, c-format msgid "%s: value for field `%s' must be in range %d...%d" msgstr "" -#: locale/programs/ld-monetary.c:747 locale/programs/ld-numeric.c:274 +#: locale/programs/ld-monetary.c:746 locale/programs/ld-numeric.c:273 #, c-format msgid "%s: value for field `%s' must be a single character" msgstr "" -#: locale/programs/ld-monetary.c:844 locale/programs/ld-numeric.c:318 +#: locale/programs/ld-monetary.c:843 locale/programs/ld-numeric.c:317 #, c-format msgid "%s: `-1' must be last entry in `%s' field" msgstr "" -#: locale/programs/ld-monetary.c:866 locale/programs/ld-numeric.c:335 +#: locale/programs/ld-monetary.c:865 locale/programs/ld-numeric.c:334 #, c-format msgid "%s: values for field `%s' must be smaller than 127" msgstr "" -#: locale/programs/ld-monetary.c:909 +#: locale/programs/ld-monetary.c:908 msgid "conversion rate value cannot be zero" msgstr "" -#: locale/programs/ld-name.c:129 locale/programs/ld-telephone.c:126 -#: locale/programs/ld-telephone.c:149 +#: locale/programs/ld-name.c:128 locale/programs/ld-telephone.c:125 +#: locale/programs/ld-telephone.c:148 #, c-format msgid "%s: invalid escape sequence in field `%s'" msgstr "" -#: locale/programs/ld-time.c:247 +#: locale/programs/ld-time.c:246 #, c-format msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'" msgstr "" -#: locale/programs/ld-time.c:258 +#: locale/programs/ld-time.c:257 #, c-format msgid "" "%s: direction flag in string %Zd in `era' field is not a single character" msgstr "" -#: locale/programs/ld-time.c:271 +#: locale/programs/ld-time.c:270 #, c-format msgid "%s: invalid number for offset in string %Zd in `era' field" msgstr "" -#: locale/programs/ld-time.c:279 +#: locale/programs/ld-time.c:278 #, c-format msgid "%s: garbage at end of offset value in string %Zd in `era' field" msgstr "" -#: locale/programs/ld-time.c:330 +#: locale/programs/ld-time.c:329 #, c-format msgid "%s: invalid starting date in string %Zd in `era' field" msgstr "" -#: locale/programs/ld-time.c:339 +#: locale/programs/ld-time.c:338 #, c-format msgid "%s: garbage at end of starting date in string %Zd in `era' field " msgstr "" -#: locale/programs/ld-time.c:358 +#: locale/programs/ld-time.c:357 #, c-format msgid "%s: starting date is invalid in string %Zd in `era' field" msgstr "" -#: locale/programs/ld-time.c:407 locale/programs/ld-time.c:435 +#: locale/programs/ld-time.c:406 locale/programs/ld-time.c:434 #, c-format msgid "%s: invalid stopping date in string %Zd in `era' field" msgstr "" -#: locale/programs/ld-time.c:416 +#: locale/programs/ld-time.c:415 #, c-format msgid "%s: garbage at end of stopping date in string %Zd in `era' field" msgstr "" -#: locale/programs/ld-time.c:444 +#: locale/programs/ld-time.c:443 #, c-format msgid "%s: missing era name in string %Zd in `era' field" msgstr "" -#: locale/programs/ld-time.c:456 +#: locale/programs/ld-time.c:455 #, c-format msgid "%s: missing era format in string %Zd in `era' field" msgstr "" -#: locale/programs/ld-time.c:497 +#: locale/programs/ld-time.c:496 #, c-format msgid "%s: third operand for value of field `%s' must not be larger than %d" msgstr "" -#: locale/programs/ld-time.c:505 locale/programs/ld-time.c:513 -#: locale/programs/ld-time.c:521 +#: locale/programs/ld-time.c:504 locale/programs/ld-time.c:512 +#: locale/programs/ld-time.c:520 #, c-format msgid "%s: values for field `%s' must not be larger than %d" msgstr "" -#: locale/programs/ld-time.c:1004 +#: locale/programs/ld-time.c:1003 #, c-format msgid "%s: too few values for field `%s'" msgstr "" -#: locale/programs/ld-time.c:1049 +#: locale/programs/ld-time.c:1048 msgid "extra trailing semicolon" msgstr "" -#: locale/programs/ld-time.c:1052 +#: locale/programs/ld-time.c:1051 #, c-format msgid "%s: too many values for field `%s'" msgstr "" -#: locale/programs/linereader.c:130 +#: locale/programs/linereader.c:129 msgid "trailing garbage at end of line" msgstr "" -#: locale/programs/linereader.c:298 +#: locale/programs/linereader.c:297 msgid "garbage at end of number" msgstr "" -#: locale/programs/linereader.c:410 +#: locale/programs/linereader.c:409 msgid "garbage at end of character code specification" msgstr "" -#: locale/programs/linereader.c:496 +#: locale/programs/linereader.c:495 msgid "unterminated symbolic name" msgstr "" -#: locale/programs/linereader.c:623 +#: locale/programs/linereader.c:622 msgid "illegal escape sequence at end of string" msgstr "" -#: locale/programs/linereader.c:627 locale/programs/linereader.c:855 +#: locale/programs/linereader.c:626 locale/programs/linereader.c:854 msgid "unterminated string" msgstr "" -#: locale/programs/linereader.c:669 +#: locale/programs/linereader.c:668 msgid "non-symbolic character value should not be used" msgstr "" -#: locale/programs/linereader.c:816 +#: locale/programs/linereader.c:815 #, c-format msgid "symbol `%.*s' not in charmap" msgstr "" -#: locale/programs/linereader.c:837 +#: locale/programs/linereader.c:836 #, c-format msgid "symbol `%.*s' not in repertoire map" msgstr "" -#: locale/programs/locale-spec.c:131 +#: locale/programs/locale-spec.c:130 #, c-format msgid "unknown name \"%s\"" msgstr "" @@ -2508,107 +2597,107 @@ msgstr "" msgid "while preparing output" msgstr "" -#: locale/programs/localedef.c:120 +#: locale/programs/localedef.c:119 msgid "Input Files:" msgstr "" -#: locale/programs/localedef.c:122 +#: locale/programs/localedef.c:121 msgid "Symbolic character names defined in FILE" msgstr "" -#: locale/programs/localedef.c:123 +#: locale/programs/localedef.c:122 msgid "Source definitions are found in FILE" msgstr "" -#: locale/programs/localedef.c:125 +#: locale/programs/localedef.c:124 msgid "FILE contains mapping from symbolic names to UCS4 values" msgstr "" -#: locale/programs/localedef.c:129 +#: locale/programs/localedef.c:128 msgid "Create output even if warning messages were issued" msgstr "" -#: locale/programs/localedef.c:130 +#: locale/programs/localedef.c:129 msgid "Create old-style tables" msgstr "" -#: locale/programs/localedef.c:131 +#: locale/programs/localedef.c:130 msgid "Optional output file prefix" msgstr "" -#: locale/programs/localedef.c:132 +#: locale/programs/localedef.c:131 msgid "Be strictly POSIX conform" msgstr "" -#: locale/programs/localedef.c:134 +#: locale/programs/localedef.c:133 msgid "Suppress warnings and information messages" msgstr "" -#: locale/programs/localedef.c:135 +#: locale/programs/localedef.c:134 msgid "Print more messages" msgstr "" -#: locale/programs/localedef.c:136 +#: locale/programs/localedef.c:135 msgid "Archive control:" msgstr "" -#: locale/programs/localedef.c:138 +#: locale/programs/localedef.c:137 msgid "Don't add new data to archive" msgstr "" -#: locale/programs/localedef.c:140 +#: locale/programs/localedef.c:139 msgid "Add locales named by parameters to archive" msgstr "" -#: locale/programs/localedef.c:141 +#: locale/programs/localedef.c:140 msgid "Replace existing archive content" msgstr "" -#: locale/programs/localedef.c:143 +#: locale/programs/localedef.c:142 msgid "Remove locales named by parameters from archive" msgstr "" -#: locale/programs/localedef.c:144 +#: locale/programs/localedef.c:143 msgid "List content of archive" msgstr "" -#: locale/programs/localedef.c:146 +#: locale/programs/localedef.c:145 msgid "locale.alias file to consult when making archive" msgstr "" -#: locale/programs/localedef.c:151 +#: locale/programs/localedef.c:150 msgid "Compile locale specification" msgstr "" -#: locale/programs/localedef.c:154 +#: locale/programs/localedef.c:153 msgid "" "NAME\n" "[--add-to-archive|--delete-from-archive] FILE...\n" "--list-archive [FILE]" msgstr "" -#: locale/programs/localedef.c:232 +#: locale/programs/localedef.c:228 #, c-format msgid "cannot create directory for output files" msgstr "" -#: locale/programs/localedef.c:243 +#: locale/programs/localedef.c:239 #, c-format msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'" msgstr "" -#: locale/programs/localedef.c:257 locale/programs/localedef.c:273 -#: locale/programs/localedef.c:599 locale/programs/localedef.c:619 +#: locale/programs/localedef.c:253 locale/programs/localedef.c:269 +#: locale/programs/localedef.c:595 locale/programs/localedef.c:615 #, c-format msgid "cannot open locale definition file `%s'" msgstr "" -#: locale/programs/localedef.c:285 +#: locale/programs/localedef.c:281 #, c-format msgid "cannot write output files to `%s'" msgstr "" -#: locale/programs/localedef.c:366 +#: locale/programs/localedef.c:362 #, c-format msgid "" "System's directory for character maps : %s\n" @@ -2617,211 +2706,212 @@ msgid "" "%s" msgstr "" -#: locale/programs/localedef.c:567 +#: locale/programs/localedef.c:563 #, c-format msgid "circular dependencies between locale definitions" msgstr "" -#: locale/programs/localedef.c:573 +#: locale/programs/localedef.c:569 #, c-format msgid "cannot add already read locale `%s' a second time" msgstr "" -#: locale/programs/locarchive.c:92 locale/programs/locarchive.c:338 +#: locale/programs/locarchive.c:113 locale/programs/locarchive.c:347 +#: nss/makedb.c:289 #, c-format msgid "cannot create temporary file" msgstr "" -#: locale/programs/locarchive.c:122 locale/programs/locarchive.c:384 +#: locale/programs/locarchive.c:143 locale/programs/locarchive.c:393 #, c-format msgid "cannot initialize archive file" msgstr "" -#: locale/programs/locarchive.c:129 locale/programs/locarchive.c:391 +#: locale/programs/locarchive.c:150 locale/programs/locarchive.c:400 #, c-format msgid "cannot resize archive file" msgstr "" -#: locale/programs/locarchive.c:152 locale/programs/locarchive.c:414 -#: locale/programs/locarchive.c:633 +#: locale/programs/locarchive.c:163 locale/programs/locarchive.c:413 +#: locale/programs/locarchive.c:619 #, c-format msgid "cannot map archive header" msgstr "" -#: locale/programs/locarchive.c:174 +#: locale/programs/locarchive.c:185 #, c-format msgid "failed to create new locale archive" msgstr "" -#: locale/programs/locarchive.c:186 +#: locale/programs/locarchive.c:197 #, c-format msgid "cannot change mode of new locale archive" msgstr "" -#: locale/programs/locarchive.c:285 +#: locale/programs/locarchive.c:296 #, c-format msgid "cannot read data from locale archive" msgstr "" -#: locale/programs/locarchive.c:318 +#: locale/programs/locarchive.c:327 #, c-format msgid "cannot map locale archive file" msgstr "" -#: locale/programs/locarchive.c:422 +#: locale/programs/locarchive.c:421 #, c-format msgid "cannot lock new archive" msgstr "" -#: locale/programs/locarchive.c:488 +#: locale/programs/locarchive.c:485 #, c-format msgid "cannot extend locale archive file" msgstr "" -#: locale/programs/locarchive.c:497 +#: locale/programs/locarchive.c:494 #, c-format msgid "cannot change mode of resized locale archive" msgstr "" -#: locale/programs/locarchive.c:505 +#: locale/programs/locarchive.c:502 #, c-format msgid "cannot rename new archive" msgstr "" -#: locale/programs/locarchive.c:558 +#: locale/programs/locarchive.c:555 #, c-format msgid "cannot open locale archive \"%s\"" msgstr "" -#: locale/programs/locarchive.c:563 +#: locale/programs/locarchive.c:560 #, c-format msgid "cannot stat locale archive \"%s\"" msgstr "" -#: locale/programs/locarchive.c:582 +#: locale/programs/locarchive.c:579 #, c-format msgid "cannot lock locale archive \"%s\"" msgstr "" -#: locale/programs/locarchive.c:605 +#: locale/programs/locarchive.c:602 #, c-format msgid "cannot read archive header" msgstr "" -#: locale/programs/locarchive.c:680 +#: locale/programs/locarchive.c:666 #, c-format msgid "locale '%s' already exists" msgstr "" -#: locale/programs/locarchive.c:942 locale/programs/locarchive.c:957 -#: locale/programs/locarchive.c:969 locale/programs/locarchive.c:981 -#: locale/programs/locfile.c:344 +#: locale/programs/locarchive.c:928 locale/programs/locarchive.c:943 +#: locale/programs/locarchive.c:955 locale/programs/locarchive.c:967 +#: locale/programs/locfile.c:343 #, c-format msgid "cannot add to locale archive" msgstr "" -#: locale/programs/locarchive.c:1139 +#: locale/programs/locarchive.c:1125 #, c-format msgid "locale alias file `%s' not found" msgstr "" -#: locale/programs/locarchive.c:1289 +#: locale/programs/locarchive.c:1275 #, c-format msgid "Adding %s\n" msgstr "" -#: locale/programs/locarchive.c:1295 +#: locale/programs/locarchive.c:1281 #, c-format msgid "stat of \"%s\" failed: %s: ignored" msgstr "" -#: locale/programs/locarchive.c:1301 +#: locale/programs/locarchive.c:1287 #, c-format msgid "\"%s\" is no directory; ignored" msgstr "" -#: locale/programs/locarchive.c:1308 +#: locale/programs/locarchive.c:1294 #, c-format msgid "cannot open directory \"%s\": %s: ignored" msgstr "" -#: locale/programs/locarchive.c:1380 +#: locale/programs/locarchive.c:1366 #, c-format msgid "incomplete set of locale files in \"%s\"" msgstr "" -#: locale/programs/locarchive.c:1444 +#: locale/programs/locarchive.c:1430 #, c-format msgid "cannot read all files in \"%s\": ignored" msgstr "" -#: locale/programs/locarchive.c:1514 +#: locale/programs/locarchive.c:1500 #, c-format msgid "locale \"%s\" not in archive" msgstr "" -#: locale/programs/locfile.c:132 +#: locale/programs/locfile.c:131 #, c-format msgid "argument to `%s' must be a single character" msgstr "" -#: locale/programs/locfile.c:252 +#: locale/programs/locfile.c:251 msgid "syntax error: not inside a locale definition section" msgstr "" -#: locale/programs/locfile.c:626 +#: locale/programs/locfile.c:625 #, c-format msgid "cannot open output file `%s' for category `%s'" msgstr "" -#: locale/programs/locfile.c:650 +#: locale/programs/locfile.c:649 #, c-format msgid "failure while writing data for category `%s'" msgstr "" -#: locale/programs/locfile.c:746 +#: locale/programs/locfile.c:745 #, c-format msgid "cannot create output file `%s' for category `%s'" msgstr "" -#: locale/programs/locfile.c:782 +#: locale/programs/locfile.c:781 msgid "expecting string argument for `copy'" msgstr "" -#: locale/programs/locfile.c:786 +#: locale/programs/locfile.c:785 msgid "locale name should consist only of portable characters" msgstr "" -#: locale/programs/locfile.c:805 +#: locale/programs/locfile.c:804 msgid "no other keyword shall be specified when `copy' is used" msgstr "" -#: locale/programs/locfile.c:819 +#: locale/programs/locfile.c:818 #, c-format msgid "`%1$s' definition does not end with `END %1$s'" msgstr "" -#: locale/programs/repertoire.c:229 locale/programs/repertoire.c:270 -#: locale/programs/repertoire.c:295 +#: locale/programs/repertoire.c:228 locale/programs/repertoire.c:269 +#: locale/programs/repertoire.c:294 #, c-format msgid "syntax error in repertoire map definition: %s" msgstr "" -#: locale/programs/repertoire.c:271 +#: locale/programs/repertoire.c:270 msgid "no or value given" msgstr "" -#: locale/programs/repertoire.c:331 +#: locale/programs/repertoire.c:330 #, c-format msgid "cannot save new repertoire map" msgstr "" -#: locale/programs/repertoire.c:342 +#: locale/programs/repertoire.c:341 #, c-format msgid "repertoire map file `%s' not found" msgstr "" -#: login/programs/pt_chown.c:78 +#: login/programs/pt_chown.c:77 #, c-format msgid "" "Set the owner, group and access permission of the slave pseudo terminal " @@ -2830,7 +2920,7 @@ msgid "" "to be run directly from the command line.\n" msgstr "" -#: login/programs/pt_chown.c:88 +#: login/programs/pt_chown.c:87 #, c-format msgid "" "The owner is set to the current user, the group is set to `%s', and the " @@ -2839,41 +2929,41 @@ msgid "" "%s" msgstr "" -#: login/programs/pt_chown.c:192 +#: login/programs/pt_chown.c:191 #, c-format msgid "too many arguments" msgstr "" -#: login/programs/pt_chown.c:200 +#: login/programs/pt_chown.c:199 #, c-format msgid "needs to be installed setuid `root'" msgstr "" -#: malloc/mcheck.c:350 +#: malloc/mcheck.c:349 msgid "memory is consistent, library is buggy\n" msgstr "" -#: malloc/mcheck.c:353 +#: malloc/mcheck.c:352 msgid "memory clobbered before allocated block\n" msgstr "" -#: malloc/mcheck.c:356 +#: malloc/mcheck.c:355 msgid "memory clobbered past end of allocated block\n" msgstr "" -#: malloc/mcheck.c:359 +#: malloc/mcheck.c:358 msgid "block freed twice\n" msgstr "" -#: malloc/mcheck.c:362 +#: malloc/mcheck.c:361 msgid "bogus mcheck_status, library is buggy\n" msgstr "" -#: malloc/memusage.sh:33 +#: malloc/memusage.sh:32 msgid "%s: option '%s' requires an argument\\n" msgstr "" -#: malloc/memusage.sh:39 +#: malloc/memusage.sh:38 msgid "" "Usage: memusage [OPTION]... PROGRAM [PROGRAMOPTION]...\n" "Profile memory usage of PROGRAM.\n" @@ -2904,7 +2994,7 @@ msgid "" "\n" msgstr "" -#: malloc/memusage.sh:101 +#: malloc/memusage.sh:100 msgid "" "Syntax: memusage [--data=FILE] [--progname=NAME] [--png=FILE] [--" "unbuffered]\n" @@ -2913,61 +3003,61 @@ msgid "" "\t PROGRAM [PROGRAMOPTION]..." msgstr "" -#: malloc/memusage.sh:193 +#: malloc/memusage.sh:192 msgid "memusage: option \\`${1##*=}' is ambiguous" msgstr "" -#: malloc/memusage.sh:202 +#: malloc/memusage.sh:201 msgid "memusage: unrecognized option \\`$1'" msgstr "" -#: malloc/memusage.sh:215 +#: malloc/memusage.sh:214 msgid "No program name given" msgstr "" -#: malloc/memusagestat.c:57 +#: malloc/memusagestat.c:56 msgid "Name output file" msgstr "" -#: malloc/memusagestat.c:58 +#: malloc/memusagestat.c:57 msgid "Title string used in output graphic" msgstr "" -#: malloc/memusagestat.c:59 +#: malloc/memusagestat.c:58 msgid "" "Generate output linear to time (default is linear to number of function " "calls)" msgstr "" -#: malloc/memusagestat.c:61 +#: malloc/memusagestat.c:60 msgid "Also draw graph for total memory consumption" msgstr "" -#: malloc/memusagestat.c:62 +#: malloc/memusagestat.c:61 msgid "Make output graphic VALUE pixels wide" msgstr "" -#: malloc/memusagestat.c:63 +#: malloc/memusagestat.c:62 msgid "Make output graphic VALUE pixels high" msgstr "" -#: malloc/memusagestat.c:68 +#: malloc/memusagestat.c:67 msgid "Generate graphic from memory profiling data" msgstr "" -#: malloc/memusagestat.c:71 +#: malloc/memusagestat.c:70 msgid "DATAFILE [OUTFILE]" msgstr "" -#: misc/error.c:118 +#: misc/error.c:117 msgid "Unknown system error" msgstr "" -#: nis/nis_callback.c:189 +#: nis/nis_callback.c:188 msgid "unable to free arguments" msgstr "" -#: nis/nis_error.h:1 nis/ypclnt.c:833 nis/ypclnt.c:921 posix/regcomp.c:132 +#: nis/nis_error.h:1 nis/ypclnt.c:832 nis/ypclnt.c:920 posix/regcomp.c:131 #: sysdeps/gnu/errlist.c:20 msgid "Success" msgstr "" @@ -3009,7 +3099,7 @@ msgid "First/next chain broken" msgstr "" #. TRANS Permission denied; the file permissions do not allow the attempted operation. -#: nis/nis_error.h:11 nis/ypclnt.c:878 sysdeps/gnu/errlist.c:157 +#: nis/nis_error.h:11 nis/ypclnt.c:877 sysdeps/gnu/errlist.c:157 msgid "Permission denied" msgstr "" @@ -3161,258 +3251,258 @@ msgstr "" msgid "Master server busy, full dump rescheduled." msgstr "" -#: nis/nis_local_names.c:122 +#: nis/nis_local_names.c:121 #, c-format msgid "LOCAL entry for UID %d in directory %s not unique\n" msgstr "" -#: nis/nis_print.c:51 +#: nis/nis_print.c:50 msgid "UNKNOWN" msgstr "" -#: nis/nis_print.c:109 +#: nis/nis_print.c:108 msgid "BOGUS OBJECT\n" msgstr "" -#: nis/nis_print.c:112 +#: nis/nis_print.c:111 msgid "NO OBJECT\n" msgstr "" -#: nis/nis_print.c:115 +#: nis/nis_print.c:114 msgid "DIRECTORY\n" msgstr "" -#: nis/nis_print.c:118 +#: nis/nis_print.c:117 msgid "GROUP\n" msgstr "" -#: nis/nis_print.c:121 +#: nis/nis_print.c:120 msgid "TABLE\n" msgstr "" -#: nis/nis_print.c:124 +#: nis/nis_print.c:123 msgid "ENTRY\n" msgstr "" -#: nis/nis_print.c:127 +#: nis/nis_print.c:126 msgid "LINK\n" msgstr "" -#: nis/nis_print.c:130 +#: nis/nis_print.c:129 msgid "PRIVATE\n" msgstr "" -#: nis/nis_print.c:133 +#: nis/nis_print.c:132 msgid "(Unknown object)\n" msgstr "" -#: nis/nis_print.c:167 +#: nis/nis_print.c:166 #, c-format msgid "Name : `%s'\n" msgstr "" -#: nis/nis_print.c:168 +#: nis/nis_print.c:167 #, c-format msgid "Type : %s\n" msgstr "" -#: nis/nis_print.c:173 +#: nis/nis_print.c:172 msgid "Master Server :\n" msgstr "" -#: nis/nis_print.c:175 +#: nis/nis_print.c:174 msgid "Replicate :\n" msgstr "" -#: nis/nis_print.c:176 +#: nis/nis_print.c:175 #, c-format msgid "\tName : %s\n" msgstr "" -#: nis/nis_print.c:177 +#: nis/nis_print.c:176 msgid "\tPublic Key : " msgstr "" -#: nis/nis_print.c:181 +#: nis/nis_print.c:180 msgid "None.\n" msgstr "" -#: nis/nis_print.c:184 +#: nis/nis_print.c:183 #, c-format msgid "Diffie-Hellmann (%d bits)\n" msgstr "" -#: nis/nis_print.c:189 +#: nis/nis_print.c:188 #, c-format msgid "RSA (%d bits)\n" msgstr "" -#: nis/nis_print.c:192 +#: nis/nis_print.c:191 msgid "Kerberos.\n" msgstr "" -#: nis/nis_print.c:195 +#: nis/nis_print.c:194 #, c-format msgid "Unknown (type = %d, bits = %d)\n" msgstr "" -#: nis/nis_print.c:206 +#: nis/nis_print.c:205 #, c-format msgid "\tUniversal addresses (%u)\n" msgstr "" -#: nis/nis_print.c:228 +#: nis/nis_print.c:227 msgid "Time to live : " msgstr "" -#: nis/nis_print.c:230 +#: nis/nis_print.c:229 msgid "Default Access rights :\n" msgstr "" -#: nis/nis_print.c:239 +#: nis/nis_print.c:238 #, c-format msgid "\tType : %s\n" msgstr "" -#: nis/nis_print.c:240 +#: nis/nis_print.c:239 msgid "\tAccess rights: " msgstr "" -#: nis/nis_print.c:254 +#: nis/nis_print.c:253 msgid "Group Flags :" msgstr "" -#: nis/nis_print.c:257 +#: nis/nis_print.c:256 msgid "" "\n" "Group Members :\n" msgstr "" -#: nis/nis_print.c:269 +#: nis/nis_print.c:268 #, c-format msgid "Table Type : %s\n" msgstr "" -#: nis/nis_print.c:270 +#: nis/nis_print.c:269 #, c-format msgid "Number of Columns : %d\n" msgstr "" -#: nis/nis_print.c:271 +#: nis/nis_print.c:270 #, c-format msgid "Character Separator : %c\n" msgstr "" -#: nis/nis_print.c:272 +#: nis/nis_print.c:271 #, c-format msgid "Search Path : %s\n" msgstr "" -#: nis/nis_print.c:273 +#: nis/nis_print.c:272 msgid "Columns :\n" msgstr "" -#: nis/nis_print.c:276 +#: nis/nis_print.c:275 #, c-format msgid "\t[%d]\tName : %s\n" msgstr "" -#: nis/nis_print.c:278 +#: nis/nis_print.c:277 msgid "\t\tAttributes : " msgstr "" -#: nis/nis_print.c:280 +#: nis/nis_print.c:279 msgid "\t\tAccess Rights : " msgstr "" -#: nis/nis_print.c:290 +#: nis/nis_print.c:289 msgid "Linked Object Type : " msgstr "" -#: nis/nis_print.c:292 +#: nis/nis_print.c:291 #, c-format msgid "Linked to : %s\n" msgstr "" -#: nis/nis_print.c:302 +#: nis/nis_print.c:301 #, c-format msgid "\tEntry data of type %s\n" msgstr "" -#: nis/nis_print.c:305 +#: nis/nis_print.c:304 #, c-format msgid "\t[%u] - [%u bytes] " msgstr "" -#: nis/nis_print.c:308 +#: nis/nis_print.c:307 msgid "Encrypted data\n" msgstr "" -#: nis/nis_print.c:310 +#: nis/nis_print.c:309 msgid "Binary data\n" msgstr "" -#: nis/nis_print.c:326 +#: nis/nis_print.c:325 #, c-format msgid "Object Name : %s\n" msgstr "" -#: nis/nis_print.c:327 +#: nis/nis_print.c:326 #, c-format msgid "Directory : %s\n" msgstr "" -#: nis/nis_print.c:328 +#: nis/nis_print.c:327 #, c-format msgid "Owner : %s\n" msgstr "" -#: nis/nis_print.c:329 +#: nis/nis_print.c:328 #, c-format msgid "Group : %s\n" msgstr "" -#: nis/nis_print.c:330 +#: nis/nis_print.c:329 msgid "Access Rights : " msgstr "" -#: nis/nis_print.c:332 +#: nis/nis_print.c:331 #, c-format msgid "" "\n" "Time to Live : " msgstr "" -#: nis/nis_print.c:335 +#: nis/nis_print.c:334 #, c-format msgid "Creation Time : %s" msgstr "" -#: nis/nis_print.c:337 +#: nis/nis_print.c:336 #, c-format msgid "Mod. Time : %s" msgstr "" -#: nis/nis_print.c:338 +#: nis/nis_print.c:337 msgid "Object Type : " msgstr "" -#: nis/nis_print.c:358 +#: nis/nis_print.c:357 #, c-format msgid " Data Length = %u\n" msgstr "" -#: nis/nis_print.c:372 +#: nis/nis_print.c:371 #, c-format msgid "Status : %s\n" msgstr "" -#: nis/nis_print.c:373 +#: nis/nis_print.c:372 #, c-format msgid "Number of objects : %u\n" msgstr "" -#: nis/nis_print.c:377 +#: nis/nis_print.c:376 #, c-format msgid "Object #%d:\n" msgstr "" @@ -3470,514 +3560,543 @@ msgstr "" msgid " No recursive nonmembers\n" msgstr "" -#: nis/nss_nisplus/nisplus-publickey.c:101 -#: nis/nss_nisplus/nisplus-publickey.c:183 +#: nis/nss_nisplus/nisplus-publickey.c:100 +#: nis/nss_nisplus/nisplus-publickey.c:182 #, c-format msgid "DES entry for netname %s not unique\n" msgstr "" -#: nis/nss_nisplus/nisplus-publickey.c:220 +#: nis/nss_nisplus/nisplus-publickey.c:219 #, c-format msgid "netname2user: missing group id list in `%s'" 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 +#: nis/nss_nisplus/nisplus-publickey.c:301 +#: nis/nss_nisplus/nisplus-publickey.c:307 +#: nis/nss_nisplus/nisplus-publickey.c:372 +#: nis/nss_nisplus/nisplus-publickey.c:381 #, c-format msgid "netname2user: (nis+ lookup): %s\n" msgstr "" -#: nis/nss_nisplus/nisplus-publickey.c:321 +#: nis/nss_nisplus/nisplus-publickey.c:320 #, c-format msgid "netname2user: DES entry for %s in directory %s not unique" msgstr "" -#: nis/nss_nisplus/nisplus-publickey.c:339 +#: nis/nss_nisplus/nisplus-publickey.c:338 #, c-format msgid "netname2user: principal name `%s' too long" msgstr "" -#: nis/nss_nisplus/nisplus-publickey.c:395 +#: nis/nss_nisplus/nisplus-publickey.c:394 #, c-format msgid "netname2user: LOCAL entry for %s in directory %s not unique" msgstr "" -#: nis/nss_nisplus/nisplus-publickey.c:402 +#: nis/nss_nisplus/nisplus-publickey.c:401 msgid "netname2user: should not have uid 0" msgstr "" -#: nis/ypclnt.c:836 +#: nis/ypclnt.c:835 msgid "Request arguments bad" msgstr "" -#: nis/ypclnt.c:839 +#: nis/ypclnt.c:838 msgid "RPC failure on NIS operation" msgstr "" -#: nis/ypclnt.c:842 +#: nis/ypclnt.c:841 msgid "Can't bind to server which serves this domain" msgstr "" -#: nis/ypclnt.c:845 +#: nis/ypclnt.c:844 msgid "No such map in server's domain" msgstr "" -#: nis/ypclnt.c:848 +#: nis/ypclnt.c:847 msgid "No such key in map" msgstr "" -#: nis/ypclnt.c:851 +#: nis/ypclnt.c:850 msgid "Internal NIS error" msgstr "" -#: nis/ypclnt.c:854 +#: nis/ypclnt.c:853 msgid "Local resource allocation failure" msgstr "" -#: nis/ypclnt.c:857 +#: nis/ypclnt.c:856 msgid "No more records in map database" msgstr "" -#: nis/ypclnt.c:860 +#: nis/ypclnt.c:859 msgid "Can't communicate with portmapper" msgstr "" -#: nis/ypclnt.c:863 +#: nis/ypclnt.c:862 msgid "Can't communicate with ypbind" msgstr "" -#: nis/ypclnt.c:866 +#: nis/ypclnt.c:865 msgid "Can't communicate with ypserv" msgstr "" -#: nis/ypclnt.c:869 +#: nis/ypclnt.c:868 msgid "Local domain name not set" msgstr "" -#: nis/ypclnt.c:872 +#: nis/ypclnt.c:871 msgid "NIS map database is bad" msgstr "" -#: nis/ypclnt.c:875 +#: nis/ypclnt.c:874 msgid "NIS client/server version mismatch - can't supply service" msgstr "" -#: nis/ypclnt.c:881 +#: nis/ypclnt.c:880 msgid "Database is busy" msgstr "" -#: nis/ypclnt.c:884 +#: nis/ypclnt.c:883 msgid "Unknown NIS error code" msgstr "" -#: nis/ypclnt.c:924 +#: nis/ypclnt.c:923 msgid "Internal ypbind error" msgstr "" -#: nis/ypclnt.c:927 +#: nis/ypclnt.c:926 msgid "Domain not bound" msgstr "" -#: nis/ypclnt.c:930 +#: nis/ypclnt.c:929 msgid "System resource allocation failure" msgstr "" -#: nis/ypclnt.c:933 +#: nis/ypclnt.c:932 msgid "Unknown ypbind error" msgstr "" -#: nis/ypclnt.c:974 +#: nis/ypclnt.c:973 msgid "yp_update: cannot convert host to netname\n" msgstr "" -#: nis/ypclnt.c:992 +#: nis/ypclnt.c:991 msgid "yp_update: cannot get server address\n" msgstr "" -#: nscd/aicache.c:83 nscd/hstcache.c:492 +#: nscd/aicache.c:82 nscd/hstcache.c:493 #, c-format msgid "Haven't found \"%s\" in hosts cache!" msgstr "" -#: nscd/aicache.c:85 nscd/hstcache.c:494 +#: nscd/aicache.c:84 nscd/hstcache.c:495 #, c-format msgid "Reloading \"%s\" in hosts cache!" msgstr "" -#: nscd/cache.c:150 +#: nscd/cache.c:151 #, c-format msgid "add new entry \"%s\" of type %s for %s to cache%s" msgstr "" -#: nscd/cache.c:152 +#: nscd/cache.c:153 msgid " (first)" msgstr "" -#: nscd/cache.c:276 nscd/connections.c:861 +#: nscd/cache.c:285 nscd/connections.c:1002 #, c-format msgid "cannot stat() file `%s': %s" msgstr "" -#: nscd/cache.c:318 +#: nscd/cache.c:331 #, c-format msgid "pruning %s cache; time %ld" msgstr "" -#: nscd/cache.c:347 +#: nscd/cache.c:360 #, c-format msgid "considering %s entry \"%s\", timeout %" msgstr "" -#: nscd/connections.c:565 +#: nscd/connections.c:570 #, c-format msgid "invalid persistent database file \"%s\": %s" msgstr "" -#: nscd/connections.c:573 +#: nscd/connections.c:578 msgid "uninitialized header" msgstr "" -#: nscd/connections.c:578 +#: nscd/connections.c:583 msgid "header size does not match" msgstr "" -#: nscd/connections.c:588 +#: nscd/connections.c:593 msgid "file size does not match" msgstr "" -#: nscd/connections.c:605 +#: nscd/connections.c:610 msgid "verification failed" msgstr "" -#: nscd/connections.c:619 +#: nscd/connections.c:624 #, c-format msgid "" "suggested size of table for database %s larger than the persistent " "database's table" msgstr "" -#: nscd/connections.c:630 nscd/connections.c:715 +#: nscd/connections.c:635 nscd/connections.c:720 #, c-format msgid "cannot create read-only descriptor for \"%s\"; no mmap" msgstr "" -#: nscd/connections.c:646 +#: nscd/connections.c:651 #, c-format msgid "cannot access '%s'" msgstr "" -#: nscd/connections.c:694 +#: nscd/connections.c:699 #, c-format msgid "" "database for %s corrupted or simultaneously used; remove %s manually if " "necessary and restart" msgstr "" -#: nscd/connections.c:701 +#: nscd/connections.c:706 #, c-format msgid "cannot create %s; no persistent database used" msgstr "" -#: nscd/connections.c:704 +#: nscd/connections.c:709 #, c-format msgid "cannot create %s; no sharing possible" msgstr "" -#: nscd/connections.c:775 +#: nscd/connections.c:780 #, c-format msgid "cannot write to database file %s: %s" msgstr "" -#: nscd/connections.c:814 +#: nscd/connections.c:819 #, c-format msgid "cannot set socket to close on exec: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:897 +#: nscd/connections.c:868 #, c-format msgid "cannot open socket: %s" msgstr "" -#: nscd/connections.c:917 +#: nscd/connections.c:888 nscd/connections.c:952 #, c-format msgid "cannot change socket to nonblocking mode: %s" msgstr "" -#: nscd/connections.c:925 +#: nscd/connections.c:896 nscd/connections.c:962 #, c-format msgid "cannot set socket to close on exec: %s" msgstr "" -#: nscd/connections.c:938 +#: nscd/connections.c:909 #, c-format msgid "cannot enable socket to accept connections: %s" msgstr "" -#: nscd/connections.c:1039 +#: nscd/connections.c:986 +#, c-format +msgid "register trace file %s for database %s" +msgstr "" + +#: nscd/connections.c:1116 #, c-format msgid "provide access to FD %d, for %s" msgstr "" -#: nscd/connections.c:1051 +#: nscd/connections.c:1128 #, c-format msgid "cannot handle old request version %d; current version is %d" msgstr "" -#: nscd/connections.c:1073 +#: nscd/connections.c:1150 #, c-format msgid "request from %ld not handled due to missing permission" msgstr "" -#: nscd/connections.c:1078 +#: nscd/connections.c:1155 #, c-format msgid "request from '%s' [%ld] not handled due to missing permission" msgstr "" -#: nscd/connections.c:1083 +#: nscd/connections.c:1160 msgid "request not handled due to missing permission" msgstr "" -#: nscd/connections.c:1121 nscd/connections.c:1174 +#: nscd/connections.c:1198 nscd/connections.c:1251 #, c-format msgid "cannot write result: %s" msgstr "" -#: nscd/connections.c:1257 +#: nscd/connections.c:1342 #, c-format msgid "error getting caller's id: %s" msgstr "" -#: nscd/connections.c:1316 +#: nscd/connections.c:1402 #, c-format msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1330 +#: nscd/connections.c:1416 #, c-format msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1370 +#: nscd/connections.c:1456 #, c-format msgid "cannot change to old UID: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1380 +#: nscd/connections.c:1466 #, c-format msgid "cannot change to old GID: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1393 +#: nscd/connections.c:1479 #, c-format msgid "cannot change to old working directory: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1439 +#: nscd/connections.c:1525 #, c-format msgid "re-exec failed: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1448 +#: nscd/connections.c:1534 #, c-format msgid "cannot change current working directory to \"/\": %s" msgstr "" -#: nscd/connections.c:1641 +#: nscd/connections.c:1727 #, c-format msgid "short read while reading request: %s" msgstr "" -#: nscd/connections.c:1674 +#: nscd/connections.c:1760 #, c-format msgid "key length in request too long: %d" msgstr "" -#: nscd/connections.c:1687 +#: nscd/connections.c:1773 #, c-format msgid "short read while reading request key: %s" msgstr "" -#: nscd/connections.c:1696 +#: nscd/connections.c:1782 #, c-format msgid "handle_request: request received (Version = %d) from PID %ld" msgstr "" -#: nscd/connections.c:1701 +#: nscd/connections.c:1787 #, c-format msgid "handle_request: request received (Version = %d)" msgstr "" -#: nscd/connections.c:1901 nscd/connections.c:2099 +#: nscd/connections.c:1999 nscd/connections.c:2227 #, c-format msgid "disabled inotify after read error %d" msgstr "" -#: nscd/connections.c:2228 +#: nscd/connections.c:2374 msgid "could not initialize conditional variable" msgstr "" -#: nscd/connections.c:2236 +#: nscd/connections.c:2382 msgid "could not start clean-up thread; terminating" msgstr "" -#: nscd/connections.c:2250 +#: nscd/connections.c:2396 msgid "could not start any worker thread; terminating" msgstr "" -#: nscd/connections.c:2301 nscd/connections.c:2302 nscd/connections.c:2319 -#: nscd/connections.c:2328 nscd/connections.c:2346 nscd/connections.c:2357 -#: nscd/connections.c:2368 +#: nscd/connections.c:2447 nscd/connections.c:2448 nscd/connections.c:2465 +#: nscd/connections.c:2474 nscd/connections.c:2492 nscd/connections.c:2503 +#: nscd/connections.c:2514 #, c-format msgid "Failed to run nscd as user '%s'" msgstr "" -#: nscd/connections.c:2320 +#: nscd/connections.c:2466 #, c-format msgid "initial getgrouplist failed" msgstr "" -#: nscd/connections.c:2329 +#: nscd/connections.c:2475 #, c-format msgid "getgrouplist failed" msgstr "" -#: nscd/connections.c:2347 +#: nscd/connections.c:2493 #, c-format msgid "setgroups failed" msgstr "" -#: nscd/grpcache.c:383 nscd/hstcache.c:439 nscd/initgrcache.c:406 -#: nscd/pwdcache.c:378 nscd/servicescache.c:332 +#: nscd/grpcache.c:390 nscd/hstcache.c:440 nscd/initgrcache.c:411 +#: nscd/pwdcache.c:383 nscd/servicescache.c:338 #, c-format msgid "short write in %s: %s" msgstr "" -#: nscd/grpcache.c:428 nscd/initgrcache.c:78 +#: nscd/grpcache.c:435 nscd/initgrcache.c:77 #, c-format msgid "Haven't found \"%s\" in group cache!" msgstr "" -#: nscd/grpcache.c:430 nscd/initgrcache.c:80 +#: nscd/grpcache.c:437 nscd/initgrcache.c:79 #, c-format msgid "Reloading \"%s\" in group cache!" msgstr "" -#: nscd/grpcache.c:509 +#: nscd/grpcache.c:516 #, c-format msgid "Invalid numeric gid \"%s\"!" msgstr "" -#: nscd/mem.c:431 +#: nscd/mem.c:425 #, c-format msgid "freed %zu bytes in %s cache" msgstr "" -#: nscd/mem.c:574 +#: nscd/mem.c:568 #, c-format msgid "no more memory for database '%s'" msgstr "" -#: nscd/nscd.c:101 +#: nscd/netgroupcache.c:77 +#, c-format +msgid "Haven't found \"%s\" in netgroup cache!" +msgstr "" + +#: nscd/netgroupcache.c:79 +#, c-format +msgid "Reloading \"%s\" in netgroup cache!" +msgstr "" + +#: nscd/netgroupcache.c:467 +#, c-format +msgid "Haven't found \"%s (%s,%s,%s)\" in netgroup cache!" +msgstr "" + +#: nscd/netgroupcache.c:470 +#, c-format +msgid "Reloading \"%s (%s,%s,%s)\" in netgroup cache!" +msgstr "" + +#: nscd/nscd.c:116 msgid "Read configuration data from NAME" msgstr "" -#: nscd/nscd.c:103 +#: nscd/nscd.c:118 msgid "Do not fork and display messages on the current tty" msgstr "" -#: nscd/nscd.c:104 +#: nscd/nscd.c:120 +msgid "Do not fork, but otherwise behave like a daemon" +msgstr "" + +#: nscd/nscd.c:121 msgid "NUMBER" msgstr "" -#: nscd/nscd.c:104 +#: nscd/nscd.c:121 msgid "Start NUMBER threads" msgstr "" -#: nscd/nscd.c:105 +#: nscd/nscd.c:122 msgid "Shut the server down" msgstr "" -#: nscd/nscd.c:106 +#: nscd/nscd.c:123 msgid "Print current configuration statistics" msgstr "" -#: nscd/nscd.c:107 +#: nscd/nscd.c:124 msgid "TABLE" msgstr "" -#: nscd/nscd.c:108 +#: nscd/nscd.c:125 msgid "Invalidate the specified cache" msgstr "" -#: nscd/nscd.c:109 +#: nscd/nscd.c:126 msgid "TABLE,yes" msgstr "" -#: nscd/nscd.c:110 +#: nscd/nscd.c:127 msgid "Use separate cache for each user" msgstr "" -#: nscd/nscd.c:115 +#: nscd/nscd.c:132 msgid "Name Service Cache Daemon." msgstr "" -#: nscd/nscd.c:147 nss/getent.c:952 nss/makedb.c:123 +#: nscd/nscd.c:164 nss/getent.c:999 nss/makedb.c:207 #, c-format msgid "wrong number of arguments" msgstr "" -#: nscd/nscd.c:157 +#: nscd/nscd.c:174 #, c-format msgid "failure while reading configuration file; this is fatal" msgstr "" -#: nscd/nscd.c:166 +#: nscd/nscd.c:183 #, c-format msgid "already running" msgstr "" -#: nscd/nscd.c:181 nscd/nscd.c:236 +#: nscd/nscd.c:201 nscd/nscd.c:259 #, c-format msgid "cannot fork" msgstr "" -#: nscd/nscd.c:244 +#: nscd/nscd.c:268 #, c-format msgid "cannot change current working directory to \"/\"" msgstr "" -#: nscd/nscd.c:252 +#: nscd/nscd.c:276 msgid "Could not create log file" msgstr "" -#: nscd/nscd.c:305 nscd/nscd.c:330 nscd/nscd_stat.c:174 +#: nscd/nscd.c:346 nscd/nscd.c:371 nscd/nscd_stat.c:173 #, c-format msgid "Only root is allowed to use this option!" msgstr "" -#: nscd/nscd.c:345 +#: nscd/nscd.c:386 #, c-format msgid "'%s' is not a known database" msgstr "" -#: nscd/nscd.c:370 nscd/nscd_stat.c:193 +#: nscd/nscd.c:411 nscd/nscd_stat.c:192 #, c-format msgid "write incomplete" msgstr "" -#: nscd/nscd.c:381 +#: nscd/nscd.c:422 #, c-format msgid "cannot read invalidate ACK" msgstr "" -#: nscd/nscd.c:387 +#: nscd/nscd.c:428 #, c-format msgid "invalidation failed" msgstr "" -#: nscd/nscd.c:397 +#: nscd/nscd.c:438 #, c-format msgid "secure services not implemented anymore" msgstr "" @@ -4002,60 +4121,55 @@ msgstr "" msgid "Must specify user name for stat-user option" msgstr "" -#: nscd/nscd_conf.c:245 -#, c-format -msgid "invalid value for 'reload-count': %u" -msgstr "" - -#: nscd/nscd_conf.c:260 +#: nscd/nscd_conf.c:258 #, c-format msgid "Must specify value for restart-interval option" msgstr "" -#: nscd/nscd_conf.c:274 +#: nscd/nscd_conf.c:272 #, c-format msgid "Unknown option: %s %s %s" msgstr "" -#: nscd/nscd_conf.c:287 +#: nscd/nscd_conf.c:285 #, c-format msgid "cannot get current working directory: %s; disabling paranoia mode" msgstr "" -#: nscd/nscd_conf.c:307 +#: nscd/nscd_conf.c:305 #, c-format msgid "maximum file size for %s database too small" msgstr "" -#: nscd/nscd_stat.c:143 +#: nscd/nscd_stat.c:142 #, c-format msgid "cannot write statistics: %s" msgstr "" -#: nscd/nscd_stat.c:158 +#: nscd/nscd_stat.c:157 msgid "yes" msgstr "" -#: nscd/nscd_stat.c:159 +#: nscd/nscd_stat.c:158 msgid "no" msgstr "" -#: nscd/nscd_stat.c:170 +#: nscd/nscd_stat.c:169 #, c-format msgid "Only root or %s is allowed to use this option!" msgstr "" -#: nscd/nscd_stat.c:181 +#: nscd/nscd_stat.c:180 #, c-format msgid "nscd not running!\n" msgstr "" -#: nscd/nscd_stat.c:205 +#: nscd/nscd_stat.c:204 #, c-format msgid "cannot read statistics data" msgstr "" -#: nscd/nscd_stat.c:208 +#: nscd/nscd_stat.c:207 #, c-format msgid "" "nscd configuration:\n" @@ -4063,27 +4177,27 @@ msgid "" "%15d server debug level\n" msgstr "" -#: nscd/nscd_stat.c:232 +#: nscd/nscd_stat.c:231 #, c-format msgid "%3ud %2uh %2um %2lus server runtime\n" msgstr "" -#: nscd/nscd_stat.c:235 +#: nscd/nscd_stat.c:234 #, c-format msgid " %2uh %2um %2lus server runtime\n" msgstr "" -#: nscd/nscd_stat.c:237 +#: nscd/nscd_stat.c:236 #, c-format msgid " %2um %2lus server runtime\n" msgstr "" -#: nscd/nscd_stat.c:239 +#: nscd/nscd_stat.c:238 #, c-format msgid " %2lus server runtime\n" msgstr "" -#: nscd/nscd_stat.c:241 +#: nscd/nscd_stat.c:240 #, c-format msgid "" "%15d current number of threads\n" @@ -4094,7 +4208,7 @@ msgid "" "%15u reload count\n" msgstr "" -#: nscd/nscd_stat.c:276 +#: nscd/nscd_stat.c:275 #, c-format msgid "" "\n" @@ -4122,97 +4236,97 @@ msgid "" "%15s check /etc/%s for changes\n" msgstr "" -#: nscd/pwdcache.c:423 +#: nscd/pwdcache.c:428 #, c-format msgid "Haven't found \"%s\" in password cache!" msgstr "" -#: nscd/pwdcache.c:425 +#: nscd/pwdcache.c:430 #, c-format msgid "Reloading \"%s\" in password cache!" msgstr "" -#: nscd/pwdcache.c:506 +#: nscd/pwdcache.c:511 #, c-format msgid "Invalid numeric uid \"%s\"!" msgstr "" -#: nscd/selinux.c:156 +#: nscd/selinux.c:160 #, c-format msgid "Failed opening connection to the audit subsystem: %m" msgstr "" -#: nscd/selinux.c:177 +#: nscd/selinux.c:181 msgid "Failed to set keep-capabilities" msgstr "" -#: nscd/selinux.c:178 nscd/selinux.c:241 +#: nscd/selinux.c:182 nscd/selinux.c:245 #, c-format msgid "prctl(KEEPCAPS) failed" msgstr "" -#: nscd/selinux.c:192 +#: nscd/selinux.c:196 msgid "Failed to initialize drop of capabilities" msgstr "" -#: nscd/selinux.c:193 +#: nscd/selinux.c:197 #, c-format msgid "cap_init failed" msgstr "" -#: nscd/selinux.c:214 nscd/selinux.c:231 +#: nscd/selinux.c:218 nscd/selinux.c:235 msgid "Failed to drop capabilities" msgstr "" -#: nscd/selinux.c:215 nscd/selinux.c:232 +#: nscd/selinux.c:219 nscd/selinux.c:236 #, c-format msgid "cap_set_proc failed" msgstr "" -#: nscd/selinux.c:240 +#: nscd/selinux.c:244 msgid "Failed to unset keep-capabilities" msgstr "" -#: nscd/selinux.c:256 +#: nscd/selinux.c:260 msgid "Failed to determine if kernel supports SELinux" msgstr "" -#: nscd/selinux.c:271 +#: nscd/selinux.c:275 #, c-format msgid "Failed to start AVC thread" msgstr "" -#: nscd/selinux.c:293 +#: nscd/selinux.c:297 #, c-format msgid "Failed to create AVC lock" msgstr "" -#: nscd/selinux.c:333 +#: nscd/selinux.c:337 #, c-format msgid "Failed to start AVC" msgstr "" -#: nscd/selinux.c:335 +#: nscd/selinux.c:339 msgid "Access Vector Cache (AVC) started" msgstr "" -#: nscd/selinux.c:356 +#: nscd/selinux.c:360 msgid "Error getting context of socket peer" msgstr "" -#: nscd/selinux.c:361 +#: nscd/selinux.c:365 msgid "Error getting context of nscd" msgstr "" -#: nscd/selinux.c:367 +#: nscd/selinux.c:371 msgid "Error getting sid from context" msgstr "" -#: nscd/selinux.c:374 +#: nscd/selinux.c:378 msgid "compile-time support for database policy missing" msgstr "" -#: nscd/selinux.c:407 +#: nscd/selinux.c:411 #, c-format msgid "" "\n" @@ -4228,118 +4342,162 @@ msgid "" "%15u CAV misses\n" msgstr "" -#: nscd/servicescache.c:381 +#: nscd/servicescache.c:387 #, c-format msgid "Haven't found \"%s\" in services cache!" msgstr "" -#: nscd/servicescache.c:383 +#: nscd/servicescache.c:389 #, c-format msgid "Reloading \"%s\" in services cache!" msgstr "" -#: nss/getent.c:54 +#: nss/getent.c:53 msgid "database [key ...]" msgstr "" -#: nss/getent.c:59 +#: nss/getent.c:58 msgid "Service configuration to be used" msgstr "" -#: nss/getent.c:60 +#: nss/getent.c:59 msgid "disable IDN encoding" msgstr "" -#: nss/getent.c:65 +#: nss/getent.c:64 msgid "Get entries from administrative database." msgstr "" -#: nss/getent.c:149 nss/getent.c:479 +#: nss/getent.c:148 nss/getent.c:477 nss/getent.c:522 #, c-format msgid "Enumeration not supported on %s\n" msgstr "" -#: nss/getent.c:866 +#: nss/getent.c:913 #, c-format msgid "Unknown database name" msgstr "" -#: nss/getent.c:896 +#: nss/getent.c:943 msgid "Supported databases:\n" msgstr "" -#: nss/getent.c:962 +#: nss/getent.c:1009 #, c-format msgid "Unknown database: %s\n" msgstr "" -#: nss/makedb.c:60 +#: nss/makedb.c:117 msgid "Convert key to lower case" msgstr "" -#: nss/makedb.c:63 +#: nss/makedb.c:120 msgid "Do not print messages while building database" msgstr "" -#: nss/makedb.c:65 +#: nss/makedb.c:122 msgid "Print content of database file, one entry a line" msgstr "" -#: nss/makedb.c:70 -msgid "Create simple DB database from textual input." +#: nss/makedb.c:123 +msgid "CHAR" msgstr "" -#: nss/makedb.c:73 +#: nss/makedb.c:124 +msgid "Generated line not part of iteration" +msgstr "" + +#: nss/makedb.c:129 +msgid "Create simple database from textual input." +msgstr "" + +#: nss/makedb.c:132 msgid "" "INPUT-FILE OUTPUT-FILE\n" "-o OUTPUT-FILE INPUT-FILE\n" "-u INPUT-FILE" msgstr "" -#: nss/makedb.c:142 +#: nss/makedb.c:228 #, c-format -msgid "No usable database library found." +msgid "cannot open database file `%s'" msgstr "" -#: nss/makedb.c:149 +#: nss/makedb.c:273 #, c-format -msgid "cannot open database file `%s': %s" +msgid "no entries to be processed" msgstr "" -#: nss/makedb.c:151 -msgid "incorrectly formatted file" +#: nss/makedb.c:283 +#, c-format +msgid "cannot create temporary file name" msgstr "" -#: nss/makedb.c:331 -msgid "duplicate key" +#: nss/makedb.c:305 +#, c-format +msgid "cannot stat newly created file" +msgstr "" + +#: nss/makedb.c:316 +#, c-format +msgid "cannot rename temporary file" msgstr "" -#: nss/makedb.c:337 +#: nss/makedb.c:529 nss/makedb.c:552 #, c-format -msgid "while writing database file" +msgid "cannot create search tree" +msgstr "" + +#: nss/makedb.c:558 +msgid "duplicate key" msgstr "" -#: nss/makedb.c:348 +#: nss/makedb.c:570 #, c-format msgid "problems while reading `%s'" msgstr "" -#: nss/makedb.c:368 nss/makedb.c:385 +#: nss/makedb.c:794 +#, c-format +msgid "failed to write new database file" +msgstr "" + +#: nss/makedb.c:807 #, c-format -msgid "while reading database" +msgid "cannot stat database file" msgstr "" -#: posix/getconf.c:1036 +#: nss/makedb.c:812 +#, c-format +msgid "cannot map database file" +msgstr "" + +#: nss/makedb.c:815 +#, c-format +msgid "file not a database file" +msgstr "" + +#: nss/makedb.c:866 +#, c-format +msgid "cannot set file creation context for `%s'" +msgstr "" + +#: ports/sysdeps/unix/sysv/linux/ia64/makecontext.c:62 +#, c-format +msgid "makecontext: does not know how to handle more than 8 arguments\n" +msgstr "" + +#: posix/getconf.c:1035 #, c-format msgid "Usage: %s [-v specification] variable_name [pathname]\n" msgstr "" -#: posix/getconf.c:1039 +#: posix/getconf.c:1038 #, c-format msgid " %s -a [pathname]\n" msgstr "" -#: posix/getconf.c:1115 +#: posix/getconf.c:1114 #, c-format msgid "" "Usage: getconf [-v SPEC] VAR\n" @@ -4351,150 +4509,150 @@ msgid "" "\n" msgstr "" -#: posix/getconf.c:1173 +#: posix/getconf.c:1172 #, c-format msgid "unknown specification \"%s\"" msgstr "" -#: posix/getconf.c:1225 +#: posix/getconf.c:1224 #, c-format msgid "Couldn't execute %s" msgstr "" -#: posix/getconf.c:1269 posix/getconf.c:1285 +#: posix/getconf.c:1268 posix/getconf.c:1284 msgid "undefined" msgstr "" -#: posix/getconf.c:1307 +#: posix/getconf.c:1306 #, c-format msgid "Unrecognized variable `%s'" msgstr "" -#: posix/getopt.c:594 posix/getopt.c:623 +#: posix/getopt.c:593 posix/getopt.c:622 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "" -#: posix/getopt.c:664 posix/getopt.c:668 +#: posix/getopt.c:663 posix/getopt.c:667 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "" -#: posix/getopt.c:677 posix/getopt.c:682 +#: posix/getopt.c:676 posix/getopt.c:681 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "" -#: posix/getopt.c:725 posix/getopt.c:744 +#: posix/getopt.c:724 posix/getopt.c:743 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "" -#: posix/getopt.c:782 posix/getopt.c:785 +#: posix/getopt.c:781 posix/getopt.c:784 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "" -#: posix/getopt.c:793 posix/getopt.c:796 +#: posix/getopt.c:792 posix/getopt.c:795 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "" -#: posix/getopt.c:845 posix/getopt.c:848 +#: posix/getopt.c:844 posix/getopt.c:847 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "" -#: posix/getopt.c:898 posix/getopt.c:915 posix/getopt.c:1123 -#: posix/getopt.c:1141 +#: posix/getopt.c:900 posix/getopt.c:917 posix/getopt.c:1127 +#: posix/getopt.c:1145 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "" -#: posix/getopt.c:971 posix/getopt.c:987 +#: posix/getopt.c:973 posix/getopt.c:989 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "" -#: posix/getopt.c:1011 posix/getopt.c:1029 +#: posix/getopt.c:1013 posix/getopt.c:1031 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "" -#: posix/getopt.c:1050 posix/getopt.c:1068 +#: posix/getopt.c:1052 posix/getopt.c:1070 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "" -#: posix/regcomp.c:135 +#: posix/regcomp.c:134 msgid "No match" msgstr "" -#: posix/regcomp.c:138 +#: posix/regcomp.c:137 msgid "Invalid regular expression" msgstr "" -#: posix/regcomp.c:141 +#: posix/regcomp.c:140 msgid "Invalid collation character" msgstr "" -#: posix/regcomp.c:144 +#: posix/regcomp.c:143 msgid "Invalid character class name" msgstr "" -#: posix/regcomp.c:147 +#: posix/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: posix/regcomp.c:150 +#: posix/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: posix/regcomp.c:153 +#: posix/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: posix/regcomp.c:156 +#: posix/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: posix/regcomp.c:159 +#: posix/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: posix/regcomp.c:162 +#: posix/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: posix/regcomp.c:165 +#: posix/regcomp.c:164 msgid "Invalid range end" msgstr "" -#: posix/regcomp.c:168 +#: posix/regcomp.c:167 msgid "Memory exhausted" msgstr "" -#: posix/regcomp.c:171 +#: posix/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "" -#: posix/regcomp.c:174 +#: posix/regcomp.c:173 msgid "Premature end of regular expression" msgstr "" -#: posix/regcomp.c:177 +#: posix/regcomp.c:176 msgid "Regular expression too big" msgstr "" -#: posix/regcomp.c:180 +#: posix/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" -#: posix/regcomp.c:680 +#: posix/regcomp.c:679 msgid "No previous regular expression" msgstr "" -#: posix/wordexp.c:1832 +#: posix/wordexp.c:1829 msgid "parameter null or not set" msgstr "" @@ -4526,27 +4684,27 @@ msgstr "" msgid "Unknown resolver error" msgstr "" -#: resolv/res_hconf.c:124 +#: resolv/res_hconf.c:122 #, c-format msgid "%s: line %d: cannot specify more than %d trim domains" msgstr "" -#: resolv/res_hconf.c:145 +#: resolv/res_hconf.c:143 #, c-format msgid "%s: line %d: list delimiter not followed by domain" msgstr "" -#: resolv/res_hconf.c:204 +#: resolv/res_hconf.c:202 #, c-format msgid "%s: line %d: expected `on' or `off', found `%s'\n" msgstr "" -#: resolv/res_hconf.c:247 +#: resolv/res_hconf.c:245 #, c-format msgid "%s: line %d: bad command `%s'\n" msgstr "" -#: resolv/res_hconf.c:282 +#: resolv/res_hconf.c:280 #, c-format msgid "%s: line %d: ignoring trailing garbage `%s'\n" msgstr "" @@ -4691,207 +4849,207 @@ msgstr "" msgid "Device disconnected" msgstr "" -#: stdio-common/psiginfo.c:145 +#: stdio-common/psiginfo.c:139 msgid "Signal sent by kill()" msgstr "" -#: stdio-common/psiginfo.c:148 +#: stdio-common/psiginfo.c:142 msgid "Signal sent by sigqueue()" msgstr "" -#: stdio-common/psiginfo.c:151 +#: stdio-common/psiginfo.c:145 msgid "Signal generated by the expiration of a timer" msgstr "" -#: stdio-common/psiginfo.c:154 +#: stdio-common/psiginfo.c:148 msgid "Signal generated by the completion of an asynchronous I/O request" msgstr "" -#: stdio-common/psiginfo.c:158 +#: stdio-common/psiginfo.c:152 msgid "Signal generated by the arrival of a message on an empty message queue" msgstr "" -#: stdio-common/psiginfo.c:163 +#: stdio-common/psiginfo.c:157 msgid "Signal sent by tkill()" msgstr "" -#: stdio-common/psiginfo.c:168 +#: stdio-common/psiginfo.c:162 msgid "" "Signal generated by the completion of an asynchronous name lookup request" msgstr "" -#: stdio-common/psiginfo.c:174 +#: stdio-common/psiginfo.c:168 msgid "Signal generated by the completion of an I/O request" msgstr "" -#: stdio-common/psiginfo.c:180 +#: stdio-common/psiginfo.c:174 msgid "Signal sent by the kernel" msgstr "" -#: stdio-common/psiginfo.c:204 +#: stdio-common/psiginfo.c:198 #, c-format msgid "Unknown signal %d\n" msgstr "" -#: stdio-common/psignal.c:51 +#: stdio-common/psignal.c:43 #, c-format msgid "%s%sUnknown signal %d\n" msgstr "" -#: stdio-common/psignal.c:52 +#: stdio-common/psignal.c:44 msgid "Unknown signal" msgstr "" -#: string/_strerror.c:47 sysdeps/mach/_strerror.c:87 +#: string/_strerror.c:46 sysdeps/mach/_strerror.c:86 msgid "Unknown error " msgstr "" -#: string/strerror.c:43 +#: string/strerror.c:42 msgid "Unknown error" msgstr "" -#: string/strsignal.c:65 +#: string/strsignal.c:60 #, c-format msgid "Real-time signal %d" msgstr "" -#: string/strsignal.c:69 +#: string/strsignal.c:64 #, c-format msgid "Unknown signal %d" msgstr "" -#: sunrpc/auth_unix.c:113 sunrpc/clnt_tcp.c:125 sunrpc/clnt_udp.c:136 -#: sunrpc/clnt_unix.c:126 sunrpc/svc_tcp.c:173 sunrpc/svc_tcp.c:218 -#: sunrpc/svc_udp.c:147 sunrpc/svc_unix.c:174 sunrpc/svc_unix.c:215 -#: sunrpc/xdr.c:632 sunrpc/xdr.c:792 sunrpc/xdr_array.c:100 -#: sunrpc/xdr_rec.c:154 sunrpc/xdr_ref.c:79 +#: sunrpc/auth_unix.c:111 sunrpc/clnt_tcp.c:123 sunrpc/clnt_udp.c:134 +#: sunrpc/clnt_unix.c:124 sunrpc/svc_tcp.c:171 sunrpc/svc_tcp.c:216 +#: sunrpc/svc_udp.c:145 sunrpc/svc_unix.c:171 sunrpc/svc_unix.c:212 +#: sunrpc/xdr.c:630 sunrpc/xdr.c:790 sunrpc/xdr_array.c:97 +#: sunrpc/xdr_rec.c:151 sunrpc/xdr_ref.c:76 msgid "out of memory\n" msgstr "" -#: sunrpc/auth_unix.c:351 +#: sunrpc/auth_unix.c:349 msgid "auth_unix.c: Fatal marshalling problem" msgstr "" -#: sunrpc/clnt_perr.c:98 sunrpc/clnt_perr.c:114 +#: sunrpc/clnt_perr.c:95 sunrpc/clnt_perr.c:111 #, c-format msgid "%s: %s; low version = %lu, high version = %lu" msgstr "" -#: sunrpc/clnt_perr.c:105 +#: sunrpc/clnt_perr.c:102 #, c-format msgid "%s: %s; why = %s\n" msgstr "" -#: sunrpc/clnt_perr.c:107 +#: sunrpc/clnt_perr.c:104 #, c-format msgid "%s: %s; why = (unknown authentication error - %d)\n" msgstr "" -#: sunrpc/clnt_perr.c:156 +#: sunrpc/clnt_perr.c:153 msgid "RPC: Success" msgstr "" -#: sunrpc/clnt_perr.c:159 +#: sunrpc/clnt_perr.c:156 msgid "RPC: Can't encode arguments" msgstr "" -#: sunrpc/clnt_perr.c:163 +#: sunrpc/clnt_perr.c:160 msgid "RPC: Can't decode result" msgstr "" -#: sunrpc/clnt_perr.c:167 +#: sunrpc/clnt_perr.c:164 msgid "RPC: Unable to send" msgstr "" -#: sunrpc/clnt_perr.c:171 +#: sunrpc/clnt_perr.c:168 msgid "RPC: Unable to receive" msgstr "" -#: sunrpc/clnt_perr.c:175 +#: sunrpc/clnt_perr.c:172 msgid "RPC: Timed out" msgstr "" -#: sunrpc/clnt_perr.c:179 +#: sunrpc/clnt_perr.c:176 msgid "RPC: Incompatible versions of RPC" msgstr "" -#: sunrpc/clnt_perr.c:183 +#: sunrpc/clnt_perr.c:180 msgid "RPC: Authentication error" msgstr "" -#: sunrpc/clnt_perr.c:187 +#: sunrpc/clnt_perr.c:184 msgid "RPC: Program unavailable" msgstr "" -#: sunrpc/clnt_perr.c:191 +#: sunrpc/clnt_perr.c:188 msgid "RPC: Program/version mismatch" msgstr "" -#: sunrpc/clnt_perr.c:195 +#: sunrpc/clnt_perr.c:192 msgid "RPC: Procedure unavailable" msgstr "" -#: sunrpc/clnt_perr.c:199 +#: sunrpc/clnt_perr.c:196 msgid "RPC: Server can't decode arguments" msgstr "" -#: sunrpc/clnt_perr.c:203 +#: sunrpc/clnt_perr.c:200 msgid "RPC: Remote system error" msgstr "" -#: sunrpc/clnt_perr.c:207 +#: sunrpc/clnt_perr.c:204 msgid "RPC: Unknown host" msgstr "" -#: sunrpc/clnt_perr.c:211 +#: sunrpc/clnt_perr.c:208 msgid "RPC: Unknown protocol" msgstr "" -#: sunrpc/clnt_perr.c:215 +#: sunrpc/clnt_perr.c:212 msgid "RPC: Port mapper failure" msgstr "" -#: sunrpc/clnt_perr.c:219 +#: sunrpc/clnt_perr.c:216 msgid "RPC: Program not registered" msgstr "" -#: sunrpc/clnt_perr.c:223 +#: sunrpc/clnt_perr.c:220 msgid "RPC: Failed (unspecified error)" msgstr "" -#: sunrpc/clnt_perr.c:264 +#: sunrpc/clnt_perr.c:261 msgid "RPC: (unknown error code)" msgstr "" -#: sunrpc/clnt_perr.c:336 +#: sunrpc/clnt_perr.c:333 msgid "Authentication OK" msgstr "" -#: sunrpc/clnt_perr.c:339 +#: sunrpc/clnt_perr.c:336 msgid "Invalid client credential" msgstr "" -#: sunrpc/clnt_perr.c:343 +#: sunrpc/clnt_perr.c:340 msgid "Server rejected credential" msgstr "" -#: sunrpc/clnt_perr.c:347 +#: sunrpc/clnt_perr.c:344 msgid "Invalid client verifier" msgstr "" -#: sunrpc/clnt_perr.c:351 +#: sunrpc/clnt_perr.c:348 msgid "Server rejected verifier" msgstr "" -#: sunrpc/clnt_perr.c:355 +#: sunrpc/clnt_perr.c:352 msgid "Client credential too weak" msgstr "" -#: sunrpc/clnt_perr.c:359 +#: sunrpc/clnt_perr.c:356 msgid "Invalid server verifier" msgstr "" -#: sunrpc/clnt_perr.c:363 +#: sunrpc/clnt_perr.c:360 msgid "Failed (unspecified error)" msgstr "" @@ -4927,240 +5085,240 @@ msgstr "" msgid "Cannot receive reply to broadcast" msgstr "" -#: sunrpc/rpc_main.c:288 +#: sunrpc/rpc_main.c:280 #, c-format msgid "%s: output would overwrite %s\n" msgstr "" -#: sunrpc/rpc_main.c:295 +#: sunrpc/rpc_main.c:287 #, c-format msgid "%s: unable to open %s: %m\n" msgstr "" -#: sunrpc/rpc_main.c:307 +#: sunrpc/rpc_main.c:299 #, c-format msgid "%s: while writing output %s: %m" msgstr "" -#: sunrpc/rpc_main.c:342 +#: sunrpc/rpc_main.c:334 #, c-format msgid "cannot find C preprocessor: %s \n" msgstr "" -#: sunrpc/rpc_main.c:350 +#: sunrpc/rpc_main.c:342 msgid "cannot find any C preprocessor (cpp)\n" msgstr "" -#: sunrpc/rpc_main.c:419 +#: sunrpc/rpc_main.c:411 #, c-format msgid "%s: C preprocessor failed with signal %d\n" msgstr "" -#: sunrpc/rpc_main.c:422 +#: sunrpc/rpc_main.c:414 #, c-format msgid "%s: C preprocessor failed with exit code %d\n" msgstr "" -#: sunrpc/rpc_main.c:462 +#: sunrpc/rpc_main.c:454 #, c-format msgid "illegal nettype: `%s'\n" msgstr "" -#: sunrpc/rpc_main.c:1128 +#: sunrpc/rpc_main.c:1089 #, c-format msgid "rpcgen: too many defines\n" msgstr "" -#: sunrpc/rpc_main.c:1140 +#: sunrpc/rpc_main.c:1101 #, c-format msgid "rpcgen: arglist coding error\n" msgstr "" #. TRANS: the file will not be removed; this is an #. TRANS: informative message. -#: sunrpc/rpc_main.c:1173 +#: sunrpc/rpc_main.c:1134 #, c-format msgid "file `%s' already exists and may be overwritten\n" msgstr "" -#: sunrpc/rpc_main.c:1218 +#: sunrpc/rpc_main.c:1179 #, c-format msgid "Cannot specify more than one input file!\n" msgstr "" -#: sunrpc/rpc_main.c:1392 +#: sunrpc/rpc_main.c:1349 #, c-format msgid "This implementation doesn't support newstyle or MT-safe code!\n" msgstr "" -#: sunrpc/rpc_main.c:1401 +#: sunrpc/rpc_main.c:1358 #, c-format msgid "Cannot use netid flag with inetd flag!\n" msgstr "" -#: sunrpc/rpc_main.c:1413 +#: sunrpc/rpc_main.c:1367 #, c-format msgid "Cannot use netid flag without TIRPC!\n" msgstr "" -#: sunrpc/rpc_main.c:1420 +#: sunrpc/rpc_main.c:1374 #, c-format msgid "Cannot use table flags with newstyle!\n" msgstr "" -#: sunrpc/rpc_main.c:1439 +#: sunrpc/rpc_main.c:1393 #, c-format msgid "\"infile\" is required for template generation flags.\n" msgstr "" -#: sunrpc/rpc_main.c:1444 +#: sunrpc/rpc_main.c:1398 #, c-format msgid "Cannot have more than one file generation flag!\n" msgstr "" -#: sunrpc/rpc_main.c:1453 +#: sunrpc/rpc_main.c:1407 #, c-format msgid "usage: %s infile\n" msgstr "" -#: sunrpc/rpc_main.c:1454 +#: sunrpc/rpc_main.c:1408 #, c-format msgid "" "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] " "infile\n" msgstr "" -#: sunrpc/rpc_main.c:1456 +#: sunrpc/rpc_main.c:1410 #, c-format msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n" msgstr "" -#: sunrpc/rpc_main.c:1458 +#: sunrpc/rpc_main.c:1412 #, c-format msgid "\t%s [-s nettype]* [-o outfile] [infile]\n" msgstr "" -#: sunrpc/rpc_main.c:1459 +#: sunrpc/rpc_main.c:1413 #, c-format msgid "\t%s [-n netid]* [-o outfile] [infile]\n" msgstr "" -#: sunrpc/rpc_main.c:1467 +#: sunrpc/rpc_main.c:1421 #, c-format msgid "options:\n" msgstr "" -#: sunrpc/rpc_main.c:1468 +#: sunrpc/rpc_main.c:1422 #, c-format msgid "-a\t\tgenerate all files, including samples\n" msgstr "" -#: sunrpc/rpc_main.c:1469 +#: sunrpc/rpc_main.c:1423 #, c-format msgid "-b\t\tbackward compatibility mode (generates code for SunOS 4.1)\n" msgstr "" -#: sunrpc/rpc_main.c:1470 +#: sunrpc/rpc_main.c:1424 #, c-format msgid "-c\t\tgenerate XDR routines\n" msgstr "" -#: sunrpc/rpc_main.c:1471 +#: sunrpc/rpc_main.c:1425 #, c-format msgid "-C\t\tANSI C mode\n" msgstr "" -#: sunrpc/rpc_main.c:1472 +#: sunrpc/rpc_main.c:1426 #, c-format msgid "-Dname[=value]\tdefine a symbol (same as #define)\n" msgstr "" -#: sunrpc/rpc_main.c:1473 +#: sunrpc/rpc_main.c:1427 #, c-format msgid "-h\t\tgenerate header file\n" msgstr "" -#: sunrpc/rpc_main.c:1474 +#: sunrpc/rpc_main.c:1428 #, c-format msgid "-i size\t\tsize at which to start generating inline code\n" msgstr "" -#: sunrpc/rpc_main.c:1475 +#: sunrpc/rpc_main.c:1429 #, c-format msgid "-I\t\tgenerate code for inetd support in server (for SunOS 4.1)\n" msgstr "" -#: sunrpc/rpc_main.c:1476 +#: sunrpc/rpc_main.c:1430 #, c-format msgid "-K seconds\tserver exits after K seconds of inactivity\n" msgstr "" -#: sunrpc/rpc_main.c:1477 +#: sunrpc/rpc_main.c:1431 #, c-format msgid "-l\t\tgenerate client side stubs\n" msgstr "" -#: sunrpc/rpc_main.c:1478 +#: sunrpc/rpc_main.c:1432 #, c-format msgid "-L\t\tserver errors will be printed to syslog\n" msgstr "" -#: sunrpc/rpc_main.c:1479 +#: sunrpc/rpc_main.c:1433 #, c-format msgid "-m\t\tgenerate server side stubs\n" msgstr "" -#: sunrpc/rpc_main.c:1480 +#: sunrpc/rpc_main.c:1434 #, c-format msgid "-M\t\tgenerate MT-safe code\n" msgstr "" -#: sunrpc/rpc_main.c:1481 +#: sunrpc/rpc_main.c:1435 #, c-format msgid "-n netid\tgenerate server code that supports named netid\n" msgstr "" -#: sunrpc/rpc_main.c:1482 +#: sunrpc/rpc_main.c:1436 #, c-format msgid "-N\t\tsupports multiple arguments and call-by-value\n" msgstr "" -#: sunrpc/rpc_main.c:1483 +#: sunrpc/rpc_main.c:1437 #, c-format msgid "-o outfile\tname of the output file\n" msgstr "" -#: sunrpc/rpc_main.c:1484 +#: sunrpc/rpc_main.c:1438 #, c-format msgid "-s nettype\tgenerate server code that supports named nettype\n" msgstr "" -#: sunrpc/rpc_main.c:1485 +#: sunrpc/rpc_main.c:1439 #, c-format msgid "-Sc\t\tgenerate sample client code that uses remote procedures\n" msgstr "" -#: sunrpc/rpc_main.c:1486 +#: sunrpc/rpc_main.c:1440 #, c-format msgid "-Ss\t\tgenerate sample server code that defines remote procedures\n" msgstr "" -#: sunrpc/rpc_main.c:1487 +#: sunrpc/rpc_main.c:1441 #, c-format msgid "-Sm \t\tgenerate makefile template \n" msgstr "" -#: sunrpc/rpc_main.c:1488 +#: sunrpc/rpc_main.c:1442 #, c-format msgid "-t\t\tgenerate RPC dispatch table\n" msgstr "" -#: sunrpc/rpc_main.c:1489 +#: sunrpc/rpc_main.c:1443 #, c-format msgid "-T\t\tgenerate code to support RPC dispatch tables\n" msgstr "" -#: sunrpc/rpc_main.c:1490 +#: sunrpc/rpc_main.c:1444 #, c-format msgid "-Y path\t\tdirectory name to find C preprocessor (cpp)\n" msgstr "" @@ -5270,127 +5428,127 @@ msgstr "" msgid "svc_run: - poll failed" msgstr "" -#: sunrpc/svc_simple.c:81 +#: sunrpc/svc_simple.c:80 #, c-format msgid "can't reassign procedure number %ld\n" msgstr "" -#: sunrpc/svc_simple.c:91 +#: sunrpc/svc_simple.c:90 msgid "couldn't create an rpc server\n" msgstr "" -#: sunrpc/svc_simple.c:99 +#: sunrpc/svc_simple.c:98 #, c-format msgid "couldn't register prog %ld vers %ld\n" msgstr "" -#: sunrpc/svc_simple.c:107 +#: sunrpc/svc_simple.c:106 msgid "registerrpc: out of memory\n" msgstr "" -#: sunrpc/svc_simple.c:168 +#: sunrpc/svc_simple.c:169 #, c-format msgid "trouble replying to prog %d\n" msgstr "" -#: sunrpc/svc_simple.c:177 +#: sunrpc/svc_simple.c:178 #, c-format msgid "never registered prog %d\n" msgstr "" -#: sunrpc/svc_tcp.c:149 +#: sunrpc/svc_tcp.c:147 msgid "svc_tcp.c - tcp socket creation problem" msgstr "" -#: sunrpc/svc_tcp.c:164 +#: sunrpc/svc_tcp.c:162 msgid "svc_tcp.c - cannot getsockname or listen" msgstr "" -#: sunrpc/svc_udp.c:122 +#: sunrpc/svc_udp.c:120 msgid "svcudp_create: socket creation problem" msgstr "" -#: sunrpc/svc_udp.c:136 +#: sunrpc/svc_udp.c:134 msgid "svcudp_create - cannot getsockname" msgstr "" -#: sunrpc/svc_udp.c:168 +#: sunrpc/svc_udp.c:166 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n" msgstr "" -#: sunrpc/svc_udp.c:476 +#: sunrpc/svc_udp.c:474 msgid "enablecache: cache already enabled" msgstr "" -#: sunrpc/svc_udp.c:482 +#: sunrpc/svc_udp.c:480 msgid "enablecache: could not allocate cache" msgstr "" -#: sunrpc/svc_udp.c:491 +#: sunrpc/svc_udp.c:489 msgid "enablecache: could not allocate cache data" msgstr "" -#: sunrpc/svc_udp.c:499 +#: sunrpc/svc_udp.c:497 msgid "enablecache: could not allocate cache fifo" msgstr "" -#: sunrpc/svc_udp.c:535 +#: sunrpc/svc_udp.c:533 msgid "cache_set: victim not found" msgstr "" -#: sunrpc/svc_udp.c:546 +#: sunrpc/svc_udp.c:544 msgid "cache_set: victim alloc failed" msgstr "" -#: sunrpc/svc_udp.c:553 +#: sunrpc/svc_udp.c:551 msgid "cache_set: could not allocate new rpc_buffer" msgstr "" -#: sunrpc/svc_unix.c:148 +#: sunrpc/svc_unix.c:145 msgid "svc_unix.c - AF_UNIX socket creation problem" msgstr "" -#: sunrpc/svc_unix.c:164 +#: sunrpc/svc_unix.c:161 msgid "svc_unix.c - cannot getsockname or listen" msgstr "" -#: sysdeps/generic/siglist.h:29 sysdeps/unix/siglist.c:27 +#: sysdeps/generic/siglist.h:28 msgid "Hangup" msgstr "" -#: sysdeps/generic/siglist.h:30 sysdeps/unix/siglist.c:28 +#: sysdeps/generic/siglist.h:29 msgid "Interrupt" msgstr "" -#: sysdeps/generic/siglist.h:31 sysdeps/unix/siglist.c:29 +#: sysdeps/generic/siglist.h:30 msgid "Quit" msgstr "" -#: sysdeps/generic/siglist.h:32 sysdeps/unix/siglist.c:30 +#: sysdeps/generic/siglist.h:31 msgid "Illegal instruction" msgstr "" -#: sysdeps/generic/siglist.h:33 sysdeps/unix/siglist.c:31 +#: sysdeps/generic/siglist.h:32 msgid "Trace/breakpoint trap" msgstr "" -#: sysdeps/generic/siglist.h:34 +#: sysdeps/generic/siglist.h:33 msgid "Aborted" msgstr "" -#: sysdeps/generic/siglist.h:35 sysdeps/unix/siglist.c:34 +#: sysdeps/generic/siglist.h:34 msgid "Floating point exception" msgstr "" -#: sysdeps/generic/siglist.h:36 sysdeps/unix/siglist.c:35 +#: sysdeps/generic/siglist.h:35 msgid "Killed" msgstr "" -#: sysdeps/generic/siglist.h:37 sysdeps/unix/siglist.c:36 +#: sysdeps/generic/siglist.h:36 msgid "Bus error" msgstr "" -#: sysdeps/generic/siglist.h:38 sysdeps/unix/siglist.c:37 +#: sysdeps/generic/siglist.h:37 msgid "Segmentation fault" msgstr "" @@ -5399,100 +5557,99 @@ msgstr "" #. 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 +#: sysdeps/generic/siglist.h:38 sysdeps/gnu/errlist.c:359 msgid "Broken pipe" msgstr "" -#: sysdeps/generic/siglist.h:40 sysdeps/unix/siglist.c:40 +#: sysdeps/generic/siglist.h:39 msgid "Alarm clock" msgstr "" -#: sysdeps/generic/siglist.h:41 sysdeps/unix/siglist.c:41 +#: sysdeps/generic/siglist.h:40 msgid "Terminated" msgstr "" -#: sysdeps/generic/siglist.h:42 sysdeps/unix/siglist.c:42 +#: sysdeps/generic/siglist.h:41 msgid "Urgent I/O condition" msgstr "" -#: sysdeps/generic/siglist.h:43 sysdeps/unix/siglist.c:43 +#: sysdeps/generic/siglist.h:42 msgid "Stopped (signal)" msgstr "" -#: sysdeps/generic/siglist.h:44 sysdeps/unix/siglist.c:44 +#: sysdeps/generic/siglist.h:43 msgid "Stopped" msgstr "" -#: sysdeps/generic/siglist.h:45 sysdeps/unix/siglist.c:45 +#: sysdeps/generic/siglist.h:44 msgid "Continued" msgstr "" -#: sysdeps/generic/siglist.h:46 sysdeps/unix/siglist.c:46 +#: sysdeps/generic/siglist.h:45 msgid "Child exited" msgstr "" -#: sysdeps/generic/siglist.h:47 sysdeps/unix/siglist.c:47 +#: sysdeps/generic/siglist.h:46 msgid "Stopped (tty input)" msgstr "" -#: sysdeps/generic/siglist.h:48 sysdeps/unix/siglist.c:48 +#: sysdeps/generic/siglist.h:47 msgid "Stopped (tty output)" msgstr "" -#: sysdeps/generic/siglist.h:49 sysdeps/unix/siglist.c:49 +#: sysdeps/generic/siglist.h:48 msgid "I/O possible" msgstr "" -#: sysdeps/generic/siglist.h:50 sysdeps/unix/siglist.c:50 +#: sysdeps/generic/siglist.h:49 msgid "CPU time limit exceeded" msgstr "" -#: sysdeps/generic/siglist.h:51 sysdeps/unix/siglist.c:51 +#: sysdeps/generic/siglist.h:50 msgid "File size limit exceeded" msgstr "" -#: sysdeps/generic/siglist.h:52 sysdeps/unix/siglist.c:52 +#: sysdeps/generic/siglist.h:51 msgid "Virtual timer expired" msgstr "" -#: sysdeps/generic/siglist.h:53 sysdeps/unix/siglist.c:53 +#: sysdeps/generic/siglist.h:52 msgid "Profiling timer expired" msgstr "" -#: sysdeps/generic/siglist.h:54 sysdeps/unix/siglist.c:54 +#: sysdeps/generic/siglist.h:53 msgid "Window changed" msgstr "" -#: sysdeps/generic/siglist.h:55 sysdeps/unix/siglist.c:56 +#: sysdeps/generic/siglist.h:54 msgid "User defined signal 1" msgstr "" -#: sysdeps/generic/siglist.h:56 sysdeps/unix/siglist.c:57 +#: sysdeps/generic/siglist.h:55 msgid "User defined signal 2" msgstr "" -#: sysdeps/generic/siglist.h:60 sysdeps/unix/siglist.c:33 +#: sysdeps/generic/siglist.h:59 msgid "EMT trap" msgstr "" -#: sysdeps/generic/siglist.h:63 sysdeps/unix/siglist.c:38 +#: sysdeps/generic/siglist.h:62 msgid "Bad system call" msgstr "" -#: sysdeps/generic/siglist.h:66 +#: sysdeps/generic/siglist.h:65 msgid "Stack fault" msgstr "" -#: sysdeps/generic/siglist.h:69 +#: sysdeps/generic/siglist.h:68 msgid "Information request" msgstr "" -#: sysdeps/generic/siglist.h:71 +#: sysdeps/generic/siglist.h:70 msgid "Power failure" msgstr "" -#: sysdeps/generic/siglist.h:74 sysdeps/unix/siglist.c:55 +#: sysdeps/generic/siglist.h:73 msgid "Resource lost" msgstr "" @@ -5534,8 +5691,8 @@ 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. +#. TRANS File}) occupy too much memory space. This condition never arises on +#. TRANS @gnuhurdsystems{}. #: sysdeps/gnu/errlist.c:94 msgid "Argument list too long" msgstr "" @@ -5575,7 +5732,7 @@ msgid "Cannot allocate memory" msgstr "" #. TRANS Bad address; an invalid pointer was detected. -#. TRANS In the GNU system, this error never happens; you get a signal instead. +#. TRANS On @gnuhurdsystems{}, this error never happens; you get a signal instead. #: sysdeps/gnu/errlist.c:167 msgid "Bad address" msgstr "" @@ -5643,7 +5800,7 @@ 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. +#. TRANS @ref{Linked Channels}. This error never occurs on @gnuhurdsystems{}. #: sysdeps/gnu/errlist.c:275 msgid "Too many open files in system" msgstr "" @@ -5658,7 +5815,7 @@ msgstr "" #. 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. +#. TRANS is not an error on @gnuhurdsystems{}; the text is copied as necessary. #: sysdeps/gnu/errlist.c:298 msgid "Text file busy" msgstr "" @@ -5705,7 +5862,7 @@ 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 they are always the same in @theglibc{}. #. TRANS #. TRANS This error can happen in a few different situations: #. TRANS @@ -5736,7 +5893,7 @@ msgstr "" msgid "Resource temporarily unavailable" msgstr "" -#. TRANS In the GNU C library, this is another name for @code{EAGAIN} (above). +#. TRANS In @theglibc{}, 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 @@ -5799,7 +5956,7 @@ 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 implemented for all communications protocols. On @gnuhurdsystems{}, 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. @@ -5966,7 +6123,7 @@ 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.) +#. TRANS properly on @gnuhurdsystems{}, making this error code impossible.) #: sysdeps/gnu/errlist.c:799 msgid "Object is remote" msgstr "" @@ -5997,7 +6154,7 @@ msgid "RPC bad procedure for program" msgstr "" #. 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 @ref{File Locks}. This error is never generated by @gnuhurdsystems{}, but #. TRANS it can result from an operation to an NFS server running another #. TRANS operating system. #: sysdeps/gnu/errlist.c:856 @@ -6054,7 +6211,7 @@ msgstr "" msgid "Invalid or incomplete multibyte or wide character" msgstr "" -#. TRANS In the GNU system, servers supporting the @code{term} protocol return +#. TRANS On @gnuhurdsystems{}, 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 @@ -6064,7 +6221,7 @@ msgstr "" msgid "Inappropriate operation for background process" msgstr "" -#. TRANS In the GNU system, opening a file returns this error when the file is +#. TRANS On @gnuhurdsystems{}, 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 @@ -6329,7 +6486,11 @@ msgstr "" msgid "Operation not possible due to RF-kill" msgstr "" -#: sysdeps/mach/_strerror.c:57 +#: sysdeps/gnu/errlist.c:1469 +msgid "Memory page has hardware error" +msgstr "" + +#: sysdeps/mach/_strerror.c:56 msgid "Error in unknown error system: " msgstr "" @@ -6401,37 +6562,24 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: sysdeps/unix/siglist.c:26 -msgid "Signal 0" -msgstr "" - -#: sysdeps/unix/siglist.c:32 -msgid "IOT trap" -msgstr "" - -#: sysdeps/unix/sysv/linux/i386/readelflib.c:49 +#: sysdeps/unix/sysv/linux/i386/readelflib.c:65 #, c-format msgid "%s is for unknown machine %d.\n" msgstr "" -#: sysdeps/unix/sysv/linux/ia64/makecontext.c:63 -#, c-format -msgid "makecontext: does not know how to handle more than 8 arguments\n" -msgstr "" - -#: sysdeps/unix/sysv/linux/lddlibc4.c:61 +#: sysdeps/unix/sysv/linux/lddlibc4.c:60 #, c-format msgid "" "Usage: lddlibc4 FILE\n" "\n" msgstr "" -#: sysdeps/unix/sysv/linux/lddlibc4.c:82 +#: sysdeps/unix/sysv/linux/lddlibc4.c:81 #, c-format msgid "cannot open `%s'" msgstr "" -#: sysdeps/unix/sysv/linux/lddlibc4.c:86 +#: sysdeps/unix/sysv/linux/lddlibc4.c:85 #, c-format msgid "cannot read header from `%s'" msgstr "" @@ -6457,7 +6605,7 @@ msgstr "" msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n" msgstr "" -#: timezone/zdump.c:242 +#: timezone/zdump.c:244 #, c-format msgid "" "%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] " @@ -6466,16 +6614,16 @@ msgid "" "Report bugs to tz@elsie.nci.nih.gov.\n" msgstr "" -#: timezone/zdump.c:311 +#: timezone/zdump.c:313 #, c-format msgid "%s: wild -c argument %s\n" msgstr "" -#: timezone/zdump.c:398 +#: timezone/zdump.c:400 msgid "Error writing to standard output" msgstr "" -#: timezone/zdump.c:421 +#: timezone/zdump.c:423 #, c-format msgid "" "%s: use of -v on system with floating time_t other than float or double\n" @@ -6606,7 +6754,7 @@ msgstr "" msgid "expected continuation line not found" msgstr "" -#: timezone/zic.c:943 timezone/zic.c:2480 timezone/zic.c:2499 +#: timezone/zic.c:943 timezone/zic.c:2541 timezone/zic.c:2560 msgid "time overflow" msgstr "" @@ -6747,100 +6895,100 @@ msgstr "" msgid "%s: Can't create %s: %s\n" msgstr "" -#: timezone/zic.c:1726 +#: timezone/zic.c:1773 #, c-format msgid "%s: Error writing %s\n" msgstr "" -#: timezone/zic.c:2019 +#: timezone/zic.c:2070 msgid "no POSIX environment variable for zone" msgstr "" -#: timezone/zic.c:2176 +#: timezone/zic.c:2237 msgid "can't determine time zone abbreviation to use just after until time" msgstr "" -#: timezone/zic.c:2222 +#: timezone/zic.c:2283 msgid "too many transitions?!" msgstr "" -#: timezone/zic.c:2241 +#: timezone/zic.c:2302 msgid "internal error - addtype called with bad isdst" msgstr "" -#: timezone/zic.c:2245 +#: timezone/zic.c:2306 msgid "internal error - addtype called with bad ttisstd" msgstr "" -#: timezone/zic.c:2249 +#: timezone/zic.c:2310 msgid "internal error - addtype called with bad ttisgmt" msgstr "" -#: timezone/zic.c:2268 +#: timezone/zic.c:2329 msgid "too many local time types" msgstr "" -#: timezone/zic.c:2272 +#: timezone/zic.c:2333 msgid "UTC offset out of range" msgstr "" -#: timezone/zic.c:2300 +#: timezone/zic.c:2361 msgid "too many leap seconds" msgstr "" -#: timezone/zic.c:2306 +#: timezone/zic.c:2367 msgid "repeated leap second moment" msgstr "" -#: timezone/zic.c:2358 +#: timezone/zic.c:2419 msgid "Wild result from command execution" msgstr "" -#: timezone/zic.c:2359 +#: timezone/zic.c:2420 #, c-format msgid "%s: command was '%s', result was %d\n" msgstr "" -#: timezone/zic.c:2457 +#: timezone/zic.c:2518 msgid "Odd number of quotation marks" msgstr "" -#: timezone/zic.c:2546 +#: timezone/zic.c:2607 msgid "use of 2/29 in non leap-year" msgstr "" -#: timezone/zic.c:2581 +#: timezone/zic.c:2642 msgid "" "rule goes past start/end of month--will not work with pre-2004 versions of " "zic" msgstr "" -#: timezone/zic.c:2613 +#: timezone/zic.c:2674 msgid "time zone abbreviation lacks alphabetic at start" msgstr "" -#: timezone/zic.c:2615 +#: timezone/zic.c:2676 msgid "time zone abbreviation has more than 3 alphabetics" msgstr "" -#: timezone/zic.c:2617 +#: timezone/zic.c:2678 msgid "time zone abbreviation has too many alphabetics" msgstr "" -#: timezone/zic.c:2627 +#: timezone/zic.c:2688 msgid "time zone abbreviation differs from POSIX standard" msgstr "" -#: timezone/zic.c:2639 +#: timezone/zic.c:2700 msgid "too many, or too long, time zone abbreviations" msgstr "" -#: timezone/zic.c:2680 +#: timezone/zic.c:2741 #, c-format msgid "%s: Can't create directory %s: %s\n" msgstr "" -#: timezone/zic.c:2702 +#: timezone/zic.c:2763 #, c-format msgid "%s: %d did not sign extend correctly\n" msgstr "" diff --git a/libc/scripts/list-sources.sh b/libc/scripts/list-sources.sh index 53b6f7f0e..528e971b4 100755 --- a/libc/scripts/list-sources.sh +++ b/libc/scripts/list-sources.sh @@ -11,8 +11,21 @@ esac if [ -r .git/HEAD ]; then - exec ${GIT:-git} ls-files - + # List files for glibc core. + ${GIT:-git} ls-files + # List files for glibc ports. + ports="ports" + if [ -d "$PWD/$ports" ]; then + cd "$PWD/$ports" + ${GIT:-git} ls-files | sed -e "s,^,$ports/,g" + else + # We expect the glibc-ports directory to be symlinked as PORTS. + # The glibc release manager will run this script as part of libc.pot + # regeneration and should ensure the symlink to PORTS is setup. + echo >&2 "WARNING: No \"$ports\" directory found. Expected glibc-ports"\ + "source directory to be symlinked as \"$ports\" directory." + fi + exit 0 fi echo >&2 'Cannot list sources without some version control system in use.' diff --git a/libc/sysdeps/i386/fpu_control.h b/libc/sysdeps/i386/fpu_control.h deleted file mode 100644 index dd6be2737..000000000 --- a/libc/sysdeps/i386/fpu_control.h +++ /dev/null @@ -1,101 +0,0 @@ -/* FPU control word bits. i387 version. - Copyright (C) 1993,1995-1998,2000,2001,2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Olaf Flebbe. - - 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, see - . */ - -#ifndef _FPU_CONTROL_H -#define _FPU_CONTROL_H 1 - -/* Here is the dirty part. Set up your 387 through the control word - * (cw) register. - * - * 15-13 12 11-10 9-8 7-6 5 4 3 2 1 0 - * | reserved | IC | RC | PC | reserved | PM | UM | OM | ZM | DM | IM - * - * IM: Invalid operation mask - * DM: Denormalized operand mask - * ZM: Zero-divide mask - * OM: Overflow mask - * UM: Underflow mask - * PM: Precision (inexact result) mask - * - * Mask bit is 1 means no interrupt. - * - * PC: Precision control - * 11 - round to extended precision - * 10 - round to double precision - * 00 - round to single precision - * - * RC: Rounding control - * 00 - rounding to nearest - * 01 - rounding down (toward - infinity) - * 10 - rounding up (toward + infinity) - * 11 - rounding toward zero - * - * IC: Infinity control - * That is for 8087 and 80287 only. - * - * The hardware default is 0x037f which we use. - */ - -#include - -/* masking of interrupts */ -#define _FPU_MASK_IM 0x01 -#define _FPU_MASK_DM 0x02 -#define _FPU_MASK_ZM 0x04 -#define _FPU_MASK_OM 0x08 -#define _FPU_MASK_UM 0x10 -#define _FPU_MASK_PM 0x20 - -/* precision control */ -#define _FPU_EXTENDED 0x300 /* libm requires double extended precision. */ -#define _FPU_DOUBLE 0x200 -#define _FPU_SINGLE 0x0 - -/* rounding control */ -#define _FPU_RC_NEAREST 0x0 /* RECOMMENDED */ -#define _FPU_RC_DOWN 0x400 -#define _FPU_RC_UP 0x800 -#define _FPU_RC_ZERO 0xC00 - -#define _FPU_RESERVED 0xF0C0 /* Reserved bits in cw */ - - -/* The fdlibm code requires strict IEEE double precision arithmetic, - and no interrupts for exceptions, rounding to nearest. */ - -#define _FPU_DEFAULT 0x037f - -/* IEEE: same as above. */ -#define _FPU_IEEE 0x037f - -/* Type of the control word. */ -typedef unsigned int fpu_control_t __attribute__ ((__mode__ (__HI__))); - -/* Macros for accessing the hardware control word. - - Note that the use of these macros is no sufficient anymore with - recent hardware. Some floating point operations are executed in - the SSE/SSE2 engines which have their own control and status register. */ -#define _FPU_GETCW(cw) __asm__ __volatile__ ("fnstcw %0" : "=m" (*&cw)) -#define _FPU_SETCW(cw) __asm__ __volatile__ ("fldcw %0" : : "m" (*&cw)) - -/* Default control word set at startup. */ -extern fpu_control_t __fpu_control; - -#endif /* fpu_control.h */ diff --git a/libc/sysdeps/i386/sysdep.h b/libc/sysdeps/i386/sysdep.h index ba00d65c5..b31caab0f 100644 --- a/libc/sysdeps/i386/sysdep.h +++ b/libc/sysdeps/i386/sysdep.h @@ -160,7 +160,7 @@ GET_PC_THUNK(reg): \ call 0f; \ 0: popl %ebx; \ cfi_adjust_cfa_offset (-4); \ - addl $_GLOBAL_OFFSET_TABLE+[.-0b], %ebx; + addl $_GLOBAL_OFFSET_TABLE_+[.-0b], %ebx; #else #define JUMPTARGET(name) name diff --git a/libc/sysdeps/ieee754/dbl-64/wordsize-64/e_cosh.c b/libc/sysdeps/ieee754/dbl-64/wordsize-64/e_cosh.c index b8ab74830..84593521c 100644 --- a/libc/sysdeps/ieee754/dbl-64/wordsize-64/e_cosh.c +++ b/libc/sysdeps/ieee754/dbl-64/wordsize-64/e_cosh.c @@ -67,6 +67,7 @@ __ieee754_cosh (double x) /* |x| in [log(maxdouble), overflowthresold] */ int64_t fix; EXTRACT_WORDS64(fix, x); + fix &= UINT64_C(0x7fffffffffffffff); if (fix <= UINT64_C(0x408633ce8fb9f87d)) { w = __ieee754_exp(half*fabs(x)); t = half*w; diff --git a/libc/sysdeps/s390/bits/byteswap-16.h b/libc/sysdeps/s390/bits/byteswap-16.h index 8bfec78ff..126f38214 100644 --- a/libc/sysdeps/s390/bits/byteswap-16.h +++ b/libc/sysdeps/s390/bits/byteswap-16.h @@ -28,7 +28,7 @@ # if __WORDSIZE == 64 # define __bswap_16(x) \ (__extension__ \ - ({ unsigned short int __v, __x = (x); \ + ({ unsigned short int __v, __x = (unsigned short int) (x); \ if (__builtin_constant_p (x)) \ __v = __bswap_constant_16 (__x); \ else { \ @@ -41,7 +41,7 @@ # else # define __bswap_16(x) \ (__extension__ \ - ({ unsigned short int __v, __x = (x); \ + ({ unsigned short int __v, __x = (unsigned short int) (x); \ if (__builtin_constant_p (x)) \ __v = __bswap_constant_16 (__x); \ else { \ diff --git a/libc/sysdeps/s390/bits/byteswap.h b/libc/sysdeps/s390/bits/byteswap.h index e91d4ccb8..3ae6436bb 100644 --- a/libc/sysdeps/s390/bits/byteswap.h +++ b/libc/sysdeps/s390/bits/byteswap.h @@ -1,5 +1,5 @@ /* Macros to swap the order of bytes in integer values. s390 version. - Copyright (C) 2000-2003, 2008, 2011, 2012 Free Software Foundation, Inc. + Copyright (C) 2000-2012 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -27,7 +27,7 @@ #define _BITS_BYTESWAP_H 1 #define __bswap_constant_16(x) \ - ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) + ((unsigned short int) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))) /* Get __bswap_16. */ #include diff --git a/libc/sysdeps/x86/fpu_control.h b/libc/sysdeps/x86/fpu_control.h new file mode 100644 index 000000000..605302c09 --- /dev/null +++ b/libc/sysdeps/x86/fpu_control.h @@ -0,0 +1,109 @@ +/* FPU control word bits. x86 version. + Copyright (C) 1993-2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Olaf Flebbe. + + 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, see + . */ + +#ifndef _FPU_CONTROL_H +#define _FPU_CONTROL_H 1 + +/* Note that this file sets on x86-64 only the x87 FPU, it does not + touch the SSE unit. */ + +/* Here is the dirty part. Set up your 387 through the control word + * (cw) register. + * + * 15-13 12 11-10 9-8 7-6 5 4 3 2 1 0 + * | reserved | IC | RC | PC | reserved | PM | UM | OM | ZM | DM | IM + * + * IM: Invalid operation mask + * DM: Denormalized operand mask + * ZM: Zero-divide mask + * OM: Overflow mask + * UM: Underflow mask + * PM: Precision (inexact result) mask + * + * Mask bit is 1 means no interrupt. + * + * PC: Precision control + * 11 - round to extended precision + * 10 - round to double precision + * 00 - round to single precision + * + * RC: Rounding control + * 00 - rounding to nearest + * 01 - rounding down (toward - infinity) + * 10 - rounding up (toward + infinity) + * 11 - rounding toward zero + * + * IC: Infinity control + * That is for 8087 and 80287 only. + * + * The hardware default is 0x037f which we use. + */ + +#include + +/* masking of interrupts */ +#define _FPU_MASK_IM 0x01 +#define _FPU_MASK_DM 0x02 +#define _FPU_MASK_ZM 0x04 +#define _FPU_MASK_OM 0x08 +#define _FPU_MASK_UM 0x10 +#define _FPU_MASK_PM 0x20 + +/* precision control */ +#define _FPU_EXTENDED 0x300 /* libm requires double extended precision. */ +#define _FPU_DOUBLE 0x200 +#define _FPU_SINGLE 0x0 + +/* rounding control */ +#define _FPU_RC_NEAREST 0x0 /* RECOMMENDED */ +#define _FPU_RC_DOWN 0x400 +#define _FPU_RC_UP 0x800 +#define _FPU_RC_ZERO 0xC00 + +#define _FPU_RESERVED 0xF0C0 /* Reserved bits in cw */ + + +/* The fdlibm code requires strict IEEE double precision arithmetic, + and no interrupts for exceptions, rounding to nearest. */ + +#define _FPU_DEFAULT 0x037f + +/* IEEE: same as above. */ +#define _FPU_IEEE 0x037f + +/* Type of the control word. */ +typedef unsigned int fpu_control_t __attribute__ ((__mode__ (__HI__))); + +/* Macros for accessing the hardware control word. "*&" is used to + work around a bug in older versions of GCC. __volatile__ is used + to support combination of writing the control register and reading + it back. Without __volatile__, the old value may be used for reading + back under compiler optimization. + + Note that the use of these macros is not sufficient anymore with + recent hardware nor on x86-64. Some floating point operations are + executed in the SSE/SSE2 engines which have their own control and + status register. */ +#define _FPU_GETCW(cw) __asm__ __volatile__ ("fnstcw %0" : "=m" (*&cw)) +#define _FPU_SETCW(cw) __asm__ __volatile__ ("fldcw %0" : : "m" (*&cw)) + +/* Default control word set at startup. */ +extern fpu_control_t __fpu_control; + +#endif /* fpu_control.h */ diff --git a/libc/sysdeps/x86_64/fpu_control.h b/libc/sysdeps/x86_64/fpu_control.h deleted file mode 100644 index 61bc30e97..000000000 --- a/libc/sysdeps/x86_64/fpu_control.h +++ /dev/null @@ -1,100 +0,0 @@ -/* FPU control word bits. x86-64 version. - Copyright (C) 1993,1995,1996,1997,1998,2000,2001,2002 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Olaf Flebbe. - - 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, see - . */ - -#ifndef _FPU_CONTROL_H -#define _FPU_CONTROL_H 1 - -/* Note that this file sets on x86-64 only the x87 FPU, it does not - touch the SSE unit. */ - -/* Here is the dirty part. Set up your 387 through the control word - * (cw) register. - * - * 15-13 12 11-10 9-8 7-6 5 4 3 2 1 0 - * | reserved | IC | RC | PC | reserved | PM | UM | OM | ZM | DM | IM - * - * IM: Invalid operation mask - * DM: Denormalized operand mask - * ZM: Zero-divide mask - * OM: Overflow mask - * UM: Underflow mask - * PM: Precision (inexact result) mask - * - * Mask bit is 1 means no interrupt. - * - * PC: Precision control - * 11 - round to extended precision - * 10 - round to double precision - * 00 - round to single precision - * - * RC: Rounding control - * 00 - rounding to nearest - * 01 - rounding down (toward - infinity) - * 10 - rounding up (toward + infinity) - * 11 - rounding toward zero - * - * IC: Infinity control - * That is for 8087 and 80287 only. - * - * The hardware default is 0x037f which we use. - */ - -#include - -/* masking of interrupts */ -#define _FPU_MASK_IM 0x01 -#define _FPU_MASK_DM 0x02 -#define _FPU_MASK_ZM 0x04 -#define _FPU_MASK_OM 0x08 -#define _FPU_MASK_UM 0x10 -#define _FPU_MASK_PM 0x20 - -/* precision control */ -#define _FPU_EXTENDED 0x300 /* libm requires double extended precision. */ -#define _FPU_DOUBLE 0x200 -#define _FPU_SINGLE 0x0 - -/* rounding control */ -#define _FPU_RC_NEAREST 0x0 /* RECOMMENDED */ -#define _FPU_RC_DOWN 0x400 -#define _FPU_RC_UP 0x800 -#define _FPU_RC_ZERO 0xC00 - -#define _FPU_RESERVED 0xF0C0 /* Reserved bits in cw */ - - -/* The fdlibm code requires strict IEEE double precision arithmetic, - and no interrupts for exceptions, rounding to nearest. */ - -#define _FPU_DEFAULT 0x037f - -/* IEEE: same as above. */ -#define _FPU_IEEE 0x037f - -/* Type of the control word. */ -typedef unsigned int fpu_control_t __attribute__ ((__mode__ (__HI__))); - -/* Macros for accessing the hardware control word. */ -#define _FPU_GETCW(cw) __asm__ ("fnstcw %0" : "=m" (*&cw)) -#define _FPU_SETCW(cw) __asm__ ("fldcw %0" : : "m" (*&cw)) - -/* Default control word set at startup. */ -extern fpu_control_t __fpu_control; - -#endif /* fpu_control.h */ -- cgit v1.2.3