[epiphany] Clean up the credits somewhat

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 557f4d14dd3e47440789f04753730c1c361a6c91
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Wed Nov 15 21:02:05 2017 -0600

    Clean up the credits somewhat
    
    Macro will be the only "author." The rest of us can be "contributors"
    or "maintainers."
    
    And get rid of the AUTHORS file. Everyone listed there is already in
    the credits, except for Daniel, who I've added.

 AUTHORS                 |    8 --------
 src/resources/about.ini |   12 ++++++++----
 src/window-commands.c   |   26 ++++++++++++++++----------
 3 files changed, 24 insertions(+), 22 deletions(-)
---
diff --git a/src/resources/about.ini b/src/resources/about.ini
index d39bf2d..c340302 100644
--- a/src/resources/about.ini
+++ b/src/resources/about.ini
@@ -1,6 +1,10 @@
+# Feel free to add yourself to Contributors if you believe your contributions
+# are substantial. Just please KEEP ALPHABETIZED (by last name)!
+
 [About]
-Authors=Carlos García Campos;Michael Catanzaro;
-Contributors=Wouter Bolsterlee;Crispin Flowerday;Peter Harvey;Reinout van Schouwen;Raphaël Slinckx;Cyril 
Brulebois;Cosimo Cecchi;William Jon McCann;Arnaud Bonatti;
-PastAuthors=Marco Pesenti Gritti;David Bordoley;Adam Hooper;Christian Persch;Jean-François Rameau;Diego 
Escalante Urrelo;Xan López;Gustavo Noronha;Claudio Saavedra;
-Artists=Andreas Nilsson;Jakub Steiner;Lapo Calamandrei;
+Author=Marco Pesenti Gritti (in memoriam);
+Maintainers=Carlos García Campos;Michael Catanzaro;
+PastMaintainers=Xan López;Christian Persch;Claudio Saavedra;
+Contributors=Daniel Aleksandersen;Wouter Bolsterlee;Arnaud Bonatti;David Bordoley;Cyril Brulebois;Cosimo 
Cecchi;Crispin Flowerday;Peter Harvey;Adam Hooper;Gabriel Ivascu;William Jon McCann;Gustavo Noronha;Iulian 
Radu;Jean-François Rameau;Reinout van Schouwen;Raphaël Slinckx;Diego Escalante Urrelo;
+Artists=Lapo Calamandrei;Andreas Nilsson;Jakub Steiner;
 Documenters=Ekaterina Gerasimova;
diff --git a/src/window-commands.c b/src/window-commands.c
index 6ea741c..2333597 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -562,8 +562,8 @@ window_cmd_show_about (GSimpleAction *action,
   GKeyFile *key_file;
   GBytes *bytes;
   GError *error = NULL;
-  char **list, **authors, **contributors, **past_authors, **artists, **documenters;
-  gsize n_authors, n_contributors, n_past_authors, n_artists, n_documenters, i, j;
+  char **list, **authors, **maintainers, **past_maintainers, **contributors, **artists, **documenters;
+  gsize n_authors, n_maintainers, n_past_maintainers, n_contributors, n_artists, n_documenters, i, j;
 
   key_file = g_key_file_new ();
   bytes = g_resources_lookup_data ("/org/gnome/epiphany/about.ini", 0, NULL);
@@ -574,12 +574,14 @@ window_cmd_show_about (GSimpleAction *action,
   }
   g_bytes_unref (bytes);
 
-  list = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Authors",
+  list = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Author",
                                      &n_authors, NULL);
+  maintainers = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Maintainers",
+                                            &n_maintainers, NULL);
+  past_maintainers = g_key_file_get_string_list (key_file, ABOUT_GROUP, "PastMaintainers",
+                                                 &n_past_maintainers, NULL);
   contributors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Contributors",
                                              &n_contributors, NULL);
-  past_authors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "PastAuthors",
-                                             &n_past_authors, NULL);
 
 #define APPEND(_to, _from) \
   _to[i++] = g_strdup (_from);
@@ -595,19 +597,23 @@ window_cmd_show_about (GSimpleAction *action,
   }
 
   authors = g_new (char *, (list ? n_authors : 0) +
-                   (contributors ? n_contributors : 0) +
-                   (past_authors ? n_past_authors : 0) + 7 + 1);
+                   (maintainers ? n_maintainers : 0) +
+                   (past_maintainers ? n_past_maintainers : 0) +
+                   (contributors ? n_contributors : 0) + 9 + 1);
   i = 0;
   APPEND_STRV_AND_FREE (authors, list);
   APPEND (authors, "");
+  APPEND (authors, "Current maintainers:");
+  APPEND_STRV_AND_FREE (authors, maintainers);
+  APPEND (authors, "");
   APPEND (authors, _("Contact us at:"));
   APPEND (authors, "<epiphany-list gnome org>");
   APPEND (authors, "");
+  APPEND (authors, _("Past maintainers:"));
+  APPEND_STRV_AND_FREE (authors, past_maintainers);
+  APPEND (authors, "");
   APPEND (authors, _("Contributors:"));
   APPEND_STRV_AND_FREE (authors, contributors);
-  APPEND (authors, "");
-  APPEND (authors, _("Past developers:"));
-  APPEND_STRV_AND_FREE (authors, past_authors);
   authors[i++] = NULL;
 
   list = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Artists", &n_artists, NULL);