[Commits] [SCM] claws branch, master, updated. 3.14.0-122-ga87b489
claws at claws-mail.org
claws at claws-mail.org
Tue Oct 25 12:15:43 CEST 2016
The branch, master has been updated
via a87b48979bc51901574fd99c29248a775a2653aa (commit)
via 484ab8c24f0bf6660eedca9aae050c698624a7c2 (commit)
from 112b21df10378b0352501528aab3bd587247cd0c (commit)
Summary of changes:
src/gtk/sslcertwindow.c | 16 ++++++++--------
src/plugins/rssyl/rssyl_feed_props.c | 6 +++---
src/plugins/rssyl/rssyl_prefs.c | 4 ++--
src/plugins/vcalendar/vcal_prefs.c | 6 +++---
src/ssl_manager.c | 2 +-
src/wizard.c | 14 +++++++-------
6 files changed, 24 insertions(+), 24 deletions(-)
- Log -----------------------------------------------------------------
commit a87b48979bc51901574fd99c29248a775a2653aa
Author: Paul <paul at claws-mail.org>
Date: Tue Oct 25 11:15:39 2016 +0100
more 'SSL' to 'SSL/TLS'
diff --git a/src/wizard.c b/src/wizard.c
index 5625c36..2ca7532 100644
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Colin Leroy <colin at colino.net>
+ * Copyright (C) 1999-2016 Colin Leroy <colin at colino.net>
* and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
@@ -279,19 +279,19 @@ static gchar *accountrc_tmpl =
"#default is 0, 1 is SSL/TLS, 2 is STARTTLS\n"
"#recvssl=\n"
"\n"
- "#SSL client certificate path for SMTP\n"
+ "#SSL/TLS client certificate path for SMTP\n"
"#default is empty (no certificate)\n"
"#smtpssl_cert=\n"
"\n"
- "#SSL client certificate path for POP/IMAP\n"
+ "#SSL/TLS client certificate path for POP/IMAP\n"
"#default is empty (no certificate)\n"
"#recvssl_cert=\n"
"\n"
- "#SSL client certificate password for SMTP\n"
+ "#SSL/TLS client certificate password for SMTP\n"
"#default is empty (no password)\n"
"#smtpssl_cert_pass=\n"
"\n"
- "#SSL client certificate password for POP/IMAP\n"
+ "#SSL/TLS client certificate password for POP/IMAP\n"
"#default is empty (no password)\n"
"#recvssl_cert_pass=\n"
;
@@ -1185,7 +1185,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 certificate (optional)"));
+ label = gtk_label_new(_("Client SSL/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);
@@ -1605,7 +1605,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 certificate (optional)"));
+ label = gtk_label_new(_("Client SSL/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);
commit 484ab8c24f0bf6660eedca9aae050c698624a7c2
Author: Paul <paul at claws-mail.org>
Date: Tue Oct 25 11:15:02 2016 +0100
more 'SSL' to 'SSL/TLS'
diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
index c6fe7e4..5a643b6 100644
--- a/src/gtk/sslcertwindow.c
+++ b/src/gtk/sslcertwindow.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Colin Leroy <colin at colino.net>
+ * Copyright (C) 1999-2016 Colin Leroy <colin at colino.net>
* and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
@@ -299,7 +299,7 @@ void sslcertwindow_show_cert(SSLCertificate *cert)
GtkWidget *cert_widget = cert_presenter(cert);
gchar *buf;
- buf = g_strdup_printf(_("SSL certificate for %s"), cert->host);
+ buf = g_strdup_printf(_("SSL/TLS certificate for %s"), cert->host);
alertpanel_full(buf, NULL, GTK_STOCK_CLOSE, NULL, NULL,
FALSE, cert_widget, ALERT_NOTICE, G_ALERTDEFAULT);
g_free(buf);
@@ -361,9 +361,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 certificate is invalid");
+ title = _("SSL/TLS certificate is invalid");
else
- title = _("SSL certificate is unknown");
+ title = _("SSL/TLS certificate is unknown");
val = alertpanel_full(title, NULL,
_("_Cancel connection"), _("_Accept and save"), NULL,
@@ -411,9 +411,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 certificate is invalid and expired");
+ title = _("SSL/TLS certificate is invalid and expired");
else
- title = _("SSL certificate is expired");
+ title = _("SSL/TLS certificate is expired");
val = alertpanel_full(title, NULL,
_("_Cancel connection"), _("_Accept"), NULL,
@@ -474,9 +474,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 certificate changed and is invalid");
+ title = _("SSL/TLS certificate changed and is invalid");
else
- title = _("SSL certificate changed");
+ title = _("SSL/TLS certificate changed");
val = alertpanel_full(title, NULL,
_("_Cancel connection"), _("_Accept and save"), NULL,
FALSE, vbox2, ALERT_WARNING, G_ALERTDEFAULT);
diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
index a75b889..4b4e987 100644
--- a/src/plugins/rssyl/rssyl_feed_props.c
+++ b/src/plugins/rssyl/rssyl_feed_props.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2001-2016 the Claws Mail team
* This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
* - Plugin preferences
@@ -369,7 +369,7 @@ void rssyl_gtk_prop(RFolderItem *ritem)
/* Verify SSL peer certificate */
feedprop->ssl_verify_peer = gtk_check_button_new_with_label(
- _("Verify SSL certificate validity"));
+ _("Verify SSL/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 295905e..afabc92 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) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 2001-2016 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 certificates validity for new feeds"));
+ _("Verify SSL/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 16c7f76..ce7ed07 100644
--- a/src/plugins/vcalendar/vcal_prefs.c
+++ b/src/plugins/vcalendar/vcal_prefs.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Colin Leroy <colin at colino.net> and
+ * Copyright (C) 1999-2016 Colin Leroy <colin at colino.net> and
* the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
@@ -578,7 +578,7 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
vcalprefs.freebusy_get_url);
/* SSL frame */
- PACK_FRAME(vbox2, frame_ssl_options, _("SSL options"));
+ PACK_FRAME(vbox2, frame_ssl_options, _("SSL/TLS options"));
vbox3 = gtk_vbox_new (FALSE, 8);
gtk_widget_show (vbox3);
gtk_container_add (GTK_CONTAINER (frame_ssl_options), vbox3);
@@ -590,7 +590,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 certificate validity"));
+ _("Verify SSL/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/ssl_manager.c b/src/ssl_manager.c
index b1531dc..d5086a9 100644
--- a/src/ssl_manager.c
+++ b/src/ssl_manager.c
@@ -153,7 +153,7 @@ void ssl_manager_create(void)
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "ssl_manager");
gtk_window_set_title (GTK_WINDOW(window),
- _("Saved SSL certificates"));
+ _("Saved SSL/TLS certificates"));
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list