16 files changed, 90 insertions, 103 deletions
diff --git a/AUTHORS b/AUTHORS
index 1aea6b442..4e8a5d49e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -51,7 +51,7 @@ pinky: Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi
 pr: Pete TerMaat and Roland Huebner
 printenv: David MacKenzie and Richard Mlynarik
 printf: David MacKenzie
-ptx: François Pinard
+ptx: FranÃ§ois Pinard
 pwd: Jim Meyering
 rm: Paul Rubin, David MacKenzie, Richard Stallman, and Jim Meyering
 rmdir: David MacKenzie
diff --git a/ChangeLog b/ChangeLog
index bf8bcd8a7..861ad5a99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3934,7 +3934,7 @@
 
 	* src/factor.c (print_factors): Give a separate diagnostic
 	for numbers that are too large, but otherwise valid.
-	Reported by Dániel Varga.
+	Reported by DÃ¡niel Varga.
 
 2003-09-10  Jim Meyering  <jim@meyering.net>
 
@@ -5912,10 +5912,10 @@
 
 	* README: Refer new feature discussion to bug-coreutils@gnu.org,
 	rather than bug-gnu-utils, now that the former is better known.
-	Suggestion from Göran Uddeborg.
+	Suggestion from GÃ¶ran Uddeborg.
 
 	* src/stat.c (usage): Capitalize consistently.
-	Reported by Göran Uddeborg.
+	Reported by GÃ¶ran Uddeborg.
 
 	* Makefile.maint (rel-files): Include $(signatures), so that
 	those files are also copied into $(release_archive_dir).
@@ -6734,7 +6734,7 @@
 	the empty string.
 	(count_entry): When appending a file name component,
 	account for the fact that the current path may end in `/'.
-	François Pinard reported that `du symlink-to-dir/' was not
+	FranÃ§ois Pinard reported that `du symlink-to-dir/' was not
 	equivalent to `du symlink-to-dir/.'.  Now it is.
 	* tests/du/trailing-slash: New file/test, for the above fix.
 	* tests/du/Makefile.am (TESTS): Add trailing-slash.
diff --git a/README b/README
index 0de53059c..df35be461 100644
--- a/README
+++ b/README
@@ -34,16 +34,16 @@ file shouldn't affect how it operates, so that people can get the
 behavior they want with whatever name they want.
 
 Special thanks to Paul Eggert, Brian Matthews, Bruce Evans, Karl Berry,
-Kaveh Ghazi, and François Pinard for help with debugging and porting
+Kaveh Ghazi, and FranÃ§ois Pinard for help with debugging and porting
 these programs.  Many thanks to all of the people who have taken the
 time to submit problem reports and fixes.  All contributed changes are
 attributed in the ChangeLog file.
 
 And thanks to the following people who have provided accounts for
 portability testing on many different types of systems: Bob Proulx,
-Christian Robert, François Pinard, Greg McGary, Harlan Stenn,
+Christian Robert, FranÃ§ois Pinard, Greg McGary, Harlan Stenn,
 Joel N. Weber, Mark D. Roth, Matt Schalit, Nelson H. F. Beebe,
-Réjean Payette, Sam Tardieu.
+RÃ©jean Payette, Sam Tardieu.
 
 Thanks to Michael Stone for inflicting test releases of the fileutils
 on Debian's unstable distribution, and to all the kind folks who used
diff --git a/THANKS b/THANKS
index a41b7b8af..44b7b020f 100644
--- a/THANKS
+++ b/THANKS
@@ -102,7 +102,7 @@ Dan Hagerty                         hag@gnu.ai.it.edu
 Dan Jacobson                        http://www.geocities.com/jidani
 Dan Pascu                           dan@services.iiruc.ro
 Daniel Bergstrom                    noa@melody.se
-Dániel Varga                        danielv@axelero.hu
+DÃ¡niel Varga                        danielv@axelero.hu
 Danny Levinson                      danny.levinson@overture.com
 Darren Salt                         ds@youmustbejoking.demon.co.uk
 Dave Beckett                        dajobe@dajobe.org
@@ -143,14 +143,14 @@ Felix Lee                           flee@teleport.com
 Ferdinand                           fw@scenic.mine.nu
 Fletcher Mattox                     fletcher@cs.utexas.edu
 Florin Iucha                        fiucha@hsys.mic.ro
-François Pinard                     pinard@iro.umontreal.ca
+FranÃ§ois Pinard                     pinard@iro.umontreal.ca
 Frank Adler                         fadler@allesklar.de
 Frank T Lofaro                      ftlofaro@snooks.Egr.UNLV.EDU
 Fred Fish                           fnf@ninemoons.com
-Frédéric L. W. Meunier              0@pervalidus.net
+FrÃ©dÃ©ric L. W. Meunier              0@pervalidus.net
 Frederik Eaton                      frederik@caltech.edu
 Gabor Z. Papp                       gzp@gzp.org.hu
