aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-accounts.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4ef4c7b3c1..00e37a4346 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-13 Anna Marie Dirks <anna@ximian.com>
+ * mail-accounts.c: Changed the title of the Mail Settings
+ dialog from "Evolution Account Manager" to "Mail Settings" .
+
2001-08-13 Jeffrey Stedfast <fejj@ximian.com>
* mail-callbacks.c (expunge_folder): Confirm that the user really
@@ -155,6 +159,7 @@
* 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-accounts.c b/mail/mail-accounts.c
index 88cb204a87..e8e692d8ef 100644
--- a/mail/mail-accounts.c
+++ b/mail/mail-accounts.c
@@ -738,7 +738,7 @@ construct (MailAccountsDialog *dialog)
gtk_widget_reparent (notebook, GNOME_DIALOG (dialog)->vbox);
/* give our dialog an Close button and title */
- gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Account Manager"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Mail Settings"));
gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, TRUE);
gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 300);
gnome_dialog_append_button (GNOME_DIALOG (dialog), GNOME_STOCK_BUTTON_CLOSE);