From a5facd0e78bda439cd4e72f50817fe5f5dbb910c Mon Sep 17 00:00:00 2001
From: Anna Marie Dirks <anna@ximian.com>
Date: Mon, 13 Aug 2001 21:02:59 +0000
Subject: Changed all instances of "Wizard" and "Druid" to "Assistant".

2001-08-13  Anna Marie Dirks <anna@ximian.com>
	* mail-config.glade: Changed all instances of "Wizard" and "Druid"
	to "Assistant".

	* mail-config-druid.c: Ditto.

svn path=/trunk/; revision=11960
---
 mail/ChangeLog           | 8 +++++++-
 mail/mail-config-druid.c | 2 +-
 mail/mail-config.glade   | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mail/ChangeLog b/mail/ChangeLog
index c595cddcd6..7389e9368f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-13  Anna Marie Dirks <anna@ximian.com>
+	
+	* mail-config.glade: Changed all instances of "Wizard" and "Druid"
+	to "Assistant".
+
+	* mail-config-druid.c: Ditto.
+	
 2001-08-13  Anna Marie Dirks <anna@ximian.com>
 
 	* mail-accounts.c: Changed the title of the Mail Settings
@@ -166,7 +173,6 @@
 
 	* message-list.c (message_list_select): Fix inline documentation.
 
->>>>>>> 1.1546
 2001-08-09  Anna Marie Dirks <anna@ximian.com>
 
 	Fixes bug #6918
diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c
index 59d4a0a136..a60ba37c09 100644
--- a/mail/mail-config-druid.c
+++ b/mail/mail-config-druid.c
@@ -460,7 +460,7 @@ construct (MailConfigDruid *druid)
 	druid->druid = GNOME_DRUID (widget);
 
 	/* set window title */
-	gtk_window_set_title (GTK_WINDOW (druid), _("Evolution Account Wizard"));
+	gtk_window_set_title (GTK_WINDOW (druid), _("Evolution Account Assistant"));
 	gtk_window_set_policy (GTK_WINDOW (druid), FALSE, TRUE, FALSE);
 	gtk_window_set_modal (GTK_WINDOW (druid), TRUE);
 	gtk_object_set (GTK_OBJECT (druid), "type", GTK_WINDOW_DIALOG, NULL);
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index d32051c9aa..c7a60c8baf 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -35,7 +35,7 @@
       <class>GnomeDruidPageStart</class>
       <name>druidpagestart1</name>
       <title>Mail Configuration</title>
-      <text>Welcome to the Evolution Mail Configuration Druid.
+      <text>Welcome to the Evolution Mail Configuration Assistant.
 
 Click &quot;Next&quot; to begin. </text>
       <title_color>255,255,255</title_color>
@@ -2169,7 +2169,7 @@ Kerberos
   <class>GtkWindow</class>
   <name>mail_accounts_window</name>
   <visible>False</visible>
-  <title>window1</title>
+  <title>Mail Settings</title>
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
-- 
cgit v1.2.3