-Gaël Quéri                          gqueri@mail.dotcom.fr
+GaÃ«l QuÃ©ri                          gqueri@mail.dotcom.fr
 Galen Hazelwood                     galenh@micron.net
 Gary Anderson                       ganderson@clark.net
 Gary V. Vaughan                     gary@gnu.org
@@ -161,7 +161,7 @@ Geoff Odhner                        geoff@franklin.com
 Geoff Whale                         geoffw@cse.unsw.EDU.AU
 Gerhard Poul                        gpoul@gnu.org
 Germano Leichsenring                germano@jedi.cs.kobe-u.ac.jp
-Göran Uddeborg                      goeran@uddeborg.pp.se
+GÃ¶ran Uddeborg                      goeran@uddeborg.pp.se
 GOTO Masanori                       gotom@debian.or.jp
 Greg Louis                          glouis@dynamicro.on.ca
 Greg McGary                         gkm@gnu.org
@@ -203,7 +203,7 @@ Jeff Sheinberg                      jeff@bsrd.net
 Jens Elkner                         elkner@imsgroup.de
 Jens Schmidt                        jms@jsds.hamburg.com
 Jerome Abela                        abela@hsc.fr
-Jérôme Zago                         bug-coreutils-ml@agt-the-walker.net
+JÃ©rÃ´me Zago                         bug-coreutils-ml@agt-the-walker.net
 Jesse Kornblum                      kornblum@usna.edu
 Jesse Thilo                         jgt2@eecs.lehigh.edu
 Jie Xu                              xuj@iag.net
@@ -229,7 +229,7 @@ Jorge Stolfi                        stolfi@ic.unicamp.br
 Joseph S. Myers                     jsm28@cam.ac.uk
 Juan F. Codagnone                   juam@arnet.com.ar
 Jungshik Shin                       jshin@pantheon.yale.edu
-Jürgen Fluk                         louis@dachau.marco.de
+JÃ¼rgen Fluk                         louis@dachau.marco.de
 Jurriaan                            thunder7@xs4all.nl
 jvogel                              jvogel@linkny.com
 Kai Henningsen                      kai@debian.org
@@ -344,7 +344,7 @@ Olatunji Oluwabukunmi Ruwase        tjruwase@stanford.edu
 Olav Morkrid                        olav@funcom.com
 Ole Laursen                         olau@hardworking.dk
 Oliver Kiddle                       okiddle@yahoo.co.uk
-Ørn E. Hansen                       oehansen@daimi.aau.dk
+Ã˜rn E. Hansen                       oehansen@daimi.aau.dk
 Oskar Liljeblad                     osk@hem.passagen.se
 Patrick Mauritz                     oxygene@studentenbude.ath.cx
 Paul Eggert                         eggert@twinsun.com
@@ -374,7 +374,7 @@ Rainer Orth                         ro@TechFak.Uni-Bielefeld.DE
 Ralf W. Stephan                     stephan@tmt.de
 Ralph Loader                        loader@maths.ox.ac.uk
 Raul Miller                         moth@magenta.com
-Raúl Núñez de Arenas Coronado       raul@pleyades.net
+RaÃºl NÃºÃ±ez de Arenas Coronado       raul@pleyades.net
 Reuben Thomas                       rrt@sc3d.org
 Richard A Downing                   richard.downing@bcs.org.uk
 Richard Braakman                    dark@xs4all.nl
@@ -405,7 +405,7 @@ Shing-Shong Shei                    shei@cs.indiana.edu
 Soeren Sonnenburg                   sonnenburg@informatik.hu-berlin.de
 Solar Designer                      solar@owl.openwall.com
 Stanislav Ievlev                    inger@altlinux.ru
-Stéphane Chazelas                   Stephane_CHAZELAS@yahoo.fr
+StÃ©phane Chazelas                   Stephane_CHAZELAS@yahoo.fr
 Stephen Depooter                    sbdep@myrealbox.com
 Stephen Eglen                       eglen@pcg.wustl.edu
 Stephen Gildea                      gildea@stop.mail-abuse.org
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 62987b82e..76c6ef891 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1023,7 +1023,7 @@
 
 	* hash.c, hash.h: Update from gnulib.
 	* hash-pjw.c, hash-pjw.h: Likewise.
-	* obstack.c, obstack.h: Likewise.
+	* obstack.c, obstack.h: Likewise.
 
 2003-10-25  Jim Meyering  <meyering@lucent.com>
 
@@ -1978,7 +1978,7 @@
 	* xnanosleep.c (clock_get_realtime): Use gettime.c's gettime function,
 	rather than an inferior, open-coded version that would fail on
 	AIX systems due to clock_gettime failing with errno == ENOSYS.
-	Reported by Jérôme Zago.
+	Reported by JÃ©rÃ´me Zago.
 
 2003-05-05  Jim Meyering  <jim@meyering.net>
 
