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

List:       kde-commits
Subject:    KDE/kdepim/kmail
From:       Martin Koller <kollix () aon ! at>
Date:       2009-08-30 18:25:25
Message-ID: 1251656725.976343.21969.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1017472 by mkoller:

Improve the text in the "encoding problem" dialog.


 M  +5 -3      messagecomposer.cpp  


--- trunk/KDE/kdepim/kmail/messagecomposer.cpp #1017471:1017472
@@ -2301,6 +2301,7 @@
       KMMsgBase::autoDetectCharset( mCharset, KMMessage::preferredCharsets(),
                                     mComposeWin->mEditor->textOrHtml() );
   if ( charset.isEmpty() ) {
+    KCursorSaver idle( KBusyPtr::idle() );
     KMessageBox::sorry( mComposeWin,
                         i18n( "No suitable encoding could be found for "
                               "your message.\nPlease set an encoding "
@@ -2370,10 +2371,11 @@
     bool loseChars = ( KMessageBox::warningYesNo(
                        mComposeWin,
                        i18n("<qt>Not all characters fit into the chosen"
-                            " encoding.<br /><br />Send the message anyway?</qt>"),
+                            " encoding '%1'.<br /><br />Send the message anyway and \
lose some characters" +                            " or let Kmail try to \
automatically find a suitable encoding?</qt>", QLatin1String( mCharset) ),  \
                i18n("Some Characters Will Be Lost"),
-                       KGuiItem ( i18n("Lose Characters") ),
-                       KGuiItem( i18n("Change Encoding") ) ) == KMessageBox::Yes );
+                       KGuiItem ( i18n("Send Anyway") ),
+                       KGuiItem( i18n("Auto-Detect Encoding") ) ) == \
KMessageBox::Yes );  if ( loseChars ) {
       const QTextCodec *codec = KMMsgBase::codecForName( mCharset );
       mComposeWin->mEditor->replaceUnknownChars( codec );


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