summaryrefslogtreecommitdiff
path: root/iconv
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-09-23 10:14:27 +0000
committerJakub Jelinek <jakub@redhat.com>2006-09-23 10:14:27 +0000
commit0e4d91bd31869b6f67e9284e1de3d470e10a3156 (patch)
tree25d90813148cd22f3c5ea19061e5b4dfaa2a6c6e /iconv
parent787b20e995af2c10ffa8fc116a071cba7d2ed065 (diff)
Updated to fedora-glibc-20060923T0946cvs/fedora-glibc-2_4_90-34
Diffstat (limited to 'iconv')
-rw-r--r--iconv/iconv_prog.c2
-rw-r--r--iconv/iconvconfig.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index fabdd001e3..77829971ad 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 9d23520314..59867f9015 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;
}