@@ -3811,7 +3811,7 @@
 
 	* argmatch.c: Include "quote.h".
 	(argmatch_invalid): Remove explicit `' quotes.  Instead, use the
-	quote function.  Reported by Göran Uddeborg.
+	quote function.  Reported by GÃ¶ran Uddeborg.
 
 2001-05-20  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
@@ -5198,7 +5198,7 @@
 
 2000-01-17  Jim Meyering  <jim@meyering.net>
 
-	* interlock: Remove unused file.  Reported by François Pinard.
+	* interlock: Remove unused file.  Reported by FranÃ§ois Pinard.
 
 2000-01-16  Paul Eggert  <eggert@twinsun.com>
 
diff --git a/lib/strverscmp.c b/lib/strverscmp.c
index 83b7f90bd..635360973 100644
--- a/lib/strverscmp.c
+++ b/lib/strverscmp.c
@@ -1,7 +1,7 @@
 /* Compare strings while treating digits characters numerically.
    Copyright (C) 1997, 2000, 2002, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
+   Contributed by Jean-FranÃ§ois Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/m4/ChangeLog b/m4/ChangeLog
index b367e1ebd..dcdb411d3 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -2389,7 +2389,7 @@
 2000-02-09  Jim Meyering  <jim@meyering.net>
 
 	* lib-check.m4 (jm_LIB_CHECK): Fix typo: check for sp_pwdp in
-	struct spwd, rather than in struct passwd.  Reported by Gaël Quéri.
+	struct spwd, rather than in struct passwd.  Reported by GaÃ«l QuÃ©ri.
 
 2000-02-08  Akim Demaille  <akim@epita.fr>
 
@@ -2447,7 +2447,7 @@
 2000-01-28  Jim Meyering  <jim@meyering.net>
 
 	* perl.m4: Change format of warning message to look more like that
-	from the missing script.  Suggestion from François Pinard.
+	from the missing script.  Suggestion from FranÃ§ois Pinard.
 
 2000-01-25  Jim Meyering  <jim@meyering.net>
 
diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index 37bdc1fe0..5f12d1ca3 100644
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -967,7 +967,7 @@
 	Reported by Michael Gaughen <mgaughen@polyserve.com>
 
 	* src/shred.c (usage): Also mention Ext3.
-	Suggestion from Göran Uddeborg.
+	Suggestion from GÃ¶ran Uddeborg.
 
 2002-01-06  Bruno Haible  <bruno@clisp.org>
 
@@ -1238,7 +1238,7 @@
 2001-11-06  Jim Meyering  <meyering@lucent.com>
 
 	* src/dircolors.hin: Remove duplicate entry for .png.
-	Reported by Frédéric L. W. Meunier.
+	Reported by FrÃ©dÃ©ric L. W. Meunier.
 
 2001-11-03  Jim Meyering  <meyering@lucent.com>
 
@@ -1959,7 +1959,7 @@
 	* src/mkfifo.c (main): Remove quotes around %s.
 	The argument is already quoted via the quote function.
 	* src/mknod.c (main): Likewise.
-	Reported by Göran Uddeborg.
+	Reported by GÃ¶ran Uddeborg.
 
 2001-05-21  Jim Meyering  <meyering@lucent.com>
 
@@ -2260,7 +2260,7 @@
 	that exists is a directory, don't treat it as if it were the only
 	argument.  Before, `mkdir d; ls no-dir d 2>/dev/null' would act like
 	`ls d' and produce no output.  Now, it prints `d:'.
-	Report and patch from Stéphane Chazelas.
+	Report and patch from StÃ©phane Chazelas.
 	* tests/ls-2/tests: New tests, for the above fix.
 
 2001-04-08  Jim Meyering  <meyering@lucent.com>
@@ -4085,7 +4085,7 @@
 	* src/mkdir.c: Allow -v as synonym for --verbose, to be consistent
 	with other fileutils.
 	* src/rmdir.c: Likewise.
-	Suggestion from François Pinard.
+	Suggestion from FranÃ§ois Pinard.
 
 2000-06-02  Jim Meyering  <meyering@lucent.com>
 
@@ -4615,7 +4615,7 @@
 	* src/Makefile.am: s/libfu/libfetish/
 
 	* lib/hash.c (hash_initialize): Fix typo in comment.
-	From François Pinard.
+	From FranÃ§ois Pinard.
 
 2000-01-10  Jim Meyering  <meyering@lucent.com>
 
@@ -4722,7 +4722,7 @@
 
 	* src/ln.c (usage): Correct typos.
 	List new --target-directory=... usage.
-	Reported by Göran Uddeborg
+	Reported by GÃ¶ran Uddeborg
 
 	* src/mv.c (usage): List new --target-directory=... usage.
 
@@ -5435,7 +5435,7 @@
 
 	* lib/fsusage.c (get_fs_usage) [STATFS_TRUNCATES_BLOCK_COUNTS]:
 	Work around SunOS botch also when block size is different from 1k.
-	From Jürgen Fluk.
+	From JÃ¼rgen Fluk.
 
 1999-07-10  Jim Meyering  <meyering@ascend.com>
 
