From 409b67ac0559a06dc58da81fc90f0ba959d6068c Mon Sep 17 00:00:00 2001 From: mio Date: Sun, 23 Mar 2025 16:34:07 +1000 Subject: kmail: Rename TLS to STARTTLS and SSL to SSL/TLS Avoid confusion between TLS and STARTTLS in the UI when configuring accounts. The values of EncryptionMethods (private) match the ID of the radio buttons, and since the button order changed, the values need to as well. Signed-off-by: mio (cherry picked from commit 625d3c38cd3a49d07b6e1f511fe06d0792440791) --- kmail/accountwizard.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kmail/accountwizard.cpp') diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index b050275c..aec50b7c 100644 --- a/kmail/accountwizard.cpp +++ b/kmail/accountwizard.cpp @@ -276,7 +276,7 @@ void AccountWizard::setupServerInformationPage() mIncomingServerWdg = new TQVBox( mServerInformationPage ); mIncomingServer = new KLineEdit( mIncomingServerWdg ); - mIncomingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mIncomingServerWdg ); + mIncomingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL/TLS)" ), mIncomingServerWdg ); mIncomingLocationWdg = new TQHBox( mServerInformationPage ); mIncomingLocation = new KLineEdit( mIncomingLocationWdg ); @@ -296,7 +296,7 @@ void AccountWizard::setupServerInformationPage() layout->addWidget( label, 1, 0 ); layout->addWidget( mOutgoingServer, 1, 1 ); - mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mServerInformationPage ); + mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL/TLS)" ), mServerInformationPage ); layout->addWidget( mOutgoingUseSSL, 2, 1 ); mLocalDelivery = new TQCheckBox( i18n( "Use local delivery" ), @@ -516,7 +516,7 @@ void AccountWizard::checkPopCapabilities( const TQString &server, int port ) connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), this, TQ_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Checking for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::checkImapCapabilities( const TQString &server, int port ) @@ -527,7 +527,7 @@ void AccountWizard::checkImapCapabilities( const TQString &server, int port ) connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), this, TQ_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Checking for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::checkSmtpCapabilities( const TQString &server, int port ) @@ -540,7 +540,7 @@ void AccountWizard::checkSmtpCapabilities( const TQString &server, int port ) this, TQ_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&, const TQString&, const TQString&, const TQString& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Checking for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::popCapabilities( const TQStringList &capaNormalList, -- cgit v1.2.3