From Malcolm Tredinnick <malcolm@commsecure.com.au>, Fixes #66261

2004-09-21  JP Rosevear  <jpr@novell.com>

	From Malcolm Tredinnick <malcolm@commsecure.com.au>, Fixes #66261

	* e-shell-window-commands.c (about_box_new): don't show
	"translator-credits" if not translated

2004-09-07  JP Rosevear  <jpr@novell.com>

	Fixes #17338

	* e-shell-window-commands.c (about_box_new): use per language
	translator credits, update authors lists (not strictly authors,
	but we have a lot of helpful people)

svn path=/trunk/; revision=27323

2 files changed, 269 insertions, 139 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index c04f5d0863..c39495bda6 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,18 @@
+2004-09-21  JP Rosevear  <jpr@novell.com>
+
+	From Malcolm Tredinnick <malcolm@commsecure.com.au>, Fixes #66261
+	
+	* e-shell-window-commands.c (about_box_new): don't show
+	"translator-credits" if not translated
+
+2004-09-07  JP Rosevear  <jpr@novell.com>
+
+	Fixes #17338
+	
+	* e-shell-window-commands.c (about_box_new): use per language
+	translator credits, update authors lists (not strictly authors,
+	but we have a lot of helpful people)
+
 2004-09-13  Sivaiah Nallagatla <snallagatla@novell.com>
 
 	* e-shell.c (offline_procedure_finished_cb)
diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c
index 8851f35138..dd8e1a8c92 100644
--- a/shell/e-shell-window-commands.c
+++ b/shell/e-shell-window-commands.c
@@ -135,162 +135,273 @@ command_submit_bug (BonoboUIComponent *uih,
 /* must be in utf8, the weird breaking of escaped strings
    is so the hex escape strings dont swallow too many chars */
 static const char *authors[] = {
-	"Darin Adler",
-	"Arturo Espinosa Aldama",
-	"H\xC3\xA9" "ctor Garc\xC3\xAD" "a \xC3\x81" "lvarez",
-	"Jes\xC3\xBA" "s Bravo \xC3\x81" "lvarez",
-	"Seth Alves",
-	"Marius Andreiana",
-	"Sean Atkinson",
-	"Szabolcs BAN",
-	"Timur Bakeyev",
-	"Martin Baulig",
-	"Frank Belew",
-	"Dan Berger",
-	"Jacob Berkman",
-	"Matt Bissiri",
-	"Jonathan Blandford",
-	"Richard Boulton",
-	"Robert Brady",
-	"Kevin Breit",
-	"Martha Burke",
-	"Dave Camp",
-	"Ian Campbell",
-	"Anders Carlsson",
-	"Damon Chaplin",
+	"Aaron Weber",
 	"Abel Cheung",
-	"Zbigniew Chyla",
-	"Clifford R. Conover",
-	"Sam Creasey",
-	"Frederic Crozat",
-	"Wayne Davis",
-	"Rodney Dawes",
-	"Jos Dehaes",
-	"Fatih Demir",
-	"Arik Devens",
-	"Anna Marie Dirks",
-	"Bob Doan",
-	"Radek Doul\xC3\xADk",
-	"Edd Dumbill",
-	"Larry Ewing",
-	"Gilbert Fang",
-	"Francisco Javier F. Serrador",
-	"Nuno Ferreira",
-	"Valek Filippov",
-	"Nat Friedman",
-	"Sean Gao",
-	"Jeff Garzik",
-	"Nike Gerdts",
-	"Grzegorz Goawski",
-	"Jody Goldberg",
-	"Pablo Gonzalo del Campo",
-	"Mark Gordon",
-	"Kenny Graunke",
+	"Adam Weinberger",
+	"Akira TAGOH",
+	"Alastair McKinstry",
 	"Alex Graveley",
-	"Bertrand Guiheneuf",
-	"Jean-Noel Guiheneuf",
-	"Mikael Hallendal",
-	"Raja R Harinath",
-	"Heath Harrelson",
-	"Taylor Hayward",
-	"Jon K Hellan",
-	"Martin Hicks",
-	"Iain Holmes",
-	"Max Horn",
-	"Greg Hudson",
-	"Richard Hult",
+	"Alex Jiang",
+	"Alfred Peng",
+	"Almer S. Tigelaar",
+	"Anders Carlsson",
+	"Andre Klapper"
 	"Andreas Hyden",
-	"Miguel de Icaza",
-	"Hans Petter Jansson",
-	"Jack Jia",
-	"Wang Jian",
-	"Sanshao Jiang",
+	"Andrew T. Veliath",
+	"Andrew Wu",
+	"Ankit Patel",
+	"Anna Marie Dirks",
+	"Antonio Xu",
+	"Arafat Medini",
+	"Ariel Rios",
+	"Arik Devens",
+	"Arturo Espinosa Aldama",
+	"Bastien Nocera",
 	"Benjamin Kahn",
-	"Yanko Kaneti",
-	"Lauris Kaplinski",
-	"Jeremy Katz",
-	"Mike Kestner",
+	"Bertrand Guiheneuf",
+	"Bill Zhu",
+	"Bjorn Torkelsson"
+	"Bob Doan",
+	"Bolian Yin",
+	"Bruce Tao",
+	"Calvin Liu",
+	"Cantona Su",
+	"Carl Sun",
+	"Carlos Garnacho Parro",
+	"Carlos Perell\xC3\xB3" " Mar\xC3\xAD" "n",
+	"Carsten Schaar",
+	"Changwoo Ryu",
+	"Charles Zhang",
+	"Chema Celorio",
+	"Chenthill Palanisamy",
+	"Chris Lahey",
+	"Chris Toshok",
+	"Christian Hammond",
+	"Christian Kellner",
 	"Christian Kreibich",
-	"Nicholas J Kreucher",
-	"Ronald Kuetemeier",
-	"Tuomas Kuosmanen",
-	"Mathieu Lacage",
+	"Christian Neumair",
+	"Christophe Fergeau",
+	"Christophe Merlet",
+	"Christopher Blizzard",
 	"Christopher J. Lahey",
-	"Eneko Lacunza",
-	"Miles Lane",
-	"Jason Leach",
-	"Elliot Lee",
-	"Ji Lee",
-	"Timothy Lee",
-	"T\xC3\xB5" "ivo Leedj\xC3\xA4" "rv",
-	"Richard Li",
-	"Matthew Loper",
+	"Clifford R. Conover",
+	"Cody Russell",
+	"Craig Small",
+	"Damon Chaplin",
+	"Dan Berger",
+	"Dan Winship",
+	"Danilo \xC5\xA0" "egan",
+	"Darin Adler",
+	"Dave Camp",
+	"Dave Fallon",
+	"Dave West",
+	"David Malcolm",
+	"David Moore",
+	"David Trowbridge",
+	"David Woodhouse",
+	"Dietmar Maurer",
 	"Duarte Loreto",
-	"Harry Lu",
-	"Michael MacDonald",
 	"Duncan Mak",
-	"Kjartan Maraas",
-	"Garardo Marin",
-	"Matt Martin",
-	"Carlos Perell\xC3\xB3" " Mar\xC3\xAD" "n",
-	"Dietmar Maurer",
-	"William Jon McCann",
-	"Mike McEwan",
-	"Alastair McKinstry",
-	"Michael Meeks",
-	"Federico Mena",
-	"Christophe Merlet",
-	"Michael M. Morrison",
-	"Rodrigo Moya",
-	"Steve Murphy",
-	"Yukihiro Nakai",
-	"Martin Norb\xC3\xA4" "ck",
-	"Tomas Ogren",
-	"Ismael Olea",
+	"ERDI Gergo",
+	"Edd Dumbill",
+	"Edgar Luna Díaz",
+	"Elliot Lee",
+	"Elliot Turner",
+	"Eneko Lacunza",
+	"Enver ALTIN",
+	"Eric Zhao",
 	"Eskil Heyn Olsen",
-	"Sergey Panov",
+	"Ettore Perazzoli",
+	"Fatih Demir",
+	"Federico Mena Quintero",
+	"Fernando Herrera",
+	"Francisco Javier F. Serrador",
+	"Frank Belew",
+	"Frederic Crozat",
+	"Garardo Marin",
+	"Gary Ekker",
 	"Gediminas Paulauskas",
-	"Jesse Pavel",
+	"Gil Osher",
+	"Gilbert Fang",
+	"Grahame Bowland",
+	"Greg Hudson",
+	"Gregory McLean",
+	"Grzegorz Goawski",
+	"Gustavo Maciel Dias Vieira",
+	"H P Nadig",
+	"H\xC3\xA9" "ctor Garc\xC3\xAD" "a \xC3\x81" "lvarez",
+	"Hans Petter Jansson",
+	"Hao Sheng",
+	"Hari Prasad Nadig",
+	"Harish Krishnaswamy",
+	"Harry Lu",
+	"Hasbullah Bin Pit",
 	"Havoc Pennington",
-	"Ettore Perazzoli",
-	"Petta Pietikainen",
+	"Heath Harrelson",
 	"Herbert V. Riedel",
-	"Ariel Rios",
+	"Iain Holmes",
+	"Ian Campbell",
+	"Ismael Olea",
+	"Israel Escalante",
+	"J.H.M. Dassen (Ray)",
 	"JP Rosevear",
-	"Cody Russell",
-	"Martyn Russell",
-	"Changwoo Ryu",
-	"Pablo Saratxaga",
-	"Carsten Schaar",
-	"Joe Shaw",
-	"Timo Sirainen",
-	"Craig Small",
-	"Maciej Stachowiak",
-	"Jeffrey Stedfast",
+	"Jack Jia",
+	"Jacob Berkman",
+	"Jaka Mocnik",
 	"Jakub Steiner",
-	"Russell Steinthal",
-	"Vadim Strizhevsky",
-	"Yuri Syrota",
+	"James Henstridge",
+	"James Willcox",
+	"Jan Arne Petersen",
+	"Jason Leach",
 	"Jason Tackaberry",
-	"Peter Teichman",
-	"Chris Toshok",
-	"Tom Tromey",
+	"Jean-Noel Guiheneuf",
+	"Jeff Garzik",
+	"Jeffrey Stedfast",
+	"Jeremy Katz",
+	"Jeremy Wise",
+	"Jerome Lacoste",
+	"Jes\xC3\xBA" "s Bravo \xC3\x81" "lvarez",
+	"Jesse Pavel",
+	"Ji Lee",
+	"Jody Goldberg",
+	"Joe Shaw",
+	"Jon K Hellan",
+	"Jon Oberheide",
 	"Jon Trowbridge",
-	"Andrew T. Veliath",
-	"Gustavo Maciel Dias Vieira",
+	"Jonas Borgstr",
+	"Jonathan Blandford",
+	"Jos Dehaes",
+	"Jukka Zitting",
+	"J\xC3\xBC" "rg Billeter",
+	"Karl Eichwalder",
+	"Karsten Br\xC3\xA4" "ckelmann",
+	"Kenneth Christiansen",
+	"Kenny Graunke",
+	"Kevin Breit",
+	"Kidd Wang",
+	"Kjartan Maraas",
+	"Larry Ewing",
+	"Laurent Dhima",
+	"Lauris Kaplinski",
+	"Leon Zhang",
+	"Lorenzo Gil Sanchez",
 	"Luis Villa",
-	"Stanislav Visnovsky",
-	"Aaron Weber",
-	"Dave West",
-	"Peter Williams",
+	"Maciej Stachowiak",
+	"Malcolm Tredinnick",
+	"Marius Andreiana",
+	"Marius Vollmer",
+	"Mark Crichton",
+	"Mark Gordon",
+	"Martha Burke",
+	"Martin Baulig",
+	"Martin Hicks",
+	"Martin Norb\xC3\xA4" "ck",
+	"Martyn Russell",
+	"Mathieu Lacage",
+	"Matt Bissiri",
+	"Matt Martin",
 	"Matt Wilson",
+	"Matthew Loper",
 	"Matthew Wilson",
-	"Dan Winship",
-	"Jeremy Wise",
-	"Leon Zhang",
-	"Philip Zhao",
-	"Jukka Zitting",
+	"Max Horn",
+	"Maxx Cao",
+	"Meilof Veeningen",
+	"Michael M. Morrison",
+	"Michael MacDonald",
+	"Michael Meeks",
+	"Michael Terry",
 	"Michael Zucchi",
+	"Michel Daenzer",
+	"Miguel de Icaza",
+	"Mikael Hallendal",
+	"Mike Castle",
+	"Mike Kestner",
+	"Mike McEwan",
+	"Miles Lane",
+	"Nat Friedman",
+	"Nicel KM",
+	"Nicholas J Kreucher",
+	"Nike Gerdts",
+	"Nuno Ferreira",
+	"P Chenthill",
+	"Pablo Gonzalo del Campo",
+	"Pablo Saratxaga",
+	"Paolo Molaro",
+	"Parthasarathi S A",
+	"Pavel Cisler",
+	"Pavel Roskin",
+	"Peter Pouliot",
+	"Peter Teichman",
+	"Peter Williams",
+	"Petta Pietikainen",
+	"Philip Zhao",
+	"Pratik V. Parikh",
+	"Priit Laes",
+	"Priyanshu Raj",
+	"Radek Doul\xC3\xADk",
+	"Raja R Harinath",
+	"Ray Strode",
+	"Richard Boulton",
+	"Richard Hult",
+	"Richard Li",
+	"Robert Brady",
+	"Robert Sedak",
+	"Rodney Dawes",
+	"Rodrigo Moya",
+	"Ronald Kuetemeier",
+	"Roozbeh Pournader",
+	"Ross Burton",
+	"Russell Steinthal",
+	"Ryan P. Skadberg",
+	"S N Tejasvi",
+	"Sam Creasey",
+	"Sam\xC3\xBA" "el J\xC3\xB3" "n Gunnarsson",
+	"Sanlig Badral",
+	"Sanshao Jiang",
+	"Sarfraaz Ahmed",
+	"Sean Atkinson",
+	"Sean Gao",
+	"Sebastian Rittau",
+	"Sebastian Wilhelmi",
+	"Sergey Panov",
+	"Seth Alves",
+	"Sivaiah Nallagatla",
+	"Stanislav Brabec",
+	"Stanislav Visnovsky",
+	"Steve Murphy",
+	"Stuart Parmenter",
+	"Suresh Chandrasekharan",
+	"Sushma Rai",
+	"Szabolcs BAN",
+	"T\xC3\xB5" "ivo Leedj\xC3\xA4" "rv",
+	"Taylor Hayward",
+	"Tim Wo",
+	"Timo Sirainen",
+	"Timothy Lee",
+	"Timur Bakeyev",
+	"Tom Tromey",
+	"Tomas Ogren",
+	"Tomislav Vujec",
+	"Trent Lloyd",
+	"Tuomas J. Lukka",
+	"Tuomas Kuosmanen",
+	"Umesh Tiwari",
+	"Umeshtej",
+	"V Ravi Kumar Raju",
+	"Vadim Strizhevsky",
+	"Valek Filippov",
+	"Vardhman Jain",
+	"Vladimir Vukicevic",
+	"Wang Jian",
+	"Wayne Davis",
+	"William Jon McCann",
+	"Xan Lopez",
+	"Yanko Kaneti",
+	"Yong Sun",
+	"Yuedong Du",
+	"Yukihiro Nakai",
+	"Yuri Syrota",
+	"Zbigniew Chyla",
 	NULL
 };
 static const char *documentors[] = { 
@@ -298,7 +409,6 @@ static const char *documentors[] = {
 	"David Trowbridge",
 	NULL
 };
-static const char *translator_credits = "The GNOME Translation Project";
 
 static GtkWidget *
 about_box_new (void)
@@ -307,8 +417,13 @@ about_box_new (void)
 	GdkPixbuf *pixbuf = NULL;
 	char copyright[1024];
 	char *filename = NULL;
+
+	/* The translator-credits string is for translators to list
+	 * per language credits for translation, displayed in the
+	 * about box*/
+	char *translator_credits = _("translator-credits");
 	
-	g_sprintf (copyright, "Copyright \xC2\xA9 1999 - 2004 Novell, Inc.");
+	g_sprintf (copyright, "Copyright \xC2\xA9 1999 - 2004 Novell, Inc. and Others");
                                                                                 
 	filename = g_build_filename (EVOLUTION_DATADIR, "pixmaps",
 				     "evolution-1.5.png", NULL);
@@ -322,7 +437,7 @@ about_box_new (void)
 				     copyright,
 				     _("Groupware Suite"),
 				     authors, documentors,
-				     translator_credits,
+				     strcmp (translator_credits, "translator-credits") ? translator_credits : NULL,
 				     pixbuf);
 	
         if (pixbuf != NULL)