diff --git a/antispamwizard.cpp b/antispamwizard.cpp index f1dc050c0..7c6cb489a 100644 --- a/antispamwizard.cpp +++ b/antispamwizard.cpp @@ -663,7 +663,7 @@ void AntiSpamWizard::sortFilterOnExistance( //--------------------------------------------------------------------------- AntiSpamWizard::SpamToolConfig::SpamToolConfig( const QString &toolId, int configVersion, int prio, const QString &name, const QString &exec, - const QString &url, const QString &filter, const QString &detection, + const QString &url, const QString &filter, const QString &detection, const QString &spam, const QString &ham, const QString &noSpam, const QString &header, const QString &pattern, const QString &pattern2, const QString &serverPattern, bool detectionOnly, bool regExp, @@ -947,7 +947,7 @@ void ASWizInfoPage::addAvailableTool( const QString &visibleName ) bool ASWizInfoPage::isProgramSelected( const QString &visibleName ) { QString listName = visibleName; - + QList foundItems = mToolsList->findItems( listName, Qt::MatchFixedString ); return (foundItems.size() > 0 && foundItems[0]->isSelected()); } @@ -993,8 +993,8 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( QWidget * parent, const char * name, mMoveUnsureRules->setWhatsThis( i18n( "The default folder is the inbox folder, but you may change that " "in the folder view below.

" - "Not all tools support a classification as unsure. If you haven't " - "selected a capable tool, you can't select a folder as well.

") ); + "Not all tools support a classification as unsure. If you have not " + "selected a capable tool, you cannot select a folder as well.

") ); layout->addWidget( mMoveUnsureRules ); mFolderReqForUnsureFolder = new FolderRequester( this, mainFolderTree ); diff --git a/identitydialog.cpp b/identitydialog.cpp index 0a49d8d44..9303ae827 100644 --- a/identitydialog.cpp +++ b/identitydialog.cpp @@ -148,7 +148,7 @@ namespace KMail { glay->addWidget( label, row, 0 ); msg = i18n("

Organization

" "

This field should have the name of your organization " - "if you'd like it to be shown in the email header that " + "if you would like it to be shown in the email header that " "is sent out.

" "

It is safe (and normal) to leave this blank.

"); label->setWhatsThis( msg ); @@ -639,7 +639,7 @@ namespace KMail { mSMIMESigningKeyRequester->setFingerprint( ident.smimeSigningKey() ); mSMIMEEncryptionKeyRequester->setFingerprint( ident.smimeEncryptionKey() ); - mPreferredCryptoMessageFormat->setCurrentIndex( format2cb( + mPreferredCryptoMessageFormat->setCurrentIndex( format2cb( Kleo::stringToCryptoMessageFormat( ident.preferredCryptoMessageFormat() ) ) ); // "Advanced" tab: @@ -709,7 +709,7 @@ namespace KMail { ident.setPGPEncryptionKey( mPGPEncryptionKeyRequester->fingerprint().toLatin1() ); ident.setSMIMESigningKey( mSMIMESigningKeyRequester->fingerprint().toLatin1() ); ident.setSMIMEEncryptionKey( mSMIMEEncryptionKeyRequester->fingerprint().toLatin1() ); - ident.setPreferredCryptoMessageFormat( + ident.setPreferredCryptoMessageFormat( Kleo::cryptoMessageFormatToString(cb2format( mPreferredCryptoMessageFormat->currentIndex() ) ) ); // "Advanced" tab: ident.setReplyToAddr( mReplyToEdit->text() ); diff --git a/keyresolver.cpp b/keyresolver.cpp index 2c8fba1b1..b7309689a 100644 --- a/keyresolver.cpp +++ b/keyresolver.cpp @@ -1328,7 +1328,7 @@ std::vector Kleo::KeyResolver::getEncryptionKeys( const QString & pe // notified about it as early as possible: keys = selectKeys( person, i18nc("if in your language something like " - "'key(s)' isn't possible please " + "'key(s)' is not possible please " "use the plural in the translation", "There is a problem with the " "encryption key(s) for \"%1\".\n\n" @@ -1364,14 +1364,14 @@ std::vector Kleo::KeyResolver::getEncryptionKeys( const QString & pe return selectKeys( person, matchingKeys.empty() ? i18nc("if in your language something like " - "'key(s)' isn't possible please " + "'key(s)' is not possible please " "use the plural in the translation", "No valid and trusted encryption key was " "found for \"%1\".\n\n" "Select the key(s) which should " "be used for this recipient.", person) : i18nc("if in your language something like " - "'key(s)' isn't possible please " + "'key(s)' is not possible please " "use the plural in the translation", "More than one key matches \"%1\".\n\n" "Select the key(s) which should " diff --git a/kmfoldercachedimap.cpp b/kmfoldercachedimap.cpp index bb66a1d14..118325178 100644 --- a/kmfoldercachedimap.cpp +++ b/kmfoldercachedimap.cpp @@ -1287,7 +1287,7 @@ void KMFolderCachedImap::uploadNewMessages() i18n("

Your access rights to folder %1 have been restricted, " "it will no longer be possible to add messages to this folder.

", folder()->prettyUrl() ), - i18n("Acces rights revoked"), "KMailACLRevocationNotification" ); + i18n("Access rights revoked"), "KMailACLRevocationNotification" ); } } newState( mProgress, i18n("No messages to upload to server")); diff --git a/kmfoldercachedimap.h b/kmfoldercachedimap.h index e2462269a..c5f8215c5 100644 --- a/kmfoldercachedimap.h +++ b/kmfoldercachedimap.h @@ -228,7 +228,7 @@ class KMFolderCachedImap : public KMFolderMaildir /** Reimplemented from KMFolderMaildir */ virtual int addMsg( KMMessage *msg, int *index_return = 0 ); - + /** Adds a message without clearing it's X-UID field. @@ -593,7 +593,7 @@ public slots: and not bumped up permaturely, as it is the watermark which is used to discern message which are not present locally, because they were deleted locally and now need to be deleted from the server, - from those which are new and need to be downloaded. Sucessfull + from those which are new and need to be downloaded. Successful downloading of all pending mail from the server sets this. Between invocations it is stored on disk in the uidcache file. It must not change during a sync. diff --git a/kmheaders.cpp b/kmheaders.cpp index fb53c8eed..1827c18fc 100644 --- a/kmheaders.cpp +++ b/kmheaders.cpp @@ -2327,7 +2327,7 @@ void KMHeaders::contentsMousePressEvent(QMouseEvent* e) if ( lvi && !rootDecoClicked ) { if ( lvi != currentItem() ) highlightMessage( lvi ); - /* Explicitely set selection state. This is necessary because we want to + /* Explicitly set selection state. This is necessary because we want to * also select all children of closed threads when the parent is selected. */ // unless ctrl mask, set selected if it isn't already diff --git a/kmmsginfo.cpp b/kmmsginfo.cpp index 278156af9..0c7322d4f 100644 --- a/kmmsginfo.cpp +++ b/kmmsginfo.cpp @@ -298,7 +298,7 @@ KMMessageTagList* KMMsgInfo::tagList( void ) const { if (mTagList) return mTagList; - mTagList = new KMMessageTagList( KMMessageTagList::split( ",", + mTagList = new KMMessageTagList( KMMessageTagList::split( ",", getStringPart( MsgTagPart ) ) ); mTagList->prioritySort(); return mTagList; @@ -698,7 +698,7 @@ void KMMsgInfo::setDate(time_t aUnixTime) mDirty = true; } -//--- For compatability with old index files +//--- For compatibility with old index files void KMMsgInfo::compat_fromOldIndexString(const QByteArray& str, bool toUtf8) { const char *start, *offset; diff --git a/warningconfiguration.ui b/warningconfiguration.ui index 32a212e12..13866a119 100644 --- a/warningconfiguration.ui +++ b/warningconfiguration.ui @@ -371,7 +371,7 @@ The recommended SPHINX setting is 14 days. - Re-enable All "Don't Ask Again" Warnings + Re-enable All "Do not Ask Again" Warnings