commit c634666731bcf32b9490ef8b6a2bca2826ded974
Author: staikos <staikos@localhost>
Date: Fri May 17 04:11:50 2002 +0000
--- tcpslavebase.cpp 2002/03/19 05:13:29 1.101
+++ tcpslavebase.cpp 2002/05/17 05:10:29
@@ -398,6 +398,7 @@ void TCPSlaveBase::cleanSSL()
if (m_bIsSSL) {
delete d->kssl;
+ d->kssl = 0;
}
d->militantSSL = false;
}
svn path=/trunk/kdelibs/; revision=155921
diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp
index b34ce00..aae0c9f 100644
--- a/kio/kio/tcpslavebase.cpp
+++ b/kio/kio/tcpslavebase.cpp
@@ -302,7 +302,7 @@ bool TCPSlaveBase::connectToHost( const QString &host,
"longer be encrypted.\nThis "
"means that a third party could "
"observe your data in transit."),
- i18n("Security Information"),
+ i18n("Security information"),
i18n("Continue Loading") );
if ( result == KMessageBox::Cancel ) {
d->userAborted = true;
@@ -398,6 +398,7 @@ void TCPSlaveBase::cleanSSL()
if (m_bIsSSL) {
delete d->kssl;
+ d->kssl = 0;
}
d->militantSSL = false;
}
@@ -654,7 +655,7 @@ KSSLCertificateHome::KSSLAuthAction aa;
pkcs = KSSLCertificateHome::getCertificateByName(certname, pass);
if (!pkcs) {
- int rc = messageBox(WarningYesNo, i18n("Unable to open the "
+ int rc = messageBox(WarningYesNo, i18n("Couldn't open the "
"certificate. Try a "
"new password?"),
i18n("SSL"));
@@ -666,7 +667,7 @@ KSSLCertificateHome::KSSLAuthAction aa;
// If we could open the certificate, let's send it
if (pkcs) {
if (!d->kssl->setClientCertificate(pkcs)) {
- messageBox(Information, i18n("The procedure to set the "
+ messageBox(Information, i18n("Sorry, the procedure to set the "
"client certificate for the session "
"failed."), i18n("SSL"));
delete pkcs; // we don't need this anymore
@@ -1006,7 +1007,7 @@ int TCPSlaveBase::verifyCertificate()
"will be able to "
"easily observe your "
"data in transit."),
- i18n("Security Information"),
+ i18n("Security information"),
i18n("Display SSL "
"Information"),
i18n("Continue") );