Updated the MAINTAINERS and AUTHORS files and credits in applets

4 files changed, 97 insertions, 51 deletions

diff --git a/AUTHORS b/AUTHORS
index baaa26cee..f900287f9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,13 @@
+Martyn Russell <martyn at lanedo com>
+Jürg Billeter <juerg.billeter at codethink co uk>
+Philip Van Hoof <pvanhoof at gnome org>
+Carlos Garnacho <carlos at lanedo com>
+Mikael Ottela <mikael.ottela at ixonos com>
+Ivan Frade <ivan.frade at nokia com>
+Jamie McCracken <jamiemcc at gnome org>
 Anders Aagaard <aagaande at gmail com>
 Anders Rune Jensen <anders iola dk>
 Baptiste Mille-Mathias <baptist millemathias gmail com>
-Carlos Garnacho <carlos at imendio com>
 Christoph Laimburg <christoph laimburg at rolmail net>
 Dan Nicolaescu <dann at ics uci edu>
 Deji Akingunola <dakingun gmail com>
@@ -11,9 +17,7 @@ Eugenio <me at eugesoftware com>
 Fabien VALLON <fabien at sonappart net>
 Gergan Penkov <gergan at gmail com>
 Halton Huo <halton huo at sun com>
-Ivan Frade <ivan frade at nokia com>
 Jaime Frutos Morales <acidborg at gmail com>
-Jamie McCracken <jamiemcc at gnome org>
 Jedy Wang <jedy wang at sun com>
 Jerry Tan <jerry tan at sun com>
 John Stowers <john.stowers at gmail com>
@@ -21,14 +25,11 @@ Julien <julienc psychologie-fr org>
 Laurent Aguerreche <laurent.aguerreche at free fr>
 Luca Ferretti <elle.uca at libero it>
 Marcus Fritzsch <fritschy at googlemail com>
-Martyn Russell <martyn at imendio com>
 Michael Biebl <mbiebl at gmail com>
 Michal Pryc <michal pryc at sun com>
-Mikael Ottela <mikael ottela at ixonos com>
 Mikkel Kamstrup Erlandsen <mikkel kamstrup gmail com>
 Nate Nielsen  <nielsen at memberwewbs com>
 Neil Patel <njpatel at gmail com>
-Philip Van Hoof <philip at codeminded be>
 Richard Quirk <quirky at zoom co uk>
 Saleem Abdulrasool <compnerd at gentoo org>
 Samuel Cormier-Iijima <sciyoshi at gmail com>
diff --git a/MAINTAINERS b/MAINTAINERS
index 5d2e94eb6..f2557d5ee 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,27 +1,26 @@
-Jamie McCracken
-E-mail: jamiemcc@gnome.org
-Userid: jamiemcc
-
 Martyn Russell
 E-mail: martyn@lanedo.com
 Userid: mr
 
+Jürg Billeter
+E-mail: juerg.billeter@codethink.co.uk
+Userid: juergbi
+
+Philip Van Hoof
+E-mail: pvanhoof@gnome.org
+Userid: pvanhoof
+
 Carlos Garnacho
 E-mail: carlos@lanedo.com
 Userid: carlosg
 
+Mikael Ottela
+E-mail: mikael.ottela@ixonos.com
+Userid: mottela
+
 Ivan Frade
 E-mail: ivan.frade@nokia.com
 Userid: ifrade
 
-Mikael Ottela
-E-mail: mikael.ottela@ixonos.com
-Userid: mottela
 
-Philip Van Hoof
-E-mail: pvanhoof@gnome.org
-Userid: pvanhoof
 
-Jürg Billeter
-E-mail: juerg.billeter@codethink.co.uk
-Userid: juergbi
diff --git a/src/tracker-search-bar/tracker-search-bar.ui b/src/tracker-search-bar/tracker-search-bar.ui
index d683c2373..6272fca3f 100644
--- a/src/tracker-search-bar/tracker-search-bar.ui
+++ b/src/tracker-search-bar/tracker-search-bar.ui
@@ -9,7 +9,7 @@
     <property name="has_separator">False</property>
     <property name="program_name">Search Bar</property>
     <property name="version">0.7</property>
-    <property name="copyright" translatable="yes">Copyright Tracker Maintainers 2009</property>
+    <property name="copyright" translatable="yes">Copyright Tracker Authors 2005-2009</property>
     <property name="comments" translatable="yes">A search bar applet for finding content stored in Tracker</property>
     <property name="website">http://www.tracker-project.org/</property>
     <property name="website_label" translatable="yes">http://www.tracker-project.org/</property>
