diff --git a/antispamwizard.cpp b/antispamwizard.cpp index abbc0fcc0..cd72ab826 100644 --- a/antispamwizard.cpp +++ b/antispamwizard.cpp @@ -525,7 +525,7 @@ void AntiSpamWizard::checkToolAvailability() : i18n("Scanning for anti-virus tools finished.") ); else mInfoPage->setScanProgressText( ( mMode == AntiSpam ) - ? i18n("

Sorry, no spam detection tools have been found. " + ? i18n("

No spam detection tools have been found. " "Install your spam detection software and " "re-run this wizard.

") : i18n("Scanning complete. No anti-virus tools found.") ); diff --git a/configuredialog.cpp b/configuredialog.cpp index dcabd133a..382e218e3 100644 --- a/configuredialog.cpp +++ b/configuredialog.cpp @@ -4429,7 +4429,7 @@ MiscPageFolderTab::MiscPageFolderTab( QWidget * parent, const char * name ) msg = i18n( "what's this help", "

Full text indexing allows very fast searches on the content " "of your messages. When enabled, the search dialog will work very fast. " - "Also, the search tool bar will also select messages based on content.

" + "Also, the search tool bar will select messages based on content.

" "

It takes up a certain amount of disk space " "(about half the disk space for the messages).

" "

After enabling, the index will need to be built, but you can continue to use KMail " diff --git a/kmailicalifaceimpl.cpp b/kmailicalifaceimpl.cpp index d6a45eedb..4cca59b14 100644 --- a/kmailicalifaceimpl.cpp +++ b/kmailicalifaceimpl.cpp @@ -1542,9 +1542,9 @@ void KMailICalIfaceImpl::readConfig() if ( i != KMail::ContentsTypeMail ) { QString typeName = localizedDefaultFolderName( static_cast( i ) ); if ( results[i].found == StandardFolderSearchResult::NotFound ) - operations += "

  • " + i18n( "%1: no folder found, will create it" ).arg( typeName ) + "
  • "; + operations += "
  • " + i18n( "%1: no folder found. It will be created." ).arg( typeName ) + "
  • "; else if ( results[i].found == StandardFolderSearchResult::FoundByType || results[i].found == StandardFolderSearchResult::FoundByName ) - operations += "
  • " + i18n( "%1: found folder %2, will set it as main groupware folder" ). + operations += "
  • " + i18n( "%1: found folder %2. It will be set as the main groupware folder." ). arg( typeName ).arg( results[i].folder->label() ) + "
  • "; } } diff --git a/kmfoldercachedimap.cpp b/kmfoldercachedimap.cpp index 290641f6b..38ae32202 100644 --- a/kmfoldercachedimap.cpp +++ b/kmfoldercachedimap.cpp @@ -1120,7 +1120,7 @@ void KMFolderCachedImap::uploadNewMessages() "have sufficient access rights on the folder now to upload them. " "Please contact your administrator to allow upload of new messages " "to you, or move them out of this folder.

    " - "

    Do you want to move those messages to another folder now?

    ") ); + "

    Do you want to move these messages to another folder now?

    ") ); if ( KMessageBox::warningYesNo( 0, msg, QString::null, i18n("Move"), i18n("Do Not Move") ) == KMessageBox::Yes ) { KMail::KMFolderSelDlg dlg( kmkernel->getKMMainWidget(), i18n("Move Messages to Folder"), true ); diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp index 18956a216..7741c4cc1 100644 --- a/kmmainwidget.cpp +++ b/kmmainwidget.cpp @@ -2286,7 +2286,7 @@ void KMMainWidget::setupActions() (void) new KAction( i18n("&Send Queued Messages"), "mail_send", 0, this, SLOT(slotSendQueued()), actionCollection(), "send_queued"); - (void) new KAction( i18n("Onlinestatus (unknown)"), "online_status", 0, this, + (void) new KAction( i18n("Online Status (unknown)"), "online_status", 0, this, SLOT(slotOnlineStatus()), actionCollection(), "online_status"); KActionMenu *sendActionMenu = new