[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r4210 - in /fsf/trunk/libc: ChangeLog nscd/cache.c nscd/gai.c po/nl.po po/sv.po sysdeps/unix/sysv/linux/check_native.c

To: commits@xxxxxxxxxx
Subject: [commits] r4210 - in /fsf/trunk/libc: ChangeLog nscd/cache.c nscd/gai.c po/nl.po po/sv.po sysdeps/unix/sysv/linux/check_native.c
From: eglibc@xxxxxxxxxx
Date: Thu, 15 Nov 2007 08:03:09 -0000
Author: eglibc
Date: Thu Nov 15 00:03:08 2007
New Revision: 4210

Log:
Import glibc-mainline for 2007-11-15

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nscd/cache.c
    fsf/trunk/libc/nscd/gai.c
    fsf/trunk/libc/po/nl.po
    fsf/trunk/libc/po/sv.po
    fsf/trunk/libc/sysdeps/unix/sysv/linux/check_native.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Nov 15 00:03:08 2007
@@ -1,3 +1,16 @@
+2007-11-14  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/check_native.c (__check_native): Simplify
+	significantly.  The device type is also part of the ifinfomsg data.
+
+	* po/sv.po: Update from translation team.
+	* po/nl.po: Likewise.
+
+	* nscd/cache.c (prune_cache): If cache is empty, instruct caller
+	to wake up in 24 hours.
+
+	* nscd/gai.c (__ioctl): Define.  Include check_native.c.
+
 2007-11-13  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* po/cs.po: Update from translation team.

Modified: fsf/trunk/libc/nscd/cache.c
==============================================================================
--- fsf/trunk/libc/nscd/cache.c (original)
+++ fsf/trunk/libc/nscd/cache.c Thu Nov 15 00:03:08 2007
@@ -288,7 +288,8 @@
     dbg_log (_("pruning %s cache; time %ld"),
 	     dbnames[table - dbs], (long int) now);
 
-  time_t next_timeout = LONG_MAX;
+#define NO_TIMEOUT LONG_MAX
+  time_t next_timeout = NO_TIMEOUT;
   do
     {
       ref_t run = table->head->array[--cnt];
@@ -474,5 +475,7 @@
   if (any)
     gc (table);
 
-  return next_timeout - now;
+  /* If there is no entry in the database and we therefore have no new
+     timeout value, tell the caller to wake up in 24 hours.  */
+  return next_timeout == NO_TIMEOUT ? 24 * 60 * 60 : next_timeout - now;
 }

Modified: fsf/trunk/libc/nscd/gai.c
==============================================================================
--- fsf/trunk/libc/nscd/gai.c (original)
+++ fsf/trunk/libc/nscd/gai.c Thu Nov 15 00:03:08 2007
@@ -22,6 +22,7 @@
 /* This file uses the getaddrinfo code but it compiles it without NSCD
    support.  We just need a few symbol renames.  */
 #define __inet_aton inet_aton
+#define __ioctl ioctl
 #define __getsockname getsockname
 #define __socket socket
 #define __recvmsg recvmsg
@@ -36,6 +37,7 @@
 
 /* Support code.  */
 #include <check_pf.c>
+#include <check_native.c>
 #ifdef HAVE_LIBIDN
 # include <libidn/idn-stub.c>
 #endif

Modified: fsf/trunk/libc/po/nl.po
==============================================================================
--- fsf/trunk/libc/po/nl.po (original)
+++ fsf/trunk/libc/po/nl.po Thu Nov 15 00:03:08 2007
@@ -1,14 +1,14 @@
-# Translation of libc-2.6.1 to Dutch.
+# Translation of libc-2.7 to Dutch.
 # Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
+#
 # Elros Cyriatan <cyriatan@xxxxxxxxxxx>, 2004.
 # Benno Schulenberg <benno@xxxxxxxxxxx>, 2006, 2007.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.6.1\n"
+"Project-Id-Version: libc-2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-04 11:37+0200\n"
-"PO-Revision-Date: 2007-08-15 22:44+0200\n"
+"POT-Creation-Date: 2007-10-15 21:18-0700\n"
+"PO-Revision-Date: 2007-11-14 21:31+0100\n"
 "Last-Translator: Benno Schulenberg <benno@xxxxxxxxxxx>\n"
 "Language-Team: Dutch <vertaling@xxxxxxxxxxxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -138,7 +138,7 @@
 "-o UITVOERBESTAND [INVOERBESTAND...]\n"
 "[UITVOERBESTAND [INVOERBESTAND...]]"
 
-#: catgets/gencat.c:232 debug/pcprofiledump.c:199 iconv/iconv_prog.c:411
+#: catgets/gencat.c:232 debug/pcprofiledump.c:204 iconv/iconv_prog.c:411
 #: iconv/iconvconfig.c:380 locale/programs/localedef.c:371
 #: login/programs/pt_chown.c:88 malloc/memusagestat.c:526 nss/makedb.c:231
 msgid ""
@@ -148,7 +148,7 @@
 "Voor het rapporteren van fouten, zie:\n"
 "  <http://www.gnu.org/software/libc/bugs.html>.\n"
 
-#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:287
+#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:296
 #: elf/ldd.bash.in:39 elf/sprof.c:355 iconv/iconv_prog.c:426
 #: iconv/iconvconfig.c:395 locale/programs/locale.c:275
 #: locale/programs/localedef.c:387 login/programs/pt_chown.c:59
@@ -161,11 +161,11 @@
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"Dit is vrije software; zie de brontekst voor de kopieervoorwaarden.\n"
-"Er is GEEN garantie; zelfs niet van VERKOOPBAARHEID of GESCHIKTHEID\n"
+"Dit is vrije software; zie de programmatekst voor de kopieervoorwaarden.\n"
+"Er is GEEN garantie, zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID\n"
 "VOOR EEN BEPAALD DOEL.\n"
 
-#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:292 elf/sprof.c:361
+#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:301 elf/sprof.c:361
 #: iconv/iconv_prog.c:431 iconv/iconvconfig.c:400 locale/programs/locale.c:280
 #: locale/programs/localedef.c:392 malloc/memusage.sh:75 nscd/nscd.c:411
 #: nss/getent.c:88 nss/makedb.c:250 posix/getconf.c:1017
@@ -257,31 +257,31 @@
 msgid "cannot determine escape character"
 msgstr "kan niet bepalen wat het escapeteken is"
 
-#: debug/pcprofiledump.c:52
+#: debug/pcprofiledump.c:53
 msgid "Don't buffer output"
 msgstr "uitvoer niet bufferen"
 
-#: debug/pcprofiledump.c:57
+#: debug/pcprofiledump.c:58
 msgid "Dump information generated by PC profiling."
 msgstr ""
 "  \n"
 "Door prestatie-analyse gegenereerde informatie weergeven."
 
-#: debug/pcprofiledump.c:60
+#: debug/pcprofiledump.c:61
 msgid "[FILE]"
 msgstr "[BESTAND]"
 
-#: debug/pcprofiledump.c:100
+#: debug/pcprofiledump.c:104
 #, c-format
 msgid "cannot open input file"
 msgstr "kan invoerbestand niet openen"
 
-#: debug/pcprofiledump.c:106
+#: debug/pcprofiledump.c:111
 #, c-format
 msgid "cannot read header"
 msgstr "kan kop van bestand niet lezen"
 
-#: debug/pcprofiledump.c:170
+#: debug/pcprofiledump.c:175
 #, c-format
 msgid "invalid pointer size"
 msgstr "ongeldige pointergrootte"
@@ -365,60 +365,55 @@
 msgid "invalid mode parameter"
 msgstr "ongeldige modusparameter"
 
-#: elf/cache.c:68
+#: elf/cache.c:69
 msgid "unknown"
 msgstr "onbekend"
 
-#: elf/cache.c:111
+#: elf/cache.c:112
 msgid "Unknown OS"
 msgstr "onbekend besturingssysteem"
 
-#: elf/cache.c:116
+#: elf/cache.c:117
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", OS-ABI: %s %d.%d.%d"
 
-#: elf/cache.c:142 elf/ldconfig.c:1236
+#: elf/cache.c:134 elf/ldconfig.c:1270
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "Kan cachebestand %s niet openen\n"
 
-#: elf/cache.c:154
+#: elf/cache.c:148
 #, c-format
 msgid "mmap of cache file failed.\n"
 msgstr "mmap() van cachebestand is mislukt\n"
 
-#: elf/cache.c:158 elf/cache.c:168
+#: elf/cache.c:152 elf/cache.c:166
 #, c-format
 msgid "File is not a cache file.\n"
 msgstr "Bestand is geen cachebestand\n"
 
-#: elf/cache.c:201 elf/cache.c:211
+#: elf/cache.c:199 elf/cache.c:209
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "%d bibliotheken gevonden in cache '%s'\n"
 
-#: elf/cache.c:410
-#, c-format
-msgid "Can't remove old temporary cache file %s"
-msgstr "Kan oud tijdelijk cachebestand %s niet verwijderen"
-
-#: elf/cache.c:417
+#: elf/cache.c:403
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "Kan tijdelijk cachebestand %s niet aanmaken"
 
-#: elf/cache.c:425 elf/cache.c:435 elf/cache.c:439 elf/cache.c:443
+#: elf/cache.c:411 elf/cache.c:421 elf/cache.c:425 elf/cache.c:430
 #, c-format
 msgid "Writing of cache data failed"
 msgstr "Schrijven van cachegegevens is mislukt"
 
-#: elf/cache.c:450
+#: elf/cache.c:435
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "Wijzigen van toegangsrechten van %s naar %#o is mislukt"
 
-#: elf/cache.c:455
+#: elf/cache.c:440
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "Naamswijziging van %s naar %s is mislukt"
@@ -431,28 +426,28 @@
 msgid "shared object not open"
 msgstr "gedeeld object is niet open"
 
-#: elf/dl-deps.c:112
+#: elf/dl-deps.c:114
 msgid "DST not allowed in SUID/SGID programs"
 msgstr "DST is niet toegestaan in SUID/SGID-programma's"
 
-#: elf/dl-deps.c:125 elf/dl-open.c:282
+#: elf/dl-deps.c:127 elf/dl-open.c:282
 msgid "empty dynamic string token substitution"
 msgstr "lege vervanging van DST"
 
-#: elf/dl-deps.c:131
+#: elf/dl-deps.c:133
 #, c-format
 msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
 msgstr "kan helper '%s' niet laden vanwege lege DST-vervanging\n"
 
-#: elf/dl-deps.c:472
+#: elf/dl-deps.c:474
 msgid "cannot allocate dependency list"
 msgstr "kan geen geheugen reserveren voor afhankelijkhedenlijst"
 
-#: elf/dl-deps.c:505 elf/dl-deps.c:560
+#: elf/dl-deps.c:510 elf/dl-deps.c:565
 msgid "cannot allocate symbol search list"
 msgstr "kan geen geheugen reserveren voor symbolenzoeklijst"
 
-#: elf/dl-deps.c:545
+#: elf/dl-deps.c:550
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr "Met LD_TRACE_PRELINKING worden filters niet ondersteund"
 
@@ -628,11 +623,11 @@
 msgid "cannot open shared object file"
 msgstr "kan gedeeld objectbestand niet openen"
 
-#: elf/dl-lookup.c:261
+#: elf/dl-lookup.c:356
 msgid "relocation error"
 msgstr "verplaatsingsfout"
 
-#: elf/dl-lookup.c:289
+#: elf/dl-lookup.c:384
 msgid "symbol lookup error"
 msgstr "opzoekfout voor symbool"
 
@@ -684,11 +679,11 @@
 msgid "cannot apply additional memory protection after relocation"
 msgstr "kan extra geheugenbescherming niet toepassen na verplaatsing"
 
-#: elf/dl-sym.c:161
+#: elf/dl-sym.c:162
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "RTLD_NEXT is gebruikt in code die niet dynamisch geladen is"
 
-#: elf/dl-sysdep.c:474 elf/dl-sysdep.c:486
+#: elf/dl-sysdep.c:469 elf/dl-sysdep.c:481
 msgid "cannot create capability list"
 msgstr "kan privilegeslijst niet aanmaken"
 
@@ -700,220 +695,224 @@
 msgid "cannot allocate version reference table"
 msgstr "kan geen geheugen reserveren voor tabel met versieverwijzingen"
 
-#: elf/ldconfig.c:135
+#: elf/ldconfig.c:138
 msgid "Print cache"
 msgstr "inhoud van de cache weergeven"
 
-#: elf/ldconfig.c:136
+#: elf/ldconfig.c:139
 msgid "Generate verbose messages"
 msgstr "breedsprakige uitvoer"
 
-#: elf/ldconfig.c:137
+#: elf/ldconfig.c:140
 msgid "Don't build cache"
 msgstr "geen cache opbouwen"
 
-#: elf/ldconfig.c:138
+#: elf/ldconfig.c:141
 msgid "Don't generate links"
 msgstr "geen koppelingen genereren"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "Change to and use ROOT as root directory"
 msgstr "naar deze map gaan en als hoofdmap gebruiken"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "ROOT"
 msgstr "BASISMAP"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "CACHE"
 msgstr "CACHE-BESTAND"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "Use CACHE as cache file"
 msgstr "dit cachebestand gebruiken"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "CONF"
 msgstr "CONFIG-BESTAND"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "Use CONF as configuration file"
 msgstr "dit configuratiebestand gebruiken"
 
-#: elf/ldconfig.c:142
+#: elf/ldconfig.c:145
 msgid "Only process directories specified on the command line.  Don't build cache."
 msgstr "alleen de mappen op de opdrachtregel verwerken; geen cache opbouwen"
 
-#: elf/ldconfig.c:143
+#: elf/ldconfig.c:146
 msgid "Manually link individual libraries."
 msgstr "individuele bibliotheken handmatig koppelen"
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "FORMAT"
 msgstr "INDELING"
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "Format to use: new, old or compat (default)"
 msgstr "te gebruiken indeling: 'compat' (standaard), 'new', of 'old'"
 
-#: elf/ldconfig.c:152
+#: elf/ldconfig.c:148
+msgid "Ignore auxiliary cache file"
+msgstr "hulpcachebestand negeren"
+
+#: elf/ldconfig.c:156
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr ""
 "  \n"
 "Configureren van de dynamische linker."
 
-#: elf/ldconfig.c:310
+#: elf/ldconfig.c:319
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "Pad '%s' is meerdere malen opgegeven"
 
-#: elf/ldconfig.c:350
+#: elf/ldconfig.c:359
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s is geen bekende bibliotheeksoort"
 
-#: elf/ldconfig.c:375
+#: elf/ldconfig.c:384
 #, c-format
 msgid "Can't stat %s"
 msgstr "Kan status van %s niet opvragen"
 
-#: elf/ldconfig.c:449
+#: elf/ldconfig.c:458
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "Kan status van %s niet opvragen\n"
 
-#: elf/ldconfig.c:459
+#: elf/ldconfig.c:468
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s is geen symbolische koppeling\n"
 
-#: elf/ldconfig.c:478
+#: elf/ldconfig.c:487
 #, c-format
 msgid "Can't unlink %s"
 msgstr "Kan %s niet ontkoppelen"
 
-#: elf/ldconfig.c:484
+#: elf/ldconfig.c:493
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "Kan %s niet aan %s koppelen"
 
-#: elf/ldconfig.c:490
+#: elf/ldconfig.c:499
 msgid " (changed)\n"
 msgstr " (gewijzigd)\n"
 
-#: elf/ldconfig.c:492
+#: elf/ldconfig.c:501
 msgid " (SKIPPED)\n"
 msgstr " (OVERGESLAGEN)\n"
 
-#: elf/ldconfig.c:547
+#: elf/ldconfig.c:556
 #, c-format
 msgid "Can't find %s"
 msgstr "Kan %s niet vinden"
 
-#: elf/ldconfig.c:563 elf/ldconfig.c:737 elf/ldconfig.c:784
+#: elf/ldconfig.c:572 elf/ldconfig.c:745 elf/ldconfig.c:793 elf/ldconfig.c:827
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "Kan status van link %s niet opvragen"
 
-#: elf/ldconfig.c:570
+#: elf/ldconfig.c:579
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "Bestand %s wordt genegeerd omdat het geen gewoon bestand is."
 
-#: elf/ldconfig.c:578
+#: elf/ldconfig.c:588
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr ""
 "Geen koppeling aangemaakt, want kan van %s de 'soname'\n"
 "(de naam van het gedeelde object) niet vinden"
 
-#: elf/ldconfig.c:669
+#: elf/ldconfig.c:671
 #, c-format
 msgid "Can't open directory %s"
 msgstr "Kan map %s niet openen"
 
-#: elf/ldconfig.c:749
+#: elf/ldconfig.c:759
 #, c-format
 msgid "Cannot stat %s"
 msgstr "Kan status van %s niet opvragen"
 
-#: elf/ldconfig.c:806 elf/readlib.c:91
+#: elf/ldconfig.c:814 elf/readlib.c:91
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "Kan invoerbestand %s niet vinden\n"
 
-#: elf/ldconfig.c:857
+#: elf/ldconfig.c:888
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5-bibliotheek %s zit in verkeerde map"
 
-#: elf/ldconfig.c:860
+#: elf/ldconfig.c:891
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc6-bibliotheek %s zit in verkeerde map"
 
-#: elf/ldconfig.c:863
+#: elf/ldconfig.c:894
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4-bibliotheek %s zit in verkeerde map"
 
-#: elf/ldconfig.c:890
+#: elf/ldconfig.c:922
 #, c-format
 msgid "libraries %s and %s in directory %s have same soname but different type."
 msgstr "Bibliotheken %s en %s in map %s hebben dezelfde 'soname' maar een verschillende soort"
 
-#: elf/ldconfig.c:997
+#: elf/ldconfig.c:1031
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr "Kan configuratiebestand %s niet openen"
 
-#: elf/ldconfig.c:1061
+#: elf/ldconfig.c:1095
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr "%s:%u: onjuiste syntax in 'hwcap'-regel"
 
-#: elf/ldconfig.c:1067
+#: elf/ldconfig.c:1101
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
 msgstr "%s:%u: 'hwcap'-index %lu overschrijdt maximum %u"
 
-#: elf/ldconfig.c:1074 elf/ldconfig.c:1082
+#: elf/ldconfig.c:1108 elf/ldconfig.c:1116
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
 msgstr "%s:%u: 'hwcap'-index %lu is al gedefinieerd als %s"
 
-#: elf/ldconfig.c:1085
+#: elf/ldconfig.c:1119
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
 msgstr "%s:%u: dubbele 'hwcap' %lu %s"
 
-#: elf/ldconfig.c:1107
+#: elf/ldconfig.c:1141
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr "bij gebruik van '-r' is voor het configuratiebestand een absoluut pad vereist"
 
-#: elf/ldconfig.c:1114 locale/programs/xmalloc.c:70 malloc/obstack.c:434
+#: elf/ldconfig.c:1148 locale/programs/xmalloc.c:70 malloc/obstack.c:434
 #: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1163
 #, c-format
 msgid "memory exhausted"
 msgstr "onvoldoende geheugen beschikbaar"
 
-#: elf/ldconfig.c:1144
+#: elf/ldconfig.c:1178
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr "%s:%u: kan map %s niet lezen"
 
-#: elf/ldconfig.c:1189
+#: elf/ldconfig.c:1223
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr "relatief pad '%s' wordt gebruikt bij opbouwen van cache"
 
-#: elf/ldconfig.c:1215
+#: elf/ldconfig.c:1249
 #, c-format
 msgid "Can't chdir to /"
 msgstr "Kan niet naar hoofdmap ('/') gaan"
 
-#: elf/ldconfig.c:1257
+#: elf/ldconfig.c:1291
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "Kan map %s voor cachebestand niet openen\n"
@@ -1440,7 +1439,7 @@
 msgid "Character out of range for UTF-8"
 msgstr "Teken ligt buiten bereik voor UTF-8"
 
-#: locale/programs/charmap-dir.c:58
+#: locale/programs/charmap-dir.c:59
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "kan tekenskaartmap '%s' niet lezen"
@@ -1468,7 +1467,7 @@
 msgstr "%s: <mb_cur_max> moet groter zijn dan <mb_cur_min>\n"
 
 #: locale/programs/charmap.c:357 locale/programs/charmap.c:374
-#: locale/programs/repertoire.c:175
+#: locale/programs/repertoire.c:174
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "syntaxfout in proloog: %s"
@@ -1478,7 +1477,7 @@
 msgstr "ongeldige definitie"
 
 #: locale/programs/charmap.c:375 locale/programs/locfile.c:126
-#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
+#: locale/programs/locfile.c:153 locale/programs/repertoire.c:175
 msgid "bad argument"
 msgstr "onjuist argument"
 
@@ -1497,7 +1496,7 @@
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "waarde van <%s> moet groter of gelijk aan de waarde van <%s> zijn"
 
-#: locale/programs/charmap.c:445 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "argument van <%s> moet een enkel teken zijn"
@@ -1515,7 +1514,7 @@
 msgstr "syntaxfout in definitie van %s: %s"
 
 #: locale/programs/charmap.c:499 locale/programs/charmap.c:679
-#: locale/programs/charmap.c:775 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
 msgid "no symbolic name given"
 msgstr "geen symbolische naam gegeven"
 
@@ -1532,19 +1531,19 @@
 msgstr "te veel bytes in tekencodering"
 
 #: locale/programs/charmap.c:586 locale/programs/charmap.c:734
-#: locale/programs/charmap.c:817 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296
 msgid "no symbolic name given for end of range"
 msgstr "geen symbolische naam gegeven voor einde-van-bereik"
 
 #: locale/programs/charmap.c:610 locale/programs/ld-address.c:600
-#: locale/programs/ld-collate.c:2677 locale/programs/ld-collate.c:3828
+#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3924
 #: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984
 #: locale/programs/ld-identification.c:452
 #: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
 #: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307
 #: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241
 #: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221
-#: locale/programs/repertoire.c:314
+#: locale/programs/repertoire.c:313
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr "%1$s: definitie eindigt niet met 'END %1$s'"
@@ -1564,14 +1563,14 @@
 msgstr "%s: **interne fout** in toestandsmachine"
 
 #: locale/programs/charmap.c:850 locale/programs/ld-address.c:616
-#: locale/programs/ld-collate.c:2674 locale/programs/ld-collate.c:3844
+#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4115
 #: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001
 #: locale/programs/ld-identification.c:468
 #: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
 #: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323
 #: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257
 #: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237
-#: locale/programs/locfile.c:826 locale/programs/repertoire.c:325
+#: locale/programs/locfile.c:826 locale/programs/repertoire.c:324
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s: voortijdig einde van bestand"
@@ -1586,21 +1585,21 @@
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
 msgstr "het aantal bytes in de bytereeks is voor begin en einde van het bereik niet hetzelfde: %d tegenover %d"
 
-#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:2957
-#: locale/programs/repertoire.c:420
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3047
+#: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr "ongeldige namen voor tekenbereik"
 
-#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
 msgid "hexadecimal range format should use only capital characters"
 msgstr "hexadecimale bereikopgave mag alleen hoofdletters bevatten"
 
-#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:450
+#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
 msgstr "<%s> en <%s> zijn ongeldige namen voor een bereik"
 
-#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:457
+#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456
 msgid "upper limit in range is smaller than lower limit"
 msgstr "bovengrens in bereik is kleiner dan ondergrens"
 
@@ -1608,7 +1607,7 @@
 msgid "resulting bytes for range not representable."
 msgstr "resulterende bytes voor bereik zijn niet te representeren"
 
-#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1536
+#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1556
 #: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133
 #: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
@@ -1695,7 +1694,7 @@
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: onbekend teken in het veld '%s'"
 
-#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3826
+#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3922
 #: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449
 #: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305
@@ -1705,12 +1704,13 @@
 msgid "%s: incomplete `END' line"
 msgstr "%s: onvolledige 'END'-regel"
 
-#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:522
-#: locale/programs/ld-collate.c:574 locale/programs/ld-collate.c:870
-#: locale/programs/ld-collate.c:883 locale/programs/ld-collate.c:2664
-#: locale/programs/ld-collate.c:3835 locale/programs/ld-ctype.c:1960
-#: locale/programs/ld-ctype.c:2219 locale/programs/ld-ctype.c:2806
-#: locale/programs/ld-ctype.c:2992 locale/programs/ld-identification.c:459
+#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:542
+#: locale/programs/ld-collate.c:594 locale/programs/ld-collate.c:890
+#: locale/programs/ld-collate.c:903 locale/programs/ld-collate.c:2733
+#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4105
+#: locale/programs/ld-ctype.c:1960 locale/programs/ld-ctype.c:2219
+#: locale/programs/ld-ctype.c:2806 locale/programs/ld-ctype.c:2992
+#: locale/programs/ld-identification.c:459
 #: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314
 #: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248
@@ -1719,246 +1719,266 @@
 msgid "%s: syntax error"
 msgstr "%s: syntaxfout"
 
-#: locale/programs/ld-collate.c:397
+#: locale/programs/ld-collate.c:417
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "'%.*s' is al gedefinieerd in tekenskaart"
 
-#: locale/programs/ld-collate.c:406
+#: locale/programs/ld-collate.c:426
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "`%.*s' is al gedefinieerd in repertoire"
 
-#: locale/programs/ld-collate.c:413
+#: locale/programs/ld-collate.c:433
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "'%.*s' is al gedefinieerd als sorteringssymbool"
 
-#: locale/programs/ld-collate.c:420
+#: locale/programs/ld-collate.c:440
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "'%.*s' is al gedefinieerd als sorteringselement"
 
-#: locale/programs/ld-collate.c:451 locale/programs/ld-collate.c:477
+#: locale/programs/ld-collate.c:471 locale/programs/ld-collate.c:497
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: 'forward' en 'backward' sluiten elkaar uit"
 
-#: locale/programs/ld-collate.c:461 locale/programs/ld-collate.c:487
-#: locale/programs/ld-collate.c:503
+#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507
+#: locale/programs/ld-collate.c:523
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: '%s' wordt meerdere keren genoemd in definitie van gewicht %d"
 
-#: locale/programs/ld-collate.c:559
+#: locale/programs/ld-collate.c:579
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: te veel voorschriften; het eerste item had er slechts %d"
 
-#: locale/programs/ld-collate.c:595
+#: locale/programs/ld-collate.c:615
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: niet genoeg sorteervoorschriften"
 
-#: locale/programs/ld-collate.c:760
+#: locale/programs/ld-collate.c:780
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: lege gewichtstekenreeks is niet toegestaan"
 
-#: locale/programs/ld-collate.c:855
+#: locale/programs/ld-collate.c:875
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: gewichten moeten hetzelfde beletselteken gebruiken als de naam"
 
-#: locale/programs/ld-collate.c:911
+#: locale/programs/ld-collate.c:931
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: te veel waarden"
 
-#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
+#: locale/programs/ld-collate.c:1051 locale/programs/ld-collate.c:1226
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "sorteervolgorde voor '%.*s' is al gedefinieerd in %s:%Zu"
 
-#: locale/programs/ld-collate.c:1081
+#: locale/programs/ld-collate.c:1101
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: het begin- en eindsymbool van een bereik moeten enkele tekens aanduiden"
 
-#: locale/programs/ld-collate.c:1108
+#: locale/programs/ld-collate.c:1128
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: de bytereeksen van het eerste en laatste bereikteken moeten dezelfde lengte hebben"
 
-#: locale/programs/ld-collate.c:1150
+#: locale/programs/ld-collate.c:1170
 #, c-format
 msgid "%s: byte sequence of first character of range is not lower than that of the last character"
 msgstr "%s: de bytereeks van het eerste bereikteken is niet kleiner dan die van het laatste"
 
-#: locale/programs/ld-collate.c:1275
+#: locale/programs/ld-collate.c:1295
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: beletselteken van symbolenbereik mag niet direct na 'order_start' staan"
 
-#: locale/programs/ld-collate.c:1279
+#: locale/programs/ld-collate.c:1299
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr "%s: beletselteken van symbolenbereik mag niet direct voor 'order_end' staan"
 
-#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1477
+#: locale/programs/ld-collate.c:1319 locale/programs/ld-ctype.c:1477
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "'%s' en '%.*s' zijn geen geldige namen voor een symbolenbereik"
 
-#: locale/programs/ld-collate.c:1349 locale/programs/ld-collate.c:3763
+#: locale/programs/ld-collate.c:1369 locale/programs/ld-collate.c:3858
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: sorteervolgorde van '%.*s' is al gedefinieerd in %s:%Zu"
 
-#: locale/programs/ld-collate.c:1358
+#: locale/programs/ld-collate.c:1378
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: '%s' moet een teken zijn"
 
-#: locale/programs/ld-collate.c:1552
+#: locale/programs/ld-collate.c:1573
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: 'position' moet voor een specifiek niveau gebruikt worden ofwel in alle secties ofwel in geen"
 
-#: locale/programs/ld-collate.c:1577
+#: locale/programs/ld-collate.c:1598
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "symbool '%s' is niet gedefinieerd"
 
-#: locale/programs/ld-collate.c:1653 locale/programs/ld-collate.c:1759
+#: locale/programs/ld-collate.c:1674 locale/programs/ld-collate.c:1780
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "symbool '%s' heeft dezelfde codering als"
 
-#: locale/programs/ld-collate.c:1657 locale/programs/ld-collate.c:1763
+#: locale/programs/ld-collate.c:1678 locale/programs/ld-collate.c:1784
 #, c-format
 msgid "symbol `%s'"
 msgstr "symbool '%s'"
 
-#: locale/programs/ld-collate.c:1805
+#: locale/programs/ld-collate.c:1826
 #, c-format
 msgid "no definition of `UNDEFINED'"
 msgstr "geen definitie van 'UNDEFINED'"
 
-#: locale/programs/ld-collate.c:1834
+#: locale/programs/ld-collate.c:1855
 #, c-format
 msgid "too many errors; giving up"
 msgstr "te veel fouten -- gestopt"
 
-#: locale/programs/ld-collate.c:2762
+#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4044
+#, c-format
+msgid "%s: nested conditionals not supported"
+msgstr "%s: geneste voorwaardelijke constructies worden niet ondersteund"
+
+#: locale/programs/ld-collate.c:2677
+#, c-format
+msgid "%s: more then one 'else'"
+msgstr "%s: meer dan Ã©Ã©n 'else'"
+
+#: locale/programs/ld-collate.c:2852
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: dubbele definitie van '%s'"
 
-#: locale/programs/ld-collate.c:2798
+#: locale/programs/ld-collate.c:2888
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: dubbele declaratie van sectie '%s'"
 
-#: locale/programs/ld-collate.c:2937
+#: locale/programs/ld-collate.c:3027
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: onbekend teken in naam van sorteringssymbool"
 
-#: locale/programs/ld-collate.c:3069
+#: locale/programs/ld-collate.c:3159
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: onbekend teken in naam van equivalentiedefinitie"
 
-#: locale/programs/ld-collate.c:3082
+#: locale/programs/ld-collate.c:3172
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: onbekend teken in waarde van equivalentiedefinitie"
 
-#: locale/programs/ld-collate.c:3092
+#: locale/programs/ld-collate.c:3182
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: onbekend symbool '%s' in equivalentiedefinitie"
 
-#: locale/programs/ld-collate.c:3101
+#: locale/programs/ld-collate.c:3191
 msgid "error while adding equivalent collating symbol"
 msgstr "fout bij toevoegen van equivalent sorteringssymbool"
 
-#: locale/programs/ld-collate.c:3131
+#: locale/programs/ld-collate.c:3221
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "dubbele definitie van script '%s'"
 
-#: locale/programs/ld-collate.c:3179
+#: locale/programs/ld-collate.c:3269
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr "%s: onbekende sectienaam '%.*s'"
 
-#: locale/programs/ld-collate.c:3208
+#: locale/programs/ld-collate.c:3298
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: meerdere sorteervolgorde-definities voor sectie '%s'"
 
-#: locale/programs/ld-collate.c:3233
+#: locale/programs/ld-collate.c:3326
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: ongeldig aantal sorteervoorschriften"
 
-#: locale/programs/ld-collate.c:3260
+#: locale/programs/ld-collate.c:3353
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: meerdere sorteervolgorde-definities voor naamloze sectie"
 
-#: locale/programs/ld-collate.c:3314 locale/programs/ld-collate.c:3442
-#: locale/programs/ld-collate.c:3804
+#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537
+#: locale/programs/ld-collate.c:3900
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: ontbrekend sleutelwoord 'order_end'"
 
-#: locale/programs/ld-collate.c:3375
+#: locale/programs/ld-collate.c:3470
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: sorteervolgorde voor symbool '%.*s' is nog niet gedefinieerd"
 
-#: locale/programs/ld-collate.c:3393
+#: locale/programs/ld-collate.c:3488
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: sorteervolgorde voor element '%.*s' is nog niet gedefinieerd"
 
-#: locale/programs/ld-collate.c:3404
+#: locale/programs/ld-collate.c:3499
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: kan niet herordenen na '%.*s': dit symbool is onbekend"
 
-#: locale/programs/ld-collate.c:3456 locale/programs/ld-collate.c:3816
+#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: ontbrekend sleutelwoord 'reorder-end'"
 
-#: locale/programs/ld-collate.c:3490 locale/programs/ld-collate.c:3688
+#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: sectie '%.*s' is onbekend"
 
-#: locale/programs/ld-collate.c:3555
+#: locale/programs/ld-collate.c:3650
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: onjuist symbool <%.*s>"
 
-#: locale/programs/ld-collate.c:3751
+#: locale/programs/ld-collate.c:3846
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: '%s' kan geen einde van bereik zijn"
 
-#: locale/programs/ld-collate.c:3800
+#: locale/programs/ld-collate.c:3896
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: lege categoriebeschrijving is niet toegestaan"
 
-#: locale/programs/ld-collate.c:3819
+#: locale/programs/ld-collate.c:3915
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: ontbrekend sleutelwoord 'reorder-sections-end'"
+
+#: locale/programs/ld-collate.c:4077
+#, c-format
+msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: '%s' zonder bijpassende 'ifdef' of 'ifndef'"
+
+#: locale/programs/ld-collate.c:4095
+#, c-format
+msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: 'endif' zonder bijpassende 'ifdef' of 'ifndef'"
 
 #: locale/programs/ld-ctype.c:439
 #, c-format
@@ -2735,22 +2755,22 @@
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "%1$s: definitie eindigt niet met 'END %1$s'"
 
-#: locale/programs/repertoire.c:230 locale/programs/repertoire.c:271
-#: locale/programs/repertoire.c:296
+#: locale/programs/repertoire.c:229 locale/programs/repertoire.c:270
+#: locale/programs/repertoire.c:295
 #, c-format
 msgid "syntax error in repertoire map definition: %s"
 msgstr "syntaxfout in repertoire-kaart-definitie: %s"
 
-#: locale/programs/repertoire.c:272
+#: locale/programs/repertoire.c:271
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "geen waarde <Uxxxx> of <Uxxxxxxxx> gegeven"
 
-#: locale/programs/repertoire.c:332
+#: locale/programs/repertoire.c:331
 #, c-format
 msgid "cannot save new repertoire map"
 msgstr "kan nieuwe repertoire-kaart niet opslaan"
 
-#: locale/programs/repertoire.c:343
+#: locale/programs/repertoire.c:342
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr "kan repertoire-kaart '%s' niet vinden"
@@ -3572,12 +3592,12 @@
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: kan server-adres niet opvragen\n"
 
-#: nscd/aicache.c:77 nscd/hstcache.c:462
+#: nscd/aicache.c:77 nscd/hstcache.c:468
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "Item \"%s\" niet gevonden in hosts-cache!"
 
-#: nscd/aicache.c:79 nscd/hstcache.c:464
+#: nscd/aicache.c:79 nscd/hstcache.c:470
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr "Herladen van \"%s\" in hosts-cache!"
@@ -3591,7 +3611,7 @@
 msgid " (first)"
 msgstr " (eerste)"
 
-#: nscd/cache.c:256 nscd/connections.c:786
+#: nscd/cache.c:256 nscd/connections.c:810
 #, c-format
 msgid "cannot stat() file `%s': %s"
 msgstr "kan status van bestand '%s' niet opvragen: %s"
@@ -3606,188 +3626,188 @@
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr "overwegen van %s-item \"%s\", tijdslimiet %<PRIu64>"
 
-#: nscd/connections.c:505 nscd/connections.c:517 nscd/connections.c:529
-#: nscd/connections.c:548
+#: nscd/connections.c:521 nscd/connections.c:533 nscd/connections.c:545
+#: nscd/connections.c:564
 #, c-format
 msgid "invalid persistent database file \"%s\": %s"
 msgstr "ongeldig persistent gegevensbestand '%s': %s"
 
-#: nscd/connections.c:519
+#: nscd/connections.c:535
 msgid "header size does not match"
 msgstr "grootte van de kop klopt niet"
 
-#: nscd/connections.c:531
+#: nscd/connections.c:547
 msgid "file size does not match"
 msgstr "bestandsgrootte klopt niet"
 
-#: nscd/connections.c:550
+#: nscd/connections.c:566
 msgid "verification failed"
 msgstr "gegevenscontrole is mislukt"
 
-#: nscd/connections.c:564
+#: nscd/connections.c:580
 #, c-format
 msgid "suggested size of table for database %s larger than the persistent database's table"
 msgstr "de aangeraden tabelgrootte voor gegevensbestand '%s' is groter dan de tabelgrootte van het persistente gegevensbestand"
 
-#: nscd/connections.c:574 nscd/connections.c:655
+#: nscd/connections.c:591 nscd/connections.c:673
 #, c-format
 msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr "kan geen alleen-lezen-descriptor voor '%s' aanmaken; geen mmap()"
 
-#: nscd/connections.c:634
+#: nscd/connections.c:652
 #, c-format
 msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
 msgstr "gegevensbestand voor %s is beschadigd of wordt al gebruikt; verwijder %s zo nodig handmatig en herstart"
 
-#: nscd/connections.c:641
+#: nscd/connections.c:659
 #, c-format
 msgid "cannot create %s; no persistent database used"
 msgstr "kan %s niet aanmaken; geen persistent gegevensbestand gebruikt"
 
-#: nscd/connections.c:644
+#: nscd/connections.c:662
 #, c-format
 msgid "cannot create %s; no sharing possible"
 msgstr "kan %s niet aanmaken; bestandsdeling is niet mogelijk"
 
-#: nscd/connections.c:715
+#: nscd/connections.c:733
 #, c-format
 msgid "cannot write to database file %s: %s"
 msgstr "kan niet naar gegevensbestand %s schrijven: %s"
 
-#: nscd/connections.c:749
+#: nscd/connections.c:772
 #, c-format
 msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
 msgstr "kan socket niet op sluiten-bij-exec instellen: %s -- paranoia-modus is uitgeschakeld"
 
-#: nscd/connections.c:799
+#: nscd/connections.c:823
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "kan socket niet openen: %s"
 
-#: nscd/connections.c:816
+#: nscd/connections.c:840
 #, c-format
 msgid "cannot change socket to nonblocking mode: %s"
 msgstr "kan socket niet omschakelen naar niet-blokkerende modus: %s"
 
-#: nscd/connections.c:824
+#: nscd/connections.c:848
 #, c-format
 msgid "cannot set socket to close on exec: %s"
 msgstr "kan socket niet op sluiten-bij-exec instellen: %s"
 
-#: nscd/connections.c:835
+#: nscd/connections.c:859
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "kan socket geen verbindingen laten accepteren: %s"
 
-#: nscd/connections.c:926
+#: nscd/connections.c:955
 #, c-format
 msgid "provide access to FD %d, for %s"
 msgstr "toegang verleend aan bestandsdescriptor %d, voor %s"
 
-#: nscd/connections.c:938
+#: nscd/connections.c:967
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "kan verzoek voor oude versie %d niet behandelen; huidige versie is %d"
 
-#: nscd/connections.c:980 nscd/connections.c:1033
+#: nscd/connections.c:1009 nscd/connections.c:1062
 #, c-format
 msgid "cannot write result: %s"
 msgstr "kan resultaat niet schrijven: %s"
 
-#: nscd/connections.c:1116
+#: nscd/connections.c:1145
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr "fout bij opvragen van ID van aanroeper: %s"
 
-#: nscd/connections.c:1175
+#: nscd/connections.c:1204
 #, c-format
 msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "kan '/proc/self/cmdline' niet openen: %s -- paranoia-modus is uitgeschakeld"
 
-#: nscd/connections.c:1189
+#: nscd/connections.c:1218
 #, c-format
 msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "kan '/proc/self/cmdline' niet openen: %s -- paranoia-modus wordt uitgeschakeld"
 
-#: nscd/connections.c:1229
+#: nscd/connections.c:1258
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr "kan niet overschakelen naar oude UID: %s -- paranoia-modus is uitgeschakeld"
 
-#: nscd/connections.c:1239
+#: nscd/connections.c:1268
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr "kan niet overschakelen naar oude GID: %s -- paranoia-modus is uitgeschakeld"
 
-#: nscd/connections.c:1252
+#: nscd/connections.c:1281
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr "kan niet overschakelen naar oude werkmap: %s -- paranoia-modus is uitgeschakeld"
 
-#: nscd/connections.c:1280
+#: nscd/connections.c:1310
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr "her-exec() is mislukt: %s -- paranoia-modus is uitgeschakeld"
 
-#: nscd/connections.c:1289
+#: nscd/connections.c:1319
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr "kan huidige werkmap niet overschakelen naar '/': %s"
 
-#: nscd/connections.c:1407
+#: nscd/connections.c:1437
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "te weinig gelezen bij lezen van verzoek: %s"
 
-#: nscd/connections.c:1438
+#: nscd/connections.c:1468
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "sleutellengte in verzoek is te lang: %d"
 
-#: nscd/connections.c:1451
+#: nscd/connections.c:1481
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "te weinig gelezen bij lezen van verzoeksleutel: %s"
 
-#: nscd/connections.c:1460
+#: nscd/connections.c:1490
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr "handle_request(): verzoek ontvangen (versie = %d) van PID %ld"
 
-#: nscd/connections.c:1465
+#: nscd/connections.c:1495
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request(): verzoek ontvangen (versie = %d)"
 
-#: nscd/connections.c:1826
+#: nscd/connections.c:1856
 #, c-format
 msgid "could only start %d threads; terminating"
 msgstr "kan slechts %d threads starten -- gestopt"
 
-#: nscd/connections.c:1874 nscd/connections.c:1875 nscd/connections.c:1892
-#: nscd/connections.c:1901 nscd/connections.c:1919 nscd/connections.c:1930
-#: nscd/connections.c:1941
+#: nscd/connections.c:1904 nscd/connections.c:1905 nscd/connections.c:1922
+#: nscd/connections.c:1931 nscd/connections.c:1949 nscd/connections.c:1960
+#: nscd/connections.c:1971
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "uitvoeren van nscd als gebruiker '%s' is mislukt"
 
-#: nscd/connections.c:1893
+#: nscd/connections.c:1923
 #, c-format
 msgid "initial getgrouplist failed"
 msgstr "eerste getgrouplist() is mislukt"
 
-#: nscd/connections.c:1902
+#: nscd/connections.c:1932
 #, c-format
 msgid "getgrouplist failed"
 msgstr "getgrouplist() is mislukt"
 
-#: nscd/connections.c:1920
+#: nscd/connections.c:1950
 #, c-format
 msgid "setgroups failed"
 msgstr "setgroups() is mislukt"
 
-#: nscd/grpcache.c:402 nscd/hstcache.c:412 nscd/initgrcache.c:412
-#: nscd/pwdcache.c:397 nscd/servicescache.c:342
+#: nscd/grpcache.c:402 nscd/hstcache.c:418 nscd/initgrcache.c:412
+#: nscd/pwdcache.c:397 nscd/servicescache.c:343
 #, c-format
 msgid "short write in %s: %s"
 msgstr "te weinig geschreven in %s: %s"
@@ -4200,12 +4220,12 @@
 "%15u  CAV-peilingen\n"
 "%15u  CAV-missers\n"
 
-#: nscd/servicescache.c:389
+#: nscd/servicescache.c:390
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
 msgstr "Item \"%s\" niet gevonden in diensten-cache!"
 
-#: nscd/servicescache.c:391
+#: nscd/servicescache.c:392
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
 msgstr "Herladen van \"%s\" in diensten-cache!"
@@ -5370,7 +5390,7 @@
 #. TRANS is not an error in the GNU system; the text is copied as necessary.
 #: sysdeps/gnu/errlist.c:298
 msgid "Text file busy"
-msgstr "Tekstbestand is bezig"
+msgstr "Tekstbestand is in gebruik"
 
 #. TRANS File too big; the size of a file would be larger than allowed by the system.
 #: sysdeps/gnu/errlist.c:307
@@ -6282,7 +6302,7 @@
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: Schrikkelregel in niet-schrikkelbestand %s\n"
 
-#: timezone/zic.c:892 timezone/zic.c:1323 timezone/zic.c:1345
+#: timezone/zic.c:892 timezone/zic.c:1329 timezone/zic.c:1351
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: **interne fout** -- ongeldige regelcode %d\n"
@@ -6301,231 +6321,239 @@
 msgid "expected continuation line not found"
 msgstr "verwachte regelcontinuering is niet gevonden"
 
-#: timezone/zic.c:956
+#: timezone/zic.c:956 timezone/zic.c:2489 timezone/zic.c:2508
+msgid "time overflow"
+msgstr "tijdsoverloop"
+
+#: timezone/zic.c:960
 msgid "24:00 not handled by pre-1998 versions of zic"
 msgstr "versies van 'zic' van voor 1998 kunnen '24:00' niet aan"
 
-#: timezone/zic.c:970
+#: timezone/zic.c:963
+msgid "values over 24 hours not handled by pre-2007 versions of zic"
+msgstr "versies van 'zic' van voor 2007 kunnen uren boven de 24 niet aan"
+
+#: timezone/zic.c:976
 msgid "wrong number of fields on Rule line"
 msgstr "verkeerd aantal velden op 'Rule'-regel"
 
-#: timezone/zic.c:974
+#: timezone/zic.c:980
 msgid "nameless rule"
 msgstr "naamloos voorschrift"
 
-#: timezone/zic.c:979
+#: timezone/zic.c:985
 msgid "invalid saved time"
 msgstr "ongeldige opgeslagen tijd"
 
-#: timezone/zic.c:1000
+#: timezone/zic.c:1006
 msgid "wrong number of fields on Zone line"
 msgstr "verkeerd aantal velden op 'Zone'-regel"
 
-#: timezone/zic.c:1006
+#: timezone/zic.c:1012
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "De regel \"Zone %s\" en optie -l sluiten elkaar uit"
 
-#: timezone/zic.c:1014
+#: timezone/zic.c:1020
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "De regel \"Zone %s\" en optie -p sluiten elkaar uit"
 
-#: timezone/zic.c:1026
+#: timezone/zic.c:1032
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "dubbele zonenaam '%s' (in bestand %s, regel %d)"
 
-#: timezone/zic.c:1042
+#: timezone/zic.c:1048
 msgid "wrong number of fields on Zone continuation line"
 msgstr "verkeerd aantal velden op 'Zone'-continueringsregel"
 
-#: timezone/zic.c:1082
+#: timezone/zic.c:1088
 msgid "invalid UTC offset"
 msgstr "ongeldige positie ten opzichte van UTC"
 
-#: timezone/zic.c:1085
+#: timezone/zic.c:1091
 msgid "invalid abbreviation format"
 msgstr "ongeldige opmaak voor afkorting"
 
-#: timezone/zic.c:1114
+#: timezone/zic.c:1120
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr "'Zone'-continueringsregel: eindtijd ligt niet na eindtijd van vorige regel"
 
-#: timezone/zic.c:1142
+#: timezone/zic.c:1148
 msgid "wrong number of fields on Leap line"
 msgstr "verkeerd aantal velden op 'Leap'-regel"
 
-#: timezone/zic.c:1151
+#: timezone/zic.c:1157
 msgid "invalid leaping year"
 msgstr "ongeldig schrikkeljaar"
 
-#: timezone/zic.c:1171 timezone/zic.c:1277
+#: timezone/zic.c:1177 timezone/zic.c:1283
 msgid "invalid month name"
 msgstr "ongeldige maandnaam"
 
-#: timezone/zic.c:1184 timezone/zic.c:1390 timezone/zic.c:1404
+#: timezone/zic.c:1190 timezone/zic.c:1396 timezone/zic.c:1410
 msgid "invalid day of month"
 msgstr "ongeldige dag van maand"
 
-#: timezone/zic.c:1189
+#: timezone/zic.c:1195
 msgid "time before zero"
 msgstr "tijdswaarde is kleiner dan nul"
 
-#: timezone/zic.c:1193
+#: timezone/zic.c:1199
 msgid "time too small"
 msgstr "tijdswaarde is te klein"
 
-#: timezone/zic.c:1197
+#: timezone/zic.c:1203
 msgid "time too large"
 msgstr "tijdswaarde is te groot"
 
-#: timezone/zic.c:1201 timezone/zic.c:1306
+#: timezone/zic.c:1207 timezone/zic.c:1312
 msgid "invalid time of day"
 msgstr "ongeldige tijd van de dag"
 
-#: timezone/zic.c:1220
+#: timezone/zic.c:1226
 msgid "illegal CORRECTION field on Leap line"
 msgstr "ongeldig CORRECTION-veld op 'Leap'-regel"
 
-#: timezone/zic.c:1225
+#: timezone/zic.c:1231
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "ongeldig 'Rolling'/'Stationary'-veld op 'Leap'-regel"
 
-#: timezone/zic.c:1241
+#: timezone/zic.c:1247
 msgid "wrong number of fields on Link line"
 msgstr "verkeerd aantal velden op 'Link'-regel"
 
-#: timezone/zic.c:1245
+#: timezone/zic.c:1251
 msgid "blank FROM field on Link line"
 msgstr "leeg FROM-veld op 'Link'-regel"
 
-#: timezone/zic.c:1249
+#: timezone/zic.c:1255
 msgid "blank TO field on Link line"
 msgstr "leeg TO-veld op 'Link'-regel"
 
-#: timezone/zic.c:1327
+#: timezone/zic.c:1333
 msgid "invalid starting year"
 msgstr "ongeldig beginjaar"
 
-#: timezone/zic.c:1349
+#: timezone/zic.c:1355
 msgid "invalid ending year"
 msgstr "ongeldig eindjaar"
 
-#: timezone/zic.c:1353
+#: timezone/zic.c:1359
 msgid "starting year greater than ending year"
 msgstr "beginjaar is groter dan eindjaar"
 
-#: timezone/zic.c:1360
+#: timezone/zic.c:1366
 msgid "typed single year"
 msgstr "begin- en eindjaar zijn gelijk"
 
-#: timezone/zic.c:1395
+#: timezone/zic.c:1401
 msgid "invalid weekday name"
 msgstr "ongeldige naam voor weekdag"
 
-#: timezone/zic.c:1573
+#: timezone/zic.c:1579
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s: Kan %s niet verwijderen: %s\n"
 
-#: timezone/zic.c:1583
+#: timezone/zic.c:1589
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: Kan %s niet aanmaken: %s\n"
 
-#: timezone/zic.c:1733
+#: timezone/zic.c:1739
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: Fout bij schrijven van %s\n"
 
-#: timezone/zic.c:2025
+#: timezone/zic.c:2031
 msgid "no POSIX environment variable for zone"
 msgstr "geen POSIX-omgevingsvariabele voor tijdzone"
 
-#: timezone/zic.c:2179
+#: timezone/zic.c:2185
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr "kan tijdzone-afkorting voor gebruik na een tot-tijd niet bepalen"
 
-#: timezone/zic.c:2225
+#: timezone/zic.c:2231
 msgid "too many transitions?!"
 msgstr "te veel overgangen!?"
 
-#: timezone/zic.c:2244
+#: timezone/zic.c:2250
 msgid "internal error - addtype called with bad isdst"
 msgstr "**interne fout** -- addtype() aangeroepen met onjuiste 'isdst'"
 
-#: timezone/zic.c:2248
+#: timezone/zic.c:2254
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "**interne fout** -- addtype() aangeroepen met onjuiste 'ttisstd'"
 
-#: timezone/zic.c:2252
+#: timezone/zic.c:2258
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "**interne fout** -- addtype() aangeroepen met onjuiste 'ttisgmt'"
 
-#: timezone/zic.c:2271
+#: timezone/zic.c:2277
 msgid "too many local time types"
 msgstr "te veel soorten lokale tijd"
 
-#: timezone/zic.c:2299
+#: timezone/zic.c:2281
+msgid "UTC offset out of range"
+msgstr "Verschuiving ten opzichte van UTC valt buiten bereik"
+
+#: timezone/zic.c:2309
 msgid "too many leap seconds"
 msgstr "te veel schrikkelseconden"
 
-#: timezone/zic.c:2305
+#: timezone/zic.c:2315
 msgid "repeated leap second moment"
 msgstr "herhaald schrikkelseconde-moment"
 
-#: timezone/zic.c:2357
+#: timezone/zic.c:2367
 msgid "Wild result from command execution"
 msgstr "Vreemd resultaat van uitgevoerde opdracht"
 
-#: timezone/zic.c:2358
+#: timezone/zic.c:2368
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: opdracht was '%s', resultaat was %d\n"
 
-#: timezone/zic.c:2456
+#: timezone/zic.c:2466
 msgid "Odd number of quotation marks"
 msgstr "Oneven aantal aanhalingstekens"
 
-#: timezone/zic.c:2479 timezone/zic.c:2498
-msgid "time overflow"
-msgstr "tijdsoverloop"
-
-#: timezone/zic.c:2545
+#: timezone/zic.c:2555
 msgid "use of 2/29 in non leap-year"
 msgstr "'29-2' gebruikt in een niet-schrikkeljaar"
 
-#: timezone/zic.c:2580
+#: timezone/zic.c:2590
 msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic"
 msgstr "voorschrift gaat voorbij begin of einde van maand -- dit werkt niet met versies van 'zic' van voor 2004"
 
-#: timezone/zic.c:2612
+#: timezone/zic.c:2622
 msgid "time zone abbreviation lacks alphabetic at start"
 msgstr "tijdzone-afkorting begint niet met een letter"
 
-#: timezone/zic.c:2614
+#: timezone/zic.c:2624
 msgid "time zone abbreviation has more than 3 alphabetics"
 msgstr "tijdzone-afkorting heeft meer dan drie letters"
 
-#: timezone/zic.c:2616
+#: timezone/zic.c:2626
 msgid "time zone abbreviation has too many alphabetics"
 msgstr "tijdzone-afkorting heeft te veel letters"
 
-#: timezone/zic.c:2626
+#: timezone/zic.c:2636
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr "tijdzone-afkorting verschilt van de POSIX-standaard"
 
-#: timezone/zic.c:2638
+#: timezone/zic.c:2648
 msgid "too many, or too long, time zone abbreviations"
 msgstr "te veel of te lange tijdzone-afkortingen"
 
-#: timezone/zic.c:2679
+#: timezone/zic.c:2689
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: Kan map %s niet aanmaken: %s\n"
 
-#: timezone/zic.c:2701
+#: timezone/zic.c:2711
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: %d is niet correct omgezet naar een grotere precisie\n"

Modified: fsf/trunk/libc/po/sv.po
==============================================================================
--- fsf/trunk/libc/po/sv.po (original)
+++ fsf/trunk/libc/po/sv.po Thu Nov 15 00:03:08 2007
@@ -1,13 +1,13 @@
 # GNU libc message catalog for swedish
 # Copyright Â© 1996, 1998, 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 # Jan DjÃ¤rv <jan.h.d@xxxxxxxxxx>, 1996, 1998, 2001, 2002, 2003, 2006, 2007.
-# Revision: 1.55
+# Revision: 1.57
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.6.1\n"
-"POT-Creation-Date: 2007-08-04 11:37+0200\n"
-"PO-Revision-Date: 2007-08-07 18:31+0200\n"
+"Project-Id-Version: libc 2.7\n"
+"POT-Creation-Date: 2007-10-15 21:18-0700\n"
+"PO-Revision-Date: 2007-11-14 21:01+0100\n"
 "Last-Translator: Jan DjÃ¤rv <jan.h.d@xxxxxxxxxx>\n"
 "Language-Team: Swedish <tp-sv@xxxxxxxxxxxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -132,7 +132,7 @@
 "-o UTFIL [INFIL]...\n"
 "[UTFIL [INFIL]...]"
 
-#: catgets/gencat.c:232 debug/pcprofiledump.c:199 iconv/iconv_prog.c:411
+#: catgets/gencat.c:232 debug/pcprofiledump.c:204 iconv/iconv_prog.c:411
 #: iconv/iconvconfig.c:380 locale/programs/localedef.c:371
 #: login/programs/pt_chown.c:88 malloc/memusagestat.c:526 nss/makedb.c:231
 msgid ""
@@ -143,7 +143,7 @@
 "<http://www.gnu.org/software/libc/bugs.html>.\n"
 "Rapportera fel eller synpunkter pÃ¥ Ã¶versÃ¤ttningen till <tp-sv@xxxxxxxxxxxxxxx>.\n"
 
-#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:287
+#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:296
 #: elf/ldd.bash.in:39 elf/sprof.c:355 iconv/iconv_prog.c:426
 #: iconv/iconvconfig.c:395 locale/programs/locale.c:275
 #: locale/programs/localedef.c:387 login/programs/pt_chown.c:59
@@ -160,7 +160,7 @@
 "INGEN garanti; inte ens fÃ¶r SÃ„LJBARHET eller LÃ„MPLIGHET FÃ–R NÃ…GOT SPECIELLT\n"
 "Ã„NDAMÃ…L.\n"
 
-#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:292 elf/sprof.c:361
+#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:301 elf/sprof.c:361
 #: iconv/iconv_prog.c:431 iconv/iconvconfig.c:400 locale/programs/locale.c:280
 #: locale/programs/localedef.c:392 malloc/memusage.sh:75 nscd/nscd.c:411
 #: nss/getent.c:88 nss/makedb.c:250 posix/getconf.c:1017
@@ -252,29 +252,29 @@
 msgid "cannot determine escape character"
 msgstr "kan inte avgÃ¶ra kontrolltecken"
 
-#: debug/pcprofiledump.c:52
+#: debug/pcprofiledump.c:53
 msgid "Don't buffer output"
 msgstr "Buffra inte resultatet"
 
-#: debug/pcprofiledump.c:57
+#: debug/pcprofiledump.c:58
 msgid "Dump information generated by PC profiling."
 msgstr "Visa information genererad av PC-profilering."
 
-#: debug/pcprofiledump.c:60
+#: debug/pcprofiledump.c:61
 msgid "[FILE]"
 msgstr "[FIL]"
 
-#: debug/pcprofiledump.c:100
+#: debug/pcprofiledump.c:104
 #, c-format
 msgid "cannot open input file"
 msgstr "kan inte Ã¶ppna infil"
 
-#: debug/pcprofiledump.c:106
+#: debug/pcprofiledump.c:111
 #, c-format
 msgid "cannot read header"
 msgstr "kan inte lÃ¤sa huvud"
 
-#: debug/pcprofiledump.c:170
+#: debug/pcprofiledump.c:175
 #, c-format
 msgid "invalid pointer size"
 msgstr "ogiltig pekarstorlek"
@@ -360,60 +360,55 @@
 msgid "invalid mode parameter"
 msgstr "ogiltig lÃ¤gesparameter"
 
-#: elf/cache.c:68
+#: elf/cache.c:69
 msgid "unknown"
 msgstr "okÃ¤nt"
 
-#: elf/cache.c:111
+#: elf/cache.c:112
 msgid "Unknown OS"
 msgstr "OkÃ¤nt OS"
 
-#: elf/cache.c:116
+#: elf/cache.c:117
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", OS ABI: %s %d.%d.%d"
 
-#: elf/cache.c:142 elf/ldconfig.c:1236
+#: elf/cache.c:134 elf/ldconfig.c:1270
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "Kan inte Ã¶ppna cache-fil \"%s\"\n"
 
-#: elf/cache.c:154
+#: elf/cache.c:148
 #, c-format
 msgid "mmap of cache file failed.\n"
 msgstr "minnesmappning av cache-fil misslyckades.\n"
 
-#: elf/cache.c:158 elf/cache.c:168
+#: elf/cache.c:152 elf/cache.c:166
 #, c-format
 msgid "File is not a cache file.\n"
 msgstr "Filen Ã¤r inte en cache-fil.\n"
 
-#: elf/cache.c:201 elf/cache.c:211
+#: elf/cache.c:199 elf/cache.c:209
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "%d bibliotek hittades i cache \"%s\"\n"
 
-#: elf/cache.c:410
-#, c-format
-msgid "Can't remove old temporary cache file %s"
-msgstr "Kan inte ta bort gammal temporÃ¤r cache-fil %s"
-
-#: elf/cache.c:417
+#: elf/cache.c:403
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "Kan inte skapa temporÃ¤r cache-fil \"%s\""
 
-#: elf/cache.c:425 elf/cache.c:435 elf/cache.c:439 elf/cache.c:443
+#: elf/cache.c:411 elf/cache.c:421 elf/cache.c:425 elf/cache.c:430
 #, c-format
 msgid "Writing of cache data failed"
 msgstr "Skrivning av cache-data misslyckades"
 
-#: elf/cache.c:450
+#: elf/cache.c:435
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "Misslyckades med att byta Ã¥tkomstrÃ¤ttigheter fÃ¶r %s till %#o"
 
-#: elf/cache.c:455
+#: elf/cache.c:440
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "Namnbyte pÃ¥ %s till %s misslyckades"
@@ -426,30 +421,30 @@
 msgid "shared object not open"
 msgstr "delat objekt Ã¤r inte Ã¶ppnat"
 
-#: elf/dl-deps.c:112
+#: elf/dl-deps.c:114
 msgid "DST not allowed in SUID/SGID programs"
 msgstr "DST inte tillÃ¥ten i SUID/SGID-program"
 
-#: elf/dl-deps.c:125 elf/dl-open.c:282
+#: elf/dl-deps.c:127 elf/dl-open.c:282
 msgid "empty dynamic string token substitution"
 msgstr "substitution av \"dynamic string token\" Ã¤r tom"
 
-#: elf/dl-deps.c:131
+#: elf/dl-deps.c:133
 #, c-format
 msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
 msgstr ""
 "kan ite ladda extra \"%s\" pÃ¥ grund av att substitution av\n"
 "\"dynamic string token\" Ã¤r tom\n"
 
-#: elf/dl-deps.c:472
+#: elf/dl-deps.c:474
 msgid "cannot allocate dependency list"
 msgstr "kan inte allokera beroendelista"
 
-#: elf/dl-deps.c:505 elf/dl-deps.c:560
+#: elf/dl-deps.c:510 elf/dl-deps.c:565
 msgid "cannot allocate symbol search list"
 msgstr "kan inte allokera sÃ¶klista fÃ¶r symboler"
 
-#: elf/dl-deps.c:545
+#: elf/dl-deps.c:550
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr "Filter stÃ¶ds ej med LD_TRACE_PRELINKING"
 
@@ -625,11 +620,11 @@
 msgid "cannot open shared object file"
 msgstr "kan inte Ã¶ppna delad objektfil"
 
-#: elf/dl-lookup.c:261
+#: elf/dl-lookup.c:356
 msgid "relocation error"
 msgstr "fel vid relokering"
 
-#: elf/dl-lookup.c:289
+#: elf/dl-lookup.c:384
 msgid "symbol lookup error"
 msgstr "fel vid symboluppslagning"
 
@@ -679,11 +674,11 @@
 msgid "cannot apply additional memory protection after relocation"
 msgstr "kan inte applicera extra minnesskydd efter relokering"
 
-#: elf/dl-sym.c:161
+#: elf/dl-sym.c:162
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "RTLD_NEXT anvÃ¤nds i kod som inte Ã¤r dynamiskt laddad"
 
-#: elf/dl-sysdep.c:474 elf/dl-sysdep.c:486
+#: elf/dl-sysdep.c:469 elf/dl-sysdep.c:481
 msgid "cannot create capability list"
 msgstr "kan inte skapa egenskapslista"
 
@@ -695,216 +690,220 @@
 msgid "cannot allocate version reference table"
 msgstr "kan inte allokera tabell fÃ¶r versionsreferenser"
 
-#: elf/ldconfig.c:135
+#: elf/ldconfig.c:138
 msgid "Print cache"
 msgstr "Visa cache"
 
-#: elf/ldconfig.c:136
+#: elf/ldconfig.c:139
 msgid "Generate verbose messages"
 msgstr "AnvÃ¤nd utfÃ¶rligare meddelanden"
 
-#: elf/ldconfig.c:137
+#: elf/ldconfig.c:140
 msgid "Don't build cache"
 msgstr "Bygg inte cache"
 
-#: elf/ldconfig.c:138
+#: elf/ldconfig.c:141
 msgid "Don't generate links"
 msgstr "Generera inte lÃ¤nkar"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "Change to and use ROOT as root directory"
 msgstr "Byt till och anvÃ¤nd ROT som rotkatalog"
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:142
 msgid "ROOT"
 msgstr "ROT"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "CACHE"
 msgstr "CACHE"
 
-#: elf/ldconfig.c:140
+#: elf/ldconfig.c:143
 msgid "Use CACHE as cache file"
 msgstr "AnvÃ¤nd CACHE som cache-fil"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "CONF"
 msgstr "CONF"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:144
 msgid "Use CONF as configuration file"
 msgstr "AnvÃ¤nd CONF som konfigurationsfil"
 
-#: elf/ldconfig.c:142
+#: elf/ldconfig.c:145
 msgid "Only process directories specified on the command line.  Don't build cache."
 msgstr "Behandla endast kataloger givna som argument.  Bygg inte cache."
 
-#: elf/ldconfig.c:143
+#: elf/ldconfig.c:146
 msgid "Manually link individual libraries."
 msgstr "LÃ¤nka enskilda bibliotek manuellt."
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "Format to use: new, old or compat (default)"
 msgstr "Format att anvÃ¤nda: \"new\", \"old\" eller \"compat\" (standardvÃ¤rde)"
 
-#: elf/ldconfig.c:152
+#: elf/ldconfig.c:148
+msgid "Ignore auxiliary cache file"
+msgstr "Ignorera hjÃ¤lpcachefilen"
+
+#: elf/ldconfig.c:156
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr "Konfigurera bindningar fÃ¶r den dynamiska lÃ¤nkaren."
 
-#: elf/ldconfig.c:310
+#: elf/ldconfig.c:319
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "SÃ¶kvÃ¤g \"%s\" given mer Ã¤n en gÃ¥ng"
 
-#: elf/ldconfig.c:350
+#: elf/ldconfig.c:359
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s Ã¤r inte en kÃ¤nd bibliotekstyp"
 
-#: elf/ldconfig.c:375
+#: elf/ldconfig.c:384
 #, c-format
 msgid "Can't stat %s"
 msgstr "Kan inte ta status pÃ¥ %s"
 
-#: elf/ldconfig.c:449
+#: elf/ldconfig.c:458
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "Kan inte ta status pÃ¥ %s\n"
 
-#: elf/ldconfig.c:459
+#: elf/ldconfig.c:468
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s Ã¤r inte en symbolisk lÃ¤nk\n"
 
-#: elf/ldconfig.c:478
+#: elf/ldconfig.c:487
 #, c-format
 msgid "Can't unlink %s"
 msgstr "Kan inte ta bort (unlink) %s"
 
-#: elf/ldconfig.c:484
+#: elf/ldconfig.c:493
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "Kan inte lÃ¤nka %s till %s"
 
-#: elf/ldconfig.c:490
+#: elf/ldconfig.c:499
 msgid " (changed)\n"
 msgstr " (Ã¤ndrad)\n"
 
-#: elf/ldconfig.c:492
+#: elf/ldconfig.c:501
 msgid " (SKIPPED)\n"
 msgstr " (HOPPAR Ã–VER)\n"
 
-#: elf/ldconfig.c:547
+#: elf/ldconfig.c:556
 #, c-format
 msgid "Can't find %s"
 msgstr "Kan inte hitta %s"
 
-#: elf/ldconfig.c:563 elf/ldconfig.c:737 elf/ldconfig.c:784
+#: elf/ldconfig.c:572 elf/ldconfig.c:745 elf/ldconfig.c:793 elf/ldconfig.c:827
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "Kan inte ta status (lstat) pÃ¥ %s"
 
-#: elf/ldconfig.c:570
+#: elf/ldconfig.c:579
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "Ignorerar fil %s eftersom den inte Ã¤r en vanlig fil"
 
-#: elf/ldconfig.c:578
+#: elf/ldconfig.c:588
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "Ingen lÃ¤nk skapad eftersom \"soname\" inte hittades fÃ¶r %s"
 
-#: elf/ldconfig.c:669
+#: elf/ldconfig.c:671
 #, c-format
 msgid "Can't open directory %s"
 msgstr "Kan inte Ã¶ppna katalog %s"
 
-#: elf/ldconfig.c:749
+#: elf/ldconfig.c:759
 #, c-format
 msgid "Cannot stat %s"
 msgstr "Kan inte ta status pÃ¥ %s"
 
-#: elf/ldconfig.c:806 elf/readlib.c:91
+#: elf/ldconfig.c:814 elf/readlib.c:91
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "Hittar inte infil %s.\n"
 
-#: elf/ldconfig.c:857
+#: elf/ldconfig.c:888
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5-bibliotek %s i fel katalog"
 
-#: elf/ldconfig.c:860
+#: elf/ldconfig.c:891
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc6-bibliotek %s i fel katalog"
 
-#: elf/ldconfig.c:863
+#: elf/ldconfig.c:894
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4-bibliotek %s i fel katalog"
 
-#: elf/ldconfig.c:890
+#: elf/ldconfig.c:922
 #, c-format
 msgid "libraries %s and %s in directory %s have same soname but different type."
 msgstr "bibliotek %s och %s i katalog %s har samma \"soname\" men olika typ."
 
-#: elf/ldconfig.c:997
+#: elf/ldconfig.c:1031
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr "Kan inte Ã¶ppna konfigurationsfil %s"
 
-#: elf/ldconfig.c:1061
+#: elf/ldconfig.c:1095
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr "%s:%u: ogiltig syntax pÃ¥ hwcap-raden"
 
-#: elf/ldconfig.c:1067
+#: elf/ldconfig.c:1101
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
 msgstr "%s:%u: hwcap-index %lu Ã¤r stÃ¶rre Ã¤n maximum %u"
 
-#: elf/ldconfig.c:1074 elf/ldconfig.c:1082
+#: elf/ldconfig.c:1108 elf/ldconfig.c:1116
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
 msgstr "%s:%u: hwcap-index %lu redan definierat som %s"
 
-#: elf/ldconfig.c:1085
+#: elf/ldconfig.c:1119
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
 msgstr "%s:%u: duplicerad hwcap %lu %s"
 
-#: elf/ldconfig.c:1107
+#: elf/ldconfig.c:1141
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr "behÃ¶ver absolut filnamn fÃ¶r konfigurationsfil nÃ¤r -r anvÃ¤nds"
 
-#: elf/ldconfig.c:1114 locale/programs/xmalloc.c:70 malloc/obstack.c:434
+#: elf/ldconfig.c:1148 locale/programs/xmalloc.c:70 malloc/obstack.c:434
 #: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1163
 #, c-format
 msgid "memory exhausted"
 msgstr "minne slut"
 
-#: elf/ldconfig.c:1144
+#: elf/ldconfig.c:1178
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr "%s:%u: kan inte lÃ¤sa katalog %s"
 
-#: elf/ldconfig.c:1189
+#: elf/ldconfig.c:1223
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr "relativ sÃ¶kvÃ¤g \"%s\" anvÃ¤nd fÃ¶r att bygga cache"
 
-#: elf/ldconfig.c:1215
+#: elf/ldconfig.c:1249
 #, c-format
 msgid "Can't chdir to /"
 msgstr "Kan inte byta katalog till /"
 
-#: elf/ldconfig.c:1257
+#: elf/ldconfig.c:1291
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "Kan inte lÃ¤sa cache-filkatalog \"%s\"\n"
@@ -1424,7 +1423,7 @@
 msgid "Character out of range for UTF-8"
 msgstr "Tecken utanfÃ¶r intervallet fÃ¶r UTF-8"
 
-#: locale/programs/charmap-dir.c:58
+#: locale/programs/charmap-dir.c:59
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "kan inte lÃ¤sa teckenuppsÃ¤ttningskatalog \"%s\""
@@ -1450,7 +1449,7 @@
 msgstr "%s: <mb_cur_max> mÃ¥ste vara stÃ¶rre Ã¤n <mb_cur_min>\n"
 
 #: locale/programs/charmap.c:357 locale/programs/charmap.c:374
-#: locale/programs/repertoire.c:175
+#: locale/programs/repertoire.c:174
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "syntaxfel i prolog: %s"
@@ -1460,7 +1459,7 @@
 msgstr "ogiltig definition"
 
 #: locale/programs/charmap.c:375 locale/programs/locfile.c:126
-#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
+#: locale/programs/locfile.c:153 locale/programs/repertoire.c:175
 msgid "bad argument"
 msgstr "dÃ¥ligt argument"
 
@@ -1479,7 +1478,7 @@
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "vÃ¤rdet pÃ¥ <%s> mÃ¥ste vara stÃ¶rre eller lika med vÃ¤rdet pÃ¥ <%s>"
 
-#: locale/programs/charmap.c:445 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "argumentet till <%s> mÃ¥ste vara ett enskilt tecken"
@@ -1497,7 +1496,7 @@
 msgstr "syntaxfel i definition av %s: %s"
 
 #: locale/programs/charmap.c:499 locale/programs/charmap.c:679
-#: locale/programs/charmap.c:775 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
 msgid "no symbolic name given"
 msgstr "inget symboliskt namn givet"
 
@@ -1514,19 +1513,19 @@
 msgstr "fÃ¶r mÃ¥nga tecken i teckenkodning"
 
 #: locale/programs/charmap.c:586 locale/programs/charmap.c:734
-#: locale/programs/charmap.c:817 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296
 msgid "no symbolic name given for end of range"
 msgstr "inget symboliskt namn givet fÃ¶r slutet av intervallet"
 
 #: locale/programs/charmap.c:610 locale/programs/ld-address.c:600
-#: locale/programs/ld-collate.c:2677 locale/programs/ld-collate.c:3828
+#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3924
 #: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984
 #: locale/programs/ld-identification.c:452
 #: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
 #: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307
 #: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241
 #: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221
-#: locale/programs/repertoire.c:314
+#: locale/programs/repertoire.c:313
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr "%1$s: definition slutar inte med \"END %1$s\""
@@ -1546,14 +1545,14 @@
 msgstr "%s: fel i tillstÃ¥ndsmaskin"
 
 #: locale/programs/charmap.c:850 locale/programs/ld-address.c:616
-#: locale/programs/ld-collate.c:2674 locale/programs/ld-collate.c:3844
+#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4115
 #: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001
 #: locale/programs/ld-identification.c:468
 #: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
 #: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323
 #: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257
 #: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237
-#: locale/programs/locfile.c:826 locale/programs/repertoire.c:325
+#: locale/programs/locfile.c:826 locale/programs/repertoire.c:324
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s: fÃ¶r tidigt filslut"
@@ -1570,21 +1569,21 @@
 "antal byte fÃ¶r bytesekvens angivet i bÃ¶rjan respektive slutet av intervallet\n"
 "skiljer sig: %d respektive %d"
 
-#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:2957
-#: locale/programs/repertoire.c:420
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3047
+#: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr "ogiltiga namn fÃ¶r teckenintervall"
 
-#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
 msgid "hexadecimal range format should use only capital characters"
 msgstr "hexadecimalt intervallformat bÃ¶r endast anvÃ¤nda versaler"
 
-#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:450
+#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
 msgstr "<%s> och <%s> Ã¤r ogiltiga namn fÃ¶r intervall"
 
-#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:457
+#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456
 msgid "upper limit in range is smaller than lower limit"
 msgstr "Ã¶vre grÃ¤ns i intervall Ã¤r mindre Ã¤n undre grÃ¤ns"
 
@@ -1592,7 +1591,7 @@
 msgid "resulting bytes for range not representable."
 msgstr "resulterande byte fÃ¶r intervall Ã¤r inte representerbara."
 
-#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1536
+#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1556
 #: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133
 #: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
@@ -1679,7 +1678,7 @@
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: okÃ¤nt tecken i fÃ¤lt \"%s\""
 
-#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3826
+#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3922
 #: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449
 #: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305
@@ -1689,12 +1688,13 @@
 msgid "%s: incomplete `END' line"
 msgstr "%s: ofullstÃ¤ndig \"END\"-rad"
 
-#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:522
-#: locale/programs/ld-collate.c:574 locale/programs/ld-collate.c:870
-#: locale/programs/ld-collate.c:883 locale/programs/ld-collate.c:2664
-#: locale/programs/ld-collate.c:3835 locale/programs/ld-ctype.c:1960
-#: locale/programs/ld-ctype.c:2219 locale/programs/ld-ctype.c:2806
-#: locale/programs/ld-ctype.c:2992 locale/programs/ld-identification.c:459
+#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:542
+#: locale/programs/ld-collate.c:594 locale/programs/ld-collate.c:890
+#: locale/programs/ld-collate.c:903 locale/programs/ld-collate.c:2733
+#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4105
+#: locale/programs/ld-ctype.c:1960 locale/programs/ld-ctype.c:2219
+#: locale/programs/ld-ctype.c:2806 locale/programs/ld-ctype.c:2992
+#: locale/programs/ld-identification.c:459
 #: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314
 #: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248
@@ -1703,246 +1703,266 @@
 msgid "%s: syntax error"
 msgstr "%s: syntaxfel"
 
-#: locale/programs/ld-collate.c:397
+#: locale/programs/ld-collate.c:417
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "\"%.*s\" redan definerad i teckenuppsÃ¤ttning"
 
-#: locale/programs/ld-collate.c:406
+#: locale/programs/ld-collate.c:426
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "\"%.*s\" redan definierad i repertoar"
 
-#: locale/programs/ld-collate.c:413
+#: locale/programs/ld-collate.c:433
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "\"%.*s\" redan definierad som ett kollationssymbol"
 
-#: locale/programs/ld-collate.c:420
+#: locale/programs/ld-collate.c:440
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "\"%.*s\" redan definierad som ett kollationselement"
 
-#: locale/programs/ld-collate.c:451 locale/programs/ld-collate.c:477
+#: locale/programs/ld-collate.c:471 locale/programs/ld-collate.c:497
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: sorteringsordning \"forward\" och \"backward\" Ã¤r Ã¶msesidigt uteslutande"
 
-#: locale/programs/ld-collate.c:461 locale/programs/ld-collate.c:487
-#: locale/programs/ld-collate.c:503
+#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507
+#: locale/programs/ld-collate.c:523
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: \"%s\" Ã¤r nÃ¤mnd fler Ã¤n en gÃ¥ng i definitionen av vikt %d"
 
-#: locale/programs/ld-collate.c:559
+#: locale/programs/ld-collate.c:579
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: fÃ¶r mÃ¥nga regler, fÃ¶rsta delen hade bara %d"
 
-#: locale/programs/ld-collate.c:595
+#: locale/programs/ld-collate.c:615
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: inte tillrÃ¤ckligt med sorteringsregler"
 
-#: locale/programs/ld-collate.c:760
+#: locale/programs/ld-collate.c:780
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: tomt viktnamn Ã¤r inte tillÃ¥tet"
 
-#: locale/programs/ld-collate.c:855
+#: locale/programs/ld-collate.c:875
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: vikter mÃ¥ste anvÃ¤nda samma intervallsymbol som namn"
 
-#: locale/programs/ld-collate.c:911
+#: locale/programs/ld-collate.c:931
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: fÃ¶r mÃ¥nga vÃ¤rden"
 
-#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
+#: locale/programs/ld-collate.c:1051 locale/programs/ld-collate.c:1226
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "ordningsfÃ¶ljd fÃ¶r \"%.*s\" redan definierad vid %s:%Zu"
 
-#: locale/programs/ld-collate.c:1081
+#: locale/programs/ld-collate.c:1101
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: start- och slut-symbol i ett intervall mÃ¥ste representera tecken"
 
-#: locale/programs/ld-collate.c:1108
+#: locale/programs/ld-collate.c:1128
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: bytesekvens fÃ¶r fÃ¶rsta och sista tecknet mÃ¥ste ha samma lÃ¤ngd"
 
-#: locale/programs/ld-collate.c:1150
+#: locale/programs/ld-collate.c:1170
 #, c-format
 msgid "%s: byte sequence of first character of range is not lower than that of the last character"
 msgstr "%s: bytesekvens fÃ¶r fÃ¶rsta tecknet i intervallet Ã¤r inte mindre Ã¤n den fÃ¶r sista tecknet"
 
-#: locale/programs/ld-collate.c:1275
+#: locale/programs/ld-collate.c:1295
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: symboliskt intervall fÃ¥r inte vara omedelbart efter \"order_start\""
 
-#: locale/programs/ld-collate.c:1279
+#: locale/programs/ld-collate.c:1299
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr "%s: symboliskt intervall fÃ¥r inte omedelbart fÃ¶ljas av \"order_end\""
 
-#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1477
+#: locale/programs/ld-collate.c:1319 locale/programs/ld-ctype.c:1477
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "\"%s\" och \"%.*s\" Ã¤r otillÃ¥tna namn fÃ¶r symboliskt intervall"
 
-#: locale/programs/ld-collate.c:1349 locale/programs/ld-collate.c:3763
+#: locale/programs/ld-collate.c:1369 locale/programs/ld-collate.c:3858
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: ordningsfÃ¶ljd fÃ¶r \"%.*s\" redan definierad i %s:%Zu"
 
-#: locale/programs/ld-collate.c:1358
+#: locale/programs/ld-collate.c:1378
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: \"%s\" mÃ¥ste vara ett enskilt tecken"
 
-#: locale/programs/ld-collate.c:1552
+#: locale/programs/ld-collate.c:1573
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: \"position\" mÃ¥ste anvÃ¤ndas fÃ¶r en given nivÃ¥ i alla sektioner eller inte alls"
 
-#: locale/programs/ld-collate.c:1577
+#: locale/programs/ld-collate.c:1598
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "symbol \"%s\" inte definierad"
 
-#: locale/programs/ld-collate.c:1653 locale/programs/ld-collate.c:1759
+#: locale/programs/ld-collate.c:1674 locale/programs/ld-collate.c:1780
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "symbol \"%s\" har samma vÃ¤rde som"
 
-#: locale/programs/ld-collate.c:1657 locale/programs/ld-collate.c:1763
+#: locale/programs/ld-collate.c:1678 locale/programs/ld-collate.c:1784
 #, c-format
 msgid "symbol `%s'"
 msgstr "symbol \"%s\""
 
-#: locale/programs/ld-collate.c:1805
+#: locale/programs/ld-collate.c:1826
 #, c-format
 msgid "no definition of `UNDEFINED'"
 msgstr "ingen definition av \"UNDEFINED\""
 
-#: locale/programs/ld-collate.c:1834
+#: locale/programs/ld-collate.c:1855
 #, c-format
 msgid "too many errors; giving up"
 msgstr "fÃ¶r mÃ¥nga fel, ger upp"
 
-#: locale/programs/ld-collate.c:2762
+#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4044
+#, c-format
+msgid "%s: nested conditionals not supported"
+msgstr "%s: nÃ¤stlade villkor stÃ¶ds inte"
+
+#: locale/programs/ld-collate.c:2677
+#, c-format
+msgid "%s: more then one 'else'"
+msgstr "%s: mer Ã¤n en \"else\""
+
+#: locale/programs/ld-collate.c:2852
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: dubbla definitioner av \"%s\""
 
-#: locale/programs/ld-collate.c:2798
+#: locale/programs/ld-collate.c:2888
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: dubbla deklarationer fÃ¶r sektion \"%s\""
 
-#: locale/programs/ld-collate.c:2937
+#: locale/programs/ld-collate.c:3027
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: okÃ¤nt tecken i namn fÃ¶r kollationssymbol"
 
-#: locale/programs/ld-collate.c:3069
+#: locale/programs/ld-collate.c:3159
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: okÃ¤nt tecken i namnet i ekvivalensdefinitionen"
 
-#: locale/programs/ld-collate.c:3082
+#: locale/programs/ld-collate.c:3172
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: okÃ¤nt tecken i vÃ¤rdet i ekvivalensdefinitionen"
 
-#: locale/programs/ld-collate.c:3092
+#: locale/programs/ld-collate.c:3182
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: okÃ¤nd symbol \"%s\" i ekvivalensdefinition"
 
-#: locale/programs/ld-collate.c:3101
+#: locale/programs/ld-collate.c:3191
 msgid "error while adding equivalent collating symbol"
 msgstr "fel nÃ¤r ekvivalent kollationssymbol lades till"
 
-#: locale/programs/ld-collate.c:3131
+#: locale/programs/ld-collate.c:3221
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "dubblerad definition fÃ¶r skript \"%s\""
 
-#: locale/programs/ld-collate.c:3179
+#: locale/programs/ld-collate.c:3269
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr "%s: okÃ¤nt sektionsnamn \"%.*s\""
 
-#: locale/programs/ld-collate.c:3208
+#: locale/programs/ld-collate.c:3298
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: dubbla definitioner av ordningsfÃ¶ljd i sektion \"%s\""
 
-#: locale/programs/ld-collate.c:3233
+#: locale/programs/ld-collate.c:3326
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: ogiltigt antal sorteringsregler"
 
-#: locale/programs/ld-collate.c:3260
+#: locale/programs/ld-collate.c:3353
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: flera definitioner av ordningsfÃ¶ljd i namnlÃ¶s sektion"
 
-#: locale/programs/ld-collate.c:3314 locale/programs/ld-collate.c:3442
-#: locale/programs/ld-collate.c:3804
+#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537
+#: locale/programs/ld-collate.c:3900
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: nyckelord \"order_end\" saknas"
 
-#: locale/programs/ld-collate.c:3375
+#: locale/programs/ld-collate.c:3470
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: ordningsfÃ¶ljd fÃ¶r kollationssymbol %.*s Ã¤r inte definierad Ã¤nnu"
 
-#: locale/programs/ld-collate.c:3393
+#: locale/programs/ld-collate.c:3488
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: ordningsfÃ¶ljd fÃ¶r kollationselement %.*s Ã¤r inte definierad Ã¤nnu"
 
-#: locale/programs/ld-collate.c:3404
+#: locale/programs/ld-collate.c:3499
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: kan inte byta ordning efter %.*s: okÃ¤nd symbol"
 
-#: locale/programs/ld-collate.c:3456 locale/programs/ld-collate.c:3816
+#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: nyckelord \"reorder-end\" saknas"
 
-#: locale/programs/ld-collate.c:3490 locale/programs/ld-collate.c:3688
+#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: sektion \"%.*s\" okÃ¤nd"
 
-#: locale/programs/ld-collate.c:3555
+#: locale/programs/ld-collate.c:3650
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: ogiltig symbol: <%.*s>"
 
-#: locale/programs/ld-collate.c:3751
+#: locale/programs/ld-collate.c:3846
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: kan inte ha \"%s\" som Ã¤ndpunkt pÃ¥ ellips"
 
-#: locale/programs/ld-collate.c:3800
+#: locale/programs/ld-collate.c:3896
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: tom kategoribeskrivning Ã¤r inte tillÃ¥tet"
 
-#: locale/programs/ld-collate.c:3819
+#: locale/programs/ld-collate.c:3915
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: nyckelord \"reorder-sections-end\" saknas"
+
+#: locale/programs/ld-collate.c:4077
+#, c-format
+msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: \"%s\" utan matchande \"ifdef\" eller \"ifndef\""
+
+#: locale/programs/ld-collate.c:4095
+#, c-format
+msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
+msgstr "%s: \"endif\" utan matchande \"ifdef\" eller \"ifndef\""
 
 #: locale/programs/ld-ctype.c:439
 #, c-format
@@ -2716,22 +2736,22 @@
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "definition av \"%1$s\" slutar inte med \"END %1$s\""
 
-#: locale/programs/repertoire.c:230 locale/programs/repertoire.c:271
-#: locale/programs/repertoire.c:296
+#: locale/programs/repertoire.c:229 locale/programs/repertoire.c:270
+#: locale/programs/repertoire.c:295
 #, c-format
 msgid "syntax error in repertoire map definition: %s"
 msgstr "syntaxfel i repertoartabellsdefinition: %s"
 
-#: locale/programs/repertoire.c:272
+#: locale/programs/repertoire.c:271
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "inget <Uxxxx> eller <Uxxxxxxxx> vÃ¤rde angivet"
 
-#: locale/programs/repertoire.c:332
+#: locale/programs/repertoire.c:331
 #, c-format
 msgid "cannot save new repertoire map"
 msgstr "kan inte spara ny repertoartabell"
 
-#: locale/programs/repertoire.c:343
+#: locale/programs/repertoire.c:342
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr "hittar inte repertoarfiltabell \"%s\""
@@ -3546,12 +3566,12 @@
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: kan inte hÃ¤mta serveradress\n"
 
-#: nscd/aicache.c:77 nscd/hstcache.c:462
+#: nscd/aicache.c:77 nscd/hstcache.c:468
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "Hittar inte \"%s\" i vÃ¤rdcache!"
 
-#: nscd/aicache.c:79 nscd/hstcache.c:464
+#: nscd/aicache.c:79 nscd/hstcache.c:470
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr "Omladdar \"%s\" i vÃ¤rdcache!"
@@ -3565,7 +3585,7 @@
 msgid " (first)"
 msgstr " (fÃ¶rsta)"
 
-#: nscd/cache.c:256 nscd/connections.c:786
+#: nscd/cache.c:256 nscd/connections.c:810
 #, c-format
 msgid "cannot stat() file `%s': %s"
 msgstr "kan inte ta status pÃ¥ fil \"%s\": %s"
@@ -3580,188 +3600,188 @@
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr "Ã¶vervÃ¤ger %s-post \"%s\", tidsgrÃ¤ns %<PRIu64>"
 
-#: nscd/connections.c:505 nscd/connections.c:517 nscd/connections.c:529
-#: nscd/connections.c:548
+#: nscd/connections.c:521 nscd/connections.c:533 nscd/connections.c:545
+#: nscd/connections.c:564
 #, c-format
 msgid "invalid persistent database file \"%s\": %s"
 msgstr "ogiltig persistent databasfil \"%s\": %s"
 
-#: nscd/connections.c:519
+#: nscd/connections.c:535
 msgid "header size does not match"
 msgstr "huvudstorlek stÃ¤mmer inte"
 
-#: nscd/connections.c:531
+#: nscd/connections.c:547
 msgid "file size does not match"
 msgstr "filstorlek stÃ¤mmer inte"
 
-#: nscd/connections.c:550
+#: nscd/connections.c:566
 msgid "verification failed"
 msgstr "verifikation misslyckades"
 
-#: nscd/connections.c:564
+#: nscd/connections.c:580
 #, c-format
 msgid "suggested size of table for database %s larger than the persistent database's table"
 msgstr "fÃ¶reslagen storlek pÃ¥ tabellen fÃ¶r databas %s Ã¤r stÃ¶rre Ã¤n den persistenta databasens tabell"
 
-#: nscd/connections.c:574 nscd/connections.c:655
+#: nscd/connections.c:591 nscd/connections.c:673
 #, c-format
 msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr "kan inte skapa lÃ¤sbar filidentifierare fÃ¶r \"%s\", ingen mmap"
 
-#: nscd/connections.c:634
+#: nscd/connections.c:652
 #, c-format
 msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
 msgstr "databas fÃ¶r %s korrupt eller anvÃ¤nd av flera samtidigt; ta bort %s manuellt om det behÃ¶vs och starta om"
 
-#: nscd/connections.c:641
+#: nscd/connections.c:659
 #, c-format
 msgid "cannot create %s; no persistent database used"
 msgstr "kan inte skapa %s; ingen persistent databas anvÃ¤nds"
 
-#: nscd/connections.c:644
+#: nscd/connections.c:662
 #, c-format
 msgid "cannot create %s; no sharing possible"
 msgstr "kan inte skapa %s; ingen delning mÃ¶jlig"
 
-#: nscd/connections.c:715
+#: nscd/connections.c:733
 #, c-format
 msgid "cannot write to database file %s: %s"
 msgstr "kan inte skriva till databasfil %s: %s"
 
-#: nscd/connections.c:749
+#: nscd/connections.c:772
 #, c-format
 msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
 msgstr "kan inte sÃ¤tta uttag (socket) att stÃ¤ngas vid programstart: %s; kopplar ur paranoialÃ¤ge"
 
-#: nscd/connections.c:799
+#: nscd/connections.c:823
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "kan inte Ã¶ppna uttag (socket): %s"
 
-#: nscd/connections.c:816
+#: nscd/connections.c:840
 #, c-format
 msgid "cannot change socket to nonblocking mode: %s"
 msgstr "kan inte Ã¤ndra uttag (socket) till icke-blockerande: %s"
 
-#: nscd/connections.c:824
+#: nscd/connections.c:848
 #, c-format
 msgid "cannot set socket to close on exec: %s"
 msgstr "kan inte sÃ¤tta uttag (socket) att stÃ¤ngas vid programstart: %s"
 
-#: nscd/connections.c:835
+#: nscd/connections.c:859
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "kan inte fÃ¥ uttag (socket) att acceptera fÃ¶rbindelser: %s"
 
-#: nscd/connections.c:926
+#: nscd/connections.c:955
 #, c-format
 msgid "provide access to FD %d, for %s"
 msgstr "ge Ã¥tkomst till FD %d, fÃ¶r %s"
 
-#: nscd/connections.c:938
+#: nscd/connections.c:967
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "kan inte hantera Ã¤ldre fÃ¶rfrÃ¥gansversion %d, nuvarande version Ã¤r %d"
 
-#: nscd/connections.c:980 nscd/connections.c:1033
+#: nscd/connections.c:1009 nscd/connections.c:1062
 #, c-format
 msgid "cannot write result: %s"
 msgstr "kan inte skriva resultat: %s"
 
-#: nscd/connections.c:1116
+#: nscd/connections.c:1145
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr "kunde inte hÃ¤mta anropandes identitet: %s"
 
-#: nscd/connections.c:1175
+#: nscd/connections.c:1204
 #, c-format
 msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "kan inte Ã¶ppna /proc/slef/cmdline: %s, kopplar ur paranoialÃ¤ge"
 
-#: nscd/connections.c:1189
+#: nscd/connections.c:1218
 #, c-format
 msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "kan inte lÃ¤sa /proc/self/cmdline: %s, kopplar ur paranoialÃ¤ge"
 
-#: nscd/connections.c:1229
+#: nscd/connections.c:1258
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr "kan inte byta till fÃ¶regÃ¥ende UID: %s; kopplar ur paranoialÃ¤ge"
 
-#: nscd/connections.c:1239
+#: nscd/connections.c:1268
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr "kan inte byta till fÃ¶regÃ¥ende GID: %s; kopplar ur paranoialÃ¤ge"
 
-#: nscd/connections.c:1252
+#: nscd/connections.c:1281
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr "kan inte byta till fÃ¶regÃ¥ende arbetskatalog: %s; kopplar ur paranoialÃ¤ge"
 
-#: nscd/connections.c:1280
+#: nscd/connections.c:1310
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr "Ã¥terstart misslyckades: %s; kopplar ur paranoialÃ¤ge"
 
-#: nscd/connections.c:1289
+#: nscd/connections.c:1319
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr "kan inte byta aktuell katalog to \"/\": %s"
 
-#: nscd/connections.c:1407
+#: nscd/connections.c:1437
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "fattas data vid lÃ¤sning av begÃ¤ran: %s"
 
-#: nscd/connections.c:1438
+#: nscd/connections.c:1468
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "nyckellÃ¤ngd i begÃ¤ran fÃ¶r lÃ¥ng: %d"
 
-#: nscd/connections.c:1451
+#: nscd/connections.c:1481
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "fattas data vid lÃ¤sning av begÃ¤ransnyckel: %s"
 
-#: nscd/connections.c:1460
+#: nscd/connections.c:1490
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr "handle_request: begÃ¤ran mottagen (Version = %d) frÃ¥n PID %ld"
 
-#: nscd/connections.c:1465
+#: nscd/connections.c:1495
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request: begÃ¤ran mottagen (Version = %d)"
 
-#: nscd/connections.c:1826
+#: nscd/connections.c:1856
 #, c-format
 msgid "could only start %d threads; terminating"
 msgstr "kunde bara starta %d trÃ¥dar; avslutar"
 
-#: nscd/connections.c:1874 nscd/connections.c:1875 nscd/connections.c:1892
-#: nscd/connections.c:1901 nscd/connections.c:1919 nscd/connections.c:1930
-#: nscd/connections.c:1941
+#: nscd/connections.c:1904 nscd/connections.c:1905 nscd/connections.c:1922
+#: nscd/connections.c:1931 nscd/connections.c:1949 nscd/connections.c:1960
+#: nscd/connections.c:1971
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "Misslyckades att kÃ¶ra nscd som anvÃ¤ndare \"%s\""
 
-#: nscd/connections.c:1893
+#: nscd/connections.c:1923
 #, c-format
 msgid "initial getgrouplist failed"
 msgstr "fÃ¶rsta getgrouplist misslyckades"
 
-#: nscd/connections.c:1902
+#: nscd/connections.c:1932
 #, c-format
 msgid "getgrouplist failed"
 msgstr "getgrouplist misslyckades"
 
-#: nscd/connections.c:1920
+#: nscd/connections.c:1950
 #, c-format
 msgid "setgroups failed"
 msgstr "setgroups misslyckades"
 
-#: nscd/grpcache.c:402 nscd/hstcache.c:412 nscd/initgrcache.c:412
-#: nscd/pwdcache.c:397 nscd/servicescache.c:342
+#: nscd/grpcache.c:402 nscd/hstcache.c:418 nscd/initgrcache.c:412
+#: nscd/pwdcache.c:397 nscd/servicescache.c:343
 #, c-format
 msgid "short write in %s: %s"
 msgstr "ofullstÃ¤ndig skrivning i %s: %s"
@@ -4172,12 +4192,12 @@
 "%15u  CAV-sonderingar\n"
 "%15u  CAV-missar\n"
 
-#: nscd/servicescache.c:389
+#: nscd/servicescache.c:390
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
 msgstr "Hittar inte \"%s\" i servicecache!"
 
-#: nscd/servicescache.c:391
+#: nscd/servicescache.c:392
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
 msgstr "Omladdar \"%s\" i servicecache!"
@@ -6247,7 +6267,7 @@
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: \"Leap\"-rad i fil %s som inte Ã¤r skottsekundsfil\n"
 
-#: timezone/zic.c:892 timezone/zic.c:1323 timezone/zic.c:1345
+#: timezone/zic.c:892 timezone/zic.c:1329 timezone/zic.c:1351
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: panik: Ogiltigt l_value %d\n"
@@ -6266,231 +6286,239 @@
 msgid "expected continuation line not found"
 msgstr "fÃ¶rvÃ¤ntad fortsÃ¤ttningsrad inte funnen"
 
-#: timezone/zic.c:956
+#: timezone/zic.c:956 timezone/zic.c:2489 timezone/zic.c:2508
+msgid "time overflow"
+msgstr "fÃ¶r stort tidsvÃ¤rde"
+
+#: timezone/zic.c:960
 msgid "24:00 not handled by pre-1998 versions of zic"
 msgstr "24:00 hanteras inte av zic-versioner fÃ¶re 1998"
 
-#: timezone/zic.c:970
+#: timezone/zic.c:963
+msgid "values over 24 hours not handled by pre-2007 versions of zic"
+msgstr "vÃ¤rden stÃ¶rre Ã¤n 24 timmar hanteras inte av zic-versioner fÃ¶re 2007"
+
+#: timezone/zic.c:976
 msgid "wrong number of fields on Rule line"
 msgstr "fel antal fÃ¤lt pÃ¥ \"Rule\"-rad"
 
-#: timezone/zic.c:974
+#: timezone/zic.c:980
 msgid "nameless rule"
 msgstr "namnlÃ¶s regel"
 
-#: timezone/zic.c:979
+#: timezone/zic.c:985
 msgid "invalid saved time"
 msgstr "ogiltig sparad tid"
 
-#: timezone/zic.c:1000
+#: timezone/zic.c:1006
 msgid "wrong number of fields on Zone line"
 msgstr "fel antal fÃ¤lt pÃ¥ \"Zone\"-rad"
 
-#: timezone/zic.c:1006
+#: timezone/zic.c:1012
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "\"Zone %s\"-rad och flaggan -l Ã¤r Ã¶msesidigt uteslutande"
 
-#: timezone/zic.c:1014
+#: timezone/zic.c:1020
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "\"Zone %s\"-rad och flaggan -p Ã¤r Ã¶msesidigt uteslutande"
 
-#: timezone/zic.c:1026
+#: timezone/zic.c:1032
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "dubblerat zonnamn %s (fil \"%s\", rad %d)"
 
-#: timezone/zic.c:1042
+#: timezone/zic.c:1048
 msgid "wrong number of fields on Zone continuation line"
 msgstr "fel antal fÃ¤lt pÃ¥ \"Zone\"-fortsÃ¤ttningsrad"
 
-#: timezone/zic.c:1082
+#: timezone/zic.c:1088

[... 336 lines stripped ...]
Prev by Date: [commits] r4198 - in /fsf/trunk/libc: ./ include/ inet/ po/ posix/ stdlib/ sysdeps/mach/hurd/ sysdeps/posix/ sysdeps/unix/sysv/linux/
Next by Date: [commits] r4222 - in /fsf/trunk/libc: ChangeLog po/ko.po sysdeps/ieee754/dbl-64/sincos.tbl
Previous by thread: [commits] r4198 - in /fsf/trunk/libc: ./ include/ inet/ po/ posix/ stdlib/ sysdeps/mach/hurd/ sysdeps/posix/ sysdeps/unix/sysv/linux/
Next by thread: [commits] r4222 - in /fsf/trunk/libc: ChangeLog po/ko.po sysdeps/ieee754/dbl-64/sincos.tbl
Index(es):
- Date
- Thread