@@ -18,12 +18,45 @@
 Tracker is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with Tracker; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.</property>
-    <property name="authors">Martyn Russell
-J&#xFC;rg Billeter
-Carlos Garnacho
-Philip Van Hoof
-Mikael Ottela
-Ivan Frade
+    <property name="authors">Martyn Russell &lt;martyn at lanedo com&gt;
+J&#xFC;rg Billeter &lt;juerg.billeter at codethink co uk&gt;
+Philip Van Hoof &lt;pvanhoof at gnome org&gt;
+Carlos Garnacho &lt;carlos at lanedo com&gt;
+Mikael Ottela &lt;mikael.ottela at ixonos com&gt;
+Ivan Frade &lt;ivan.frade at nokia com&gt;
+Jamie McCracken &lt;jamiemcc at gnome org&gt;
+Anders Aagaard &lt;aagaande at gmail com&gt;
+Anders Rune Jensen &lt;anders iola dk&gt;
+Baptiste Mille-Mathias &lt;baptist millemathias gmail com&gt;
+Christoph Laimburg &lt;christoph laimburg at rolmail net&gt;
+Dan Nicolaescu &lt;dann at ics uci edu&gt;
+Deji Akingunola &lt;dakingun gmail com&gt;
+Edward Duffy &lt;eduffy at gmail com&gt;
+Eskil Bylund &lt;eskil at letterboxes org&gt;
+Eugenio &lt;me at eugesoftware com&gt;
+Fabien VALLON &lt;fabien at sonappart net&gt;
+Gergan Penkov &lt;gergan at gmail com&gt;
+Halton Huo &lt;halton huo at sun com&gt;
+Jaime Frutos Morales &lt;acidborg at gmail com&gt;
+Jedy Wang &lt;jedy wang at sun com&gt;
+Jerry Tan &lt;jerry tan at sun com&gt;
+John Stowers &lt;john.stowers at gmail com&gt;
+Julien &lt;julienc psychologie-fr org&gt;
+Laurent Aguerreche &lt;laurent.aguerreche at free fr&gt;
+Luca Ferretti &lt;elle.uca at libero it&gt;
+Marcus Fritzsch &lt;fritschy at googlemail com&gt;
+Michael Biebl &lt;mbiebl at gmail com&gt;
+Michal Pryc &lt;michal pryc at sun com&gt;
+Mikkel Kamstrup Erlandsen &lt;mikkel kamstrup gmail com&gt;
+Nate Nielsen  &lt;nielsen at memberwewbs com&gt;
+Neil Patel &lt;njpatel at gmail com&gt;
+Richard Quirk &lt;quirky at zoom co uk&gt;
+Saleem Abdulrasool &lt;compnerd at gentoo org&gt;
+Samuel Cormier-Iijima &lt;sciyoshi at gmail com&gt;
+Tobutaz &lt;tobutaz gmail com&gt;
+Tom &lt;tpgww at onepost net&gt;
+Tshepang Lekhonkhobe &lt;tshepang at gmail com&gt;
+Ulrik Mikaelsson &lt;ulrik mikaelsson gmail com&gt;
 </property>
     <property name="logo_icon_name">tracker</property>
     <property name="wrap_license">True</property>
