Updated based on recent check-ins and other contributions.

	* AUTHORS:
	* THANKS:
	* src/nautilus-window-menus.c: (help_menu_about_nautilus_callback):
	Updated based on recent check-ins and other contributions.

	* check-THANKS.pl: Updated to check the about list against the
	AUTHORS file and to fix some other things.

	* libnautilus/nautilus-view-component.idl: Fix a comment and
	remove a stray empty line.

8 files changed, 248 insertions, 157 deletions

diff --git a/AUTHORS b/AUTHORS
index c5fd195ce..7819f2156 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,21 +1,21 @@
 Ali Abdin  <aliabdin@aucegypt.edu>
 Andy Hertzfeld  <andy@eazel.com>
 Arlo Rose  <arlo@eazel.com>
-Bud Tribble  <bud@eazel.com>
 Darin Adler  <darin@eazel.com>
 Eli Goldberg  <eli@eazel.com>
 Elliot Lee  <sopwith@redhat.com>
 Eskil Heyn Olsen  <eskil@eazel.com>
-Ettore Perazzoli  <ettore@helixcode.com>
+Ettore Perazzoli  <ettore@ximian.com>
 Gene Z. Ragan  <gzr@eazel.com>
 George Lebl  <jirka@5z.com>
-Ian McKellar  <yakk@yakk.net.au>
+Ian McKellar  <ian@eazel.com>
+John Harper  <jsh@eazel.com>
 John Sullivan  <sullivan@eazel.com>
 Josh Barrow  <josh@eazel.com>
 J Shane Culpepper  <pepper@eazel.com>
 Maciej Stachowiak  <mjs@eazel.com>
 Mathieu Lacage  <mathieu@eazel.com>
-Michael Engber  <engber@eazel.com>
+Mike Engber  <engber@eazel.com>
 Mike Fleming  <mfleming@eazel.com>
 Pavel Císler  <pavel@eazel.com>
 Ramiro Estrugo  <ramiro@eazel.com>
diff --git a/ChangeLog b/ChangeLog
index 332ff5d50..99b4be343 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-01-24  Darin Adler  <darin@eazel.com>
+
+	* AUTHORS:
+	* THANKS:
+	* src/nautilus-window-menus.c: (help_menu_about_nautilus_callback):
+	Updated based on recent check-ins and other contributions.
+
+	* check-THANKS.pl: Updated to check the about list against the
+	AUTHORS file and to fix some other things.
+
+	* libnautilus/nautilus-view-component.idl: Fix a comment and
+	remove a stray empty line.
+
 2001-01-24  Ramiro Estrugo  <ramiro@eazel.com>
 
 	* applets/launcher/nautilus-launcher-applet.c: (create_pixbufs),
@@ -3454,7 +3467,7 @@
 	(nautilus_adapter_embeddable_embed_strategy_new): remove redundant
 	bonobo_item_container_add.
 
-2001-01-11  Andy Hertzfeld  <andy@eazel>
+2001-01-11  Andy Hertzfeld  <andy@eazel.com>
 
 	* src/nautilus-property-browser.c: (make_category_link):
 	make the category links use nautilus-image for anti-aliased
@@ -3936,7 +3949,7 @@
 	* components/services/inventory/Makefile.am: added $(IDL) to
 	EXTRA_DISTS
 
-2001-01-11  Ian McKellar  <ian@eazel.om>
+2001-01-11  Ian McKellar  <ian@eazel.com>
 
 	* components/services/install/command-line/Makefile.am:
 	Don't build the inventory test code here as the inventory code has
@@ -4535,7 +4548,7 @@
 	workaround to fix bug 3973.
 	
 
-Fri Jan 05 20:28:43 2001  George Lebl <jirka@5z.com>
+2001-01-05  George Lebl <jirka@5z.com>
 
 	Darin saw this patch and says it should not destroy the world
 	if I apply it.
@@ -5308,7 +5321,7 @@ Fri Jan 05 20:28:43 2001  George Lebl <jirka@5z.com>
 	(mozilla_content_view_one_time_happenings):
 	Add support for using mozilla caching.
 	
-Wed Jan 03 04:11:01 2001  George Lebl <jirka@5z.com>
+2001-01-03  George Lebl <jirka@5z.com>
 
 	Reviewed by Maciej, so if I broke something, blame him.
 
