From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-9072-listarch-libc-hacker=sources.redhat.com@sourceware.org>
Received: (qmail 30389 invoked by alias); 20 Sep 2006 21:36:56 -0000
Received: (qmail 30373 invoked by uid 22791); 20 Sep 2006 21:36:55 -0000
X-Spam-Check-By: sourceware.org
Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26)
    by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 20 Sep 2006 21:36:49 +0000
Received: from sunsite.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
	by sunsite.mff.cuni.cz (8.13.1/8.13.1) with ESMTP id k8KLaakp023881;
	Wed, 20 Sep 2006 23:36:36 +0200
Received: (from jj@localhost)
	by sunsite.mff.cuni.cz (8.13.1/8.13.1/Submit) id k8KLaaPr023880;
	Wed, 20 Sep 2006 23:36:36 +0200
Date: Wed, 20 Sep 2006 21:36:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Fix spelling errors in error messages
Message-ID: <20060920213635.GQ4556@sunsite.mff.cuni.cz>
Reply-To: Jakub Jelinek <jakub@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
User-Agent: Mutt/1.4.1i
Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sourceware.org>
List-Help: <mailto:libc-hacker-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: libc-hacker-owner@sourceware.org
X-SW-Source: 2006-09/txt/msg00043.txt.bz2

Hi!

BZ#3137 reports some spelling errors and this patch also updates the
*.po{t,} files, so that it doesn't create translation regressions.

2006-09-20  Jakub Jelinek  <jakub@redhat.com>

	* po/libc.pot: Regenerated.
	* po/be.po: Updated.
	* po/ca.po: Likewise.
	* po/cs.po: Likewise.
	* po/da.po: Likewise.
	* po/de.po: Likewise.
	* po/el.po: Likewise.
	* po/en_GB.po: Likewise.
	* po/es.po: Likewise.
	* po/fi.po: Likewise.
	* po/fr.po: Likewise.
	* po/gl.po: Likewise.
	* po/hr.po: Likewise.
	* po/hu.po: Likewise.
	* po/ja.po: Likewise.
	* po/ko.po: Likewise.
	* po/nb.po: Likewise.
	* po/nl.po: Likewise.
	* po/pl.po: Likewise.
	* po/pt_BR.po: Likewise.
	* po/ru.po: Likewise.
	* po/rw.po: Likewise.
	* po/sk.po: Likewise.
	* po/sv.po: Likewise.
	* po/tr.po: Likewise.
	* po/zh_CN.po: Likewise.
	* po/zh_TW.po: Likewise.

	[BZ #3137]
	* iconv/iconv_prog.c (main): Fix spelling in error message.
	* iconv/iconvconfig.c (main): Likewise.
	* locale/programs/ld-collate.c (handle_ellipsis): Likewise.
	* locale/programs/ld-ctype.c (charclass_symbolic_ellipsis): Likewise.
	* locale/programs/localedef.c (main): Likewise.
	* locale/programs/repertoire.c (repertoire_read): Likewise.
	* timezone/zdump.c (main): Likewise.
	* nscd/connections.c (handle_request): Fix spelling in log message.
	Patch by Malcolm Parsons <malcolm.parsons@gmail.com>.

--- libc/nscd/connections.c.jj	2006-06-21 17:36:39.000000000 +0200
+++ libc/nscd/connections.c	2006-09-20 23:13:12.000000000 +0200
@@ -1079,7 +1079,7 @@ cannot handle old request version %d; cu
 	  {
 	    char buf[256];
 
-	    dbg_log (_("error getting callers id: %s"),
+	    dbg_log (_("error getting caller's id: %s"),
 		     strerror_r (errno, buf, sizeof (buf)));
 	    break;
 	  }
--- libc/locale/programs/ld-collate.c.jj	2006-09-11 08:56:51.000000000 +0200
+++ libc/locale/programs/ld-collate.c	2006-09-20 23:13:12.000000000 +0200
@@ -1295,7 +1295,7 @@ order for `%.*s' already defined at %s:%
 	    {
 	    invalid_range:
 	      lr_error (ldfile, _("\
-`%s' and `%.*s' are no valid names for symbolic range"),
+`%s' and `%.*s' are not valid names for symbolic range"),
 			startp->name, (int) lento, endp->name);
 	      return;
 	    }
