Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3795
diff -u -r1.3795 ChangeLog
--- ChangeLog	10 Feb 2006 20:57:26 -0000	1.3795
+++ ChangeLog	10 Feb 2006 21:15:43 -0000
@@ -1,5 +1,9 @@
 2006-02-10  Karsten Bräckelmann  <guenther@rudersport.de>
 
+	* em-account-editor.c: Fiy the Account Editor / Security option to
+	finally be descriptive, rather than obscuring. Fixes the UI part
+	of bug #321797.
+
 	* em-utils.c (em_utils_edit_filters): Fix Filters dialog window
 	title to be HIG compliant. Fixes bug #330650.
 
Index: em-account-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-account-editor.c,v
retrieving revision 1.41
diff -u -r1.41 em-account-editor.c
--- em-account-editor.c	6 Feb 2006 09:16:47 -0000	1.41
+++ em-account-editor.c	10 Feb 2006 21:15:43 -0000
@@ -300,8 +300,8 @@
 	char *value;
 } ssl_options[] = {
 	{ N_("Never"), "never" },
-	{ N_("Whenever Possible"), "when-possible" },
-	{ N_("Always"), "always" }
+	{ N_("TLS"), "when-possible" },
+	{ N_("SSL"), "always" }
 };
 
 #define num_ssl_options (sizeof (ssl_options) / sizeof (ssl_options[0]))