diff --git a/ChangeLog-20000625 b/ChangeLog-20000625
index 89fab52ae..0bfa520bc 100644
--- a/ChangeLog-20000625
+++ b/ChangeLog-20000625
@@ -2405,7 +2405,7 @@ Sun Jun 18 02:50:47 2000  George Lebl <jirka@5z.com>
 	Changed menu item title from "Customize Icon Text..." to
 	"Icon Captions...". Not sure if I like this verbless style yet.
 
-2000-06-14  Robin * Slomkowski <rslokow@eazel.com>
+2000-06-14  Robin * Slomkowski <rslomkow@eazel.com>
 
 	* nautilus.spec.in: added permission so it can run for non-root
 	* HACKING: clean up orginization, and added what could be used from Helix
@@ -8250,7 +8250,7 @@ Tue May 30 11:21:31 2000  Raph Levien  <raph@acm.org>
 	
 	* src/ntl-index-panel.c: (add_command_buttons): Format tweaking.
 	
-2000-05-24  Eskil Heyn Olsen  <eskil@eazel.om>
+2000-05-24  Eskil Heyn Olsen  <eskil@eazel.com>
 
 	* configure.in: 
 	* components/services/install/command-line/Makefile.am:
@@ -8288,7 +8288,7 @@ Tue May 30 11:21:31 2000  Raph Levien  <raph@acm.org>
 	* src/ntl-uri-map.c: Make content loser component have lower
 	priority than anything else.
 
-2000-05-24  Eskil Heyn Olsen  <eskil@eazel.om>
+2000-05-24  Eskil Heyn Olsen  <eskil@eazel.com>
 
 	* components/services/trilobite/Makefile.am:
 	Accidently removed the wrong subdir, reinserted lib and removed src.
@@ -8978,7 +8978,7 @@ Tue May 30 11:21:31 2000  Raph Levien  <raph@acm.org>
 	of the fix for Bug # 863.  This is a statically linked command line
 	implementation only right now.
 
-2000-05-22  Eskil Heyn Olsen  <eskil@eazel.om>
+2000-05-22  Eskil Heyn Olsen  <eskil@eazel.com>
 
 	* src/ntl-app.c (display_prototype_caveat): Changed to simply use
 	a gnome_warning_dialog instead of a nautilus_simple_dialog. We
@@ -9060,7 +9060,7 @@ Tue May 30 11:21:31 2000  Raph Levien  <raph@acm.org>
 	understand and better organized. Also added a "desktop" option
 	as a start for my next task.
 
-2000-05-22  Eskil Heyn Olsen  <eskil@eazel.om>
+2000-05-22  Eskil Heyn Olsen  <eskil@eazel.com>
 
 	* components/services/trilobite/src/trilobite-service-private.h: 
 	* components/services/trilobite/src/trilobite-service-public.h: 
@@ -9435,7 +9435,7 @@ Tue May 30 11:21:31 2000  Raph Levien  <raph@acm.org>
 	added playing code to the music view, but it's still not working
 	so it's disabled
 	
-2000-05-19  Eskil Heyn Olsen  <eskil@eazel.om>
+2000-05-19  Eskil Heyn Olsen  <eskil@eazel.com>
 
 	* configure.in:
 	added the components/services/time/ makefiles
@@ -9629,7 +9629,7 @@ Tue May 30 11:21:31 2000  Raph Levien  <raph@acm.org>
 	added sorting by bitrate,
 	more work on the play controls, but they don't actually play yet
 	
-2000-05-18  Eskil Heyn Olsen  <eskil@eazel.om>
+2000-05-18  Eskil Heyn Olsen  <eskil@eazel.com>
 
 	* components/services/trilobite/sample/command-line/Makefile.am:
 	* components/services/trilobite/sample/command-line/main.c: 
@@ -9809,7 +9809,7 @@ Tue May 30 11:21:31 2000  Raph Levien  <raph@acm.org>
 	* components/music/pixmaps.h:
 	some inline images for the buttons
 		
-2000-05-17  Eskil Heyn Olsen  <eskil@eazel.om>
+2000-05-17  Eskil Heyn Olsen  <eskil@eazel.com>
 
 	* components/services/trilobite/sample/service/sample-service-impl.c:
 	Added a bug for the destroyer
@@ -10056,7 +10056,7 @@ Tue May 30 11:21:31 2000  Raph Levien  <raph@acm.org>
 	Bottleneck location change requests to nautilus through a single
 	function.
 	