@@ -6314,7 +6314,7 @@
 	(hash_rehash): Rewrite, updating for tuning.
 	(hash_insert): Honor tuning semantics.
 	(hash_delete): Likewise.
-	From François Pinard.
+	From FranÃ§ois Pinard.
 
 	* lib/hash.h (struct hash_tuning): Define.
 	(struct hash_table) [tuning]: Add member.
@@ -6325,12 +6325,12 @@
 
 	* lib/hash.c (hash_insert): Don't increment n_entries unconditionally --
 	otherwise, we'd do so even when the insertion failed.
-	From François Pinard.
+	From FranÃ§ois Pinard.
 
 1999-03-07  Jim Meyering  <meyering@ascend.com>
 
 	* lib/xmalloc.c (xalloc_fail): Use "%s" format so the message doesn't
-	have to be scanned for % signs.  Suggestion from François Pinard.
+	have to be scanned for % signs.  Suggestion from FranÃ§ois Pinard.
 
 	* Makefile.maint: Add two more URLs and the loops to use them.
 
@@ -6384,7 +6384,7 @@
 
 	* src/dircolors.c (dc_parse_stream): Don't try to dereference
 	NULL if there's an error in our built-in list.
-	Suggestion from François Pinard.
+	Suggestion from FranÃ§ois Pinard.
 
 1999-02-13  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
 
@@ -7250,7 +7250,7 @@
 
 	* tests/mv/into-self: Update to reflect changed behavior of mv.
 	* src/mv.c (do_move): Fail upon attempt to move a directory into itself.
-	With prodding from François Pinard :-)
+	With prodding from FranÃ§ois Pinard :-)
 
 	* tests/ls-2/Fetish.pm: New file
 	* tests/ls-2/run-test: New file
@@ -7616,7 +7616,7 @@
 1998-06-28  Jim Meyering  <meyering@ascend.com>
 
 	* src/ls.c (usage): Make --kilobytes description consistent with
-	that in du and df.  From Göran Uddeborg.
+	that in du and df.  From GÃ¶ran Uddeborg.
 
 	* lib/mountlist.c (fsp_to_string): Clean out some crufty #ifdefs
 	now that we're using the jm_FSTYPENAME autoconf macro.
@@ -7866,7 +7866,7 @@
 
 	* lib/hash.c: Lots of minor spec and name changes, and new comments.
 	(hash_rehash): Rewrite to be easier on the allocator.
-	From François Pinard.
+	From FranÃ§ois Pinard.
 	* lib/hash.h: More comments.
 	* src/remove.c: Change names/usage of hash-related functions to work
 	with the above.
@@ -8380,7 +8380,3 @@
 
 	* src/rm.c (remove_cwd_entries): Initialize the entry-name obstack
 	only once and never free it.
-
-Local Variables:
-version-control: never
-End:
diff --git a/old/fileutils/ChangeLog-1997 b/old/fileutils/ChangeLog-1997
index 558ef97cf..65d0e90b5 100644
--- a/old/fileutils/ChangeLog-1997
+++ b/old/fileutils/ChangeLog-1997
@@ -773,7 +773,7 @@
 	* lib/idcache.c (getuidbyname): Declare parameter to be const.
 	(getgidbyname): Declare parameter to be const.
 
-1997-07-06 Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>
+1997-07-06 Jean-FranÃ§ois Bignolles <bignolle@ecoledoc.ibp.fr>
 
 	* lib/modechange.h (mode_create_from_ref): Add prototype.
 	(MODE_MASK_ALL): New define.
@@ -797,7 +797,7 @@
 	(getgroup): Likewise.
 	(getuidbyname) [NOT_USED]: #ifdef-out unused function.
 	(getgidbyname) [NOT_USED]: #ifdef-out unused function.
-	Suggested by François Pinard.
+	Suggested by FranÃ§ois Pinard.
 	* src/ls.c (print_long_format): Reflect changes in semantics of
 	getuser, getgroup.
 
@@ -1472,7 +1472,7 @@ Mon Nov  4 23:18:03 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 	* configure.in (test for group_member): Handle it separately
 	so I can keep the hyphen (not the underscore) in the filename.
 
-	* lib/rename.c: New version from François Pinard.
+	* lib/rename.c: New version from FranÃ§ois Pinard.
 
 Sat Nov  2 07:05:36 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 
@@ -1548,7 +1548,7 @@ Thu Oct 10 23:47:34 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 Wed Oct  9 06:51:47 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 
 	* src/ls.c (usage): Improve brief descriptions of --sort and --time.
-	From François Pinard.
+	From FranÃ§ois Pinard.
 
 	* lib/rpmatch.c [!WITH_REGEX]: Include rx.h.
 	From Andreas Schwab.
@@ -1606,7 +1606,7 @@ Tue Oct  1 12:56:23 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 
 	* lib/Makefile.am (fu_SOURCES): Remove getline.c.
 	(EXTRA_DIST): Add getline.c.
-	Reported by François Pinard.
+	Reported by FranÃ§ois Pinard.
 
 Mon Sep 30 20:08:45 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 
@@ -1932,7 +1932,7 @@ Tue Jul  9 20:19:44 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 
 	* src/dircolors.c (dc_parse_stream): Don't give `unrecognized keyword'
 	message unless we've processed a matching TERM directive.  Reported
-	by Karl Berry and François Pinard.
+	by Karl Berry and FranÃ§ois Pinard.
 
 	* src/install.c (UID_T_MAX): Use `(unsigned long)1' rather than
 	`(uid_t)1' to avoid problems on systems where uid_t is signed.
@@ -2184,7 +2184,7 @@ Tue May 28 18:39:49 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 
 	* dd.c (print_stats): Don't mark "%u %s" as a translatable string.
 	* mv.c (main): Don't mark "%s" as a translatable string.
-	From Göran Uddeborg.
+	From GÃ¶ran Uddeborg.
 
 Thu May 23 07:50:38 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 
@@ -2261,7 +2261,7 @@ Wed May 15 22:54:31 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 Tue May 14 23:36:54 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
 	* dd.c (print_stats): Restructure pluralization of error message
-	so it's easier to translate.  Reported by Göran Uddeborg
+	so it's easier to translate.  Reported by GÃ¶ran Uddeborg
 	<gvran@uddeborg.pp.se>.
 	* mv.c (main): Likewise.
 
@@ -2300,7 +2300,7 @@ Wed May  1 00:20:00 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
 Mon Apr 29 22:07:41 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
-	* POTFILES.in: Add chgrp.c.  From François Pinard.
+	* POTFILES.in: Add chgrp.c.  From FranÃ§ois Pinard.
 	Add dircolors.c.
 	* dircolors.c: New file.  Written by H. Peter Anvin.
 
@@ -2368,7 +2368,7 @@ Tue Apr 23 22:05:35 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 	* chown.c [HAVE_LCHOWN]: Likewise.
 	* cp.c [HAVE_LCHOWN]: Likewise.
 	* mv.c [HAVE_LCHOWN]: Likewise.
-	Suggested by François Pinard.
+	Suggested by FranÃ§ois Pinard.
 
 	* backupfile.c (find_backup_file_name, max_backup_version,
 	make_version_name, version_number, concat): Const-ify decls of
@@ -2450,7 +2450,7 @@ Mon Apr  1 23:50:29 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 	destination directory D includes a trailing slash -- as would
 	happen when cp is used like this:
 	mkdir D; touch file D/file; cp -i file D/
-	Reported by François Pinard.
+	Reported by FranÃ§ois Pinard.
 
 Sun Mar 31 11:18:09 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
@@ -2502,7 +2502,7 @@ Sun Mar 10 22:36:11 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 	Link an nls file.
 	(AC_OUTPUT): Reflect addition of two new directories, intl and po.
 	Create po/Makefile.
-	From François Pinard.
+	From FranÃ§ois Pinard.
 
 Thu Mar  7 20:26:07 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
@@ -6154,7 +6154,3 @@ Thu Feb  8 21:25:40 1990  David J. MacKenzie  (djm at albert.ai.mit.edu)
 Mon Feb  5 17:29:20 1990  David J. MacKenzie  (djm at albert.ai.mit.edu)
 
 	* Version 1.0 released.
-
-Local Variables:
-version-control: never
-End:
diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 449a3777a..9005a62cb 100644
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1355,7 +1355,7 @@
 2000-02-09  Jim Meyering  <meyering@lucent.com>
 
 	* src/su.c (correct_password): Correct HAVE_STRUCT_* name in #if guard
-	to go along with corrected autoconf test:  Reported by Gaël Quéri.
+	to go along with corrected autoconf test:  Reported by GaÃ«l QuÃ©ri.
 
 2000-02-05  Jim Meyering  <meyering@lucent.com>
 
@@ -3691,10 +3691,10 @@ Mon Oct 28 17:40:54 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 
 	* src/Makefile.am (install-exec-local): Redirect stderr of chown to
 	/dev/null and suggest running `make install-root' upon failure to
-	install su.  Suggestions from François Pinard.
+	install su.  Suggestions from FranÃ§ois Pinard.
 
 	* configure.in: Don't output confusing diagnostic: `checking for
-	shadow password routines'.  Suggestion from François Pinard.
+	shadow password routines'.  Suggestion from FranÃ§ois Pinard.
 
 Thu Oct 24 13:50:46 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
 
@@ -3731,7 +3731,7 @@ Sun Oct 20 09:03:51 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 	* lib/Makefile.am (INCLUDES): Add -I../intl.  Reported by Eric Backus.
 
 	* src/Makefile.am (install-root): New rule.
-	Suggestion from François Pinard.
+	Suggestion from FranÃ§ois Pinard.
 
 	* src/who-users.c (print_entry): Don't take address of UT_TIME_MEMBER
 	directly.  From Ulrich Drepper.
