From cec6ae502becc24010dcc2743d91b2257ce089b3 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Mon, 13 Feb 2006 14:36:11 +0000 Subject: 2006-02-13 Karsten Bräckelmann , Andre Klapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- addressbook/ChangeLog | 6 ++++++ addressbook/gui/component/ldap-config.glade | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'addressbook') 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 + + * 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 * 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 @@ True - Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS. - Always + Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL. + SSL encryption True @@ -373,8 +373,8 @@ True - 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. - Whenever Possible + Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS. + TLS encryption True @@ -382,8 +382,8 @@ True - 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. - Never + 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. + No encryption True -- cgit