-2000-05-17  Eskil Heyn Olsen  <eskil@eazel.om>
+2000-05-17  Eskil Heyn Olsen  <eskil@eazel.com>
 
 	* components/services/trilobite/idl/sample-service.idl: 
 	* components/services/trilobite/sample/service/sample-service-public.h:
@@ -10225,7 +10225,7 @@ Tue May 30 11:21:31 2000  Raph Levien  <raph@acm.org>
 	* src/ntl-view.c: (nautilus_view_destroy_client):
 	Added bug numbers to some FIXMEs.
 
-2000-05-16  Eskil Heyn Olsen  <eskil@eazel.om>
+2000-05-16  Eskil Heyn Olsen  <eskil@eazel.com>
 
 	* components/services/trilobite/sample/service/Makefile.am
 	(sample-service.h): Missed a -I on the orbit-idl
@@ -10282,7 +10282,7 @@ Tue May 30 11:21:31 2000  Raph Levien  <raph@acm.org>
 	
 	* libnautilus-extensions/nautilus-string.h: Formatting.
 
-2000-05-16  Eskil Heyn Olsen  <eskil@eazel.om>
+2000-05-16  Eskil Heyn Olsen  <eskil@eazel.com>
 
     	* components/services/trilobite/src/trilobite-service-public.h: 
 	* components/services/trilobite/src/trilobite-service.c
@@ -10596,7 +10596,7 @@ Tue May 30 11:21:31 2000  Raph Levien  <raph@acm.org>
 	(notify_selection_change_callback), (display_pending_files):
 	some of Darin's recent changes wouldn't compile, so I fixed them
 	
-2000-05-12  Eskil Heyn Olsen  <eskil@eazel.om>
+2000-05-12  Eskil Heyn Olsen  <eskil@eazel.com>
 
 	* libnautilus/Makefile.am (BUILT_SOURCES): This is way people
 	should use a highlighting editor so you wouldn't have these broken
@@ -10634,7 +10634,7 @@ Tue May 30 11:21:31 2000  Raph Levien  <raph@acm.org>
 	* src/file-manager/fm-list-view.c: (create_list): Got rid of
 	the FIXME now that Pavel fixed bug 315.
 
-2000-05-12  Eskil Heyn Olsen  <eskil@eazel.om>
+2000-05-12  Eskil Heyn Olsen  <eskil@eazel.com>
 
 	* components/services/trilobite/sample/service/Makefile.am 
 	* components/services/trilobite/sample/nautilus-view/Makefile.am
@@ -10728,7 +10728,7 @@ Tue May 30 11:21:31 2000  Raph Levien  <raph@acm.org>
 	(get_sort_criterion_by_menu_path), (fm_icon_view_begin_loading),
 	(sort_callback): Add code to save and load the "sort by" setting.
 
-2000-05-12  Eskil Heyn Olsen  <eskil@eazel.om>
+2000-05-12  Eskil Heyn Olsen  <eskil@eazel.com>
 
 	* src/file-manager/Makefile.am (CLEANFILES): Fixed the CLEANFILES
 	so the corba generated file and the dfos_corba_stamp get's deleted
diff --git a/THANKS b/THANKS
index 2c344c0fa..830ee0979 100644
--- a/THANKS
+++ b/THANKS
@@ -1,35 +1,37 @@
-
 The Nautilus team would like to thank the following contributors:
 
 Anders Carlsson  <andersca@gnu.org> - background drawing optimizations
+Arik Devens  <arik@gnome.org> - bug fixes
 Brian Frank  <bfrank@eazel.com> - fixes to default bookmarks
 Christopher Blizzard  <blizzard@redhat.com> - mozilla component fixes
-Christopher James Lahey  <clahey@helixcode.com> - bug fixes
+Christopher James Lahey  <clahey@ximian.com> - bug fixes
 Cody Russell  <car0969@gamma2.uta.edu> - bug fixes
+Eric Fischer  <eric@eazel.com> - bug fixes
 Fatih Demir  <kabalak@gmx.net> - bug fixes
+Gregory S. Hayes  <ghayes@syncomm.org> - bug fixes
 Havoc Pennington  <hp@redhat.com> - various contributions
-Joe Shaw  <joe@helixcode.com> - installer code, bug fixes
+JP Rosevear  <jpr@arcavia.com> - bug fixes
+Jim Garrison  <garrison@users.sourceforge.net> - bug fixes
+Joe Shaw  <joe@ximian.com> - installer code, bug fixes
 John Fleck  <jfleck@inkstain.net> - help browser work
 Jonathan Blandford  <jrb@redhat.com> - help browser, bug fixes
-JP Rosevear  <jpr@arcavia.com> - bug fixes
 Kenneth Christiansen  <kenneth@gnu.org> - icons
 Kjartan Maraas <kmaraas@online.no> - bug fixes, i18n code
 Martin Baulig  <martin@home-of-linux.org> - added PersistFile support
 Matt Bissiri  <bissiri@eecs.umich.edu> - list widget improvements
-Michael Meeks  <michael@helixcode.com> - vfs stream update
+Michael Meeks  <michael@ximian.com> - vfs stream update
 Morten Welinder  <terra@diku.dk> - check-fixme suggestions
 Richard Hult  <rhult@hem.passagen.se> - bug reporting
-Robert Brady  <rwb197@zepler.org> - bugfixes
+Robert Brady  <rwb197@zepler.org> - bug fixes
 Shane Butlers  <sbutle@deakin.edu.au> - IDE in hardware view patch for showing IDE
+Stanislav Brabec  <utx@penguin.cz> - bug fixes
 Victor Lecha  <victor@eazel.com> - testing, build fixes.
-Gregory S. Hayes  <ghayes@syncomm.org> - bugfixes
 
 As well as the following people who contributed translations:
 
 Akira TAGOH  <tagoh@gnome.gr.jp>
 Alastair McKinstry  <mckinstry@computer.org>
 Almer S. Tigelaar  <almer1@dds.nl>
-Almer S. Tigelaar  <almer1@dds.nl>
 Andreas Hyden  <a.hyden@cyberpoint.se>
 Andrew V. Samoilov  <sav@bcs.zp.ua>
 Benedikt Roth  <Benedikt.Roth@gmx.net>
@@ -42,11 +44,15 @@ Fatih Demir  <kabalak@gmx.net>
 Jarkko Ranta  <jjranta@cc.joensuu.fi>
 Jean-Michel Ardantz  <jmardantz@ifrance.com>
 Jesus Bravo Alvarez  <jba@pobox.com>
-Kenneth Christiansen  <kenneth@gnu.org>
 Kjartan Maraas  <kmaraas@gnome.org>
-Matthias Warkus  <mawa@iname.com>
+Kjenneth Christiansen  <kenneth@gnu.org>
+Manuel de Vega Barreiro  <barreiro@arrakis.es>
+Martin Norbäck  <d95mback@dtek.chalmers.se>
+Matthias Warkus  <mawarkus@gnome.org>
 Pablo Saratxaga  <pablo@mandrakesoft.com>
 Robert Brady  <robert@suse.co.uk>
+Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
+Szabolcs Ban  <shooby@gnome.hu>
 Takuo Kitame  <kitame@debian.org>
 Valek Filippov  <frob@df.ru>
 Young-Ho Cha  <ganadist@dacome.co.kr>
diff --git a/check-THANKS.pl b/check-THANKS.pl
index 581e25125..39a9fe3ce 100755
--- a/check-THANKS.pl
+++ b/check-THANKS.pl
@@ -30,7 +30,6 @@
 use diagnostics;
 use strict;
 
-
 # Map from alternate names of some users to canonical versions
 
 my %name_map = ("Darin as Andy" => "Darin Adler",
@@ -38,10 +37,11 @@ my %name_map = ("Darin as Andy" => "Darin Adler",
                 "Shane Culpepper" => "J Shane Culpepper",
                 "Michael K. Fleming" => "Mike Fleming",
                 "Rebecka Schulman" => "Rebecca Schulman",
-                "Mike Engber" => "Michael Engber",
+                "Michael Engber" => "Mike Engber",
                 "Pavel Cisler" => "Pavel Císler",
                 "Pavel" => "Pavel Císler",
                 "Eskil Olsen" => "Eskil Heyn Olsen",
+		"Szabolcs BAN" => "Szabolcs Ban",
                 "Robin Slomkowski" => "Robin * Slomkowski");
 
 # Map from alternate email addresses of some users to canonical versions
@@ -49,10 +49,9 @@ my %name_map = ("Darin as Andy" => "Darin Adler",
 my %email_map = ('at@ue-spacy.com' => 'tagoh@gnome.gr.jp',
                  'sopwith@eazel.com' => 'sopwith@redhat.com',
                  'chief_wanker@eazel.com' => 'eskil@eazel.com',
-                 'eskil@eazel.om' => 'eskil@eazel.com',
-                 'yakk@yakk.net' => 'yakk@yakk.net.au',
+                 'yakk@yakk.net' => 'ian@eazel.com',
+                 'yakk@yakk.net.au' => 'ian@eazel.com',
                  'linuxfan@ionet..net' => 'josh@eazel.com',
-                 'rslokow@eazel.com' => 'rslomkow@eazel.com',
                  'snickell@stanford.edu' => 'seth@eazel.com',
                  'mathieu@gnome.org' => 'mathieu@eazel.com',
                  'hp@pobox.com' => 'hp@redhat.com',
@@ -60,6 +59,8 @@ my %email_map = ('at@ue-spacy.com' => 'tagoh@gnome.gr.jp',
                  'kmaraas@gnu.org' => 'kmaraas@gnome.org',
                  'raph@gimp.org' => 'raph@acm.org',
                  'baulig@suse.de' => 'martin@home-of-linux.org',
+                 'carlos@gnome-db.org' => 'carlos@hispalinux.es',
+                 'mawa@iname.com' => 'mawarkus@gnome.org',
                  'linuxfan@ionet.net' => 'josh@eazel.com');
 
 
@@ -70,137 +71,209 @@ my %no_credit = ('2000-09-08  Daniel Egger  <egger@suse.de>' => 1,
                  '2000-09-06  Daniel Egger  <egger@suse.de>' => 1);
 
 
-my @lines;
-my @sort_lines;
-my @changelog_people;
-my @thanks_people;
-my @uncredited;
-my @double_credited;
-
-
-
-open (CHANGELOGS,"cat `find . -name intl -prune -or -name 'ChangeLog*' -print`|");
-
-
-LOOP: while (<CHANGELOGS>) {
-    my $name;
-    my $email;
+open CHANGELOGS, "cat `find . -name intl -prune -or -name 'ChangeLog*' -and \! -name '*~' -print`|" or die;
 
+my @lines;
+LOOP: while (<CHANGELOGS>)
+  {
     chomp;
-
-    if (/@/) {
-        if ($no_credit{$_}) {
+    
+    if (/@/)
+      {
+        if ($no_credit{$_})
+          {
             next LOOP;
-        }
+          }
 
-        if (/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/) {
+        if (/^\d\d\d\d-\d\d-\d\d/)
+          {
             # Normal style ChangeLog comment 
-            s/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9][ \t]*//;
-
-        } elsif (/^(Mon|Tue|Wed|Thu|Fri|Sat|Sun).*[0-9][0-9][0-9][0-9]/) {
+            s/^\d\d\d\d-\d\d-\d\d[ \t]*//;
+          }
+        elsif (/^(Mon|Tue|Wed|Thu|Fri|Sat|Sun).*\d\d\d\d/)
+          {
             # Old style ChangeLog comment 
-            s/^.*2000[ \t\n\r]*//;
-
-        } else { 
-            # FIXME bugzilla.eazel.com 3452: we should try to extract names & addresses from 
-            # entry body text.
-
+            s/^.*20\d\d\s*//;
+          }
+        else
+          {
+            # FIXME bugzilla.eazel.com 3452: we should also try to extract
+            # names & addresses from entry body text.
             next LOOP; # ignore unknown lines for now
-        }
-
+          }
         
-        $name = $_;
-        $email = $_;
+        my $name = $_;
         
         $name =~ s/[ \t]*<.*[\n\r]*$//;
-
-        if ($name_map{$name}) {
-            $name = $name_map{$name};
-        }
-
+        
+        $name = $name_map{$name} if $name_map{$name};
+        
+        my $email = $_;
         
         $email =~ s/^.*<//;
         $email =~ s/>.*$//;
         $email =~ s/[ \t\n\r]*$//;
+	$email =~ s/helixcode/ximian/;
         
-        if ($email_map{$email}) {
-            $email = $email_map{$email};
-        }
+        $email = $email_map{$email} if $email_map{$email};
 
         push @lines, "${name}  <${email}>";
     }
 }
 
-close (CHANGELOGS);
-
-@sort_lines = sort @lines;
+close CHANGELOGS;
 
+my @changelog_people;
 my $last_line = "";
-
-foreach my $line (@sort_lines) {
+foreach my $line (sort @lines)
+  {
     push @changelog_people, $line unless $line eq $last_line;
     $last_line = $line;
-}
-
+  }
 
-open (AUTHORS, "<AUTHORS");
+open AUTHORS, "AUTHORS" or die;
 
 my @authors;
 
 while (<AUTHORS>) {
     chomp;
-
     push @authors, $_;
 }
 
-close (AUTHORS);
+close AUTHORS;
 
-open (THANKS, "<THANKS");
+open THANKS, "THANKS" or die;
 
+my @thanks_people;
 
 while (<THANKS>) {
     chomp;
-    
     s/ - .*$//;
-
     push @thanks_people, $_;
 }
 
-close (THANKS);
+close THANKS;
 
+open ABOUT, "src/nautilus-window-menus.c" or die;
 
-foreach my $person (@changelog_people) {
-    if (! (grep {$_ eq $person} @thanks_people) &&
-        ! (grep {$_ eq $person} @authors)) {
-        push @uncredited, $person;
-    }
-}
+my $found_about_authors = 0;
 
-if (@uncredited) {
-    print "The following people are in the ChangeLog but not credited in THANKS or AUTHORS:\n\n";
+while (<ABOUT>)
+  {
+    if (/const char \*authors/)
+      {
+        $found_about_authors = 1;
+        last;
+      }
+  }
 
-    foreach my $person (@uncredited) {
-        print "${person}\n";
-    }
-    print "\n";
-}
+my @about_authors;
 
+if ($found_about_authors)
+  {
+    my $i = 0;
+    while (<ABOUT>)
+      {
+        last unless /^\s+\"(.*)\",\s*\n/;
+        push @about_authors, $1;
+      }
+  }
 
+close ABOUT;
 
-foreach my $person (@authors) {
-    if (grep {$_ eq $person} @thanks_people) {
-        push @double_credited, $person;
-    }
-}
 
+my @uncredited;
+foreach my $person (@changelog_people)
+  {
+    if (! (grep {$_ eq $person} @thanks_people) &&
+        ! (grep {$_ eq $person} @authors))
+      {
+        push @uncredited, $person;
+      }
+  }
+
+my @double_credited;
+foreach my $person (@authors)
+  {
+    if (grep {$_ eq $person} @thanks_people)
+      {
+        push @double_credited, $person;
+      }
+  }
+
+my @author_names;
+foreach my $person (@authors)
+  {
+    $person =~ s/\s*<.*//;
+    push @author_names, $person;
+  }
+
+my @not_in_about;
+foreach my $person (@author_names)
+  {
+    push @not_in_about, $person unless grep {$_ eq $person} @about_authors;
+  }
+
+my @only_in_about;
+foreach my $person (@about_authors)
+  {
+    push @only_in_about, $person unless grep {$_ eq $person} @author_names;
+  }
+
+my $printed = 0;
+
+if (@uncredited)
+  {
+    print "\nThe following people are in the ChangeLog but not credited in THANKS or AUTHORS:\n\n";
+    
+    foreach my $person (@uncredited)
+      {
+        print "${person}\n";
+      }
+    
+    $printed = 1;
+  }
 
-if (@double_credited) {
-    print "The following people are listed in both THANKS and AUTHORS:\n\n";
+if (@double_credited)
+  {
+    print "\nThe following people are listed in both THANKS and AUTHORS:\n\n";
+    
+    foreach my $person (@double_credited)
+      {
+        print "${person}\n";
+      }
+    
+    $printed = 1;
+  }
+
+if (!$found_about_authors)
+  {
+    print "\nDidn't find authors section in nautilus-window-menus.c\n";
+    $printed = 1;
+  }
+
+if (@not_in_about)
+  {
+    print "\nThe following people are in AUTHORS but not the about screen:\n\n";
+    
+    foreach my $person (@not_in_about)
+      {
+        print "${person}\n";
+      }
+    
+    $printed = 1;
+  }
 
-    foreach my $person (@double_credited) {
+if (@only_in_about)
+  {
+    print "\nThe following people are in the about screen but not AUTHORS:\n\n";
+    
+    foreach my $person (@only_in_about)
+      {
         print "${person}\n";
-    }
-}
+      }
+    
+    $printed = 1;
+  }
 
-# FIXME bugzilla.eazel.com 3453: we should also make sure that AUTHORS matches the contents of
-# the About dialog.
+print "\n" if $printed;
diff --git a/libnautilus/nautilus-view-component.idl b/libnautilus/nautilus-view-component.idl
index 3a213c7ca..f9706695a 100644
--- a/libnautilus/nautilus-view-component.idl
+++ b/libnautilus/nautilus-view-component.idl
@@ -4,7 +4,7 @@
  *  libnautilus: A library for nautilus view implementations.
  *
  *  Copyright (C) 1999, 2000 Red Hat, Inc.
- *  Copyright (C) 2000 Eazel, Inc.
+ *  Copyright (C) 2000, 2001 Eazel, Inc.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -119,7 +119,6 @@ module Nautilus {
 		 * indicates that.
 		 */
 		oneway void report_load_underway ();
-
 		oneway void report_load_progress (in float fraction_done);
 		oneway void report_load_complete ();
 		oneway void report_load_failed ();
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index ee3a5eaca..e3bfd915f 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -3,7 +3,7 @@
 /*
  * Nautilus
  *
- * Copyright (C) 2000 Eazel, Inc.
+ * Copyright (C) 2000, 2001 Eazel, Inc.
  *
  * Nautilus is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -509,32 +509,32 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
 	char *time_stamp;
 	const char *authors[] = {
 		"Ali Abdin",
+		"Andy Hertzfeld",
+		"Arlo Rose",
 		"Darin Adler",
-		"Josh Barrow",
-		"Pavel Císler",
-		"J Shane Culpepper",
-		"Mike Engber",
-		"Ramiro Estrugo",
-		"Mike Fleming",
 		"Eli Goldberg",
-		"Andy Hertzfeld",
-		"Susan Kare",
-		"Mathieu Lacage",
-		"George Lebl",
 		"Elliot Lee",
-		"Raph Levien",
-		"Ian McKellar",
-		"Seth Nickell",
 		"Eskil Heyn Olsen",
 		"Ettore Perazzoli",
-		"Robey Pointer",
 		"Gene Z. Ragan",
-		"Arlo Rose",
+		"George Lebl",
+		"Ian McKellar",
+		"J Shane Culpepper",
+		"John Harper",
+		"John Sullivan",
+		"Josh Barrow",
+		"Maciej Stachowiak",
+		"Mathieu Lacage",
+		"Mike Engber",
+		"Mike Fleming",
+		"Pavel Císler",
+		"Ramiro Estrugo",
+		"Raph Levien",
 		"Rebecca Schulman",
+		"Robey Pointer",
 		"Robin * Slomkowski",
-		"Maciej Stachowiak",
-		"John Sullivan",
-		"Bud Tribble",
+		"Seth Nickell",
+		"Susan Kare",
 		NULL
 	};
 
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index ee3a5eaca..e3bfd915f 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -3,7 +3,7 @@
 /*
  * Nautilus
  *
- * Copyright (C) 2000 Eazel, Inc.
+ * Copyright (C) 2000, 2001 Eazel, Inc.
  *
  * Nautilus is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -509,32 +509,32 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
 	char *time_stamp;
 	const char *authors[] = {
 		"Ali Abdin",
+		"Andy Hertzfeld",
+		"Arlo Rose",
 		"Darin Adler",
-		"Josh Barrow",
-		"Pavel Císler",
-		"J Shane Culpepper",
-		"Mike Engber",
-		"Ramiro Estrugo",
-		"Mike Fleming",
 		"Eli Goldberg",
-		"Andy Hertzfeld",
-		"Susan Kare",
-		"Mathieu Lacage",
-		"George Lebl",
 		"Elliot Lee",
-		"Raph Levien",
-		"Ian McKellar",
-		"Seth Nickell",
 		"Eskil Heyn Olsen",
 		"Ettore Perazzoli",
-		"Robey Pointer",
 		"Gene Z. Ragan",
-		"Arlo Rose",
+		"George Lebl",
+		"Ian McKellar",
+		"J Shane Culpepper",
+		"John Harper",
+		"John Sullivan",
+		"Josh Barrow",
+		"Maciej Stachowiak",
+		"Mathieu Lacage",
+		"Mike Engber",
+		"Mike Fleming",
+		"Pavel Císler",
+		"Ramiro Estrugo",
+		"Raph Levien",
 		"Rebecca Schulman",
+		"Robey Pointer",
 		"Robin * Slomkowski",
-		"Maciej Stachowiak",
-		"John Sullivan",
-		"Bud Tribble",
+		"Seth Nickell",
+		"Susan Kare",
 		NULL
 	};