@@ -3826,7 +3826,7 @@ Mon Oct  7 18:46:28 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 	* lib/Makefile.am (EXTRA_DIST): Remove alloca.c, error.c, and mktime.
 	(su_SOURCES): Remove memcmp.c.
 	Automake automatically includes at least these, now.
-	From François Pinard.
+	From FranÃ§ois Pinard.
 
 	* lib/Makefile.am (su_SOURCES): Remove getline.c.
 
@@ -4139,7 +4139,7 @@ Mon Apr 29 22:23:40 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 	* date.c (usage): Change TAB in message to spaces.  Doing that seems
 	to have worked around a problem with something in gettext that was
 	producing a truncated usage message for date's usage.
-	From François Pinard.
+	From FranÃ§ois Pinard.
 
 Sun Apr 28 17:10:03 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
@@ -4198,7 +4198,7 @@ Tue Apr 16 20:24:44 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 	$(srcdir)/ prefix.
 	(users.c): Likewise.
 	(uptime.c): Likewise.
-	From François Pinard.
+	From FranÃ§ois Pinard.
 
 	* configure.in: Always invoke AC_GETLOADAVG, not just if we're
 	building uptime.
@@ -4295,7 +4295,7 @@ Sun Mar 31 16:26:06 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
 	* configure.in: Simplify checking for math library.
 	This also eliminates some confusing output from configure.
-	Suggested by François Pinard.
+	Suggested by FranÃ§ois Pinard.
 
 Fri Mar 29 22:13:10 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
@@ -4371,7 +4371,7 @@ Sat Mar 16 10:07:49 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 Fri Mar 15 23:42:29 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
 	* basename.c: Remove __P-protected prototype for basename.
-	Reported by François Pinard.
+	Reported by FranÃ§ois Pinard.
 	(remove_suffix): Move to precede use.  Remove prototype.
 	Declare formal parameter SUFFIX to be const.
 
@@ -4406,7 +4406,7 @@ Tue Mar 12 17:52:05 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 	Link an nls file.
 	(AC_OUTPUT): Reflect addition of two new directories, intl and po.
 	Create po/Makefile.
-	Mostly from François Pinard.
+	Mostly from FranÃ§ois Pinard.
 
 Wed Mar  6 21:40:34 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
@@ -4423,7 +4423,7 @@ Tue Mar  5 22:49:33 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 Mon Mar  4 23:46:43 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
 	* seq.c (main): Exit after processing --version.
-	Reported by François Pinard.
+	Reported by FranÃ§ois Pinard.
 
 Fri Mar  1 23:46:32 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog
index 08498a13f..12ceb7366 100644
--- a/old/textutils/ChangeLog
+++ b/old/textutils/ChangeLog
@@ -375,7 +375,7 @@
 	* Makefile.am (AUTOMAKE_OPTIONS): Require automake-1.5d.
 
 	* configure.ac (AM_INIT_AUTOMAKE): Use zero-arg form of this macro.
-	(ALL_LINGUAS): Add the bokmål dialect of Norwegian (nb).
+	(ALL_LINGUAS): Add the bokmÃ¥l dialect of Norwegian (nb).
 
 2002-01-27  Jim Meyering  <meyering@lucent.com>
 
@@ -1368,7 +1368,7 @@
 	a byte with the high bit set.
 	* src/fmt.c (prefix): Declare to be of type unsigned char, not `char'.
 	(get_prefix): Likewise for local, `p'.
-	Reported by François Pinard.
+	Reported by FranÃ§ois Pinard.
 
 	Add a test for the above-fixed problem.
 	* tests/fmt: New directory/files.
@@ -2295,7 +2295,7 @@
 	(IS_TAILABLE_FILE_TYPE): Define to produce similar result.
 	(recheck): Use it here.
 	(tail_file): Use it here.
-	Reported by François Pinard.
+	Reported by FranÃ§ois Pinard.
 
 	Once we encounter a file that is not of IS_TAILABLE_FILE_TYPE,
 	marke it as such and ignore it forever after.
@@ -2495,7 +2495,7 @@
 	Don't cast away `const'ness of parameters.
 	* lib/strpbrk.c (strpbrk): Ansideclify.
 	Use `#if' instead of `#ifdef' for `HAVE_CONFIG_H'.
-	Suggestions from François Pinard.
+	Suggestions from FranÃ§ois Pinard.
 
 2000-01-06  Jim Meyering  <meyering@ascend.com>
 
