[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] /: minor: fix misspellings and improve English phrasing
From: Allen Winter <allen.winter () kdab ! com>
Date: 2013-05-19 14:27:34
Message-ID: 20130519142734.02F66A605B () git ! kde ! org
[Download RAW message or body]
Git commit 24d464e4007f25369589f90747394c6e6eeb2a7f by Allen Winter.
Committed on 19/05/2013 at 16:26.
Pushed by winterz into branch 'master'.
minor: fix misspellings and improve English phrasing
M +1 -1 examples/coisceim/coisceim-mobile/NoteView.qml
M +4 -4 importwizard/opera/operasettings.cpp
M +1 -1 importwizard/sylpheed/sylpheedsettings.cpp
M +2 -2 importwizard/thunderbird/thunderbirdsettings.cpp
M +1 -1 kjots/localresourcecreator.cpp
M +3 -1 kmail/kmmainwidget.cpp
M +1 -1 kmail/ui/securitypagegeneraltab.ui
M +2 -2 libkdepim/completionordereditor.cpp
M +5 -5 libkdepim/kcheckcombobox.h
M +7 -7 libkdepim/multiplyingline.h
M +2 -2 messagecomposer/composerviewbase.cpp
M +3 -3 messagecomposer/messagefactory.h
M +1 -1 messagecore/tests/util.h
M +3 -3 pimcommon/renamefiledialog.cpp
M +1 -1 pimsettingexporter/exportmailjob.cpp
http://commits.kde.org/kdepim/24d464e4007f25369589f90747394c6e6eeb2a7f
diff --git a/examples/coisceim/coisceim-mobile/NoteView.qml \
b/examples/coisceim/coisceim-mobile/NoteView.qml index 776f1c4..74698ce 100644
--- a/examples/coisceim/coisceim-mobile/NoteView.qml
+++ b/examples/coisceim/coisceim-mobile/NoteView.qml
@@ -23,7 +23,7 @@ import Qt 4.7
Rectangle {
id : _topContext
- color: "#00000000" // Set a transparant color.
+ color: "#00000000" // Set a transparent color.
// property int currentNoteRow : -1
anchors.fill : parent
diff --git a/importwizard/opera/operasettings.cpp \
b/importwizard/opera/operasettings.cpp index cb07d63..ec0bbd2 100644
--- a/importwizard/opera/operasettings.cpp
+++ b/importwizard/opera/operasettings.cpp
@@ -1,15 +1,15 @@
/*
Copyright (c) 2012-2013 Montel Laurent <montel@kde.org>
-
+
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
published by the Free Software Foundation.
-
+
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-
+
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
@@ -159,7 +159,7 @@ void OperaSettings::readAccount(const KConfigGroup &grp)
settings.insert(QLatin1String( "AuthenticationMethod" ), \
MailTransport::Transport::EnumAuthenticationType::APOP); //TODO: verify break;
default:
- qDebug()<<" unknown authentification method :"<<authMethod;
+ qDebug()<<" unknown authentication method :"<<authMethod;
break;
}
diff --git a/importwizard/sylpheed/sylpheedsettings.cpp \
b/importwizard/sylpheed/sylpheedsettings.cpp index 09b96a9..c162d64 100644
--- a/importwizard/sylpheed/sylpheedsettings.cpp
+++ b/importwizard/sylpheed/sylpheedsettings.cpp
@@ -527,7 +527,7 @@ QString SylpheedSettings::readTransport( const KConfigGroup& \
accountConfig )
mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN);
break;
default:
- kDebug()<<" smtp authentification unknown :"<<authMethod;
+ kDebug()<<" smtp authentication unknown :"<<authMethod;
}
}
const int sslSmtp = accountConfig.readEntry( QLatin1String( "ssl_smtp" ), 0 \
);
diff --git a/importwizard/thunderbird/thunderbirdsettings.cpp \
b/importwizard/thunderbird/thunderbirdsettings.cpp index 39de03a..a5451aa 100644
--- a/importwizard/thunderbird/thunderbirdsettings.cpp
+++ b/importwizard/thunderbird/thunderbirdsettings.cpp
@@ -650,10 +650,10 @@ void ThunderbirdSettings::readTransport()
switch(authMethod) {
case 0:
break;
- case 1: //No authentification
+ case 1: //No authentication
mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN); \
//???? break;
- case 3: //Uncrypted password
+ case 3: //Unencrypted password
mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::CLEAR); \
//??? break;
case 4: //crypted password
diff --git a/kjots/localresourcecreator.cpp b/kjots/localresourcecreator.cpp
index 150094d..a6d7fec 100644
--- a/kjots/localresourcecreator.cpp
+++ b/kjots/localresourcecreator.cpp
@@ -117,7 +117,7 @@ void LocalResourceCreator::instanceCreated( KJob *job )
void LocalResourceCreator::syncDone(KJob* job)
{
if ( job->error() ) {
- kWarning() << "Syncronizing the resource failed:" << job->errorString();
+ kWarning() << "Synchronizing the resource failed:" << job->errorString();
deleteLater();
return;
}
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 307b53e..6e42ea9 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -4687,7 +4687,9 @@ void KMMainWidget::showCollectionProperties( const QString \
&pageToShow ) return;
if ( Solid::Networking::status() == Solid::Networking::Unconnected ) {
- KMessageBox::information( this, i18n( "Network is unconnected, some infos from \
folder could not be updated." ) ); + KMessageBox::information(
+ this,
+ i18n( "Network is unconnected. Folder information cannot be updated." ) );
showCollectionPropertiesContinued( pageToShow, QPointer<KPIM::ProgressItem>() );
} else {
const Akonadi::AgentInstance agentInstance = \
Akonadi::AgentManager::self()->instance( \
mCurrentFolder->collection().resource() );
diff --git a/kmail/ui/securitypagegeneraltab.ui b/kmail/ui/securitypagegeneraltab.ui
index 78165a7..597be27 100644
--- a/kmail/ui/securitypagegeneraltab.ui
+++ b/kmail/ui/securitypagegeneraltab.ui
@@ -207,7 +207,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
- <string>KMail can analyse messages for suspected email scams by looking for \
common techniques used to deceive you</string> + <string>KMail can analyze \
messages for suspected email scams by looking for common techniques used to deceive \
you</string> </property>
</widget>
</item>
diff --git a/libkdepim/completionordereditor.cpp \
b/libkdepim/completionordereditor.cpp index 373a626..8cacfab 100644
--- a/libkdepim/completionordereditor.cpp
+++ b/libkdepim/completionordereditor.cpp
@@ -161,8 +161,8 @@ class SimpleCompletionItem : public CompletionItem
class CompletionViewItem : public QTreeWidgetItem
{
public:
- CompletionViewItem( QTreeWidget *parent, CompletionItem* item, QTreeWidgetItem \
*preceeding )
- : QTreeWidgetItem( parent, preceeding )
+ CompletionViewItem( QTreeWidget *parent, CompletionItem* item, QTreeWidgetItem \
*preceding ) + : QTreeWidgetItem( parent, preceding )
{
setItem( item );
}
diff --git a/libkdepim/kcheckcombobox.h b/libkdepim/kcheckcombobox.h
index dc5e948..21aacfe 100644
--- a/libkdepim/kcheckcombobox.h
+++ b/libkdepim/kcheckcombobox.h
@@ -93,7 +93,7 @@ class KDEPIM_EXPORT KCheckComboBox : public KComboBox
void setAlwaysShowDefaultText( bool always );
/**
- * Returns wether or not the text will be squeezed to fit in the combo's line
+ * Returns whether or not the text will be squeezed to fit in the combo's line
* edit. This property is false by default.
*
* @see KSqueezedTextLabel
@@ -101,7 +101,7 @@ class KDEPIM_EXPORT KCheckComboBox : public KComboBox
bool squeezeText() const;
/**
- * Sets wheter or not the text must be squeezed
+ * Sets whether or not the text must be squeezed.
*
* @param squeeze The new squeeze status
*/
@@ -135,15 +135,15 @@ class KDEPIM_EXPORT KCheckComboBox : public KComboBox
void setItemCheckState( int index, Qt::CheckState state );
/**
- * Returns the current seperator used to seperate the selected items in the
+ * Returns the current separator used to separate the selected items in the
* line edit of the combo box.
*/
QString separator() const;
/**
- * Sets the seperator used to seperate items in the line edit.
+ * Sets the separator used to separate items in the line edit.
*
- * @param seperator The new seperator
+ * @param separator The new separator
*/
void setSeparator( const QString &separator );
diff --git a/libkdepim/multiplyingline.h b/libkdepim/multiplyingline.h
index 30bb72b..6d98dce 100644
--- a/libkdepim/multiplyingline.h
+++ b/libkdepim/multiplyingline.h
@@ -33,7 +33,7 @@
#include <QSharedPointer>
namespace KPIM {
-
+
/**
@short ABC representing line data
@author Casey Link
@@ -63,7 +63,7 @@ class KDEPIM_EXPORT MultiplyingLineData
*/
class KDEPIM_EXPORT MultiplyingLine : public QWidget
{
-
+
Q_OBJECT
public:
explicit MultiplyingLine( QWidget *parent );
@@ -88,7 +88,7 @@ class KDEPIM_EXPORT MultiplyingLine : public QWidget
*/
virtual bool isModified() const = 0;
- /**
+ /**
Resets the modified flag to false.
*/
virtual void clearModified() = 0;
@@ -124,10 +124,10 @@ class KDEPIM_EXPORT MultiplyingLine : public QWidget
/**
Used to set setup the correct chain of widgets to focus on
when the user presses tab.
- @param previous the previous widget (probably from the preceeding line)
-
+ @param previous the previous widget (probably from the preceding line)
+
Example with a 3 widget line:
-
+
void YourLine::fixTabOrder( QWidget *previous ) {
setTabOrder( previous, mLeftMost );
setTabOrder( mLeftMost, mMiddle);
@@ -210,7 +210,7 @@ class KDEPIM_EXPORT MultiplyingLine : public QWidget
void slotReturnPressed();
void slotFocusUp();
void slotFocusDown();
-
+
protected:
/**
diff --git a/messagecomposer/composerviewbase.cpp \
b/messagecomposer/composerviewbase.cpp index 4c08eac..12ff8e6 100644
--- a/messagecomposer/composerviewbase.cpp
+++ b/messagecomposer/composerviewbase.cpp
@@ -331,9 +331,9 @@ void Message::ComposerViewBase::readyForSending()
void Message::ComposerViewBase::slotEmailAddressResolved ( KJob* job )
{
if ( job->error() ) {
- qWarning() << "An error occured while resolving the email addresses:" << \
job->errorString(); + qWarning() << "An error occurred while resolving the email \
addresses:" << job->errorString();
// This error could be caused by a broken search infrastructure, so we ignore it \
for now
- // to not block sending emails completly.
+ // to not block sending emails completely.
}
bool autoresizeImage = \
MessageComposer::MessageComposerSettings::self()->autoResizeImageEnabled();
diff --git a/messagecomposer/messagefactory.h b/messagecomposer/messagefactory.h
index c999eb8..9a05087 100644
--- a/messagecomposer/messagefactory.h
+++ b/messagecomposer/messagefactory.h
@@ -68,7 +68,7 @@ public:
bool replyAll; ///< If true, the "reply all" template was used, otherwise the \
normal reply /// template
};
-
+
explicit MessageFactory( const KMime::Message::Ptr& origMsg, Akonadi::Item::Id id, \
const Akonadi::Collection&col = Akonadi::Collection() ); virtual ~MessageFactory();
@@ -183,8 +183,8 @@ public:
/**
* Set extra mailinglist addresses to send the created message to.
- * Any mailing-list addresses specifed in the original message
- * itself will be added by MessageFactory, so no need to add those manually.
+ * Any mailing-list addresses specified in the original message
+ * itself will be added by MessageFactory, so no need to add those manually.
*/
void setMailingListAddresses( const KMime::Types::Mailbox::List& listAddresses );
diff --git a/messagecore/tests/util.h b/messagecore/tests/util.h
index 0f44cee..ca68765 100644
--- a/messagecore/tests/util.h
+++ b/messagecore/tests/util.h
@@ -29,7 +29,7 @@ namespace MessageCore {
namespace Test {
/**
- * setup a enviroment variables for tests:
+ * setup a environment variables for tests:
* * set LC_ALL to C
* * set KDEHOME
*/
diff --git a/pimcommon/renamefiledialog.cpp b/pimcommon/renamefiledialog.cpp
index f8cc41f..e36efeb 100644
--- a/pimcommon/renamefiledialog.cpp
+++ b/pimcommon/renamefiledialog.cpp
@@ -74,10 +74,10 @@ QString \
PimCommon::RenameFileDialog::RenameFileDialogPrivate::suggestName(const
//ignore dots at the beginning, that way "..aFile.tar.gz" will become "..aFile \
1.tar.gz" instead of " 1..aFile.tar.gz" int index = \
basename.indexOf(QLatin1Char('.'));
- int continous = 0;
- while (continous == index) {
+ int continuous = 0;
+ while (continuous == index) {
index = basename.indexOf(QLatin1Char('.'), index + 1);
- ++continous;
+ ++continuous;
}
if (index != -1) {
diff --git a/pimsettingexporter/exportmailjob.cpp \
b/pimsettingexporter/exportmailjob.cpp index 524b399..ba5a2db 100644
--- a/pimsettingexporter/exportmailjob.cpp
+++ b/pimsettingexporter/exportmailjob.cpp
@@ -492,7 +492,7 @@ bool ExportMailJob::backupMailData(const KUrl& url,const QString& \
archivePath) }
mailArchive->close();
- //TODO: store as an uniq file
+ //TODO: store as an unique file
mailArchive->setCompression(KZip::NoCompression);
const bool fileAdded = archive()->addLocalFile(tmp.fileName(), archivePath + \
filename); mailArchive->setCompression(KZip::DeflateCompression);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic