[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    aegypten_branch: kdepim/kmail
From:       David Faure <faure () kde ! org>
Date:       2004-05-17 20:39:25
Message-ID: 20040517203925.29D6E8EA6 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

backport 1.822


  M +12 -4     kmcomposewin.cpp   1.765.2.37


--- kdepim/kmail/kmcomposewin.cpp  #1.765.2.36:1.765.2.37
@@ -2864,10 +2864,18 @@ void KMComposeWin::doSend(int aSendNow, 
     mMsg->removeHeaderField( "X-KMail-Markup" );
   if ( mEditor->textFormat() == Qt::RichText && inlineSigningEncryptionSelected() ) \
{ +    QString keepBtnText = mEncryptAction->isChecked() ?
+      mSignAction->isChecked() ? i18n( "&Keep markup, do not sign/encrypt" )
+                               : i18n( "&Keep markup, do not encrypt" )
+      : i18n( "&Keep markup, do not sign" );
+    QString yesBtnText = mEncryptAction->isChecked() ?
+      mSignAction->isChecked() ? i18n("Sign/Encrypt (delete markup)")
+      : i18n( "Encrypt (delete markup)" )
+      : i18n( "Sign (delete markup)" );
     int ret = KMessageBox::warningYesNoCancel(this,
-                                      i18n("<qt><p>Inline signing/encrypting HTML \
                messages is not possible.</p>"
-                                           "<p>Do you want to delete your markup \
?</p></qt>"), +                                      i18n("<qt><p>Inline \
signing/encrypting HTML messages is not possible;</p>" +                              \
"<p>do you want to delete your markup?</p></qt>"),  i18n("Sign/Encrypt Message?"),
-                                           KGuiItem( i18n("&Delete markup") ),
-                                           KGuiItem( i18n("&Keep markup") ) );
+                                           KGuiItem( yesBtnText ),
+                                           KGuiItem( keepBtnText ) );
     if ( KMessageBox::Cancel == ret )
       return;


[prev in list] [next in list] [prev in thread] [next in thread]