@@ -3786,7 +3786,7 @@
 	* src/ptx.c: Add braces to suppress warning about ambiguous `else'.
 	* lib/bumpalloc.h: Likewise.
 
-1998-08-13  François Pinard  <pinard@iro.umontreal.ca>
+1998-08-13  FranÃ§ois Pinard  <pinard@iro.umontreal.ca>
 
 	* src/ptx.c: New file.
 	* src/Makefile.am (bin_PROGRAMS): Add ptx.
@@ -4445,9 +4445,9 @@
 
 1997-10-16  Jim Meyering  <meyering@na-net.ornl.gov>
 
-	* src/sort.c (look_for_fraction): Patch from Ørn Hansen.
+	* src/sort.c (look_for_fraction): Patch from Ã˜rn Hansen.
 	(getmonth): Compare the two month names only to the length of the
-	string in the month table.  Patch from Ørn Hansen.
+	string in the month table.  Patch from Ã˜rn Hansen.
 	(NLS_STRNCMP): New macro.
 	(strncoll_s2_readonly): New function.
 	(inittables): Don't use temporary `comp' to hide type of
@@ -4460,7 +4460,7 @@
 1997-10-14  Jim Meyering  <meyering@na-net.ornl.gov>
 
 	* src/sort.c (_NL_ITEM) [!defined]: Define.
-	From from Ørn E. Hansen.
+	From from Ã˜rn E. Hansen.
 
 	* src/sort.c: Use STREQ in place of most uses of strcmp.
 	(NLS_STRCMP): Define.
@@ -4492,14 +4492,14 @@
 
 	* src/sort.c (look_for_fraction): Eliminate arbitrary limit on
 	number of `groups'.  Declare as void, not int.
-	Patch from Ørn E. Hansen.
+	Patch from Ã˜rn E. Hansen.
 	(main): When determining whether we're in the C or POSIX locale,
 	don't rely on the form of the string returned by setlocale.
 	Suggestion from Ulrich Drepper.
 
 1997-10-12  Jim Meyering  <meyering@na-net.ornl.gov>
 
-	* src/sort.c: Apply big patch from Ørn E. Hansen.
+	* src/sort.c: Apply big patch from Ã˜rn E. Hansen.
 	Clean up, indent.
 	(NLS_MEMCMP): Define.
 	(keycompare): Use it instead of open-coded #ifdefs.
@@ -5173,7 +5173,7 @@ Wed Oct  9 07:26:40 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 Tue Oct  8 21:32:17 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 
 	* lib/error.c: Include error.h to align with libit --
-	under protest, François :-).
+	under protest, FranÃ§ois :-).
 
 Sun Oct  6 08:02:28 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 
@@ -5411,7 +5411,7 @@ Wed Jul 17 00:30:28 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 Tue Jul 16 00:09:37 1996  Jim Meyering  <meyering@na-net.ornl.gov>
 
 	* aclocal.m4 (fp_C_PROTOTYPES): Improved version from
-	François Pinard.
+	FranÃ§ois Pinard.
 	Update all other macros to reference $fp_cv_prog_cc_stdc, rather
 	than $ac_cv_prog_cc_stdc.
 
@@ -5692,7 +5692,7 @@ Sun Apr 28 17:10:03 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 	trailing spaces if the prefix had any.  Before, fmt would
 	improperly output NUL bytes.  The command
 	perl -e 'print "| S";' |fmt -p' |  '|tr '\0' @
-	output `|@S'.  Reported by François Pinard.
+	output `|@S'.  Reported by FranÃ§ois Pinard.
 
 	* sort.c (main): Give a better diagnostic for `sort -0'.
 	Reported by Karl Berry.
@@ -5886,7 +5886,7 @@ Sat Mar  9 13:30:12 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 	Link an nls file.
 	(AC_OUTPUT): Reflect addition of two new directories, intl and po.
 	Create po/Makefile.
-	From François Pinard.
+	From FranÃ§ois Pinard.
 
 	* tr.c (star_digits_closebracket): Declare formal param, IDX,
 	and local I to be of type size_t (rather than int) to avoid
@@ -5926,7 +5926,7 @@ Fri Feb 16 21:44:14 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
 	* join.c (main): Mark two strings for translation.
 	* md5sum.c (md5_check): Mark a string for translation.
-	From François Pinard.
+	From FranÃ§ois Pinard.
 
 Mon Feb 12 21:12:28 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 
@@ -5953,7 +5953,7 @@ Wed Jan 31 23:26:13 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 Fri Jan  5 18:30:28  1996 Jim Meyering  (meyering@na-net.ornl.gov)
 
 	* aclocal.m4: For SVR4 systems, use -Xc -D_POSIX_C_SOURCE in CFLAGS,
-	not just -Xc.  From François Pinard.
+	not just -Xc.  From FranÃ§ois Pinard.
 
 	* doc/Makefile.am (DIST_OTHER): Don't set to mdate-sh.  mdate-sh is
 	distributed automatically.  From Tom Tromey.
@@ -5965,7 +5965,7 @@ Thu Jan  4 20:32:52 1996  Jim Meyering  (meyering@na-net.ornl.gov)
 	its definition.  From Kaveh Ghazi.
 
 	* src/Makefile.am (DIST_OTHER): Include md5-test.rfc so make check
