[evolution/wip/webkit2] Bug 761506 - Rename SSL to TLS

[Milan Crha <mcrha src gnome org>]

commit b503e9b5583861771f5aa38b780655ab6fc57fed
Author: Milan Crha <mcrha redhat com>
Date:   Tue Feb 9 10:30:05 2016 +0100

    Bug 761506 - Rename SSL to TLS

 e-util/e-source-config.c                           |    2 +-
 mail/e-mail-config-summary-page.c                  |    4 ++--
 .../book-config-ldap/evolution-book-config-ldap.c  |    6 +++---
 .../mail-config/e-mail-config-remote-accounts.c    |    2 +-
 modules/mail-config/e-mail-config-smtp-backend.c   |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/e-util/e-source-config.c b/e-util/e-source-config.c
index 4182164..d53a54e 100644
--- a/e-util/e-source-config.c
+++ b/e-util/e-source-config.c
@@ -1436,7 +1436,7 @@ e_source_config_add_secure_connection_for_webdav (ESourceConfig *config,
        extension = e_source_get_extension (scratch_source, extension_name);
 
        widget = gtk_button_new_with_mnemonic (
-               _("Unset _trust for SSL certificate"));
+               _("Unset _trust for SSL/TLS certificate"));
        gtk_widget_set_margin_left (widget, 24);
        e_source_config_insert_widget (config, scratch_source, NULL, widget);
        gtk_widget_show (widget);
diff --git a/mail/e-mail-config-summary-page.c b/mail/e-mail-config-summary-page.c
index f9b3426..417187b 100644
--- a/mail/e-mail-config-summary-page.c
+++ b/mail/e-mail-config-summary-page.c
@@ -139,10 +139,10 @@ mail_config_summary_page_refresh_security_label (ESource *source,
                        gtk_label_set_text (security_label, _("None"));
                        break;
                case CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT:
-                       gtk_label_set_text (security_label, _("SSL"));
+                       gtk_label_set_text (security_label, _("TLS"));
                        break;
                case CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT:
-                       gtk_label_set_text (security_label, _("TLS"));
+                       gtk_label_set_text (security_label, _("STARTTLS"));
                        break;
        }
        g_type_class_unref (enum_class);
diff --git a/modules/book-config-ldap/evolution-book-config-ldap.c 
b/modules/book-config-ldap/evolution-book-config-ldap.c
index c3a77cf..2ff38ef 100644
--- a/modules/book-config-ldap/evolution-book-config-ldap.c
+++ b/modules/book-config-ldap/evolution-book-config-ldap.c
@@ -445,7 +445,7 @@ book_config_build_port_combo (void)
        gtk_list_store_set (
                store, &iter,
                0, G_STRINGIFY (LDAPS_PORT),
-               1, _("LDAP over SSL (deprecated)"), -1);
+               1, _("LDAP over SSL/TLS (deprecated)"), -1);
 
        gtk_list_store_append (store, &iter);
        gtk_list_store_set (
@@ -457,7 +457,7 @@ book_config_build_port_combo (void)
        gtk_list_store_set (
                store, &iter,
                0, G_STRINGIFY (MSGCS_PORT),
-               1, _("Microsoft Global Catalog over SSL"), -1);
+               1, _("Microsoft Global Catalog over SSL/TLS"), -1);
 
        widget = gtk_combo_box_new_with_entry ();
 
@@ -628,7 +628,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend,
                _("None"));
        gtk_combo_box_text_append_text (
                GTK_COMBO_BOX_TEXT (widget),
-               _("LDAP over SSL (deprecated)"));
+               _("LDAP over SSL/TLS (deprecated)"));
        gtk_combo_box_text_append_text (
                GTK_COMBO_BOX_TEXT (widget),
                _("StartTLS (recommended)"));
diff --git a/modules/mail-config/e-mail-config-remote-accounts.c 
b/modules/mail-config/e-mail-config-remote-accounts.c
index b2d4da7..06b7297 100644
--- a/modules/mail-config/e-mail-config-remote-accounts.c
+++ b/modules/mail-config/e-mail-config-remote-accounts.c
@@ -239,7 +239,7 @@ mail_config_remote_backend_insert_widgets (EMailConfigServiceBackend *backend,
        gtk_combo_box_text_append (
                GTK_COMBO_BOX_TEXT (widget),
                "ssl-on-alternate-port",
-               _("SSL on a dedicated port"));
+               _("TLS on a dedicated port"));
        gtk_label_set_mnemonic_widget (label, widget);
        gtk_widget_set_halign (widget, GTK_ALIGN_START);
        gtk_grid_attach (GTK_GRID (container), widget, 1, 0, 1, 1);
diff --git a/modules/mail-config/e-mail-config-smtp-backend.c 
b/modules/mail-config/e-mail-config-smtp-backend.c
index 043b4d1..b9ecd9c 100644
--- a/modules/mail-config/e-mail-config-smtp-backend.c
+++ b/modules/mail-config/e-mail-config-smtp-backend.c
@@ -189,7 +189,7 @@ mail_config_smtp_backend_insert_widgets (EMailConfigServiceBackend *backend,
        gtk_combo_box_text_append (
                GTK_COMBO_BOX_TEXT (widget),
                "ssl-on-alternate-port",
-               _("SSL on a dedicated port"));
+               _("TLS on a dedicated port"));
        gtk_label_set_mnemonic_widget (label, widget);
        gtk_widget_set_halign (widget, GTK_ALIGN_START);
        gtk_grid_attach (GTK_GRID (container), widget, 1, 0, 1, 1);