Anna's dialogs.

2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-config.glade: Anna's dialogs.

	* mail-config.c (mail_config_get_account_by_address):
	Removed. Danw and I decided on setting a X-Evolution-Transport
	header on messages going to the Outbox so we can later guess which
	transport to use when sending it.

	* mail-account-editor.c (apply_changes): Update to some day be
	able to support SSL.
	(construct): Update for Anna's dialogs...

	* subscribe-dialog.c (populate_store_list): Updated to reflect
	past changes to the mail-config API.

svn path=/trunk/; revision=7461

1 files changed, 31 insertions, 40 deletions

diff --git a/mail/mail-config.glade.h b/mail/mail-config.glade.h
index 29e1846d12..55de5a085d 100644
--- a/mail/mail-config.glade.h
+++ b/mail/mail-config.glade.h
@@ -44,46 +44,6 @@ gchar *s = N_("Congratulations, your mail configuration is complete.\n"
               "using Evolution. \n"
               "\n"
               "Click \"Finish\" to save your settings.");
-gchar *s = N_("Account Properties");
-gchar *s = N_("Mail Account");
-gchar *s = N_("Type the name by which you would like to refer to these servers. For example: \"Work\" or \"Home\".");
-gchar *s = N_("User Information");
-gchar *s = N_("Select signature file");
-gchar *s = N_("Name:");
-gchar *s = N_("E-Mail Address:");
-gchar *s = N_("Reply-To:");
-gchar *s = N_("Organization:");
-gchar *s = N_("Signature:");
-gchar *s = N_("General");
-gchar *s = N_("Incoming Mail Server");
-gchar *s = N_("Save password");
-gchar *s = N_("Plain Text\n"
-              "Kerberos\n"
-              "CRAM-MD5\n"
-              "DIGEST-MD5\n"
-              "");
-gchar *s = N_("This server requires a secure connection (SSL)");
-gchar *s = N_("Username:");
-gchar *s = N_("Password:");
-gchar *s = N_("Authentication:");
-gchar *s = N_("Hostname:");
-gchar *s = N_("Type:");
-gchar *s = N_("Outgoing Mail Server");
-gchar *s = N_("None\n"
-              "CRAM-MD5\n"
-              "");
-gchar *s = N_("Sendmail\n"
-              "SMTP\n"
-              "");
-gchar *s = N_("This server requires a secure connection (SSL)");
-gchar *s = N_("Type:");
-gchar *s = N_("Hostname:");
-gchar *s = N_("Authentication:");
-gchar *s = N_("Servers");
-gchar *s = N_("Miscellaneous");
-gchar *s = N_("Keep mail on server");
-gchar *s = N_("Path:");
-gchar *s = N_("Advanced");
 gchar *s = N_("Evolution Mail Configuration");
 gchar *s = N_("Account");
 gchar *s = N_("Type");
@@ -97,3 +57,34 @@ gchar *s = N_("Add");
 gchar *s = N_("Edit");
 gchar *s = N_("Delete");
 gchar *s = N_("News");
+gchar *s = N_("Edit Mail Configuration Settings");
+gchar *s = N_("Identity");
+gchar *s = N_("Full Name:");
+gchar *s = N_("Email Address:");
+gchar *s = N_("Add Optional Fields...");
+gchar *s = N_("Receiving Mail");
+gchar *s = N_("IMAP");
+gchar *s = N_("Type:");
+gchar *s = N_("Server:");
+gchar *s = N_("Username:");
+gchar *s = N_("Path:");
+gchar *s = N_("Authentication:");
+gchar *s = N_("Password:");
+gchar *s = N_("Kerberos \n"
+              "Plain-text Password\n"
+              "");
+gchar *s = N_("Don't delete messages from server");
+gchar *s = N_("Sending Mail");
+gchar *s = N_("Server:");
+gchar *s = N_("Type:");
+gchar *s = N_("SMTP");
+gchar *s = N_("Authentication:");
+gchar *s = N_("Kerberos \n"
+              "Plain-text Password\n"
+              "");
+gchar *s = N_("Additional Identity Fields");
+gchar *s = N_("Optional Information");
+gchar *s = N_("Organization:");
+gchar *s = N_("Signature file:");
+gchar *s = N_("Select your signature file");
+gchar *s = N_("Reply-to:");