From: Paul Date: Tue, 25 Oct 2016 09:36:35 +0000 (+0100) Subject: rename SSL to SSL/TLS X-Git-Tag: 3.14.1~16 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=112b21df10378b0352501528aab3bd587247cd0c rename SSL to SSL/TLS Using just 'TLS' is ambiguous. Sometimes it refers to encrypted connection with TLSv1.0/1.1/1.2, sometimes it refers to STARTTLS command. So be more specific about what is what. Patch by Christian Hesse, with some modifications --- diff --git a/src/account.c b/src/account.c index e2f472f57..07ce3750f 100644 --- a/src/account.c +++ b/src/account.c @@ -1288,17 +1288,17 @@ static void account_list_view_add(PrefsAccount *ac_prefs) #ifdef USE_GNUTLS protocol = ac_prefs->protocol == A_POP3 ? (ac_prefs->ssl_pop == SSL_TUNNEL ? - "POP3 (SSL)" : + "POP3 (SSL/TLS)" : ac_prefs->ssl_pop == SSL_STARTTLS ? - "POP3 (TLS)" : "POP3") : + "POP3 (STARTTLS)" : "POP3") : ac_prefs->protocol == A_IMAP4 ? (ac_prefs->ssl_imap == SSL_TUNNEL ? - "IMAP4 (SSL)" : + "IMAP4 (SSL/TLS)" : ac_prefs->ssl_imap == SSL_STARTTLS ? - "IMAP4 (TLS)" : "IMAP4") : + "IMAP4 (STARTTLS)" : "IMAP4") : ac_prefs->protocol == A_NNTP ? (ac_prefs->ssl_nntp == SSL_TUNNEL ? - "NNTP (SSL)" : "NNTP") : + "NNTP (SSL/TLS)" : "NNTP") : ac_prefs->protocol == A_LOCAL ? "Local" : ac_prefs->protocol == A_NONE ? "SMTP" : "-"; #else diff --git a/src/addressbook.c b/src/addressbook.c index 94579bd55..403b556c9 100644 --- a/src/addressbook.c +++ b/src/addressbook.c @@ -539,7 +539,7 @@ static ErrMsgTableEntry _lutErrorsLDAP_[] = { { LDAPRC_CRITERIA, N_("Error in LDAP search criteria") }, { LDAPRC_NOENTRIES, N_("No LDAP entries found for search criteria") }, { LDAPRC_STOP_FLAG, N_("LDAP search terminated on request") }, - { LDAPRC_TLS, N_("Error starting TLS connection") }, + { LDAPRC_TLS, N_("Error starting STARTTLS connection") }, { LDAPRC_NODN, N_("Distinguished Name (dn) is missing") }, { LDAPRC_NAMING_VIOLATION, N_("Missing required information") }, { LDAPRC_ALREADY_EXIST, N_("Another contact exists with that key") }, diff --git a/src/common/session.c b/src/common/session.c index 356c32187..5e38f55e3 100644 --- a/src/common/session.c +++ b/src/common/session.c @@ -179,8 +179,8 @@ static gint session_connect_cb(SockInfo *sock, gpointer data) if (session->ssl_type == SSL_TUNNEL) { sock_set_nonblocking_mode(sock, FALSE); if (!ssl_init_socket(sock)) { - g_warning("can't initialize SSL."); - log_error(LOG_PROTOCOL, _("SSL handshake failed\n")); + g_warning("can't initialize SSL/TLS."); + log_error(LOG_PROTOCOL, _("SSL/TLS handshake failed\n")); session->state = SESSION_ERROR; if (session->connect_finished) session->connect_finished(session, FALSE); @@ -393,7 +393,7 @@ gint session_start_tls(Session *session) sock_set_nonblocking_mode(session->sock, FALSE); if (!ssl_init_socket(session->sock)) { - g_warning("couldn't start TLS session."); + g_warning("couldn't start STARTTLS session."); if (nb_mode) sock_set_nonblocking_mode(session->sock, session->nonblocking); return -1; diff --git a/src/common/smtp.c b/src/common/smtp.c index 144caf04a..2460f7e04 100644 --- a/src/common/smtp.c +++ b/src/common/smtp.c @@ -614,7 +614,7 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg) case SMTP_STARTTLS: #ifdef USE_GNUTLS if (session_start_tls(session) < 0) { - log_warning(LOG_PROTOCOL, _("couldn't start TLS session\n")); + log_warning(LOG_PROTOCOL, _("couldn't start STARTTLS session\n")); smtp_session->state = SMTP_ERROR; smtp_session->error_val = SM_ERROR; return -1; diff --git a/src/common/socket.c b/src/common/socket.c index b8f80a88a..19fb5e755 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -1270,7 +1270,7 @@ static gint ssl_read(gnutls_session_t ssl, gchar *buf, gint len) return -1; default: - debug_print("Unexpected SSL read result %d\n", r); + debug_print("Unexpected SSL/TLS read result %d\n", r); errno = EIO; return -1; } diff --git a/src/common/ssl.c b/src/common/ssl.c index 7637bf07d..2bb982095 100644 --- a/src/common/ssl.c +++ b/src/common/ssl.c @@ -449,7 +449,7 @@ gboolean ssl_init_socket(SockInfo *sockinfo) #endif if ((r = SSL_connect_nb(session)) < 0) { - g_warning("SSL connection failed (%s)", gnutls_strerror(r)); + g_warning("SSL/TLS connection failed (%s)", gnutls_strerror(r)); gnutls_certificate_free_credentials(xcred); gnutls_deinit(session); return FALSE; diff --git a/src/editldap.c b/src/editldap.c index a81d9b1d5..9492e7be1 100644 --- a/src/editldap.c +++ b/src/editldap.c @@ -467,16 +467,17 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) { gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_port), TRUE); #if (defined USE_LDAP_TLS || defined G_OS_WIN32) - enable_tls_checkbtn = gtk_check_button_new_with_label(_("TLS")); - enable_ssl_checkbtn = gtk_check_button_new_with_label(_("SSL")); + enable_tls_checkbtn = gtk_check_button_new_with_label(_("STARTTLS")); + enable_ssl_checkbtn = gtk_check_button_new_with_label(_("SSL/TLS")); SET_TOGGLE_SENSITIVITY_REVERSE(enable_tls_checkbtn, enable_ssl_checkbtn); SET_TOGGLE_SENSITIVITY_REVERSE(enable_ssl_checkbtn, enable_tls_checkbtn); CLAWS_SET_TIP(enable_tls_checkbtn, _( - "Enable secure connection to the LDAP server via TLS. " + "Enable secure connection to the LDAP server via STARTTLS. " + "Connection starts unencrypted and is secured by STARTTLS command. " "If connection fails, be sure to check the correct " "configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)." )); CLAWS_SET_TIP(enable_ssl_checkbtn, _( - "Enable secure connection to the LDAP server via SSL. " + "Enable secure connection to the LDAP server via SSL/TLS. " "If connection fails, be sure to check the correct " "configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)." )); diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c index 4bfa537c5..23a8d9fc4 100644 --- a/src/etpan/imap-thread.c +++ b/src/etpan/imap-thread.c @@ -1121,7 +1121,7 @@ static void starttls_run(struct etpan_thread_op * op) r = mailimap_starttls(param->imap); result->error = r; - debug_print("imap starttls run - end %i\n", r); + debug_print("imap STARTTLS run - end %i\n", r); if (r == 0) { mailimap *imap = param->imap; @@ -1132,14 +1132,14 @@ static void starttls_run(struct etpan_thread_op * op) plain_low = mailstream_get_low(imap->imap_stream); fd = mailstream_low_get_fd(plain_low); if (fd == -1) { - debug_print("imap starttls run - can't get fd\n"); + debug_print("imap STARTTLS run - can't get fd\n"); result->error = MAILIMAP_ERROR_STREAM; return; } tls_low = mailstream_low_tls_open_with_callback(fd, etpan_connect_ssl_context_cb, param->account); if (tls_low == NULL) { - debug_print("imap starttls run - can't tls_open\n"); + debug_print("imap STARTTLS run - can't tls_open\n"); result->error = MAILIMAP_ERROR_STREAM; return; } @@ -1154,7 +1154,7 @@ int imap_threaded_starttls(Folder * folder, const gchar *host, int port) struct starttls_result result; gboolean accept_if_valid = FALSE; - debug_print("imap starttls - begin\n"); + debug_print("imap STARTTLS - begin\n"); param.imap = get_imap(folder); param.server = host; @@ -1167,7 +1167,7 @@ int imap_threaded_starttls(Folder * folder, const gchar *host, int port) if (threaded_run(folder, ¶m, &result, starttls_run)) return MAILIMAP_ERROR_INVAL; - debug_print("imap starttls - end\n"); + debug_print("imap STARTTLS - end\n"); if (result.error == 0 && param.imap && !etpan_skip_ssl_cert_check) { if (etpan_certificate_check(param.imap->imap_stream, host, port, diff --git a/src/imap.c b/src/imap.c index 79d03575f..def398d49 100644 --- a/src/imap.c +++ b/src/imap.c @@ -738,7 +738,7 @@ static void imap_handle_error(Session *session, const gchar *server, int libetpa break; #ifdef USE_GNUTLS case MAILIMAP_ERROR_SSL: - log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("SSL error"), "\n", NULL), session_server); + log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("SSL/TLS error"), "\n", NULL), session_server); break; #endif default: @@ -1150,8 +1150,8 @@ static IMAPSession *imap_session_new(Folder * folder, if (account->ssl_imap != SSL_NONE) { if (alertpanel_full(_("Insecure connection"), _("This connection is configured to be secured " - "using SSL, but SSL is not available in this " - "build of Claws Mail. \n\n" + "using SSL/TLS, but SSL/TLS is not available " + "in this build of Claws Mail. \n\n" "Do you want to continue connecting to this " "server? The communication would not be " "secure."), @@ -1207,7 +1207,7 @@ static IMAPSession *imap_session_new(Folder * folder, else { #ifdef USE_GNUTLS if (r == MAILIMAP_ERROR_SSL) - log_error(LOG_PROTOCOL, _("SSL handshake failed\n")); + log_error(LOG_PROTOCOL, _("SSL/TLS handshake failed\n")); else #endif imap_handle_error(NULL, account->recv_server, r); @@ -1249,7 +1249,7 @@ static IMAPSession *imap_session_new(Folder * folder, ok = imap_cmd_starttls(session); if (ok != MAILIMAP_NO_ERROR) { - log_warning(LOG_PROTOCOL, _("Can't start TLS session.\n")); + log_warning(LOG_PROTOCOL, _("Can't start STARTTLS session.\n")); if (!is_fatal(ok)) { SESSION(session)->sock = NULL; imap_safe_destroy(session); @@ -4101,10 +4101,10 @@ static gint imap_cmd_login(IMAPSession *session, gint ok = MAILIMAP_ERROR_BAD_STATE; if (imap_has_capability(session, "STARTTLS")) { #ifdef USE_GNUTLS - log_warning(LOG_PROTOCOL, _("Server requires TLS to log in.\n")); + log_warning(LOG_PROTOCOL, _("Server requires STARTTLS to log in.\n")); ok = imap_cmd_starttls(session); if (ok != MAILIMAP_NO_ERROR) { - log_warning(LOG_PROTOCOL, _("Can't start TLS session.\n")); + log_warning(LOG_PROTOCOL, _("Can't start STARTTLS session.\n")); return ok; } else { /* refresh capas */ @@ -4117,8 +4117,8 @@ static gint imap_cmd_login(IMAPSession *session, } #else log_error(LOG_PROTOCOL, _("Connection to %s failed: " - "server requires TLS, but Claws Mail " - "has been compiled without TLS " + "server requires STARTTLS, but Claws Mail " + "has been compiled without STARTTLS " "support.\n"), SESSION(session)->server); return MAILIMAP_ERROR_LOGIN; @@ -4193,7 +4193,7 @@ static gint imap_cmd_starttls(IMAPSession *session) SESSION(session)->server, SESSION(session)->port); if (r != MAILIMAP_NO_ERROR) { imap_handle_error(SESSION(session), NULL, r); - debug_print("starttls err %d\n", r); + debug_print("STARTTLS err %d\n", r); return r; } return MAILIMAP_NO_ERROR; diff --git a/src/inc.c b/src/inc.c index c8504c9b7..b8aa62724 100644 --- a/src/inc.c +++ b/src/inc.c @@ -810,8 +810,8 @@ static IncState inc_pop3_session_do(IncSession *session) if (pop3_session->ac_prefs->ssl_pop != SSL_NONE) { if (alertpanel_full(_("Insecure connection"), _("This connection is configured to be secured " - "using SSL, but SSL is not available in this " - "build of Claws Mail. \n\n" + "using SSL/TLS, but SSL/TLS is not available " + "in this build of Claws Mail. \n\n" "Do you want to continue connecting to this " "server? The communication would not be " "secure."), diff --git a/src/ldapctrl.c b/src/ldapctrl.c index dd273b92c..d830279cd 100644 --- a/src/ldapctrl.c +++ b/src/ldapctrl.c @@ -210,14 +210,14 @@ void ldapctl_set_matching_option( LdapControl* ctl, const gint value ) { void ldapctl_set_tls( LdapControl* ctl, const gboolean value ) { #if (defined USE_LDAP_TLS || defined G_OS_WIN32) ctl->enableTLS = value; - debug_print("setting TLS: %d\n", ctl->enableTLS); + debug_print("setting STARTTLS: %d\n", ctl->enableTLS); #endif } void ldapctl_set_ssl( LdapControl* ctl, const gboolean value ) { #if (defined USE_LDAP_TLS || defined G_OS_WIN32) ctl->enableSSL = value; - debug_print("setting SSL: %d\n", ctl->enableSSL); + debug_print("setting SSL/TLS: %d\n", ctl->enableSSL); #endif } @@ -351,8 +351,8 @@ void ldapctl_print( const LdapControl *ctl, FILE *stream ) { fprintf( stream, " max age: %d\n", ctl->maxQueryAge ); fprintf( stream, "match opt: %d\n", ctl->matchingOption ); fprintf( stream, " version: %d\n", ctl->version ); - fprintf( stream, " TLS: %s\n", ctl->enableTLS ? "yes" : "no" ); - fprintf( stream, " SSL: %s\n", ctl->enableSSL ? "yes" : "no" ); + fprintf( stream, " STARTTLS: %s\n", ctl->enableTLS ? "yes" : "no" ); + fprintf( stream, " SSL/TLS: %s\n", ctl->enableSSL ? "yes" : "no" ); fprintf( stream, "crit list:\n" ); if( ctl->listCriteria ) { mgu_print_dlist( ctl->listCriteria, stream ); diff --git a/src/ldapserver.c b/src/ldapserver.c index 9507b5237..b6ae2d48d 100644 --- a/src/ldapserver.c +++ b/src/ldapserver.c @@ -782,15 +782,15 @@ LDAP *ldapsvr_connect(LdapControl *ctl) { debug_print("Failed: %s\n", ldaputil_get_error(ld)); if (ldap_get_option(ld,LDAP_OPT_SSL,(void*)&rc) != LDAP_SUCCESS) - debug_print("Can't get SSL state\n"); + debug_print("Can't get SSL/TLS state\n"); if ((void *)rc != LDAP_OPT_ON) { - debug_print("Enabling SSL\n"); + debug_print("Enabling SSL/TLS\n"); if (ldap_set_option(ld,LDAP_OPT_SSL,LDAP_OPT_ON) != LDAP_SUCCESS) debug_print("Failed: %s\n", ldaputil_get_error(ld)); else { ldap_get_option(ld,LDAP_OPT_SSL,(void*)&rc); - debug_print("SSL now %d\n", rc); + debug_print("SSL/TLS now %d\n", rc); } } @@ -830,12 +830,12 @@ LDAP *ldapsvr_connect(LdapControl *ctl) { return NULL; } } - debug_print("Setting TLS\n"); + debug_print("Setting STARTTLS\n"); rc = Win32_ldap_start_tls_s(ld, &serv_rc, NULL, NULL, NULL); debug_print("ldap_start_tls_s: %d server %d %s\n", rc, serv_rc, ldaputil_get_error(ld)); #else - debug_print("Setting TLS\n"); + debug_print("Setting STARTTLS\n"); rc = ldap_start_tls_s(ld, NULL, NULL); #endif if (rc != LDAP_SUCCESS) { diff --git a/src/news.c b/src/news.c index 5081a0e36..d510da93b 100644 --- a/src/news.c +++ b/src/news.c @@ -387,8 +387,8 @@ static Session *news_session_new_for_folder(Folder *folder) if (ac->ssl_nntp != SSL_NONE) { if (alertpanel_full(_("Insecure connection"), _("This connection is configured to be secured " - "using SSL, but SSL is not available in this " - "build of Claws Mail. \n\n" + "using SSL/TLS, but SSL/TLS is not available " + "in this build of Claws Mail. \n\n" "Do you want to continue connecting to this " "server? The communication would not be " "secure."), diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c index 6dac66f8f..c839f7325 100644 --- a/src/plugins/managesieve/managesieve.c +++ b/src/plugins/managesieve/managesieve.c @@ -697,7 +697,7 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg) log_warning(LOG_PROTOCOL, "Sieve: does not support STARTTLS\n"); sieve_session->state = SIEVE_ERROR; } else { - log_warning(LOG_PROTOCOL, "Sieve: continuing without TLS\n"); + log_warning(LOG_PROTOCOL, "Sieve: continuing unencrypted\n"); sieve_session->state = SIEVE_READY; } break; @@ -728,7 +728,7 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg) if (session_start_tls(session) < 0) { sieve_session->state = SIEVE_ERROR; sieve_session->error = SE_ERROR; - sieve_error(sieve_session, _("TLS failed")); + sieve_error(sieve_session, _("STARTTLS failed")); return -1; } sieve_session->tls_init_done = TRUE; diff --git a/src/plugins/managesieve/sieve_prefs.c b/src/plugins/managesieve/sieve_prefs.c index 381596a9a..8245d5a59 100644 --- a/src/plugins/managesieve/sieve_prefs.c +++ b/src/plugins/managesieve/sieve_prefs.c @@ -191,11 +191,11 @@ static void sieve_prefs_account_create_widget_func(PrefsPage *_page, gtk_box_pack_start (GTK_BOX (page_vbox), tls_vbox, FALSE, FALSE, 0); RADIO_ADD(tls_radio_no, tls_group, hbox, tls_vbox, - _("No TLS")); + _("No encryption")); RADIO_ADD(tls_radio_maybe, tls_group, hbox, tls_vbox, - _("Use TLS when available")); + _("Use STARTTLS when available")); RADIO_ADD(tls_radio_yes, tls_group, hbox, tls_vbox, - _("Require TLS")); + _("Require STARTTLS")); /* Authentication */ diff --git a/src/pop.c b/src/pop.c index ee2db434e..27f3afd09 100644 --- a/src/pop.c +++ b/src/pop.c @@ -895,7 +895,7 @@ static Pop3ErrorValue pop3_ok(Pop3Session *session, const gchar *msg) switch (session->state) { #ifdef USE_GNUTLS case POP3_STLS: - log_error(LOG_PROTOCOL, _("couldn't start TLS session\n")); + log_error(LOG_PROTOCOL, _("couldn't start STARTTLS session\n")); ok = PS_ERROR; break; #endif diff --git a/src/prefs_account.c b/src/prefs_account.c index 1b8c7d22b..b729560d4 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -2453,13 +2453,13 @@ static void ssl_create_widget_func(PrefsPage * _page, CREATE_RADIO_BUTTONS(vbox2, pop_nossl_radiobtn, - _("Don't use SSL"), + _("Don't use SSL/TLS"), SSL_NONE, pop_ssltunnel_radiobtn, - _("Use SSL for POP3 connection"), + _("Use SSL/TLS"), SSL_TUNNEL, pop_starttls_radiobtn, - _("Use STARTTLS command to start SSL session"), + _("Use STARTTLS command to start encrypted session"), SSL_STARTTLS); g_signal_connect(G_OBJECT(pop_ssltunnel_radiobtn), "toggled", G_CALLBACK(pop_ssltunnel_toggled), NULL); @@ -2468,13 +2468,13 @@ static void ssl_create_widget_func(PrefsPage * _page, CREATE_RADIO_BUTTONS(vbox3, imap_nossl_radiobtn, - _("Don't use SSL"), + _("Don't use SSL/TLS"), SSL_NONE, imap_ssltunnel_radiobtn, - _("Use SSL for IMAP4 connection"), + _("Use SSL/TLS"), SSL_TUNNEL, imap_starttls_radiobtn, - _("Use STARTTLS command to start SSL session"), + _("Use STARTTLS command to start encrypted session"), SSL_STARTTLS); g_signal_connect(G_OBJECT(imap_ssltunnel_radiobtn), "toggled", G_CALLBACK(imap_ssltunnel_toggled), NULL); @@ -2482,7 +2482,7 @@ static void ssl_create_widget_func(PrefsPage * _page, vbox4 = gtkut_get_options_frame(vbox1, &nntp_frame, _("NNTP")); nntp_nossl_radiobtn = - gtk_radio_button_new_with_label (NULL, _("Don't use SSL")); + gtk_radio_button_new_with_label (NULL, _("Don't use SSL/TLS")); gtk_widget_show (nntp_nossl_radiobtn); gtk_box_pack_start (GTK_BOX (vbox4), nntp_nossl_radiobtn, FALSE, FALSE, 0); @@ -2491,7 +2491,7 @@ static void ssl_create_widget_func(PrefsPage * _page, GINT_TO_POINTER (SSL_NONE)); CREATE_RADIO_BUTTON(vbox4, nntp_ssltunnel_radiobtn, nntp_nossl_radiobtn, - _("Use SSL for NNTP connection"), SSL_TUNNEL); + _("Use SSL/TLS"), SSL_TUNNEL); g_signal_connect(G_OBJECT(nntp_ssltunnel_radiobtn), "toggled", G_CALLBACK(nntp_ssltunnel_toggled), NULL); @@ -2499,13 +2499,13 @@ static void ssl_create_widget_func(PrefsPage * _page, CREATE_RADIO_BUTTONS(vbox5, smtp_nossl_radiobtn, - _("Don't use SSL (but, if necessary, use STARTTLS)"), + _("Don't use SSL/TLS (but, if necessary, use STARTTLS)"), SSL_NONE, smtp_ssltunnel_radiobtn, - _("Use SSL for SMTP connection"), + _("Use SSL/TLS"), SSL_TUNNEL, smtp_starttls_radiobtn, - _("Use STARTTLS command to start SSL session"), + _("Use STARTTLS command to start encrypted session"), SSL_STARTTLS); g_signal_connect(G_OBJECT(smtp_ssltunnel_radiobtn), "toggled", G_CALLBACK(smtp_ssltunnel_toggled), NULL); @@ -2573,10 +2573,10 @@ static void ssl_create_widget_func(PrefsPage * _page, gtk_box_pack_start (GTK_BOX (vbox1), vbox7, FALSE, FALSE, 0); PACK_CHECK_BUTTON(vbox7, ssl_certs_auto_accept_checkbtn, - _("Automatically accept valid SSL certificates")); + _("Automatically accept valid SSL/TLS certificates")); PACK_CHECK_BUTTON(vbox7, use_nonblocking_ssl_checkbtn, - _("Use non-blocking SSL")); + _("Use non-blocking SSL/TLS")); hbox = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox); @@ -2588,7 +2588,7 @@ static void ssl_create_widget_func(PrefsPage * _page, gtk_widget_set_size_request (hbox_spc, 16, -1); label = gtk_label_new - (_("Turn this off if you have SSL connection problems")); + (_("Turn this off if you have SSL/TLS connection problems")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtkut_widget_set_small_font_size (label); @@ -3393,7 +3393,7 @@ static void register_ssl_page(void) static gchar *path[3]; path[0] = _("Account"); - path[1] = _("SSL"); + path[1] = _("SSL/TLS"); path[2] = NULL; ssl_page.page.path = path; diff --git a/src/send_message.c b/src/send_message.c index 7e99c7e73..376e1228e 100644 --- a/src/send_message.c +++ b/src/send_message.c @@ -281,8 +281,8 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g if (ac_prefs->ssl_smtp != SSL_NONE) { if (alertpanel_full(_("Insecure connection"), _("This connection is configured to be secured " - "using SSL, but SSL is not available in this " - "build of Claws Mail. \n\n" + "using SSL/TLS, but SSL/TLS is not available " + "in this build of Claws Mail. \n\n" "Do you want to continue connecting to this " "server? The communication would not be " "secure."), diff --git a/src/wizard.c b/src/wizard.c index 777b8bfee..5625c362f 100644 --- a/src/wizard.c +++ b/src/wizard.c @@ -271,12 +271,12 @@ static gchar *accountrc_tmpl = "#default is \"Mail\"\n" "#mailbox=\n" "\n" - "#whether to use ssl on smtp connections\n" - "#default is 0, 1 is ssl, 2 is starttls\n" + "#whether to use encryption on SMTP connections\n" + "#default is 0, 1 is SSL/TLS, 2 is STARTTLS\n" "#smtpssl=\n" "\n" - "#whether to use ssl on pop or imap connections\n" - "#default is 0, 1 is ssl, 2 is starttls\n" + "#whether to use encryption on POP3 or IMAP connections\n" + "#default is 0, 1 is SSL/TLS, 2 is STARTTLS\n" "#recvssl=\n" "\n" "#SSL client certificate path for SMTP\n" @@ -1162,7 +1162,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard) hbox = gtk_hbox_new(FALSE, VSPACING_NARROW); gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0); wizard->smtp_use_ssl = gtk_check_button_new_with_label( - _("Use SSL to connect to SMTP server")); + _("Use SSL/TLS to connect to SMTP server")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl), tmpl.smtpssl != 0); gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_use_ssl, FALSE, FALSE, 0); @@ -1173,7 +1173,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard) gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0); gtk_widget_set_size_request (hbox_spc, 12, -1); wizard->smtp_use_tls = gtk_check_button_new_with_label( - _("Use SSL via STARTTLS")); + _("Use STARTTLS command to start encryption")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_tls), tmpl.smtpssl == 2); gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_use_tls, FALSE, FALSE, 0); @@ -1582,7 +1582,7 @@ static GtkWidget* recv_page (WizardWindow * wizard) hbox = gtk_hbox_new(FALSE, VSPACING_NARROW); gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0); wizard->recv_use_ssl = gtk_check_button_new_with_label( - _("Use SSL to connect to receiving server")); + _("Use SSL/TLS to connect to receiving server")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->recv_use_ssl), tmpl.recvssl != 0); gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_use_ssl, FALSE, FALSE, 0); @@ -1593,7 +1593,7 @@ static GtkWidget* recv_page (WizardWindow * wizard) gtk_widget_set_size_request (hbox_spc, 12, -1); gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0); wizard->recv_use_tls = gtk_check_button_new_with_label( - _("Use SSL via STARTTLS")); + _("Use STARTTLS command to start encryption")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->recv_use_tls), tmpl.recvssl == 2); gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_use_tls, FALSE, FALSE, 0);