diff --git a/src/tracker-status-icon/tracker-status-icon.c b/src/tracker-status-icon/tracker-status-icon.c
index dc363497b..6bcd40c5d 100644
--- a/src/tracker-status-icon/tracker-status-icon.c
+++ b/src/tracker-status-icon/tracker-status-icon.c
@@ -583,31 +583,46 @@ context_menu_about_cb (GtkMenuItem *item,
 		       gpointer     user_data)
 {
 	const gchar *authors[] = {
-		"Jamie McCracken <jamiemcc at gnome.org>",
-		"Saleem Abdulrasool <compnerd at compnerd.org>"
-                "Laurent Aguerreche <laurent.aguerreche at free fr>",
-		"Luca Ferretti <elle.uca@libero.it>",
-		"Eugenio <me at eugesoftware com>",
-		"Michael Biebl <mbiebl at gmail com>",
+		"Martyn Russell <martyn at lanedo com>",
+		"Jürg Billeter <juerg.billeter at codethink co uk>",
+		"Philip Van Hoof <pvanhoof at gnome org>",
+		"Carlos Garnacho <carlos at lanedo com>",
+		"Mikael Ottela <mikael.ottela at ixonos com>",
+		"Ivan Frade <ivan.frade at nokia com>",
+		"Jamie McCracken <jamiemcc at gnome org>",
+		"Anders Aagaard <aagaande at gmail com>",
+		"Anders Rune Jensen <anders iola dk>",
+		"Baptiste Mille-Mathias <baptist millemathias gmail com>",
+		"Christoph Laimburg <christoph laimburg at rolmail net>",
+		"Dan Nicolaescu <dann at ics uci edu>",
+		"Deji Akingunola <dakingun gmail com>",
 		"Edward Duffy <eduffy at gmail com>",
+		"Eskil Bylund <eskil at letterboxes org>",
+		"Eugenio <me at eugesoftware com>",
+		"Fabien VALLON <fabien at sonappart net>",
 		"Gergan Penkov <gergan at gmail com>",
-		"Deji Akingunola <dakingun gmail com>",
+		"Halton Huo <halton huo at sun com>",
+		"Jaime Frutos Morales <acidborg at gmail com>",
+		"Jedy Wang <jedy wang at sun com>",
+		"Jerry Tan <jerry tan at sun com>",
+		"John Stowers <john.stowers at gmail com>",
 		"Julien <julienc psychologie-fr org>",
-		"Tom <tpgww@onepost.net>",
+		"Laurent Aguerreche <laurent.aguerreche at free fr>",
+		"Luca Ferretti <elle.uca at libero it>",
+		"Marcus Fritzsch <fritschy at googlemail com>",
+		"Michael Biebl <mbiebl at gmail com>",
+		"Michal Pryc <michal pryc at sun com>",
+		"Mikkel Kamstrup Erlandsen <mikkel kamstrup gmail com>",
+		"Nate Nielsen  <nielsen at memberwewbs com>",
+		"Neil Patel <njpatel at gmail com>",
+		"Richard Quirk <quirky at zoom co uk>",
+		"Saleem Abdulrasool <compnerd at gentoo org>",
 		"Samuel Cormier-Iijima <sciyoshi at gmail com>",
-		"Eskil Bylund <eskil at letterboxes org>",
+		"Tobutaz <tobutaz gmail com>",
+		"Tom <tpgww at onepost net>",
+		"Tshepang Lekhonkhobe <tshepang at gmail com>",
 		"Ulrik Mikaelsson <ulrik mikaelsson gmail com>",
-		"tobutaz <tobutaz gmail com>",
-		"Mikkel Kamstrup Erlandsen <mikkel kamstrup gmail com>",
-		"Baptiste Mille-Mathias <baptiste.millemathias gmail com>",
-		"Richard Quirk <quirky@zoom.co.uk>",
-		"Marcus Fritzsch <fritschy at googlemail com>",
-		"Jedy Wang <Jedy Wang at Sun COM>",
-		"Anders Aagaard <aagaande at gmail com>",
-		"Fabien VALLON <fabien at sonappart net>",
-		"Jaime Frutos Morales <acidborg at gmail com>",
-		"Christoph Laimburg <christoph laimburg at rolmail net>",
-		NULL
+		NULL,
 	};
 
 	const gchar *documenters[] = {
@@ -638,10 +653,8 @@ context_menu_about_cb (GtkMenuItem *item,
 
 	gtk_show_about_dialog (NULL,
 			       "version", PACKAGE_VERSION,
-			       "comments", _("Tracker is a tool designed to extract info and metadata about"
-					     " your personal data so that it can be searched easily and quickly"),
-			       "copyright", _("Copyright \xC2\xA9 2005-2009 "
-					      "The Tracker authors"),
+			       "comments", _("A notification icon application to monitor data miners for Tracker"),
+			       "copyright", _("Copyright Tracker Authors 2005-2009"),
 			       "license", license_trans,
 			       "wrap-license", TRUE,
 			       "authors", authors,
@@ -653,7 +666,7 @@ context_menu_about_cb (GtkMenuItem *item,
 			       "translator-credits", _("translator-credits"),
 			       "logo-icon-name", "tracker",
 			       "website", "http://www.tracker-project.org/",
-			       "website-label", _("Tracker Web Site"),
+			       "website-label", "http://www.tracker-project.org/",
 			       NULL);
 
 	g_free (license_trans);