--- libc/locale/programs/ld-ctype.c.jj	2006-08-30 17:20:41.000000000 +0200
+++ libc/locale/programs/ld-ctype.c	2006-09-20 23:13:12.000000000 +0200
@@ -1472,7 +1472,7 @@ charclass_symbolic_ellipsis (struct line
     {
     invalid_range:
       lr_error (ldfile,
-		_("`%s' and `%.*s' are no valid names for symbolic range"),
+		_("`%s' and `%.*s' are not valid names for symbolic range"),
 		last_str, (int) now->val.str.lenmb, nowstr);
       return;
     }
--- libc/locale/programs/localedef.c.jj	2006-08-22 10:42:29.000000000 +0200
+++ libc/locale/programs/localedef.c	2006-09-20 23:13:12.000000000 +0200
@@ -288,7 +288,7 @@ cannot write output files to `%s'"), out
     }
   else
     WITH_CUR_LOCALE (error (4, 0, _("\
-no output file produced because warning were issued")));
+no output file produced because warnings were issued")));
 
   /* This exit status is prescribed by POSIX.2 4.35.7.  */
   exit (error_message_count != 0);
--- libc/locale/programs/repertoire.c.jj	2005-12-30 09:04:02.000000000 +0100
+++ libc/locale/programs/repertoire.c	2006-09-20 23:13:12.000000000 +0200
@@ -328,7 +328,7 @@ argument to <%s> must be a single charac
 
   if (tsearch (result, &known, &repertoire_compare) == NULL)
     /* Something went wrong.  */
-    WITH_CUR_LOCALE (error (0, errno, _("cannot safe new repertoire map")));
+    WITH_CUR_LOCALE (error (0, errno, _("cannot save new repertoire map")));
 
   return result;
 }
--- libc/timezone/zdump.c.jj	2006-01-11 16:55:32.000000000 +0100
+++ libc/timezone/zdump.c	2006-09-20 23:13:12.000000000 +0200
@@ -389,7 +389,7 @@ _("%s: usage is %s [ --version ] [ -v ] 
 	}
 	if (fflush(stdout) || ferror(stdout)) {
 		(void) fprintf(stderr, "%s: ", progname);
-		(void) perror(_("Error writing standard output"));
+		(void) perror(_("Error writing to standard output"));
 		exit(EXIT_FAILURE);
 	}
 	exit(EXIT_SUCCESS);
--- libc/po/be.po.jj	2003-11-04 19:33:14.000000000 +0100
+++ libc/po/be.po	2006-09-20 23:23:20.000000000 +0200
@@ -260,7 +260,7 @@ msgstr "немагчыма адчыніÑ
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr ""
 
 #: iconv/iconv_prog.c:246
@@ -352,7 +352,7 @@ msgid "Prefix used for all file accesses
 msgstr ""
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr ""
 
 #: iconv/iconvconfig.c:405
@@ -727,7 +727,7 @@ msgstr ""
 
 #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr ""
 
 #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
@@ -1620,7 +1620,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr ""
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr ""
 
 #: locale/programs/repertoire.c:343
@@ -3028,7 +3028,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutof
 msgstr ""
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Памылка запісу стандартнага вываду"
 
 #: timezone/zic.c:365
@@ -5047,7 +5047,7 @@ msgstr "немагчыма запісаÑ
 
 #: nscd/connections.c:405 nscd/connections.c:499
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr ""
 
 #: nscd/connections.c:471
--- libc/po/ca.po.jj	2004-08-14 18:18:36.000000000 +0200
+++ libc/po/ca.po	2006-09-20 23:23:20.000000000 +0200
@@ -268,7 +268,7 @@ msgstr "no s'ha pogut obrir el fitxer d'
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "no es suporta la conversió de «%s» ni a «%s»"
 
 #: iconv/iconv_prog.c:248
@@ -373,7 +373,7 @@ msgid "Prefix used for all file accesses
 msgstr "Prefix a usar en tots els accessos a fitxer."
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "no s'ha generat el fitxer d'eixida perquè s'han produït avisos"
 
 #: iconv/iconvconfig.c:405
@@ -760,7 +760,7 @@ msgstr "%s: un rang simbòlic amb eŀlip
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "«%s» i «%.*s» no són noms vàlids de rangs simbòlics"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1695,7 +1695,7 @@ msgstr "no s'ha especificat un valor <Ux
 # ivb (2001/11/05)
 # ivb  Apareix quan no es troba el repertori en un arbre de repertoris.
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "no s'ha pogut afegir el nou mapa de repertori"
 
 #: locale/programs/repertoire.c:343
@@ -3133,7 +3133,7 @@ msgid "%s: usage is %s [ --version ] [ -
 msgstr "%s: la forma d'ús és %s [--version] [-v] [-c ANY_DE_TALL] NOM_DE_ZONA...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "error en escriure en l'eixida estàndard"
 
 #: timezone/zic.c:361
@@ -5234,7 +5234,7 @@ msgstr "no s'ha pogut escriure el result
 # ivb  «chronyc» amb «chronyd»).
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "error en obtenir l'identificador del programa de control: %s"
 
 #: nscd/connections.c:485
--- libc/po/cs.po.jj	2000-04-19 04:27:04.000000000 +0200
+++ libc/po/cs.po	2006-09-20 23:23:20.000000000 +0200
@@ -3709,7 +3709,7 @@ msgstr "koncový bod `...' je vìt¹í ne¾ p
 
 #: nscd/connections.c:357 nscd/connections.c:444
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "chyba pøi zji¹»ování id volajícího: %s"
 
 #: iconv/iconv_prog.c:193
@@ -4144,7 +4144,7 @@ msgid "no other keyword shall be specifi
 msgstr "pøi pou¾ití `copy' není dovoleno pou¾ít ¾ádné jiné klíèové slovo"
 
 #: locale/programs/localedef.c:331
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "výstupní soubor nebyl vytvoøen, proto¾e se vyskytla varování"
 
 #: locale/programs/locfile.c:283 locale/programs/locfile.c:302
--- libc/po/da.po.jj	2003-03-10 00:17:53.000000000 +0100
+++ libc/po/da.po	2006-09-20 23:23:20.000000000 +0200
@@ -259,7 +259,7 @@ msgstr "kan ikke åbne udfil"
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "konvertering fra '%s' og til '%s' er ikke understøttet"
 
 #: iconv/iconv_prog.c:246
@@ -361,7 +361,7 @@ msgid "Prefix used for all file accesses
 msgstr "Præfiks brugt for alle filadgange"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "på grund af advarsler blev ingen udfil oprettet"
 
 #: iconv/iconvconfig.c:405
@@ -738,7 +738,7 @@ msgstr "%s: symbolsk interval-ellipse må
 
 #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "'%s' og '%.*s' er ikke gyldige navne for tegnområde"
 
 #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
@@ -1639,7 +1639,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr "ingen <Uxxxx>- eller <Uxxxxxxxx>-værdi givet"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "kan ikke gemme ny repertoiretabel"
 
 #: locale/programs/repertoire.c:343
@@ -3051,7 +3051,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutof
 msgstr "%s: brug er %s [ -v ] [ -c grænse ] zonenavn ...\n"
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Fejl ved skrivning til standard ud"
 
 #: timezone/zic.c:365
@@ -5073,7 +5073,7 @@ msgstr "kan ikke udskrive resultat: '%s'
 
 #: nscd/connections.c:405 nscd/connections.c:499
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "fejl ved forespørgsel på opkaldets id: %s"
 
 #: nscd/connections.c:471
--- libc/po/de.po.jj	2004-12-14 10:29:32.000000000 +0100
+++ libc/po/de.po	2006-09-20 23:23:20.000000000 +0200
@@ -304,7 +304,7 @@ msgstr "Kann die Ausgabedatei nicht öff
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "Konvertierung von »%s« nach »%s« wird nicht unterstützt"
 
 #: iconv/iconv_prog.c:248
@@ -406,7 +406,7 @@ msgid "Prefix used for all file accesses
 msgstr "Prefix für jeden Dateizugriff"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "Es wurde keine Ausgabedatei erzeugt, weil Warnungen ausgegeben wurden"
 
 #: iconv/iconvconfig.c:405
@@ -787,7 +787,7 @@ msgstr "%s: Das Symbol für Auslassungen
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "»%s« und »%.*s« sind ungültige Namen für eine symbolischen Zeichenbereich"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1716,7 +1716,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr "Kein <Uxxxx> oder <Uxxxxxxxx> Wert angegeben"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "Kann die neue »repertoire«-Map »%s« nicht speichern"
 
 #: locale/programs/repertoire.c:343
@@ -3149,7 +3149,7 @@ msgid "%s: usage is %s [ --version ] [ -
 msgstr "%s: Syntax: %s [ --version ] [ -v ] [ -c cutoff ] Zonenname ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Fehler beim Schreiben zur Standardausgabe"
 
 #: timezone/zic.c:361
@@ -5208,7 +5208,7 @@ msgstr "Das Ergebnis kann nicht geschrie
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "Fehler beim Feststellen der Identität des Aufrufers: %s"
 
 #: nscd/connections.c:485
--- libc/po/el.po.jj	2001-05-23 01:27:05.000000000 +0200
+++ libc/po/el.po	2006-09-20 23:23:20.000000000 +0200
@@ -3801,7 +3801,7 @@ msgstr "Ï ïñéóìüò `%1$s' äåí ôåëåéþíåé ì
 
 #: locale/programs/ld-collate.c:1268 locale/programs/ld-ctype.c:1454
 #, fuzzy, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "Ôá <%s> êáé <%s> åßíáé ìç áðïäåêôÜ ïíüìáôá ãéá üñéï"
 
 #: elf/sprof.c:762
@@ -4118,7 +4118,7 @@ msgstr "áäýíáôç ç áíÜãíùóç äåäïìÝíùí óôá
 
 #: locale/programs/repertoire.c:331
 #, fuzzy
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "áäõíáìßá áíÜãíùóçò ðßíáêá ñåðåñôïñßïõ `%s'"
 
 #: elf/dl-load.c:776
@@ -4329,7 +4329,7 @@ msgstr "êùäéêïðïßçóç ãéá ôï áñ÷éêü êåßìå
 
 #: nscd/connections.c:361 nscd/connections.c:453
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "óöÜëìá óôç ëÞøç ôçò ôáõôüôçôáò áõôïý ðïõ êÜëåóå: %s"
 
 #: locale/programs/ld-collate.c:3013
@@ -4771,7 +4771,7 @@ msgid "no output digits defined and none
 msgstr ""
 
 #: locale/programs/localedef.c:236
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "äåí ðáñÜ÷èçêå áñ÷åßï åîüäïõ åðåéäÞ åêäüèçêáí ðñïåéäïðïéÞóåéò"
 
 #: locale/programs/charmap.c:488 locale/programs/charmap.c:668 locale/programs/charmap.c:764
@@ -5587,7 +5587,7 @@ msgstr "yp_update: áäõíáìßá ëÞøçò äéåýèõ
 #~ msgid "while writing database file"
 #~ msgstr "êáôÜ ôçí åããñáöÞ áñ÷åßïõ âÜóåùò äåäïìÝíùí"
 
-#~ msgid "%s: Error writing standard output "
+#~ msgid "%s: Error writing to standard output "
 #~ msgstr "%s: ÓöÜëìá êáôÜ ôçí åããñáöÞ óôçí êáíïíéêÞ Ýîïäï "
 
 #~ msgid "Cputime limit exceeded"
--- libc/po/en_GB.po.jj	2000-07-03 22:42:06.000000000 +0200
+++ libc/po/en_GB.po	2006-09-20 23:23:20.000000000 +0200
@@ -3768,7 +3768,7 @@ msgstr ""
 
 #: locale/programs/ld-collate.c:1184 locale/programs/ld-ctype.c:1263
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr ""
 
 #: elf/sprof.c:763
@@ -3988,7 +3988,7 @@ msgid "cannot read statistics data"
 msgstr ""
 
 #: locale/programs/repertoire.c:331
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr ""
 
 #: nscd/cache.c:150 nscd/connections.c:151
@@ -4188,7 +4188,7 @@ msgstr ""
 
 #: nscd/connections.c:360 nscd/connections.c:451
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr ""
 
 #: locale/programs/ld-collate.c:2787
@@ -4600,7 +4600,7 @@ msgid ""
 msgstr ""
 
 #: locale/programs/localedef.c:229
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr ""
 
 #: locale/programs/charmap.c:438 locale/programs/charmap.c:589
--- libc/po/es.po.jj	2005-01-08 16:50:24.000000000 +0100
+++ libc/po/es.po	2006-09-20 23:23:20.000000000 +0200
@@ -302,7 +302,7 @@ msgstr "no se puede abrir el fichero de 
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "no se admite la conversión de `%s' a `%s'"
 
 #: iconv/iconv_prog.c:248
@@ -411,7 +411,7 @@ msgid "Prefix used for all file accesses
 msgstr "Prefijo utilizado para todos los accesos a ficheros"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "no se ha producido ningún fichero de salida debido a la existencia de avisos"
 
 #: iconv/iconvconfig.c:405
@@ -798,7 +798,7 @@ msgstr "%s: el rango simbólico de la eli
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' y `%.*s' no son nombres válidos para el rango simbólico"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1748,7 +1748,7 @@ msgstr "no se ha dado ningún valor <Uxxx
 # No sé qué es eso del "repertoire map", pero creo que el repertoire
 # es una simple aclaración. sv
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "no se puede asegurar el nuevo repertorio"
 
 #: locale/programs/repertoire.c:343
@@ -3416,7 +3416,7 @@ msgid "%s: usage is %s [ --version ] [ -
 msgstr "%s: el modo de empleo es %s [ --version ] [ -v ] [ -c cutoff ] nombrezona ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Error al escribir en la salida estándar"
 
 #: timezone/zic.c:361
@@ -5638,7 +5638,7 @@ msgstr "no se puede escribir el resultad
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "error al obtener el id de los llamantes: %s"
 
 #: nscd/connections.c:485
--- libc/po/fi.po.jj	2003-03-09 18:47:01.000000000 +0100
+++ libc/po/fi.po	2006-09-20 23:23:21.000000000 +0200
@@ -273,7 +273,7 @@ msgstr "tulostiedostoa ei voi avata"
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "muunnos \"%s\" <-> \"%s\" ei ole tuettu"
 
 #: iconv/iconv_prog.c:246
@@ -376,7 +376,7 @@ msgid "Prefix used for all file accesses
 msgstr "Jokaisen tiedoston käsittelyssä käytettävä etuliite"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "tulostiedostoa ei tuotettu varoituksen takia"
 
 #: iconv/iconvconfig.c:405
@@ -751,7 +751,7 @@ msgstr "%s: symbolisen välin sanankatkai
 
 #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "\"%s\" ja \"%.*s\" eivät ole kelvollisia nimiä symboliselle välille"
 
 #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
@@ -1652,7 +1652,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr "ei <Uxxxx>- tai <Uxxxxxxxx>-arvoa annettu"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "uutta valikoimakarttaa ei voi turvata"
 
 #: locale/programs/repertoire.c:343
@@ -3065,7 +3065,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutof
 msgstr "%s: käyttö: %s [ -v ] [ -c katkaisu ] vyöhykenimi ...\n"
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Virhe kirjoitettaessa vakiotulosteeseen"
 
 #: timezone/zic.c:365
@@ -5086,7 +5086,7 @@ msgstr "tulosta ei voi kirjoittaa: %s"
 
 #: nscd/connections.c:405 nscd/connections.c:499
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "virhe kutsujan tunnisteen hakemisessa: %s"
 
 #: nscd/connections.c:471
--- libc/po/fr.po.jj	2004-08-14 18:18:37.000000000 +0200
+++ libc/po/fr.po	2006-09-20 23:23:21.000000000 +0200
@@ -260,7 +260,7 @@ msgstr "Ne peut ouvrir le fichier de sor
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "conversions de « %s » et de , vers « %s » ne sont pas supportées"
 
 #: iconv/iconv_prog.c:248
@@ -362,7 +362,7 @@ msgid "Prefix used for all file accesses
 msgstr "Préfixe utilisé pour tous les accès fichiers"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "Aucun fichier de sortie généré en raison d'un avertissement déjà émis"
 
 #: iconv/iconvconfig.c:405
@@ -741,7 +741,7 @@ msgstr "%s: plage de l'ellipse symboliqu
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "« %s » et « %.*s » sont des noms invalides pour un intervalle symbolique."
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1664,7 +1664,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr "Aucune valeur <Uxxxx> ou <Uxxxxxxxx> fournie"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "Ne peut sauvegarder la nouvelle table des répertoires"
 
 #: locale/programs/repertoire.c:343
@@ -3087,7 +3087,7 @@ msgid "%s: usage is %s [ --version ] [ -
 msgstr "%s: usage est %s [ --version ] [ -v ] [ -c seuil ] nom_du_fuseau_horaire ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "ERREUR d'écriture sur la sortie standard"
 
 #: timezone/zic.c:361
@@ -5131,7 +5131,7 @@ msgstr "Ne peut écrire les résultats: « 
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "erreur lors de la recherche de l'identificateur de l'appelant: %s"
 
 #: nscd/connections.c:485
--- libc/po/gl.po.jj	2003-03-03 20:35:16.000000000 +0100
+++ libc/po/gl.po	2006-09-20 23:23:21.000000000 +0200
@@ -259,7 +259,7 @@ msgstr "non se pode abri-lo ficheiro de 
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "as conversións de `%s' e a `%s' non están soportadas"
 
 #: iconv/iconv_prog.c:246
@@ -360,7 +360,7 @@ msgid "Prefix used for all file accesses
 msgstr "Prefixo a empregar para tódolos accesos a ficheiro"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "non se producíu un ficheiro de saída porque se deron avisos"
 
 #: iconv/iconvconfig.c:405
@@ -735,7 +735,7 @@ msgstr "%s: os puntos suspensivos do ran
 
 #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' e `%.*s' non son nomes válidos para o rango simbólico"
 
 #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
@@ -1636,7 +1636,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr "non se deu un valor <Uxxxx> ou <Uxxxxxxxx>"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "non se pode grava-lo novo mapa de repertorios"
 
 #: locale/programs/repertoire.c:343
@@ -3049,7 +3049,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutof
 msgstr "%s: úsase %s [ -v ] [ -c corte ] nomezona ...\n"
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Erro ao escribir na saída estándar"
 
 #: timezone/zic.c:365
@@ -5070,7 +5070,7 @@ msgstr "non se pode escribi-lo resultado
 
 #: nscd/connections.c:405 nscd/connections.c:499
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "erro ao obte-lo identificador do chamante: %s"
 
 #: nscd/connections.c:471
--- libc/po/hr.po.jj	2002-06-21 00:37:34.000000000 +0200
+++ libc/po/hr.po	2006-09-20 23:23:21.000000000 +0200
@@ -1870,7 +1870,7 @@ msgid "Error while talking to callback p
 msgstr ""
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr ""
 
 #: inet/ruserpass.c:184
@@ -3828,7 +3828,7 @@ msgstr "`%1$s' definicija ne završava s
 
 #: locale/programs/ld-collate.c:1281 locale/programs/ld-ctype.c:1455
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr ""
 
 #: elf/sprof.c:762
@@ -4117,7 +4117,7 @@ msgid "cannot read statistics data"
 msgstr "ne moogu pročitati statistike"
 
 #: locale/programs/repertoire.c:331
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr ""
 
 #: elf/dl-load.c:784
@@ -4339,7 +4339,7 @@ msgstr "enkoding izvornog teksta"
 
 #: nscd/connections.c:366 nscd/connections.c:460
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "greška pri dohvatu broja pozivatelja: %s"
 
 #: locale/programs/ld-collate.c:3032
@@ -4777,7 +4777,7 @@ msgid "no output digits defined and none
 msgstr ""
 
 #: iconv/iconvconfig.c:308 locale/programs/localedef.c:236
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr ""
 
 #: locale/programs/charmap.c:493 locale/programs/charmap.c:673 locale/programs/charmap.c:769 locale/programs/repertoire.c:231
--- libc/po/hu.po.jj	2002-09-16 19:33:32.000000000 +0200
+++ libc/po/hu.po	2006-09-20 23:23:21.000000000 +0200
@@ -1968,7 +1968,7 @@ msgid "Error while talking to callback p
 msgstr "Hiba amíg kommunikáltam a visszahívó folyamattal"
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Hiba az alapértelmezett kimenetre írás során"
 
 #: inet/ruserpass.c:184
@@ -4025,7 +4025,7 @@ msgstr "a `%1$s' meghatározás nem végzõd
 
 #: locale/programs/ld-collate.c:1281 locale/programs/ld-ctype.c:1455
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "a `%s' és a `%.*s' nem érvényesek a szimbolikus tartományban"
 
 #: elf/sprof.c:762
@@ -4318,7 +4318,7 @@ msgid "cannot read statistics data"
 msgstr "nem lehet olvasni a statisztikai adatokat"
 
 #: locale/programs/repertoire.c:331
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "nem biztonságos új repertoár"
 
 #: elf/dl-load.c:784
@@ -4540,7 +4540,7 @@ msgstr "az eredeti szöveg kódolása"
 
 #: nscd/connections.c:366 nscd/connections.c:460
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "hiba a hívó azonosítás során: %s"
 
 #: locale/programs/ld-collate.c:3032
@@ -4984,7 +4984,7 @@ msgid "no output digits defined and none
 msgstr "nincs kimeneti szám meghatározva és nincs szabványos név a karakterkészletben"
 
 #: iconv/iconvconfig.c:308 locale/programs/localedef.c:236
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "nem jött létre kimeneti fájl, mert figyelmeztetést kaptam"
 
 #: locale/programs/charmap.c:493 locale/programs/charmap.c:673
--- libc/po/ja.po.jj	2004-12-21 14:33:32.000000000 +0100
+++ libc/po/ja.po	2006-09-20 23:23:21.000000000 +0200
@@ -259,7 +259,7 @@ msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "`%s'¤«¤é¤ÎÊÑ´¹¤È`%s'¤Ø¤ÎÊÑ´¹¤Ï¤É¤Á¤é¤â¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 #: iconv/iconv_prog.c:248
@@ -362,7 +362,7 @@ msgid "Prefix used for all file accesses
 msgstr "Á´¥Õ¥¡¥¤¥ë¤Î¥¢¥¯¥»¥¹¤Ë¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤ò»ÈÍѤ·¤Þ¤¹"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "·Ù¹ð¤¬½Ð¤µ¤ì¤¿¤¿¤á¥Õ¥¡¥¤¥ë¤Ë½ÐÎϤµ¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
 
 #: iconv/iconvconfig.c:405
@@ -737,7 +737,7 @@ msgstr "%s: ¥·¥ó¥Ü¥ëÈϰϾÊάµ­¹æ¤Ï`order
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' ¤È `%.*s' ¤Ï¥·¥ó¥Ü¥ë¤ÎÈϰϤȤ·¤ÆÉÔÀµ¤Ê̾Á°¤Ç¤¹"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1654,7 +1654,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr "<Uxxxx> ¤Þ¤¿¤Ï <Uxxxxxxxx> Ãͤ¬Í¿¤¨¤é¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "¿·¤·¤¤¥ì¥Ñ¡¼¥È¥ê¥Þ¥Ã¥×¤Ï°ÂÁ´¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
 #: locale/programs/repertoire.c:343
@@ -3075,7 +3075,7 @@ msgid "%s: usage is %s [ --version ] [ -
 msgstr "%s: »ÈÍÑË¡ %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "¥¨¥é¡¼¤òɸ½à½ÐÎϤ˽ñ¤­½Ð¤·Ãæ"
 
 #: timezone/zic.c:361
@@ -5112,7 +5112,7 @@ msgstr "·ë²Ì¤ò½ñ¤­¹þ¤á¤Þ¤»¤ó: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "¸Æ¤Ó½Ð¤·ID¤Î¼èÆÀ¤Ç¥¨¥é¡¼: %s"
 
 #: nscd/connections.c:485
--- libc/po/ko.po.jj	2004-08-14 18:18:37.000000000 +0200
+++ libc/po/ko.po	2006-09-20 23:23:21.000000000 +0200
@@ -260,7 +260,7 @@ msgstr "Ãâ·Â ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "`%s'¿¡¼­ º¯È¯ ¹× `%s'·ÎÀÇ º¯È¯Àº Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
 
 #: iconv/iconv_prog.c:248
@@ -361,7 +361,7 @@ msgid "Prefix used for all file accesses
 msgstr "¸ðµç ÆÄÀÏ Á¢±Ù¿¡ »ç¿ëÇÏ´Â Á¢µÎ¾î"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "°æ°í°¡ Á¦±âµÇ¾ú±â ¶§¹®¿¡ Ãâ·Â ÆÄÀÏÀÌ ¸¸µé¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù"
 
 #: iconv/iconvconfig.c:405
@@ -739,7 +739,7 @@ msgstr "%s: ±âÈ£ ¹üÀ§ ¸»ÁÙÀÓÇ¥´Â `order_
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s'°ú(¿Í) `%.*s'Àº(´Â) ±âÈ£ ¹üÀ§·Î »ç¿ë°¡´ÉÇÑ À̸§ÀÌ ¾Æ´Õ´Ï´Ù"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1667,7 +1667,7 @@ msgstr "<Uxxxx> ȤÀº <Uxxxxxxxx> °ªÀÌ ÁÖ
 
 # ¹ø¿ª: safe°¡ µ¿»ç·Î ¹¹Áö???
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "»õ·Î¿î ·¹ÆÄÅ丮 Áöµµ ÆÄÀÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
 #: locale/programs/repertoire.c:343
@@ -3096,7 +3096,7 @@ msgid "%s: usage is %s [ --version ] [ -
 msgstr "%s: »ç¿ë¹ýÀº %s [ --version ] [ -v ] [ -c Àý´Ü ] Áö¿ª¸í ... ÀÔ´Ï´Ù\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Ç¥ÁØ Ãâ·Â¿¡ ¾²´Â µ¥ ¿À·ù"
 
 #: timezone/zic.c:361
@@ -5131,7 +5131,7 @@ msgstr "°á°ú¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "È£ÃâÀÚÀÇ ID¸¦ ¾ò´Âµ¥ ¿À·ù: %s"
 
 #: nscd/connections.c:485
--- libc/po/nb.po.jj	2004-03-08 09:26:40.000000000 +0100
+++ libc/po/nb.po	2006-09-20 23:23:21.000000000 +0200
@@ -264,7 +264,7 @@ msgstr "kan ikke åpne utfil"
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "konvertering fra «%s» til «%s» er ikke støttet"
 
 #: iconv/iconv_prog.c:246
@@ -366,7 +366,7 @@ msgid "Prefix used for all file accesses
 msgstr "Prefiks brukt for all filaksessering"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "på grunn av advarsler ble ingen utfil opprettet"
 
 #: iconv/iconvconfig.c:405
@@ -742,7 +742,7 @@ msgstr "%s: symbolsk område-ellipse må i
 
 #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "«%s» og «%.*s» er ulovlige navn for symbolsk område"
 
 #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
@@ -1662,7 +1662,7 @@ msgstr "ingen <Uxxxx>- eller <Uxxxxxxxx>
 
 #: locale/programs/repertoire.c:332
 #, fuzzy
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "kan ikke lese ferdighetskart «%s»"
 
 #: locale/programs/repertoire.c:343
@@ -3148,7 +3148,7 @@ msgstr "%s: bruk er %s [ -v ] [ -c grens
 
 #: timezone/zdump.c:268
 #, fuzzy
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "%s: Feil ved skriving til standard ut "
 
 #: timezone/zic.c:365
@@ -5208,7 +5208,7 @@ msgstr "kan ikke skrive ut resultat: «%s
 
 #: nscd/connections.c:405 nscd/connections.c:499
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr ""
 
 #: nscd/connections.c:471
--- libc/po/nl.po.jj	2004-08-14 18:18:37.000000000 +0200
+++ libc/po/nl.po	2006-09-20 23:23:21.000000000 +0200
@@ -261,7 +261,7 @@ msgstr "kan uitvoerbestand niet openen"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "conversie van `%s' en naar `%s' wordt niet ondersteund"
 
 #: iconv/iconv_prog.c:248
@@ -367,7 +367,7 @@ msgid "Prefix used for all file accesses
 msgstr "Voorvoegsel gebruikt voor alle bestandstoegang"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "geen uitvoerbestand gemaakt omdat waarschuwing is gegeven"
 
 #: iconv/iconvconfig.c:405
@@ -742,7 +742,7 @@ msgstr "%s: weglatingsteken van symbolis
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' en `%.*s' zijn geen geldige namen voor een symbolisch bereik"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1659,7 +1659,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr "geen <Uxxxx> of <Uxxxxxxxx> waarde gegeven"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "kan nieuwe repertoire afbeelding niet opslaan"
 
 #: locale/programs/repertoire.c:343
@@ -3080,7 +3080,7 @@ msgid "%s: usage is %s [ --version ] [ -
 msgstr "%s: gebruik is %s [ --version ] [ -v ] [ -c afkapwaarde ] zonenaam ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Fout bij schrijven naar standaard uitvoer"
 
 #: timezone/zic.c:361
@@ -5117,7 +5117,7 @@ msgstr "kan resultaat niet schrijven: %s
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "fout bij opvragen ID van aanroeper: %s"
 
 #: nscd/connections.c:485
--- libc/po/pl.po.jj	2004-08-14 18:18:37.000000000 +0200
+++ libc/po/pl.po	2006-09-20 23:23:21.000000000 +0200
@@ -261,7 +261,7 @@ msgstr "nie mo¿na otworzyæ pliku wyj¶cio
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "konwersja z `%s' oraz do `%s' nie jest obs³ugiwana"
 
 #: iconv/iconv_prog.c:248
@@ -364,7 +364,7 @@ msgid "Prefix used for all file accesses
 msgstr "Prefiks u¿ywany przy ka¿dym dostêpie do pliku"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "nie utworzono pliku wyj¶ciowego, poniewa¿ wyst±pi³y ostrze¿enia"
 
 #: iconv/iconvconfig.c:405
@@ -743,7 +743,7 @@ msgstr "%s: wyrzutnia symbolicznego prze
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' i `%.*s' nie s± poprawnymi nazwami dla symbolicznego przedzia³u"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1662,7 +1662,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr "nie podano ¿adnych warto¶ci <Uxxxx> lub <Uxxxxxxxx>"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "nie mo¿na zachowaæ nowej tablicy repertuaru"
 
 #: locale/programs/repertoire.c:343
@@ -3086,7 +3086,7 @@ msgid "%s: usage is %s [ --version ] [ -
 msgstr "%s: sk³adnia: %s [ --version ] [ -v ] [ -c rok ] nazwa_strefy...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "B³±d podczas pisania na standardowe wyj¶cie"
 
 #: timezone/zic.c:361
@@ -5129,7 +5129,7 @@ msgstr "nie mo¿na zapisaæ wyniku: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "b³±d podczas pobierania identyfikatorów wywo³uj±cych: %s"
 
 #: nscd/connections.c:485
--- libc/po/pt_BR.po.jj	1999-08-15 17:28:07.000000000 +0200
+++ libc/po/pt_BR.po	2006-09-20 23:23:21.000000000 +0200
@@ -323,7 +323,7 @@ msgstr "%s: Erro escrevendo %s\n"
 
 #: timezone/zdump.c:266
 #, c-format
-msgid "%s: Error writing standard output "
+msgid "%s: Error writing to standard output "
 msgstr "%s: Erro escrevendo para saída padrão "
 
 #: timezone/zic.c:841
@@ -3642,7 +3642,7 @@ msgid "no other keyword shall be specifi
 msgstr "nehuma outra palavra-chave deve ser especificada quando `copy' é usado"
 
 #: locale/programs/localedef.c:334
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "nenhum arquivo de saída foi produzido porque avisos foram emitidos"
 
 #: locale/programs/locfile.c:283 locale/programs/locfile.c:301
--- libc/po/ru.po.jj	2005-02-15 11:10:52.000000000 +0100
+++ libc/po/ru.po	2006-09-20 23:23:21.000000000 +0200
@@ -259,7 +259,7 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ ÉÚ `%s' É × `%s' ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ"
 
 #: iconv/iconv_prog.c:248
@@ -361,7 +361,7 @@ msgid "Prefix used for all file accesses
 msgstr "ðÒÅÆÉËÓ, ÉÓÐÏÌØÚÕÅÍÙÊ ÄÌÑ ÄÏÓÔÕÐÁ ËÏ ×ÓÅÍ ÆÁÊÌÁÍ"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "×ÙÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÓÏÚÄÁÎ, ÐÏÓËÏÌØËÕ ÂÙÌÉ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ"
 
 #: iconv/iconvconfig.c:405
@@ -736,7 +736,7 @@ msgstr "%s: ÐÏÓÌÅ ÜÌÌÉÐÓÉÓÁ ÓÉÍ×ÏÌØÎÏÇÏ 
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' É `%.*s' ÎÅ Ñ×ÌÑÀÔÓÑ ×ÅÒÎÙÍÉ ÉÍÅÎÁÍÉ ÓÉÍ×ÏÌØÎÏÇÏ ÄÉÁÐÏÚÏÎÁ"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1649,7 +1649,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr "ÎÅ ÚÁÄÁÎÏ ÚÎÁÞÅÎÉÅ <Uxxxx> ÉÌÉ <Uxxxxxxxx>"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr ""
 
 #: locale/programs/repertoire.c:343
@@ -3074,7 +3074,7 @@ msgid "%s: usage is %s [ --version ] [ -
 msgstr "%s: ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ --version ] [ -v ] [ -c cutoff ] ÉÍÑ-ÚÏÎÙ ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
 
 #: timezone/zic.c:361
@@ -5112,7 +5112,7 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÒÅÚÕÌØÔÁÔ: %
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "ÏÛÉÂËÁ ÐÒÉ ÐÏÌÕÞÅÎÉÉ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ×ÙÚÙ×ÁÀÝÅÊ ÓÔÏÒÏÎÙ: %s"
 
 #: nscd/connections.c:485
--- libc/po/rw.po.jj	2005-04-28 17:35:34.000000000 +0200
+++ libc/po/rw.po	2006-09-20 23:23:22.000000000 +0200
@@ -302,7 +302,7 @@ msgstr "Gufungura Ibisohoka IDOSIYE"
 
 #: iconv/iconv_prog.c:243
 #, fuzzy, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "Ihindurangero Bivuye Na Kuri OYA"
 
 #: iconv/iconv_prog.c:248
@@ -403,7 +403,7 @@ msgstr "kugirango Byose IDOSIYE"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
 #, fuzzy
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "Oya Ibisohoka IDOSIYE Iburira Byasohowe"
 
 #: iconv/iconvconfig.c:405
@@ -825,7 +825,7 @@ msgstr "%s:Urutonde OYA ku"
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, fuzzy, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s'Na."
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1823,7 +1823,7 @@ msgstr "Oya Cyangwa Agaciro"
 
 #: locale/programs/repertoire.c:332
 #, fuzzy
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "Gishya"
 
 #: locale/programs/repertoire.c:343
@@ -3440,7 +3440,7 @@ msgstr "%s:Ikoresha: ni Verisiyo v C"
 
 #: timezone/zdump.c:269
 #, fuzzy
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Bisanzwe Ibisohoka"
 
 #: timezone/zic.c:361
@@ -5785,7 +5785,7 @@ msgstr "Kwandika Igisubizo"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, fuzzy, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "Ikosa ID"
 
 #: nscd/connections.c:485
--- libc/po/sk.po.jj	2004-08-14 18:18:37.000000000 +0200
+++ libc/po/sk.po	2006-09-20 23:23:22.000000000 +0200
@@ -260,7 +260,7 @@ msgstr "nie je možné otvoriť výstupn
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "konverzie z `%s' a do `%s' nie sú podporované"
 
 #: iconv/iconv_prog.c:248
@@ -361,7 +361,7 @@ msgid "Prefix used for all file accesses
 msgstr "Predpona použitá pre všetky prístupy k súborom"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "výstupný súbor nebol vytvorený kvôli výskytu varovaní"
 
 #: iconv/iconvconfig.c:405
@@ -736,7 +736,7 @@ msgstr "%s: pokračovanie symbolického 
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' a `%.*s' sú neprípustné názvy pre symbolický rozsah"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1653,7 +1653,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr "nezadaná <Uxxxx> alebo <Uxxxxxxxx> hodnota"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "nie je možné uchovať mapu repertoáru"
 
 #: locale/programs/repertoire.c:343
@@ -3074,7 +3074,7 @@ msgid "%s: usage is %s [ --version ] [ -
 msgstr "%s: použitie je %s [ --version ] [ -v ] [ -c limit ] meno_zóny ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Chyba pri zápise na štandardný výstup"
 
 #: timezone/zic.c:361
@@ -5115,7 +5115,7 @@ msgstr "nie je možné zapísať výsled
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "chyba pri získaní id volajúceho: %s"
 
 #: nscd/connections.c:485
--- libc/po/sv.po.jj	2004-08-14 18:18:37.000000000 +0200
+++ libc/po/sv.po	2006-09-20 23:23:22.000000000 +0200
@@ -260,7 +260,7 @@ msgstr "kan inte öppna utfil"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "konvertering från \"%s\" och till \"%s\" stöds ej"
 
 #: iconv/iconv_prog.c:248
@@ -364,7 +364,7 @@ msgid "Prefix used for all file accesses
 msgstr "Prefix att använda för alla filåtkomster"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "ingen utfil skapad på grund av varningar"
 
 #: iconv/iconvconfig.c:405
@@ -741,7 +741,7 @@ msgstr "%s: symboliskt intervall kan int
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+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:1348 locale/programs/ld-collate.c:3737
@@ -1658,7 +1658,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr "inget <Uxxxx> eller <Uxxxxxxxx> värde angivet"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "kan inte säkra repertoartabell"
 
 #: locale/programs/repertoire.c:343
@@ -3079,7 +3079,7 @@ msgid "%s: usage is %s [ --version ] [ -
 msgstr "%s: användning är %s [ --version ] [ -v ] [ -c gräns ] zonnamn ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Fel vid skrivning till standard ut"
 
 #: timezone/zic.c:361
@@ -5114,7 +5114,7 @@ msgstr "kan inte skriva resultat: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "kunde inte hämta anropandes identitet: %s"
 
 #: nscd/connections.c:485
--- libc/po/tr.po.jj	2005-03-01 10:34:43.000000000 +0100
+++ libc/po/tr.po	2006-09-20 23:23:22.000000000 +0200
@@ -261,7 +261,7 @@ msgstr "çıktı dosyası açılamıyor"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "`%s'den ve `%s'e dönüşüm desteklenmiyor"
 
 #: iconv/iconv_prog.c:248
@@ -366,7 +366,7 @@ msgid "Prefix used for all file accesses
 msgstr "Tüm dosya erişimlerinde kullanılan önek"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "uyarı yayınlandığından üretilen bir çıktı dosyası yok"
 
 #: iconv/iconvconfig.c:405
@@ -741,7 +741,7 @@ msgstr "%s: sembolik kapsam elipslerinin
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' ve `%.*s' sembolik kapsam için geçerli isimler değil"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1658,7 +1658,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr "<Uxxxx> ya da <Uxxxxxxxx> değeri verilmeliydi"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "yeni repertuvar eşlemin doğruluğundan emin olunamaz "
 
 #: locale/programs/repertoire.c:343
@@ -3084,7 +3084,7 @@ msgstr ""
 "zamanDilimiÄ°smi ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Standart çıktıya yazarken hata"
 
 #: timezone/zic.c:361
@@ -5122,7 +5122,7 @@ msgstr "sonuç yazılamıyor: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "çağrıcı kimliği alınırken hata: %s"
 
 #: nscd/connections.c:485
--- libc/po/zh_CN.po.jj	2003-06-10 18:23:00.000000000 +0200
+++ libc/po/zh_CN.po	2006-09-20 23:23:22.000000000 +0200
@@ -259,7 +259,7 @@ msgstr "ÎÞ·¨´ò¿ªÊä³öÎļþ"
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "²»Ö§³Ö´Ó¡°%s¡±µ½¡°%s¡±µÄת»»"
 
 #: iconv/iconv_prog.c:246
@@ -351,7 +351,7 @@ msgid "Prefix used for all file accesses
 msgstr "ÓÃÓÚËùÓÐÎļþ·ÃÎʵÄǰ׺"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "ÓÉÓÚ³öÏÖ¾¯¸æ¶øδÉú³ÉÊä³öÎļþ"
 
 #: iconv/iconvconfig.c:405
@@ -726,7 +726,7 @@ msgstr ""
 
 #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr ""
 
 #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
@@ -1623,7 +1623,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr "¼´Î´¸ø³ö <Uxxxx> Ҳδ¸ø³ö <Uxxxxxxxx>"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr ""
 
 #: locale/programs/repertoire.c:343
@@ -3033,7 +3033,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutof
 msgstr "%s£ºÓ÷¨Îª %s [ -v ] [ -c cutoff ] ÇøÓòÃû ...\n"
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "дÈë±ê×¼Êä³ö³ö´í"
 
 #: timezone/zic.c:365
@@ -5054,7 +5054,7 @@ msgstr "ÎÞ·¨Ð´Èë½á¹û£º¡°%s¡±"
 
 #: nscd/connections.c:405 nscd/connections.c:499
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr ""
 
 #: nscd/connections.c:471
--- libc/po/zh_TW.po.jj	2005-08-23 12:00:47.000000000 +0200
+++ libc/po/zh_TW.po	2006-09-20 23:23:22.000000000 +0200
@@ -262,7 +262,7 @@ msgstr "無法開啟輸出檔"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "不支援從 `%s' 以及到 `%s' 的轉換"
 
 #: iconv/iconv_prog.c:248
@@ -362,7 +362,7 @@ msgid "Prefix used for all file accesses
 msgstr "使用於所有檔案存取時的前置文字"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "因為發出過警告訊息，所以沒有製造任何輸出檔"
 
 #: iconv/iconvconfig.c:405
@@ -737,7 +737,7 @@ msgstr "%s: 符號範圍的省略不可ä
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' 和 `%.*s' 皆非符號範圍中適用的名稱"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1654,7 +1654,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value g
 msgstr "沒有給定 <Uxxxx> 或 <Uxxxxxxxx> 的值"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "無法儲存新的編碼對映檔"
 
 #: locale/programs/repertoire.c:343
@@ -3107,7 +3107,7 @@ msgid "%s: usage is %s [ --version ] [ -
 msgstr "%s: 用法是 %s [ --version ] [ -v ] [ -c 切斷 ] 地區名稱 ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "寫入標準輸出時錯誤"
 
 #: timezone/zic.c:361
@@ -5142,7 +5142,7 @@ msgstr "無法寫入結果: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "取得呼叫程式識別碼時發生錯誤: %s"
 
 #: nscd/connections.c:485
--- libc/po/libc.pot.jj	2006-02-27 18:30:51.000000000 +0100
+++ libc/po/libc.pot	2006-09-20 23:23:19.000000000 +0200
@@ -1208,7 +1208,7 @@ msgstr ""
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr ""
 
 #: iconv/iconv_prog.c:246
@@ -1295,7 +1295,7 @@ msgstr ""
 
 #: iconv/iconvconfig.c:342 locale/programs/localedef.c:290
 #, c-format
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr ""
 
 #: iconv/iconvconfig.c:428
@@ -1774,7 +1774,7 @@ msgstr ""
 
 #: locale/programs/ld-collate.c:1297 locale/programs/ld-ctype.c:1475
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr ""
 
 #: locale/programs/ld-collate.c:1346 locale/programs/ld-collate.c:3737
@@ -2720,7 +2720,7 @@ msgstr ""
 
 #: locale/programs/repertoire.c:331
 #, c-format
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr ""
 
 #: locale/programs/repertoire.c:342
@@ -3637,7 +3637,7 @@ msgstr ""
 
 #: nscd/connections.c:1066
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr ""
 
 #: nscd/connections.c:1124 nscd/connections.c:1138
@@ -6012,7 +6012,7 @@ msgid "%s: wild -c argument %s\n"
 msgstr ""
 
 #: timezone/zdump.c:392
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr ""
 
 #: timezone/zdump.c:415
--- libc/iconv/iconv_prog.c.jj	2006-08-22 10:42:28.000000000 +0200
+++ libc/iconv/iconv_prog.c	2006-09-20 23:13:12.000000000 +0200
@@ -239,7 +239,7 @@ main (int argc, char *argv[])
 		  if (to_wrong)
 		    error (0, 0,
 			   _("\
-conversion from `%s' and to `%s' are not supported"),
+conversions from `%s' and to `%s' are not supported"),
 			   from_pretty, to_pretty);
 		  else
 		    error (0, 0,
--- libc/iconv/iconvconfig.c.jj	2006-01-02 11:39:02.000000000 +0100
+++ libc/iconv/iconvconfig.c	2006-09-20 23:13:12.000000000 +0200
@@ -339,7 +339,7 @@ main (int argc, char *argv[])
   if (status == 0)
     status = write_output ();
   else
-    error (1, 0, _("no output file produced because warning were issued"));
+    error (1, 0, _("no output file produced because warnings were issued"));
 
   return status;
 }

	Jakub