-	works again.  Reported by François Pinard and Kaveh Ghazi.
+	works again.  Reported by FranÃ§ois Pinard and Kaveh Ghazi.
 
 	* rx.c [SYNTAX]: Rename from SYNTAX_TABLE.
 	[SYNTAX_TABLE]: Remove extern dcl of re_syntax_table.
@@ -6033,7 +6033,7 @@ Thu Dec  7 19:55:03 1995  Jim Meyering  (meyering@comco.com)
 	* csplit.c [!WITH_REGEX]: Include rx.h.
 	* nl.c [!WITH_REGEX]: Likewise.
 	* tac.c [!WITH_REGEX]: Likewise.
-	From Ulrich Drepper and François Pinard.
+	From Ulrich Drepper and FranÃ§ois Pinard.
 
 Tue Dec  5 17:49:53 1995  Jim Meyering  (meyering@comco.com)
 
@@ -8736,8 +8736,3 @@ Sat Dec 16 15:15:50 1989  David J. MacKenzie  (djm at hobbes.ai.mit.edu)
 	(error): Print to stderr, not stdout.
 	(xmalloc, xrealloc): Return char * instead of int.
 	Returning 0 is ok if 0 bytes requested (ANSI C).
-
-
-Local Variables:
-version-control: never
-End:
diff --git a/tests/fmt/basic b/tests/fmt/basic
index 991f01d69..28c4fb91a 100755
--- a/tests/fmt/basic
+++ b/tests/fmt/basic
@@ -24,9 +24,9 @@ use strict;
 
 my @Tests =
     (
-     ['8-bit-pfx', qw (-p 'ç'),
-      {IN=> "ça\nçb\n"},
-      {OUT=>"ça b\n"}],
+     ['8-bit-pfx', qw (-p 'Ã§'),
+      {IN=> "Ã§a\nÃ§b\n"},
+      {OUT=>"Ã§a b\n"}],
      ['wide-1', '-w 32768',
       {ERR => "fmt: invalid width: `32768'\n"}, {EXIT => 1}],
      ['wide-2', '-w 2147483647',
diff --git a/tests/ls-2/tests b/tests/ls-2/tests
index 7b1a14ab2..788ce85ab 100755
--- a/tests/ls-2/tests
+++ b/tests/ls-2/tests
@@ -92,7 +92,7 @@ my @Tests =
 				 {OUT => "\e[0m\e[01;32md\e[0m\n\e[m"},
 				  $exe_in_subdir, $remove_j],
 
-     # From Stéphane Chazelas.
+     # From StÃ©phane Chazelas.
      ['no-a-isdir-b', 'no-dir d',
 	 {OUT => "d:\n"},
 	 {ERR => "ls: no-dir: No such file or directory\n"},
diff --git a/tests/misc/printf-hex b/tests/misc/printf-hex
index 73f4ab024..7fbd1c1dd 100755
--- a/tests/misc/printf-hex
+++ b/tests/misc/printf-hex
@@ -24,9 +24,9 @@ fi
 
 fail=0
 
-$prog '\xf73\n' > out || fail=1
+$prog '\x7e3\n' > out || fail=1
 cat <<\EOF > exp
-÷3
+~3
 EOF
 
 cmp out exp || fail=1
diff --git a/tests/sort/Test.pm b/tests/sort/Test.pm
index 022c1ae04..e39b91625 100755
--- a/tests/sort/Test.pm
+++ b/tests/sort/Test.pm
@@ -147,8 +147,8 @@ my @tv = (
 
 # From Erick Branderhorst -- fixed around 1.19e
 ["16a", '-f',
- "éminence\nüberhaupt\n's-Gravenhage\naëroclub\nAag\naagtappels\n",
- "'s-Gravenhage\nAag\naagtappels\naëroclub\néminence\nüberhaupt\n",
+ "Ã©minence\nÃ¼berhaupt\n's-Gravenhage\naÃ«roclub\nAag\naagtappels\n",
+ "'s-Gravenhage\nAag\naagtappels\naÃ«roclub\nÃ©minence\nÃ¼berhaupt\n",
  0],
 
 # This provokes a one-byte memory overrun of a malloc'd block for versions
diff --git a/tests/uniq/Test.pm b/tests/uniq/Test.pm
index c846a1d02..ef5d048a5 100644
--- a/tests/uniq/Test.pm
+++ b/tests/uniq/Test.pm
@@ -15,7 +15,7 @@ my @tv = (
 ['6',  '',    "b\na\na\n",       "b\na\n",          0],
 ['7',  '',    "a\nb\nc\n",       "a\nb\nc\n",       0],
 # Make sure that eight bit characters work
-['8',  '',    "ö\nv\n",          "ö\nv\n",          0],
+['8',  '',    "Ã¶\nv\n",          "Ã¶\nv\n",          0],
 # Test output of -u option; only unique lines
 ['9',  '-u',  "a\na\n",          "",                0],
 ['10', '-u',  "a\nb\n",          "a\nb\n",          0],