i8ln invalid SSL text labels in frmInvalidSSLCertificate

diff --git a/source/frmInvalidSSLCertificate.cpp b/source/frmInvalidSSLCertificate.cpp
index 92f9e30..13e50de 100644 (file)
--- a/source/frmInvalidSSLCertificate.cpp
+++ b/source/frmInvalidSSLCertificate.cpp
@@ -56,12 +56,15 @@ void frmInvalidSSLCertificate::LoadData(SSLCertCollection CertDataInc,
        AccountName = AccountNameInc;
        CertData = CertDataInc;
 
-       lblSSLText->SetLabel(wxT("An invalid SSL certificate was received from the server for the '") + AccountName + wxT("' account.\n\n") +
-               wxT("Click on one of the following buttons:\n\n") +
-               wxT("- Accept to accept the SSL certificate for this session and future sessions until the certificate changes.\n") +
-               wxT("- Reject to not use this certificate and disconnect (you will be asked again on subsequent reconnections to the server).\n") +
-               wxT("- View Certificates to review the certificates that were received.")
-       );
+       wxString SSLTextLabel;
+       
+       SSLTextLabel.Append(wxString::Format(_("An invalid SSL certificate was received from the server for the '%s' account.\n\n"), AccountName));
+       SSLTextLabel.Append(_("Click on one of the following buttons:\n\n"));
+       SSLTextLabel.Append(_("- Accept to accept the SSL certificate for this session and future sessions until the certificate changes.\n"));
+       SSLTextLabel.Append(_("- Reject to not use this certificate and disconnect (you will be asked again on subsequent reconnections to the server).\n"));
+       SSLTextLabel.Append(_("- View Certificates to review the certificates that were received."));
+       
+       lblSSLText->SetLabel(SSLTextLabel);
 
 }
 
@@ -71,14 +74,17 @@ void frmInvalidSSLCertificate::LoadDataNew(SSLCertCollection CertDataInc,
 
        AccountName = DomainNameInc;
        CertData = CertDataInc;
-
-       lblSSLText->SetLabel(wxT("An invalid SSL certificate was received from the server ") + AccountName + (" account.\n\n") +
-               wxT("Click on one of the following buttons:\n\n") +
-               wxT("- Accept to accept the SSL certificate for this session and future sessions until the certificate changes.\n") +
-               wxT("- Reject to not use this certificate and disconnect.\n") +
-               wxT("- View Certificates to review the certificates that were received.")
-               );
-
+       
+       wxString SSLTextLabel;
+       
+       SSLTextLabel.Append(wxString::Format(_("An invalid SSL certificate was received from the server for the '%s' account.\n\n"), AccountName));
+       SSLTextLabel.Append(_("Click on one of the following buttons:\n\n"));
+       SSLTextLabel.Append(_("- Accept to accept the SSL certificate for this session and future sessions until the certificate changes.\n"));
+       SSLTextLabel.Append(_("- Reject to not use this certificate and disconnect.\n"));
+       SSLTextLabel.Append(_("- View Certificates to review the certificates that were received."));
+       
+       lblSSLText->SetLabel(SSLTextLabel);
+       
 }
 
 int frmInvalidSSLCertificate::GetResult()