From: Paul Date: Tue, 25 Oct 2016 10:15:02 +0000 (+0100) Subject: more 'SSL' to 'SSL/TLS' X-Git-Tag: 3.14.1~15 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=484ab8c24f0bf6660eedca9aae050c698624a7c2 more 'SSL' to 'SSL/TLS' --- diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c index c6fe7e400..5a643b689 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 + * Copyright (C) 1999-2016 Colin Leroy * 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 a75b889db..4b4e98733 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 * * - 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 295905e9e..afabc920c 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 * * - 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 16c7f7669..ce7ed0741 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 and + * Copyright (C) 1999-2016 Colin Leroy 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 b1531dc6f..d5086a957 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);