about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2000-09-04 09:40:57 +0000
committerAndreas Jaeger <aj@suse.de>2000-09-04 09:40:57 +0000
commit6d77214d90954bd524d5066923c114e9dd13002a (patch)
tree3d24fb6cc50d319ea03c582c5e30a60943da7da4
parent56735b1196dc5a0567de33f4df34898862460540 (diff)
downloadglibc-6d77214d90954bd524d5066923c114e9dd13002a.tar.gz
glibc-6d77214d90954bd524d5066923c114e9dd13002a.tar.xz
glibc-6d77214d90954bd524d5066923c114e9dd13002a.zip
Update.
	* locale/programs/ld-monetary.c (monetary_read): Fix typo.
	* iconv/iconv_prog.c (options): Fix typo.
	Reported by dyky@kondara.org, closes PR libc/1885.

2000-09-04  Andreas Jaeger  <aj@suse.de>
-rw-r--r--ChangeLog6
-rw-r--r--iconv/iconv_prog.c2
-rw-r--r--locale/programs/ld-monetary.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 68c4cc12bc..18ce36ec90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-09-04  Andreas Jaeger  <aj@suse.de>
 
+	* locale/programs/ld-monetary.c (monetary_read): Fix typo.
+	* iconv/iconv_prog.c (options): Fix typo.
+	Reported by dyky@kondara.org, closes PR libc/1885.
+
+2000-09-04  Andreas Jaeger  <aj@suse.de>
+
 	* sysdeps/generic/fegetenv.c: It's __fegetenv.
         Reported by Rob Levin <lilo@transvirtual.com>.
 
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index d8e7817dd9..1470721893 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -60,7 +60,7 @@ static const struct argp_option options[] =
   { NULL, 0, NULL, 0, N_("Output control:") },
   { NULL, 'c', NULL, 0, N_("omit invalid characters from output") },
   { "output", 'o', "FILE", 0, N_("output file") },
-  { "silent", 's', NULL, 0, N_("supress warnings") },
+  { "silent", 's', NULL, 0, N_("suppress warnings") },
   { "verbose", OPT_VERBOSE, NULL, 0, N_("print progress information") },
   { NULL, 0, NULL, 0, NULL }
 };
diff --git a/locale/programs/ld-monetary.c b/locale/programs/ld-monetary.c
index dd5b51c777..c64daf27ab 100644
--- a/locale/programs/ld-monetary.c
+++ b/locale/programs/ld-monetary.c
@@ -897,7 +897,7 @@ monetary_read (struct linereader *ldfile, struct localedef_t *result,
 	  if (now->val.num == 0)
 	    {
 	    invalid_conversion_rate:
-	      lr_error (ldfile, _("conversion rate valze cannot be zero"));
+	      lr_error (ldfile, _("conversion rate value cannot be zero"));
 	      if (!ignore_content)
 		{
 		  monetary->conversion_rate[0] = 1;