2006-02-13 Karsten Bräckelmann <guenther@rudersport.de>,

	    Andre Klapper  <a9016009@gmx.de>

	* addressbook/ldap-config.glade:
	* mail/em-account-editor.c: Fix the Security options to finally be
	descriptive, rather than obscuring. Fixes the UI part of bug #321797.

svn path=/trunk/; revision=31507

4 files changed, 29 insertions, 9 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 3d8c627907..8aea723121 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-13  Andre Klapper  <a9016009@gmx.de>
+ 
+	* ldap-config.glade: Fix the Security options to finally be 
+	descriptive, rather than obscuring. Identical to the changes in
+	mail/em-account-editor.c to fix the UI part of bug #321797.
+
 2006-02-05  Karsten Bräckelmann  <guenther@rudersport.de>
 
 	* gui/component/GNOME_Evolution_Addressbook.server.in.in: 
diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade
index 13ea0c4386..1cfb62ace5 100644
--- a/addressbook/gui/component/ldap-config.glade
+++ b/addressbook/gui/component/ldap-config.glade
@@ -364,8 +364,8 @@
 				      <child>
 					<widget class="GtkMenuItem" id="convertwidget42">
 					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS.</property>
-					  <property name="label" translatable="yes">Always</property>
+					  <property name="tooltip" translatable="yes">Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL.</property>
+					  <property name="label" translatable="yes">SSL encryption</property>
 					  <property name="use_underline">True</property>
 					</widget>
 				      </child>
@@ -373,8 +373,8 @@
 				      <child>
 					<widget class="GtkMenuItem" id="convertwidget43">
 					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure.</property>
-					  <property name="label" translatable="yes">Whenever Possible</property>
+					  <property name="tooltip" translatable="yes">Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS.</property>
+					  <property name="label" translatable="yes">TLS encryption</property>
 					  <property name="use_underline">True</property>
 					</widget>
 				      </child>
@@ -382,8 +382,8 @@
 				      <child>
 					<widget class="GtkMenuItem" id="convertwidget44">
 					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Selecting this option means that your server does not support either SSL or TLS.  This means that your connection will be insecure, and that you will be vulnerable to security exploits. </property>
-					  <property name="label" translatable="yes">Never</property>
+					  <property name="tooltip" translatable="yes">Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits.</property>
+					  <property name="label" translatable="yes">No encryption</property>
 					  <property name="use_underline">True</property>
 					</widget>
 				      </child>
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1d83cbad9f..0af2a9d0f5 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-13  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-13  Rohini S  <srohini@novell.com>
 
 	** Fixes bug #221270.
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 1387037046..64154cf2c5 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -299,9 +299,17 @@ static struct {
 	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]))