Replace "Evolution" with "Ximian Evolution" in a bunch of user-visible

places.

svn path=/trunk/; revision=12625

5 files changed, 30 insertions, 15 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 8bbd937ec7..eb04501571 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,18 @@
+2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
+
+	* main.c (development_warning): s/Evolution/Ximian Evolution/.
+	(idle_cb): Likewise.
+
+	* e-splash.c (e_splash_construct): s/Evolution/Ximian Evolution/.
+
+	* e-shell-view.c (e_shell_view_construct): s/Evolution/Ximian
+	Evolution/.
+	(update_for_current_uri): Likewise.
+	(update_offline_toggle_status): Likewise.
+
+	* e-shell-view-menu.c (command_about_box): s/Evolution/Ximian
+	Evolution/.
+
 2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
 
 	[Fix #6474 and friends, crash when selecting things from the
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index f62d443091..1d4d4c1671 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -214,11 +214,11 @@ command_about_box (BonoboUIComponent *uih,
 		else
 			version = g_strdup_printf ("%s [%s]", VERSION, SUB_VERSION);
 
-		about_box = gnome_about_new(_("Evolution"),
+		about_box = gnome_about_new(_("Ximian Evolution"),
 					    version,
 					    _("Copyright 1999, 2000, 2001 Ximian, Inc."),
 					    authors,
-					    _("Evolution is a suite of groupware applications\n"
+					    _("Ximian Evolution is a suite of groupware applications\n"
 					      "for mail, calendaring, and contact management\n"
 					      "within the GNOME desktop environment."),
 					    NULL);
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 4186427e93..4161ba727a 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -1275,7 +1275,7 @@ e_shell_view_construct (EShellView *shell_view,
 
 	priv = shell_view->priv;
 
-	view = E_SHELL_VIEW (bonobo_window_construct (BONOBO_WINDOW (shell_view), "evolution", "Evolution"));
+	view = E_SHELL_VIEW (bonobo_window_construct (BONOBO_WINDOW (shell_view), "evolution", "Ximian Evolution"));
 
 	if (!view) {
 		gtk_object_unref (GTK_OBJECT (shell_view));
@@ -1499,9 +1499,9 @@ update_for_current_uri (EShellView *shell_view)
 		title = g_strdup (folder_name);
 
 	if (SUB_VERSION[0] == '\0')
-		utf8_window_title = g_strdup_printf (_("%s - Evolution %s"), title, VERSION);
+		utf8_window_title = g_strdup_printf (_("%s - Ximian Evolution %s"), title, VERSION);
 	else
-		utf8_window_title = g_strdup_printf (_("%s - Evolution %s [%s]"), title, VERSION, SUB_VERSION);
+		utf8_window_title = g_strdup_printf (_("%s - Ximian Evolution %s [%s]"), title, VERSION, SUB_VERSION);
 
 	gtk_window_title = e_utf8_to_gtk_string (GTK_WIDGET (shell_view), utf8_window_title);
 	gtk_window_set_title (GTK_WINDOW (shell_view), gtk_window_title);
@@ -1541,20 +1541,20 @@ update_offline_toggle_status (EShellView *shell_view)
 		icon_pixmap = online_pixmap;
 		icon_mask   = online_mask;
 		sensitive   = TRUE;
-		tooltip     = _("Evolution is currently online.  "
+		tooltip     = _("Ximian Evolution is currently online.  "
 				"Click on this button to work offline.");
 		break;
 	case E_SHELL_LINE_STATUS_GOING_OFFLINE:
 		icon_pixmap = online_pixmap;
 		icon_mask   = online_mask;
 		sensitive   = FALSE;
-		tooltip     = _("Evolution is in the process of going offline.");
+		tooltip     = _("Ximian Evolution is in the process of going offline.");
 		break;
 	case E_SHELL_LINE_STATUS_OFFLINE:
 		icon_pixmap = offline_pixmap;
 		icon_mask   = offline_mask;
 		sensitive   = TRUE;
-		tooltip     = _("Evolution is currently offline.  "
+		tooltip     = _("Ximian Evolution is currently offline.  "
 				"Click on this button to work online.");
 		break;
 	default:
diff --git a/shell/e-splash.c b/shell/e-splash.c
index ff544d14ab..14ab3a7d37 100644
--- a/shell/e-splash.c
+++ b/shell/e-splash.c
@@ -329,7 +329,7 @@ e_splash_construct (ESplash *splash,
 	gtk_window_set_policy (GTK_WINDOW (splash), FALSE, FALSE, FALSE);
 	gtk_window_set_default_size (GTK_WINDOW (splash), image_width, image_height);
 	gnome_window_icon_set_from_file (GTK_WINDOW (splash), EVOLUTION_DATADIR "/pixmaps/evolution.png");
-	gtk_window_set_title (GTK_WINDOW (splash), "Evolution");
+	gtk_window_set_title (GTK_WINDOW (splash), "Ximian Evolution");
 
 }
 
diff --git a/shell/main.c b/shell/main.c
index 41d0156981..aaecaa5f37 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -88,14 +88,14 @@ development_warning (void)
 {
 	GtkWidget *label, *warning_dialog;
 	
-	warning_dialog = gnome_dialog_new ("Evolution " VERSION, GNOME_STOCK_BUTTON_OK, NULL);
+	warning_dialog = gnome_dialog_new ("Ximian Evolution " VERSION, GNOME_STOCK_BUTTON_OK, NULL);
 
 	label = gtk_label_new (
 		/* xgettext:no-c-format */
 		_("Hi.  Thanks for taking the time to download this preview release\n"
-		  "of the Evolution groupware suite.\n"
+		  "of the Ximian Evolution groupware suite.\n"
 		  "\n"
-		  "Evolution is not yet complete. It's getting close, but there are\n"
+		  "Ximian Evolution is not yet complete. It's getting close, but there are\n"
 		  "places where features are either missing or only half working. \n"
 		  "\n"
 		  "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
@@ -114,7 +114,7 @@ development_warning (void)
 	label = gtk_label_new (
 		_(
 		  "Thanks\n"
-		  "The Evolution Team\n"
+		  "The Ximian Evolution Team\n"
 		  ));
 	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
 	gtk_misc_set_alignment(GTK_MISC(label), 1, .5);
@@ -170,7 +170,7 @@ idle_cb (void *data)
 		corba_shell = oaf_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev);
 		if (ev._major != CORBA_NO_EXCEPTION || corba_shell == CORBA_OBJECT_NIL) {
 			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-				  _("Cannot access the Evolution shell."));
+				  _("Cannot access the Ximian Evolution shell."));
 			CORBA_exception_free (&ev);
 			gtk_main_quit ();
 			return FALSE;
@@ -181,7 +181,7 @@ idle_cb (void *data)
 
 	default:
 		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Cannot initialize the Evolution shell: %s"),
+			  _("Cannot initialize the Ximian Evolution shell: %s"),
 			  e_shell_construct_result_to_string (result));
 		CORBA_exception_free (&ev);
 		gtk_main_quit ();