Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3796
diff -u -r1.3796 ChangeLog
--- ChangeLog	10 Feb 2006 22:28:01 -0000	1.3796
+++ ChangeLog	11 Feb 2006 05:29:27 -0000
@@ -1,5 +1,11 @@
 2006-02-11  Karsten Bräckelmann  <guenther@rudersport.de>
 
+	* em-account-editor.c: Fix the Account Editor / Security option to
+	finally be descriptive, rather than obscuring. Fixes the UI part
+	of bug #321797.
+
+2006-02-11  Karsten Bräckelmann  <guenther@rudersport.de>
+
 	* message-list.c (message_list_construct): 
 	* em-format-html-display.c (efhd_attachment_button, efhd_add_bar): 
 	* em-account-prefs.c (em_account_prefs_treeview_new): 
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	11 Feb 2006 05:29:27 -0000
@@ -299,9 +299,17 @@
 	char *label;
 	char *value;
 } ssl_options[] = {
-	{ N_("Never"), "never" },
-	{ N_("Whenever Possible"), "when-possible" },
-	{ N_("Always"), "always" }
+	/* Translators: This string is a "Use secure connection" option for
+	   the Mailer. It will not use an encrypted connection. */
+	{ N_("No encryption"), "never" },
+	/* Translators: This string is a "Use secure connection" option for
+	   the Mailer. TLS (Transport Layer Security) is commonly known by
+	   this abbreviation. */
+	{ N_("TLS encryption"), "when-possible" },
+	/* Translators: This string is a "Use secure connection" option for
+	   the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+	   abbreviation. */
+	{ N_("SSL encryption"), "always" }
 };
 
 #define num_ssl_options (sizeof (ssl_options) / sizeof (ssl_options[0]))
