summary refs log tree commit diff
path: root/iconv
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 /iconv
parent83b3108ca64bc0c8a398a179f1909f8b7f7dc44b (diff)
downloadglibc-c69136aeed1f6e7ba0649b0e0a6ec425ded37df8.tar.gz
glibc-c69136aeed1f6e7ba0649b0e0a6ec425ded37df8.tar.xz
glibc-c69136aeed1f6e7ba0649b0e0a6ec425ded37df8.zip
[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>.
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 f0e5ead6ef..dc3f008457 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;
 }