[Commits] [SCM] claws branch, master, updated. 3.18.0-75-g6010dca56
wwp at claws-mail.org
wwp at claws-mail.org
Fri Sep 3 15:53:49 UTC 2021
The branch, master has been updated
via 6010dca56c8214b71f153ddfa56416ea8faa2017 (commit)
from ac192b80fe5235ce2d3a2d1c363805fa362e4593 (commit)
Summary of changes:
configure.ac | 2 +-
src/account.c | 10 +++++-----
src/common/session.c | 8 ++++----
src/common/socket.c | 4 ++--
src/common/ssl.c | 6 +++---
src/editldap.c | 6 +++---
src/gtk/sslcertwindow.c | 17 ++++++++---------
src/imap.c | 8 ++++----
src/inc.c | 4 ++--
src/ldapctrl.c | 8 ++++----
src/ldapserver.c | 12 ++++++------
src/mainwindow.c | 4 ++--
src/news.c | 6 +++---
src/oauth2.c | 4 ++--
src/plugins/rssyl/rssyl_feed_props.c | 4 ++--
src/plugins/rssyl/rssyl_prefs.c | 4 ++--
src/plugins/vcalendar/vcal_prefs.c | 7 +++----
src/prefs_account.c | 24 ++++++++++++------------
src/send_message.c | 6 +++---
src/ssl_manager.c | 4 ++--
src/wizard.c | 23 +++++++++++------------
21 files changed, 84 insertions(+), 87 deletions(-)
- Log -----------------------------------------------------------------
commit 6010dca56c8214b71f153ddfa56416ea8faa2017
Author: wwp <subscript at free.fr>
Date: Fri Sep 3 17:53:39 2021 +0200
Replace 'SSL/TLS' with 'TLS'.
diff --git a/configure.ac b/configure.ac
index d81db6fa7..a85eab03d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -251,7 +251,7 @@ AC_ARG_ENABLE(ipv6,
[enable_ipv6=$enableval], [enable_ipv6=yes])
AC_ARG_ENABLE(gnutls,
- [ --disable-gnutls Do not build GnuTLS support for SSL/TLS],
+ [ --disable-gnutls Do not build GnuTLS support for TLS],
[enable_gnutls=$enableval], [enable_gnutls=yes])
AC_ARG_ENABLE(enchant,
diff --git a/src/account.c b/src/account.c
index a3f47a9e7..aaecec85e 100644
--- a/src/account.c
+++ b/src/account.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1520,17 +1520,17 @@ static void account_list_store_insert_account_item(GtkListStore *list_store,
#ifdef USE_GNUTLS
protocol = ac_prefs->protocol == A_POP3 ?
(ac_prefs->ssl_pop == SSL_TUNNEL ?
- "POP (SSL/TLS)" :
+ "POP (TLS)" :
ac_prefs->ssl_pop == SSL_STARTTLS ?
"POP (STARTTLS)" : "POP") :
ac_prefs->protocol == A_IMAP4 ?
(ac_prefs->ssl_imap == SSL_TUNNEL ?
- "IMAP (SSL/TLS)" :
+ "IMAP (TLS)" :
ac_prefs->ssl_imap == SSL_STARTTLS ?
"IMAP (STARTTLS)" : "IMAP") :
ac_prefs->protocol == A_NNTP ?
(ac_prefs->ssl_nntp == SSL_TUNNEL ?
- "NNTP (SSL/TLS)" : "NNTP") :
+ "NNTP (TLS)" : "NNTP") :
ac_prefs->protocol == A_LOCAL ? "Local" :
ac_prefs->protocol == A_NONE ? "SMTP" : "-";
#else
diff --git a/src/common/session.c b/src/common/session.c
index 1fa42a4da..b5b49dca8 100644
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -197,8 +197,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/TLS");
- log_error(LOG_PROTOCOL, _("SSL/TLS handshake failed\n"));
+ g_warning("can't initialize TLS");
+ log_error(LOG_PROTOCOL, _("TLS handshake failed\n"));
session->state = SESSION_ERROR;
if (session->connect_finished)
session->connect_finished(session, FALSE);
diff --git a/src/common/socket.c b/src/common/socket.c
index 876ae5353..7446187b6 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1281,7 +1281,7 @@ static gint ssl_read(gnutls_session_t ssl, gchar *buf, gint len)
return -1;
default:
- debug_print("Unexpected SSL/TLS read result %d\n", r);
+ debug_print("Unexpected TLS read result %d\n", r);
errno = EIO;
return -1;
}
diff --git a/src/common/ssl.c b/src/common/ssl.c
index beb3d7ff1..f1beb6b6a 100644
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -460,7 +460,7 @@ gboolean ssl_init_socket(SockInfo *sockinfo)
#endif
if ((r = SSL_connect_nb(session)) < 0) {
- g_warning("SSL/TLS connection failed (%s)", gnutls_strerror(r));
+ g_warning("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 c6651adfd..7b9e377fa 100644
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2015 Match Grun and the Claws Mail team
+ * Copyright (C) 2001-2021 the Claws Mail team and Match Grun
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -467,7 +467,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
#if (defined USE_LDAP_TLS || defined G_OS_WIN32)
enable_tls_checkbtn = gtk_check_button_new_with_label(_("STARTTLS"));
- enable_ssl_checkbtn = gtk_check_button_new_with_label(_("SSL/TLS"));
+ enable_ssl_checkbtn = gtk_check_button_new_with_label(_("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, _(
@@ -476,7 +476,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
"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/TLS. "
+ "Enable secure connection to the LDAP server via TLS. "
"If connection fails, be sure to check the correct "
"configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)." ));
diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
index 688797139..8a5771b48 100644
--- a/src/gtk/sslcertwindow.c
+++ b/src/gtk/sslcertwindow.c
@@ -1,7 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 Colin Leroy <colin at colino.net>
- * and the Claws Mail team
+ * Copyright (C) 1999-2021 the Claws Mail team and Colin Leroy
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -325,7 +324,7 @@ void sslcertwindow_show_cert(SSLCertificate *cert)
GtkWidget *cert_widget = cert_presenter(cert);
gchar *buf;
- buf = g_strdup_printf(_("SSL/TLS certificate for %s"), cert->host);
+ buf = g_strdup_printf(_("TLS certificate for %s"), cert->host);
alertpanel_full(buf, NULL, GTK_STOCK_CLOSE, NULL, NULL,
ALERTFOCUS_FIRST, FALSE, cert_widget, ALERT_NOTICE);
g_free(buf);
@@ -387,9 +386,9 @@ static gboolean sslcertwindow_ask_new_cert(SSLCertificate *cert)
gtk_container_add(GTK_CONTAINER(button), cert_widget);
if (!ssl_certificate_check_subject_cn(cert))
- title = _("SSL/TLS certificate is invalid");
+ title = _("TLS certificate is invalid");
else
- title = _("SSL/TLS certificate is unknown");
+ title = _("TLS certificate is unknown");
val = alertpanel_full(title, NULL,
_("_Cancel connection"), _("_Accept and save"), NULL,
@@ -437,9 +436,9 @@ static gboolean sslcertwindow_ask_expired_cert(SSLCertificate *cert)
gtk_container_add(GTK_CONTAINER(button), cert_widget);
if (!ssl_certificate_check_subject_cn(cert))
- title = _("SSL/TLS certificate is invalid and expired");
+ title = _("TLS certificate is invalid and expired");
else
- title = _("SSL/TLS certificate is expired");
+ title = _("TLS certificate is expired");
val = alertpanel_full(title, NULL,
_("_Cancel connection"), _("_Accept"), NULL,
@@ -500,9 +499,9 @@ static gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCert
gtk_container_add(GTK_CONTAINER(button), vbox);
if (!ssl_certificate_check_subject_cn(new_cert))
- title = _("SSL/TLS certificate changed and is invalid");
+ title = _("TLS certificate changed and is invalid");
else
- title = _("SSL/TLS certificate changed");
+ title = _("TLS certificate changed");
val = alertpanel_full(title, NULL,
_("_Cancel connection"), _("_Accept and save"), NULL,
ALERTFOCUS_FIRST, FALSE, vbox2, ALERT_WARNING);
diff --git a/src/imap.c b/src/imap.c
index d2cff89db..514661250 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -748,7 +748,7 @@ static void imap_handle_error(Session *session, const gchar *server, int libetpa
break;
#ifdef USE_GNUTLS
case MAILIMAP_ERROR_SSL:
- MY_LOG_WARNING(g_strconcat(_("IMAP error on %s:"), " ", _("SSL/TLS error"), "\n", NULL), session_server)
+ MY_LOG_WARNING(g_strconcat(_("IMAP error on %s:"), " ", _("TLS error"), "\n", NULL), session_server)
break;
#endif
default:
@@ -1175,7 +1175,7 @@ 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/TLS, but SSL/TLS is not available "
+ "using TLS, but 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 "
@@ -1248,7 +1248,7 @@ static IMAPSession *imap_session_new(Folder * folder,
else {
#ifdef USE_GNUTLS
if (r == MAILIMAP_ERROR_SSL)
- log_error(LOG_PROTOCOL, _("SSL/TLS handshake failed\n"));
+ log_error(LOG_PROTOCOL, _("TLS handshake failed\n"));
else
#endif
imap_handle_error(NULL, account->recv_server, r);
diff --git a/src/inc.c b/src/inc.c
index e84cd4b4b..25f724330 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -880,7 +880,7 @@ static IncState inc_pop3_session_do(IncSession *session)
if (ac->ssl_pop != SSL_NONE) {
if (alertpanel_full(_("Insecure connection"),
_("This connection is configured to be secured "
- "using SSL/TLS, but SSL/TLS is not available "
+ "using TLS, but 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 "
diff --git a/src/ldapctrl.c b/src/ldapctrl.c
index bdba4ffec..1e5667cdb 100644
--- a/src/ldapctrl.c
+++ b/src/ldapctrl.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2003-2021 the Claws Mail team and Match Grun
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -217,7 +217,7 @@ void ldapctl_set_tls( LdapControl* ctl, const gboolean value ) {
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/TLS: %d\n", ctl->enableSSL);
+ debug_print("setting TLS: %d\n", ctl->enableSSL);
#endif
}
@@ -353,7 +353,7 @@ void ldapctl_print( const LdapControl *ctl, FILE *stream ) {
fprintf( stream, "match opt: %d\n", ctl->matchingOption );
fprintf( stream, " version: %d\n", ctl->version );
fprintf( stream, " STARTTLS: %s\n", ctl->enableTLS ? "yes" : "no" );
- fprintf( stream, " SSL/TLS: %s\n", ctl->enableSSL ? "yes" : "no" );
+ fprintf( stream, " 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 98fd9fe49..fec392cb3 100644
--- a/src/ldapserver.c
+++ b/src/ldapserver.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2018 Match Grun and the Claws Mail team
+ * Copyright (C) 2003-2021 the Claws Mail team and Match Grun
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -791,12 +791,12 @@ LDAP *ldapsvr_connect(LdapControl *ctl) {
rc = ldap_get_option(ld, LDAP_OPT_SSL, (void*)&op);
if (rc != LDAP_SUCCESS) {
- log_warning(LOG_PROTOCOL, _("LDAP warning (options): can't get SSL/TLS state\n"));
- debug_print("Can't get SSL/TLS state\n");
+ log_warning(LOG_PROTOCOL, _("LDAP warning (options): can't get TLS state\n"));
+ debug_print("Can't get TLS state\n");
}
if ((void *)op != LDAP_OPT_ON) {
- debug_print("Enabling SSL/TLS\n");
+ debug_print("Enabling TLS\n");
rc = ldap_set_option(ld, LDAP_OPT_SSL, LDAP_OPT_ON);
if (rc != LDAP_SUCCESS) {
log_error(LOG_PROTOCOL, _("LDAP error (options): %d (%s)\n"),
@@ -808,9 +808,9 @@ LDAP *ldapsvr_connect(LdapControl *ctl) {
log_error(LOG_PROTOCOL, _("LDAP error (options): %d (%s)\n"),
rc, ldaputil_get_error(ld));
} else {
- log_print(LOG_PROTOCOL, _("LDAP (options): SSL/TLS enabled (%d)\n"), (gint)op);
+ log_print(LOG_PROTOCOL, _("LDAP (options): TLS enabled (%d)\n"), (gint)op);
}
- debug_print("SSL/TLS now %d\n", (gint)op);
+ debug_print("TLS now %d\n", (gint)op);
}
}
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 1fff0f42d..1cc8d6eef 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1,6 +1,6 @@
/*
Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- Copyright (C) 1999-2018 the Claws Mail team and Hiroyuki Yamamoto
+ Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -784,7 +784,7 @@ static GtkActionEntry mainwin_entries[] =
{"Tools/Expunge", NULL, N_("Exp_unge"), "<control>E", NULL, G_CALLBACK(expunge_summary_cb) },
#ifdef USE_GNUTLS
/* {"Tools/---", NULL, "---", NULL, NULL, NULL }, */
- {"Tools/SSLCertificates", NULL, N_("SSL/TLS cer_tificates"), NULL, NULL, G_CALLBACK(ssl_manager_open_cb) },
+ {"Tools/SSLCertificates", NULL, N_("TLS cer_tificates"), NULL, NULL, G_CALLBACK(ssl_manager_open_cb) },
#endif
/* {"Tools/---", NULL, "---", NULL, NULL, NULL }, */
{"Tools/FilteringLog", NULL, N_("Filtering Lo_g"), NULL, NULL, G_CALLBACK(filtering_debug_window_show_cb) },
diff --git a/src/news.c b/src/news.c
index 1cfb6f804..f03f67a2f 100644
--- a/src/news.c
+++ b/src/news.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -401,7 +401,7 @@ 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/TLS, but SSL/TLS is not available "
+ "using TLS, but 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 "
diff --git a/src/oauth2.c b/src/oauth2.c
index 2ea840474..c6641031d 100644
--- a/src/oauth2.c
+++ b/src/oauth2.c
@@ -250,7 +250,7 @@ int oauth2_obtain_tokens (Oauth2Service provider, OAUTH2Data *OAUTH2Data, const
sock_set_io_timeout(10);
sock->gnutls_priority = "NORMAL:!VERS-SSL3.0:!VERS-TLS1.0:!VERS-TLS1.1";
if (ssl_init_socket(sock) == FALSE) {
- log_message(LOG_PROTOCOL, _("OAuth2 SSL/TLS connection error\n"));
+ log_message(LOG_PROTOCOL, _("OAuth2 TLS connection error\n"));
g_free(token);
return (1);
}
@@ -364,7 +364,7 @@ gint oauth2_use_refresh_token (Oauth2Service provider, OAUTH2Data *OAUTH2Data)
sock_set_io_timeout(10);
sock->gnutls_priority = "NORMAL:!VERS-SSL3.0:!VERS-TLS1.0:!VERS-TLS1.1";
if (ssl_init_socket(sock) == FALSE) {
- log_message(LOG_PROTOCOL, _("OAuth2 SSL connection error\n"));
+ log_message(LOG_PROTOCOL, _("OAuth2 TLS connection error\n"));
return (1);
}
diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
index ab079c043..0ffd8f642 100644
--- a/src/plugins/rssyl/rssyl_feed_props.c
+++ b/src/plugins/rssyl/rssyl_feed_props.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2016 the Claws Mail team
+ * Copyright (C) 2001-2021 the Claws Mail team
* This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
* - Plugin preferences
@@ -357,7 +357,7 @@ void rssyl_gtk_prop(RFolderItem *ritem)
/* Verify SSL peer certificate */
feedprop->ssl_verify_peer = gtk_check_button_new_with_label(
- _("Verify SSL/TLS certificate validity"));
+ _("Verify TLS certificate validity"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(feedprop->ssl_verify_peer),
ritem->ssl_verify_peer);
diff --git a/src/plugins/rssyl/rssyl_prefs.c b/src/plugins/rssyl/rssyl_prefs.c
index 12fec55b1..8ea68bddb 100644
--- a/src/plugins/rssyl/rssyl_prefs.c
+++ b/src/plugins/rssyl/rssyl_prefs.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2016 the Claws Mail team
+ * Copyright (C) 2001-2021 the Claws Mail team
* This file (C) 2005-2015 Andrej Kacian <andrej at kacian.sk>
*
* - Plugin preferences
@@ -167,7 +167,7 @@ static void create_rssyl_prefs_page(PrefsPage *page,
/* Whether to verify SSL peer certificate */
ssl_verify_peer = gtk_check_button_new_with_label(
- _("Verify SSL/TLS certificates validity for new feeds"));
+ _("Verify TLS certificates validity for new feeds"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ssl_verify_peer),
rssyl_prefs.ssl_verify_peer);
gtk_box_pack_start(GTK_BOX(vbox2), ssl_verify_peer, FALSE, FALSE, 0);
diff --git a/src/plugins/vcalendar/vcal_prefs.c b/src/plugins/vcalendar/vcal_prefs.c
index e467678d4..d40c94ac4 100644
--- a/src/plugins/vcalendar/vcal_prefs.c
+++ b/src/plugins/vcalendar/vcal_prefs.c
@@ -1,7 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Colin Leroy <colin at colino.net> and
- * the Claws Mail team
+ * Copyright (C) 1999-2021 the Claws Mail team and Colin Leroy
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -578,7 +577,7 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
vcalprefs.freebusy_get_url);
/* SSL frame */
- PACK_FRAME(vbox2, frame_ssl_options, _("SSL/TLS options"));
+ PACK_FRAME(vbox2, frame_ssl_options, _("TLS options"));
vbox3 = gtk_vbox_new (FALSE, 8);
gtk_widget_show (vbox3);
gtk_container_add (GTK_CONTAINER (frame_ssl_options), vbox3);
@@ -590,7 +589,7 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
gtk_box_pack_start(GTK_BOX (vbox3), hbox2, TRUE, TRUE, 0);
ssl_verify_peer_checkbtn = gtk_check_button_new_with_label(
- _("Verify SSL/TLS certificate validity"));
+ _("Verify TLS certificate validity"));
gtk_widget_show(ssl_verify_peer_checkbtn);
gtk_box_pack_start(GTK_BOX (hbox2), ssl_verify_peer_checkbtn, FALSE, FALSE, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ssl_verify_peer_checkbtn),
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 3fff3183e..6fc642262 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -2956,10 +2956,10 @@ static void ssl_create_widget_func(PrefsPage * _page,
CREATE_RADIO_BUTTONS(vbox2,
pop_nossl_radiobtn,
- _("Don't use SSL/TLS"),
+ _("Don't use TLS"),
SSL_NONE,
pop_ssltunnel_radiobtn,
- _("Use SSL/TLS"),
+ _("Use TLS"),
SSL_TUNNEL,
pop_starttls_radiobtn,
_("Use STARTTLS command to start encrypted session"),
@@ -2971,10 +2971,10 @@ static void ssl_create_widget_func(PrefsPage * _page,
CREATE_RADIO_BUTTONS(vbox3,
imap_nossl_radiobtn,
- _("Don't use SSL/TLS"),
+ _("Don't use TLS"),
SSL_NONE,
imap_ssltunnel_radiobtn,
- _("Use SSL/TLS"),
+ _("Use TLS"),
SSL_TUNNEL,
imap_starttls_radiobtn,
_("Use STARTTLS command to start encrypted session"),
@@ -2985,7 +2985,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/TLS"));
+ gtk_radio_button_new_with_label (NULL, _("Don't use TLS"));
gtk_widget_show (nntp_nossl_radiobtn);
gtk_box_pack_start (GTK_BOX (vbox4), nntp_nossl_radiobtn,
FALSE, FALSE, 0);
@@ -2994,7 +2994,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/TLS"), SSL_TUNNEL);
+ _("Use TLS"), SSL_TUNNEL);
g_signal_connect(G_OBJECT(nntp_ssltunnel_radiobtn), "toggled",
G_CALLBACK(nntp_ssltunnel_toggled), NULL);
@@ -3002,10 +3002,10 @@ static void ssl_create_widget_func(PrefsPage * _page,
CREATE_RADIO_BUTTONS(vbox5,
smtp_nossl_radiobtn,
- _("Don't use SSL/TLS (but, if necessary, use STARTTLS)"),
+ _("Don't use TLS (but, if necessary, use STARTTLS)"),
SSL_NONE,
smtp_ssltunnel_radiobtn,
- _("Use SSL/TLS"),
+ _("Use TLS"),
SSL_TUNNEL,
smtp_starttls_radiobtn,
_("Use STARTTLS command to start encrypted session"),
@@ -3089,10 +3089,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/TLS certificates"));
+ _("Automatically accept valid TLS certificates"));
PACK_CHECK_BUTTON(vbox7, use_nonblocking_ssl_checkbtn,
- _("Use non-blocking SSL/TLS"));
+ _("Use non-blocking TLS"));
hbox = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox);
@@ -3104,7 +3104,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/TLS connection problems"));
+ (_("Turn this off if you have 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);
@@ -4211,7 +4211,7 @@ static void register_ssl_page(void)
static gchar *path[3];
path[0] = _("Account");
- path[1] = _("SSL/TLS");
+ path[1] = _("TLS");
path[2] = NULL;
ssl_page.page.path = path;
diff --git a/src/send_message.c b/src/send_message.c
index f8bc5a5e5..a9ff5ccfe 100644
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -286,7 +286,7 @@ 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/TLS, but SSL/TLS is not available "
+ "using TLS, but 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 "
diff --git a/src/ssl_manager.c b/src/ssl_manager.c
index 884a0225f..67dc5e851 100644
--- a/src/ssl_manager.c
+++ b/src/ssl_manager.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Colin Leroy and the Claws Mail team
+ * Copyright (C) 1999-2021 the Claws Mail team and Colin Leroy
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -192,7 +192,7 @@ void ssl_manager_create(void)
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "ssl_manager");
gtk_window_set_title (GTK_WINDOW(window),
- _("Saved SSL/TLS certificates"));
+ _("Saved TLS certificates"));
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
diff --git a/src/wizard.c b/src/wizard.c
index fcd9088ae..8dccf238b 100644
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -1,7 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Colin Leroy <colin at colino.net>
- * and the Claws Mail team
+ * Copyright (C) 1999-2021 the Claws Mail team and Colin Leroy
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -273,26 +272,26 @@ static gchar *accountrc_tmpl =
"#mailbox=\n"
"\n"
"#whether to use encryption on SMTP connections\n"
- "#default is 0, 1 is SSL/TLS, 2 is STARTTLS\n"
+ "#default is 0, 1 is TLS, 2 is STARTTLS\n"
"#smtpssl=\n"
"\n"
"#whether to use encryption on POP3 or IMAP connections\n"
- "#default is 0, 1 is SSL/TLS, 2 is STARTTLS\n"
+ "#default is 0, 1 is TLS, 2 is STARTTLS\n"
"#recvssl=\n"
"\n"
- "#SSL/TLS client certificate path for SMTP\n"
+ "#TLS client certificate path for SMTP\n"
"#default is empty (no certificate)\n"
"#smtpssl_cert=\n"
"\n"
- "#SSL/TLS client certificate path for POP/IMAP\n"
+ "#TLS client certificate path for POP/IMAP\n"
"#default is empty (no certificate)\n"
"#recvssl_cert=\n"
"\n"
- "#SSL/TLS client certificate password for SMTP\n"
+ "#TLS client certificate password for SMTP\n"
"#default is empty (no password)\n"
"#smtpssl_cert_pass=\n"
"\n"
- "#SSL/TLS client certificate password for POP/IMAP\n"
+ "#TLS client certificate password for POP/IMAP\n"
"#default is empty (no password)\n"
"#recvssl_cert_pass=\n"
;
@@ -1164,7 +1163,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/TLS to connect to SMTP server"));
+ _("Use 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);
@@ -1187,7 +1186,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
hbox_spc = gtk_hbox_new (FALSE, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
- label = gtk_label_new(_("Client SSL/TLS certificate (optional)"));
+ label = gtk_label_new(_("Client TLS certificate (optional)"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_table_attach(GTK_TABLE(smtp_cert_table), hbox, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
@@ -1584,7 +1583,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/TLS to connect to receiving server"));
+ _("Use 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);
@@ -1607,7 +1606,7 @@ static GtkWidget* recv_page (WizardWindow * wizard)
hbox_spc = gtk_hbox_new (FALSE, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
- label = gtk_label_new(_("Client SSL/TLS certificate (optional)"));
+ label = gtk_label_new(_("Client TLS certificate (optional)"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_table_attach(GTK_TABLE(recv_cert_table), hbox, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list