From 607e51be0aa48ed8e529476046f04a872dc92b0b Mon Sep 17 00:00:00 2001
From: Ingo Klcker <kloecker@kde.org>
Date: Sat, 17 Jun 2006 22:01:59 +0000
Subject: [PATCH] Fix some word puzzles and one untranslated string.

svn path=/branches/KDE/3.5/kdepim/; revision=552469
---
 kmacctimap.cpp   | 3 +--
 kmfolderimap.cpp | 9 +++------
 searchjob.cpp    | 3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/kmacctimap.cpp b/kmacctimap.cpp
index 3eeeb54fc..8cea24ca7 100644
--- a/kmacctimap.cpp
+++ b/kmacctimap.cpp
@@ -287,8 +287,7 @@ void KMAcctImap::processNewMail(bool interactive)
   mMailCheckProgressItem =
     ProgressManager::createProgressItem(
         "MailCheckAccount" + name(),
-        // FIXME Replace by i18n("Checking account: %1" ).arg( ... )
-        i18n("Checking account: " ) + QStyleSheet::escape( name() ),
+        i18n("Checking account: %1" ).arg( QStyleSheet::escape( name() ) ),
         QString::null, // status
         true, // can be canceled
         useSSL() || useTLS() );
diff --git a/kmfolderimap.cpp b/kmfolderimap.cpp
index 6b34aa426..498f02725 100644
--- a/kmfolderimap.cpp
+++ b/kmfolderimap.cpp
@@ -228,10 +228,8 @@ void KMFolderImap::remove()
   ImapAccountBase::jobData jd(url.url());
   jd.progressItem = ProgressManager::createProgressItem(
                       "ImapFolderRemove" + ProgressManager::getUniqueID(),
-                      // FIXME Replace by i18n("Removing folder")
-                      "Removing folder",
-                      // FIXME Replace by i18n( "URL: %1" ).arg( ... )
-                      "URL: " + QStyleSheet::escape( folder()->prettyURL() ),
+                      i18n("Removing folder"),
+                      i18n( "URL: %1" ).arg( QStyleSheet::escape( folder()->prettyURL() ) ),
                       false,
                       mAccount->useSSL() || mAccount->useTLS() );
   mAccount->insertJob(job, jd);
@@ -474,8 +472,7 @@ int KMFolderImap::addMsg(QPtrList<KMMessage>& msgList, QValueList<int>& aIndex_r
       mAddMessageProgressItem = ProgressManager::createProgressItem(
           "Uploading"+ProgressManager::getUniqueID(),
           i18n("Uploading message data"),
-          // FIXME Replace by i18n("Destination folder: %1").arg( ... )
-          i18n("Destination folder: ") + QStyleSheet::escape( folder()->prettyURL() ),
+          i18n("Destination folder: %1").arg( QStyleSheet::escape( folder()->prettyURL() ) ),
           true,
           mAccount->useSSL() || mAccount->useTLS() );
       mAddMessageProgressItem->setTotalItems( msgList.count() );
diff --git a/searchjob.cpp b/searchjob.cpp
index d1ac7a25a..2ff62281e 100644
--- a/searchjob.cpp
+++ b/searchjob.cpp
@@ -254,8 +254,7 @@ void SearchJob::slotSearchFolder()
     mProgress = ProgressManager::createProgressItem(
         "ImapSearchDownload" + ProgressManager::getUniqueID(),
         i18n("Downloading emails from IMAP server"),
-        // FIXME replace by i18n( "URL: %1" ).arg( ... )
-        "URL: " + QStyleSheet::escape( mFolder->folder()->prettyURL() ),
+        i18n( "URL: %1" ).arg( QStyleSheet::escape( mFolder->folder()->prettyURL() ) ),
         true,
         mAccount->useSSL() || mAccount->useTLS() );
     mProgress->setTotalItems( numMsgs );