Git commit df24ab8bf050bbc0802de125cbd1180ee3fae680 by Allen Winter.
Committed on 19/11/2011 at 19:33.
Pushed by winterz into branch 'master'.

i18n word-puzzle--

CCMAIL: kde-i18n-doc@kde.org

M  +5    -4    agents/maildispatcher/sendjob.cpp

http://commits.kde.org/kdepim-runtime/df24ab8bf050bbc0802de125cbd1180ee3fae=
680

diff --git a/agents/maildispatcher/sendjob.cpp b/agents/maildispatcher/send=
job.cpp
index 585211a..7d465c4 100644
--- a/agents/maildispatcher/sendjob.cpp
+++ b/agents/maildispatcher/sendjob.cpp
@@ -30,7 +30,6 @@
 #include <akonadi/itemmodifyjob.h>
 #include <akonadi/itemmovejob.h>
 #include <akonadi/collectionfetchjob.h>
-#include <akonadi/collection.h>
 #include <akonadi/kmime/addressattribute.h>
 #include <akonadi/kmime/messageparts.h>
 #include <akonadi/kmime/specialmailcollections.h>
@@ -334,14 +333,16 @@ void SendJob::Private::postJobResult( KJob *job )
     QString errorString;
     switch( attribute->sentBehaviour() ) {
     case SentBehaviourAttribute::Delete:
-      errorString =3D i18n( "but failed to remove the message from the out=
box" );
+      errorString =3D
+        i18n( "Sending succeeded, but failed to remove the message from th=
e outbox." );
       break;
     default:
-      errorString =3D i18n( "but failed to move the message to the sent-ma=
il folder" );
+      errorString =3D
+        i18n( "Sending succeeded, but failed to move the message to the se=
nt-mail folder." );
       break;
     }
     q->setError( UserDefinedError );
-    q->setErrorText( i18n( "Sending succeeded, %1.", errorString ) + ' ' +=
 job->errorString() );
+    q->setErrorText( errorString + ' ' + job->errorString() );
     storeResult( false, q->errorString() );
   } else {
     kDebug() << "Success deleting or moving to sent-mail.";