aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-09-21 04:04:20 +0000
committerUlrich Drepper <drepper@redhat.com>2006-09-21 04:04:20 +0000
commitc69136aeed1f6e7ba0649b0e0a6ec425ded37df8 (patch)
tree5f26460218eb1be168ea796c872839fc88911061
parent83b3108ca64bc0c8a398a179f1909f8b7f7dc44b (diff)
downloadglibc-c69136aeed1f6e7ba0649b0e0a6ec425ded37df8.zip
glibc-c69136aeed1f6e7ba0649b0e0a6ec425ded37df8.tar.gz
glibc-c69136aeed1f6e7ba0649b0e0a6ec425ded37df8.tar.bz2
[BZ #3137]
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>.
-rw-r--r--ChangeLog41
-rw-r--r--iconv/iconv_prog.c2
-rw-r--r--iconv/iconvconfig.c2
-rw-r--r--include/link.h2
-rw-r--r--locale/programs/ld-collate.c2
-rw-r--r--locale/programs/ld-ctype.c2
-rw-r--r--locale/programs/localedef.c2
-rw-r--r--locale/programs/repertoire.c2
-rw-r--r--nscd/connections.c2
-rw-r--r--timezone/zdump.c2
10 files changed, 50 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c97c28..195686b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+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>.
+
2006-09-20 Ulrich Drepper <drepper@redhat.com>
* inet/inet6_option.c: Also emit linker warnings for the RFC 2292
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index fabdd00..7782997 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -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,
diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
index f0e5ead..dc3f008 100644
--- a/iconv/iconvconfig.c
+++ b/iconv/iconvconfig.c
@@ -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;
}
diff --git a/include/link.h b/include/link.h
index 9947ee7..0d6b661 100644
--- a/include/link.h
+++ b/include/link.h
@@ -216,7 +216,7 @@ struct link_map
/* Size of array allocated for 'l_scope'. */
size_t l_scope_max;
/* This is an array defining the lookup scope for this link map.
- There are at most three different scope lists. */
+ There are initially at most three different scope lists. */
struct r_scope_elem **l_scope;
/* A similar array, this time only with the local scope. This is
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index a140101..cf1bff1 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -1295,7 +1295,7 @@ order for `%.*s' already defined at %s:%Zu"),
{
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;
}
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index b1a28b9..ca1ec79 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -1472,7 +1472,7 @@ charclass_symbolic_ellipsis (struct linereader *ldfile,
{
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;
}
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 5df07e9..9c3acbe 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -288,7 +288,7 @@ cannot write output files to `%s'"), output_path));
}
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);
diff --git a/locale/programs/repertoire.c b/locale/programs/repertoire.c
index 7f7ba71..e9bdf9e 100644
--- a/locale/programs/repertoire.c
+++ b/locale/programs/repertoire.c
@@ -328,7 +328,7 @@ argument to <%s> must be a single character"),
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;
}
diff --git a/nscd/connections.c b/nscd/connections.c
index c4269ce..39d491a 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -1079,7 +1079,7 @@ cannot handle old request version %d; current version is %d"),
{
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;
}
diff --git a/timezone/zdump.c b/timezone/zdump.c
index 45ce641..d525da1 100644
--- a/timezone/zdump.c
+++ b/timezone/zdump.c
@@ -389,7 +389,7 @@ _("%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"),
}
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);