Git commit 9e624420df045c6dc8765bcb7607190138249e39 by Yuri Chornoivan. Committed on 15/06/2013 at 10:42. Pushed by yurchor into branch 'master'.
Fix various typos (found by Krazy 2) M +1 -1 CMakeLists.txt M +1 -1 doc/index.docbook M +1 -1 doc/jabber.docbook M +1 -1 kopete/chatwindow/kopeterichtextwidget.cpp M +1 -1 kopete/chatwindow/kopeterichtextwidget.h M +1 -1 kopete/contactlist/contactlistplainmodel.cpp M +2 -2 kopete/contactlist/contactlisttreemodel.cpp M +1 -1 kopete/kopetedbusinterface_p.h M +3 -3 libkopete/avdevice/videodevice.cpp M +1 -1 libkopete/avdevice/videodevicepool.cpp M +1 -1 libkopete/kopeteproperties.h M +1 -1 libkopete/ui/avatardialog.h M +1 -1 libkopete/ui/avatarwebcamdialog.h M +1 -1 plugins/history/historyimport.h M +1 -1 plugins/history2/history2import.h M +1 -1 protocols/bonjour/bonjouraccount.cpp M +2 -2 protocols/gadu/gadudccserver.cpp M +1 -1 protocols/jabber/googletalk/googletalk.cpp M +11 -11 protocols/jabber/googletalk/googletalk.h M +1 -1 protocols/jabber/googletalk/libjingle/talk/app/webrtc/test/fakevideocapturemodule.h M +1 -1 protocols/jabber/googletalk/libjingle/talk/base/fileutils_unittest.cc M +1 -1 protocols/jabber/googletalk/libjingle/talk/base/macasyncsocket.cc M +1 -1 protocols/jabber/googletalk/libjingle/talk/base/stream.h M +1 -1 protocols/jabber/googletalk/libjingle/talk/p2p/base/session.cc M +1 -1 protocols/jabber/googletalk/libjingle/talk/xmpp/ratelimitmanager.h M +1 -1 protocols/jabber/googletalk/libjingle/talk/xmpp/rostermodule.h M +1 -1 protocols/jabber/jabberbookmarks.h M +1 -1 protocols/jabber/jabberchatsession.cpp M +1 -1 protocols/jabber/jabberclient.cpp M +1 -1 protocols/jabber/libiris/src/xmpp/xmpp-im/types.cpp M +1 -1 protocols/oscar/liboscar/tasks/messagereceivertask.cpp M +1 -1 protocols/skype/CMakeLists.txt M +2 -2 protocols/skype/libskype/skype.cpp M +2 -2 protocols/skype/libskype/skype.h M +10 -10 protocols/skype/libskype/skypewindow.cpp M +1 -1 protocols/skype/libskype/skypewindow.h M +4 -4 protocols/skype/skypeaccount.cpp M +1 -1 protocols/skype/skypeaccount.h M +3 -3 protocols/skype/skypebuttons/qtbrowserplugin/qtbrowserplugin.cpp M +1 -1 protocols/skype/skypecalldialog.h M +2 -2 protocols/skype/skypechatsession.cpp M +3 -3 protocols/skype/skypechatsession.h M +1 -1 protocols/skype/skypecontact.cpp M +2 -2 protocols/skype/skypeprotocol.cpp M +1 -1 protocols/skype/skypeprotocol.h M +2 -2 protocols/winpopup/libwinpopup/libwinpopup.cpp M +2 -2 protocols/winpopup/winpopup-install M +1 -1 protocols/wlm/wlmprotocol.cpp http://commits.kde.org/kopete/9e624420df045c6dc8765bcb7607190138249e39 diff --git a/CMakeLists.txt b/CMakeLists.txt index e1a1ccb..18896be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ macro_optional_find_package(QCA2) macro_log_feature(QCA2_FOUND "QCA2" "Qt Cryptographic Architecture" "http://delta.affinix.com/qca"; FALSE "2.0.0" "Needed to build Kopete's GroupWise and Jabber protocols.") macro_optional_find_package(IDN) -macro_log_feature(IDN_FOUND "IDN" "GNU Libidn Internationalized Domain Name (IDN) implemenation" "http://www.gnu.org/software/libidn/"; FALSE "" "Used by the Kopete Jabber plugin.") +macro_log_feature(IDN_FOUND "IDN" "GNU Libidn Internationalized Domain Name (IDN) implementation" "http://www.gnu.org/software/libidn/"; FALSE "" "Used by the Kopete Jabber plugin.") #macro_optional_find_package(Alsa) #macro_log_feature(ALSA_FOUND "Alsa" "Alsa is Advanced Linux Sound Architecture" "" FALSE "" "Needed for Jingle Support in Kopete Jabber Plugin") diff --git a/doc/index.docbook b/doc/index.docbook index c1a7699..1576dc9 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -66,7 +66,7 @@ Plugins (Outlined, Will) Menus (Done, Will) (Short description of each menu item) FAQ (1st draft, Will) -Specialised Tasks +Specialized Tasks (Any tricks involving _use_ of Kopete) Command line flags Credits (1st draft, Will) diff --git a/doc/jabber.docbook b/doc/jabber.docbook index cf4de61..b7af974 100644 --- a/doc/jabber.docbook +++ b/doc/jabber.docbook @@ -428,7 +428,7 @@ </mediaobject> </screenshot> </para> -<para>This may take a while and you have to wait until &kopete; finished. After that close the OTR window with <guilabel>OK</guilabel> and <guilabel>Apply</guilabel> the changes. You eventually will have to restart &kopete; after this. Then open a chat window of the contact you want to safely communicate with. Go to <menuchoice><guimenu>Tools</guimenu><guisubmenu>OTR Settings</guisubmenu><guimenuitem>Start OTR Session</guimenuitem></menuchoice> or use the icon <menuchoice><guimenu>OTR Encryption</guimenu><guimenuitem>Start OTR Session</guimenuitem></menuchoice>. &kopete; will start the session if your contact is capable of OTR, otherwise you'll recieve an error message. +<para>This may take a while and you have to wait until &kopete; finished. After that close the OTR window with <guilabel>OK</guilabel> and <guilabel>Apply</guilabel> the changes. You eventually will have to restart &kopete; after this. Then open a chat window of the contact you want to safely communicate with. Go to <menuchoice><guimenu>Tools</guimenu><guisubmenu>OTR Settings</guisubmenu><guimenuitem>Start OTR Session</guimenuitem></menuchoice> or use the icon <menuchoice><guimenu>OTR Encryption</guimenu><guimenuitem>Start OTR Session</guimenuitem></menuchoice>. &kopete; will start the session if your contact is capable of OTR, otherwise you'll receive an error message. </para> <para> <screenshot> diff --git a/kopete/chatwindow/kopeterichtextwidget.cpp b/kopete/chatwindow/kopeterichtextwidget.cpp index 6a5c8cb..d99de42 100644 --- a/kopete/chatwindow/kopeterichtextwidget.cpp +++ b/kopete/chatwindow/kopeterichtextwidget.cpp @@ -174,7 +174,7 @@ void KopeteRichTextWidget::createActions(KActionCollection *actionCollection) KRichTextWidget::createActions(actionCollection); // FIXME: Really ugly hack, but we reset format in updateCharFormat and if we don't disconnect this - // then actions will have old values and not the resetted. + // then actions will have old values and not the reset. disconnect(this, SIGNAL(currentCharFormatChanged(QTextCharFormat)), this, SLOT(_k_updateCharFormatActions(QTextCharFormat))); } diff --git a/kopete/chatwindow/kopeterichtextwidget.h b/kopete/chatwindow/kopeterichtextwidget.h index a8f7d12..79c0919 100644 --- a/kopete/chatwindow/kopeterichtextwidget.h +++ b/kopete/chatwindow/kopeterichtextwidget.h @@ -28,7 +28,7 @@ #include <kopete_export.h> /** - * @brief A KopeteRichTextWidget with overidden behaviors + * @brief A KopeteRichTextWidget with overridden behaviors * * This class overrides the default behavior of fonts when cleared, pasted, etc * to match the expected behavior of the user. diff --git a/kopete/contactlist/contactlistplainmodel.cpp b/kopete/contactlist/contactlistplainmodel.cpp index 3e83963..36e43f3 100644 --- a/kopete/contactlist/contactlistplainmodel.cpp +++ b/kopete/contactlist/contactlistplainmodel.cpp @@ -75,7 +75,7 @@ void ContactListPlainModel::addMetaContactImpl( Kopete::MetaContact *mc ) if ( mcIndex == mcDesireIndex ) return; - // We're moving metaContact so temporary remove it so model is avare of the change. + // We're moving metaContact so temporary remove it so model is aware of the change. beginRemoveRows( QModelIndex(), mcIndex, mcIndex ); m_contacts.removeAt( mcIndex ); endRemoveRows(); diff --git a/kopete/contactlist/contactlisttreemodel.cpp b/kopete/contactlist/contactlisttreemodel.cpp index ac8b275..a4da4ba 100644 --- a/kopete/contactlist/contactlisttreemodel.cpp +++ b/kopete/contactlist/contactlisttreemodel.cpp @@ -148,7 +148,7 @@ void ContactListTreeModel::addMetaContactToGroup( Kopete::MetaContact *mc, Kopet if ( mcIndex == mcDesireIndex ) return; - // We're moving metaContact so temporary remove it so model is avare of the change. + // We're moving metaContact so temporary remove it so model is aware of the change. beginRemoveRows( parent, mcIndex, mcIndex ); mcModelItem->remove(); endRemoveRows(); @@ -439,7 +439,7 @@ bool ContactListTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction ac if ( gIndex == gDesireIndex ) continue; - // We're moving group so temporary remove it so model is avare of the change. + // We're moving group so temporary remove it so model is aware of the change. beginRemoveRows( indexFor( gmi->parent() ), gIndex, gIndex ); gmi->remove(); endRemoveRows(); diff --git a/kopete/kopetedbusinterface_p.h b/kopete/kopetedbusinterface_p.h index 141741a..77527c1 100644 --- a/kopete/kopetedbusinterface_p.h +++ b/kopete/kopetedbusinterface_p.h @@ -79,7 +79,7 @@ public: Q_SIGNALS: /** - * Emmited whenever a contact's property changed + * Emitted whenever a contact's property changed * @param contactId protocol:account:contact triplet of the * contact with a property change * */ diff --git a/libkopete/avdevice/videodevice.cpp b/libkopete/avdevice/videodevice.cpp index 0d322e7..9ee0786 100644 --- a/libkopete/avdevice/videodevice.cpp +++ b/libkopete/avdevice/videodevice.cpp @@ -54,7 +54,7 @@ VideoDevice::~VideoDevice() \brief Sets up the supported video-controls for the current input Determines which video-controls are supported for the current input, - reads all needed informations about them and stores the data to the local members + reads all needed information about them and stores the data to the local members */ void VideoDevice::setupControls() { @@ -178,7 +178,7 @@ void VideoDevice::setupControls() \fn bool VideoDevice::getMenuCtrlOptions(quint32 id, quint32 maxindex, QStringList * options) \param id ID of the video-control \param maxindex Highest menu index - \param options Pointer to the QStringList which will recieve the option-strings of the video-control + \param options Pointer to the QStringList which will receive the option-strings of the video-control \return The success of the operation \brief Reads the available options provided by a menu-video-control */ @@ -1727,7 +1727,7 @@ QList<ActionVideoControl> VideoDevice::getSupportedActionControls() /*! \fn int VideoDevice::getControlValue(quint32 ctrl_id, qint32 * value) \param ctrl_id ID of the video-control - \param value Pointer to the variable, which recieves the value of the querried video-control. + \param value Pointer to the variable, which receives the value of the querried video-control. For boolean controls, the value is 0 or 1. For menu-controls, the value is the index of the currently selected option. \return The result-code, currently EXIT_SUCCESS or EXIT_FAILURE diff --git a/libkopete/avdevice/videodevicepool.cpp b/libkopete/avdevice/videodevicepool.cpp index 1c36a71..cb55f87 100644 --- a/libkopete/avdevice/videodevicepool.cpp +++ b/libkopete/avdevice/videodevicepool.cpp @@ -331,7 +331,7 @@ QList<ActionVideoControl> VideoDevicePool::getSupportedActionControls() /*! \fn int VideoDevicePool::getControlValue( quint32 ctrl_id, qint32 * value ) \param ctrl_id ID of the video-control - \param value Pointer to the variable, which recieves the value of the querried video-control. + \param value Pointer to the variable, which receives the value of the querried video-control. For boolean controls, the value is 0 or 1. For menu-controls, the value is the index of the currently selected option. \return The result-code, currently EXIT_SUCCESS or EXIT_FAILURE diff --git a/libkopete/kopeteproperties.h b/libkopete/kopeteproperties.h index 58f0c29..56b598a 100644 --- a/libkopete/kopeteproperties.h +++ b/libkopete/kopeteproperties.h @@ -160,7 +160,7 @@ public: * class YourClass : public WithProperties<YourClass> { ... }; * \endcode * - * You will also need to explicitly specialise the propertyCreated() member function to + * You will also need to explicitly specify the propertyCreated() member function to * load property data upon creation of a new property object. */ template<class Parent> diff --git a/libkopete/ui/avatardialog.h b/libkopete/ui/avatardialog.h index 6d9b2cf..73757d9 100644 --- a/libkopete/ui/avatardialog.h +++ b/libkopete/ui/avatardialog.h @@ -65,7 +65,7 @@ public: */ AvatarDialog(QWidget *parent = 0); /** - * Clean-up ressource of AvatarDialog + * Clean-up resource of AvatarDialog */ virtual ~AvatarDialog(); diff --git a/libkopete/ui/avatarwebcamdialog.h b/libkopete/ui/avatarwebcamdialog.h index 2152219..c6ab517 100644 --- a/libkopete/ui/avatarwebcamdialog.h +++ b/libkopete/ui/avatarwebcamdialog.h @@ -55,7 +55,7 @@ public: */ AvatarWebcamDialog(QWidget *parent = 0); /** - * Clean-up ressource of AvatarFromWebcamDialog + * Clean-up resource of AvatarFromWebcamDialog */ virtual ~AvatarWebcamDialog(); /** diff --git a/plugins/history/historyimport.h b/plugins/history/historyimport.h index dce6b3d..1ba3015 100644 --- a/plugins/history/historyimport.h +++ b/plugins/history/historyimport.h @@ -108,7 +108,7 @@ private: bool isNickIncoming(const QString &nick, struct Log *log); /** - * Trys to extract the time from @param string using formats specified in timeFormats. + * Tries to extract the time from @param string using formats specified in timeFormats. * @param ref is used when @param string doesn't contain a date or to adjust a found date. * @param ref is taken from the filename of the log. */ diff --git a/plugins/history2/history2import.h b/plugins/history2/history2import.h index 51020ad..c2760f6 100644 --- a/plugins/history2/history2import.h +++ b/plugins/history2/history2import.h @@ -98,7 +98,7 @@ private: int countLogs(QDir dir, int depth); /** - * Trys to extract the time from @param string using formats specified in timeFormats. + * Tries to extract the time from @param string using formats specified in timeFormats. * @param ref is used when @param string doesn't contain a date or to adjust a found date. * @param ref is taken from the filename of the log. */ diff --git a/protocols/bonjour/bonjouraccount.cpp b/protocols/bonjour/bonjouraccount.cpp index 2c6e38e..1d01997 100644 --- a/protocols/bonjour/bonjouraccount.cpp +++ b/protocols/bonjour/bonjouraccount.cpp @@ -185,7 +185,7 @@ void BonjourAccount::startPublish() void BonjourAccount::published(bool success) { - // If we have sucessfully published, great :) + // If we have successfully published, great :) if (success) { kDebug()<<"Publish Successful"; } else { diff --git a/protocols/gadu/gadudccserver.cpp b/protocols/gadu/gadudccserver.cpp index 5dbe6ce..0460988 100644 --- a/protocols/gadu/gadudccserver.cpp +++ b/protocols/gadu/gadudccserver.cpp @@ -167,8 +167,8 @@ GaduDCCServer::watcher() { kDebug( 14100 ) << " dcc error occurred "; break; case GG_EVENT_DCC_NEW: - // I do expect reciver to set this boolean to true if he handled signal - // if so, no other reciver should be bothered with it, and I shall not close it + // I do expect receiver to set this boolean to true if he handled signal + // if so, no other receiver should be bothered with it, and I shall not close it // otherwise connection is closed as not handled emit incoming( dccEvent->event.dcc_new, handled ); if ( !handled ) { diff --git a/protocols/jabber/googletalk/googletalk.cpp b/protocols/jabber/googletalk/googletalk.cpp index d607fa8..3c75999 100644 --- a/protocols/jabber/googletalk/googletalk.cpp +++ b/protocols/jabber/googletalk/googletalk.cpp @@ -279,7 +279,7 @@ void GoogleTalk::read() { //Invalid JID emit(disconnected(line)); } else if ( line.startsWith("Removing from roster:") ) { - //User doesnt support google talk libjingle + //User does not support google talk libjingle QString user = line.section(':', -1).section('/', 0, 0).trimmed(); QString resource = line.section(':', -1).section('/', -1).trimmed(); // qDebug() << "user offline" << user << resource; diff --git a/protocols/jabber/googletalk/googletalk.h b/protocols/jabber/googletalk/googletalk.h index c54342d..da69d61 100644 --- a/protocols/jabber/googletalk/googletalk.h +++ b/protocols/jabber/googletalk/googletalk.h @@ -52,7 +52,7 @@ class GoogleTalk : public QObject /** * Set (or change) user name and password for Google Talk account - * Use it if you doesnt set up in constructor + * Use it if you do not set up in constructor * If you change, first logout @see logout() * @param jid user name (jabber jid) for Google Talk account (default none) * @param password password for GoogleTalk account (default none) @@ -160,25 +160,25 @@ class GoogleTalk : public QObject signals: /** - * This signal is emited when we are succesfull login to Google Talk server + * This signal is emitted when we are succesfull login to Google Talk server */ void connected(); /** - * This signal is emited when we are disconnected or logouted from Google Talk server + * This signal is emitted when we are disconnected or logouted from Google Talk server * @param res Resolution why we are disconneced */ void disconnected(const QString &res); /** - * This signal is emited when user go online and support voice call + * This signal is emitted when user go online and support voice call * @param user name of who go online * @param resource jabber resource of user */ void userOnline(const QString &user, const QString &resource); /** - * This signal is emited when user go offline or not support voice call + * This signal is emitted when user go offline or not support voice call * After succesfull login it is all user who are online, but dont support voice call * @param user name of user who go offline * @param resource jabber resource of user @@ -186,34 +186,34 @@ class GoogleTalk : public QObject void userOffline(const QString &user, const QString &resourc); /** - * This signal is emited when user call you + * This signal is emitted when user call you * @param user name of user who are call you * @param resource jabber resource of user */ void incomingCall(const QString &user, const QString &resourc); /** - * This signal is emited when you start call, but user from other side doesnt accept/reject call + * This signal is emitted when you start call, but user from other side does not accept/reject call */ void callingCall(); /** - * This signal is emited when user from other side accept call + * This signal is emitted when user from other side accept call */ void acceptedCall(); /** - * This signal is emited when user from other side reject call + * This signal is emitted when user from other side reject call */ void rejectedCall(); /** - * This signal is emited when call is active in all side + * This signal is emitted when call is active in all side */ void progressCall(); /** - * This signal is emited when user from other side hang up call + * This signal is emitted when user from other side hang up call */ void hangedupCall(); diff --git a/protocols/jabber/googletalk/libjingle/talk/app/webrtc/test/fakevideocapturemodule.h b/protocols/jabber/googletalk/libjingle/talk/app/webrtc/test/fakevideocapturemodule.h index 7c75387..a5cc763 100644 --- a/protocols/jabber/googletalk/libjingle/talk/app/webrtc/test/fakevideocapturemodule.h +++ b/protocols/jabber/googletalk/libjingle/talk/app/webrtc/test/fakevideocapturemodule.h @@ -165,7 +165,7 @@ class FakeVideoCaptureModule return impl_->EnableNoPictureAlarm(enable); } - // Inherited from MesageHandler. + // Inherited from MessageHandler. virtual void OnMessage(talk_base::Message* msg) { GenerateNewFrame(); } diff --git a/protocols/jabber/googletalk/libjingle/talk/base/fileutils_unittest.cc b/protocols/jabber/googletalk/libjingle/talk/base/fileutils_unittest.cc index 992ea82..0930b2b 100644 --- a/protocols/jabber/googletalk/libjingle/talk/base/fileutils_unittest.cc +++ b/protocols/jabber/googletalk/libjingle/talk/base/fileutils_unittest.cc @@ -114,7 +114,7 @@ TEST(FilesystemTest, TestGetDiskFreeSpace) { EXPECT_GT(free1, 0); int64 free2 = 0; - path.AppendFolder("this_folder_doesnt_exist"); + path.AppendFolder("this_folder_does not_exist"); EXPECT_FALSE(Filesystem::IsFolder(path)); EXPECT_TRUE(Filesystem::IsAbsent(path)); EXPECT_TRUE(Filesystem::GetDiskFreeSpace(path, &free2)); diff --git a/protocols/jabber/googletalk/libjingle/talk/base/macasyncsocket.cc b/protocols/jabber/googletalk/libjingle/talk/base/macasyncsocket.cc index 6aeefc8..75809b6 100644 --- a/protocols/jabber/googletalk/libjingle/talk/base/macasyncsocket.cc +++ b/protocols/jabber/googletalk/libjingle/talk/base/macasyncsocket.cc @@ -415,7 +415,7 @@ void MacAsyncSocket::MacAsyncSocketCallBack(CFSocketRef s, case kCFSocketConnectCallBack: if (data != NULL) { - // An error occured in the background while connecting + // An error occurred in the background while connecting this_socket->error_ = errno; this_socket->state_ = CS_CLOSED; this_socket->SignalCloseEvent(this_socket, this_socket->error_); diff --git a/protocols/jabber/googletalk/libjingle/talk/base/stream.h b/protocols/jabber/googletalk/libjingle/talk/base/stream.h index 808156c..a69bb85 100644 --- a/protocols/jabber/googletalk/libjingle/talk/base/stream.h +++ b/protocols/jabber/googletalk/libjingle/talk/base/stream.h @@ -97,7 +97,7 @@ class StreamInterface : public MessageHandler { virtual void Close() = 0; // Streams may signal one or more StreamEvents to indicate state changes. - // The first argument identifies the stream on which the state change occured. + // The first argument identifies the stream on which the state change occurred. // The second argument is a bit-wise combination of StreamEvents. // If SE_CLOSE is signalled, then the third argument is the associated error // code. Otherwise, the value is undefined. diff --git a/protocols/jabber/googletalk/libjingle/talk/p2p/base/session.cc b/protocols/jabber/googletalk/libjingle/talk/p2p/base/session.cc index 29ced3c..ca47cb1 100644 --- a/protocols/jabber/googletalk/libjingle/talk/p2p/base/session.cc +++ b/protocols/jabber/googletalk/libjingle/talk/p2p/base/session.cc @@ -497,7 +497,7 @@ void BaseSession::LogState(State old_state, State new_state) { void BaseSession::OnMessage(talk_base::Message *pmsg) { switch (pmsg->message_id) { case MSG_TIMEOUT: - // Session timeout has occured. + // Session timeout has occurred. SetError(ERROR_TIME); break; diff --git a/protocols/jabber/googletalk/libjingle/talk/xmpp/ratelimitmanager.h b/protocols/jabber/googletalk/libjingle/talk/xmpp/ratelimitmanager.h index 288084f..33bbfe9 100644 --- a/protocols/jabber/googletalk/libjingle/talk/xmpp/ratelimitmanager.h +++ b/protocols/jabber/googletalk/libjingle/talk/xmpp/ratelimitmanager.h @@ -103,7 +103,7 @@ class RateLimitManager { private: - // The time at which the i-th (where i = max_count) event occured + // The time at which the i-th (where i = max_count) event occurred uint32 PreviousTimeAtCounter() { return event_times_[counter_]; } diff --git a/protocols/jabber/googletalk/libjingle/talk/xmpp/rostermodule.h b/protocols/jabber/googletalk/libjingle/talk/xmpp/rostermodule.h index f5274ff..0aa0bdb 100644 --- a/protocols/jabber/googletalk/libjingle/talk/xmpp/rostermodule.h +++ b/protocols/jabber/googletalk/libjingle/talk/xmpp/rostermodule.h @@ -197,7 +197,7 @@ public: XmppSubscriptionRequestType type, const XmlElement* raw_xml) = 0; - //! Some type of presence error has occured + //! Some type of presence error has occurred virtual void SubscriptionError(XmppRosterModule* roster, const Jid& from, const XmlElement* raw_xml) = 0; diff --git a/protocols/jabber/jabberbookmarks.h b/protocols/jabber/jabberbookmarks.h index 2b5e041..182e4aa 100644 --- a/protocols/jabber/jabberbookmarks.h +++ b/protocols/jabber/jabberbookmarks.h @@ -75,7 +75,7 @@ class JabberBookmarks : public QObject /** * update or create en entry with the given jid. - * the jid ressource is the nickname + * the jid resource is the nickname */ void insertGroupChat(const XMPP::Jid &jid); diff --git a/protocols/jabber/jabberchatsession.cpp b/protocols/jabber/jabberchatsession.cpp index ec6220d..0b49b46 100644 --- a/protocols/jabber/jabberchatsession.cpp +++ b/protocols/jabber/jabberchatsession.cpp @@ -112,7 +112,7 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas //if ( chatMembers.first () ) //{ // Check if the current contact support Audio calls, also honor lock by default. - // FIXME: we should use the active ressource + // FIXME: we should use the active resource //jingleaudiocall->setEnabled( bestResource->features().canJingleAudio() ); //jinglevideocall->setEnabled( bestResource->features().canJingleVideo() ); //} diff --git a/protocols/jabber/jabberclient.cpp b/protocols/jabber/jabberclient.cpp index e076774..bc3f37b 100644 --- a/protocols/jabber/jabberclient.cpp +++ b/protocols/jabber/jabberclient.cpp @@ -1055,7 +1055,7 @@ void JabberClient::slotCSAuthenticated () } - //update the ressource: + //update the resource: d->jid = d->jabberClientStream->jid(); // start the client operation diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-im/types.cpp b/protocols/jabber/libiris/src/xmpp/xmpp-im/types.cpp index 9fee217..bb62528 100644 --- a/protocols/jabber/libiris/src/xmpp/xmpp-im/types.cpp +++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/types.cpp @@ -967,7 +967,7 @@ public: //! \brief Constructs Message with given Jid information. //! //! This function will construct a Message container. -//! \param to - specify reciver (default: empty string) +//! \param to - specify receiver (default: empty string) Message::Message(const Jid &to) { d = new Private; diff --git a/protocols/oscar/liboscar/tasks/messagereceivertask.cpp b/protocols/oscar/liboscar/tasks/messagereceivertask.cpp index f57e878..b25a3e3 100644 --- a/protocols/oscar/liboscar/tasks/messagereceivertask.cpp +++ b/protocols/oscar/liboscar/tasks/messagereceivertask.cpp @@ -289,7 +289,7 @@ void MessageReceiverTask::handleType2Message() emit receivedMessage( msg ); break; case 0x01: - kDebug(OSCAR_RAW_DEBUG) << "Received Abort Mesage"; + kDebug(OSCAR_RAW_DEBUG) << "Received Abort Message"; break; case 0x02: kDebug(OSCAR_RAW_DEBUG) << "Received OK Message"; diff --git a/protocols/skype/CMakeLists.txt b/protocols/skype/CMakeLists.txt index 705c1a8..5b72c63 100644 --- a/protocols/skype/CMakeLists.txt +++ b/protocols/skype/CMakeLists.txt @@ -91,7 +91,7 @@ install( FILES kopete_skype.desktop skype.protocol callto.protocol tel.protocol install( FILES skypeui.rc skypechatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_skype ) #Enable this for system bus dbus type communication with skype public api -#Linux skype client (version 2.0.0.72) still doesnt support it, so we doesnt need it now maybe in new skype version +#Linux skype client (version 2.0.0.72) still does not support it, so we do not need it now maybe in new skype version #if (DBUS_SYSTEM_POLICY_DIR) # install( FILES libskype/skypedbus/com.Skype.API.Client.conf DESTINATION ${DBUS_SYSTEM_POLICY_DIR}) #else (DBUS_SYSTEM_POLICY_DIR) diff --git a/protocols/skype/libskype/skype.cpp b/protocols/skype/libskype/skype.cpp index 3643284..9a42b9d 100644 --- a/protocols/skype/libskype/skype.cpp +++ b/protocols/skype/libskype/skype.cpp @@ -278,7 +278,7 @@ void Skype::connectionDone(int error, int protocolVer) { d->connection.send("GET CONNSTATUS"); d->fixGroupTimer->start(60000);//fix & load groups to memory every minutes } else { - closed(crLost);//OK, this is wrong, justclose the connection/atempt and delete the queue + closed(crLost);//OK, this is wrong, just close the connection/attempt and delete the queue } } @@ -943,7 +943,7 @@ void Skype::fixGroups(bool loadOnly) { } } - //Check if groups doesnt have same names + //Check if groups do not have same names if ( ! loadOnly ) { QStringList groupsNames = d->groupsNames.keys();//get all groups names, if group has more ides then one, add to List this group only one for ( QStringList::iterator group = groupsNames.begin(); group != groupsNames.end(); ++group ){ diff --git a/protocols/skype/libskype/skype.h b/protocols/skype/libskype/skype.h index 958ae21..90e82ad 100644 --- a/protocols/skype/libskype/skype.h +++ b/protocols/skype/libskype/skype.h @@ -449,7 +449,7 @@ class Skype : public QObject */ void wentInvisible(); /** - * Emitted when atempt to connect started + * Emitted when attempt to connect started */ void statusConnecting(); /** @@ -570,7 +570,7 @@ class Skype : public QObject */ void groupCall(const QString &callId, const QString &groupId); /** - * Emitted when we recive auth request + * Emitted when we receive auth request * @param contactId who send request * @parma info info in request */ diff --git a/protocols/skype/libskype/skypewindow.cpp b/protocols/skype/libskype/skypewindow.cpp index 833cb98..59c35a4 100644 --- a/protocols/skype/libskype/skypewindow.cpp +++ b/protocols/skype/libskype/skypewindow.cpp @@ -110,10 +110,10 @@ bool SkypeWindow::isCallDialog(const QString &user, WId wid) { kDebug(SKYPE_DEBUG_GLOBAL) << "It is skype dialog"; return true; } else { - kDebug(SKYPE_DEBUG_GLOBAL) << "pid" << pid << "windowName" << windowName << "isnt skype call dialog for name" << user; + kDebug(SKYPE_DEBUG_GLOBAL) << "pid" << pid << "windowName" << windowName << "is not skype call dialog for name" << user; } } else { - kDebug(SKYPE_DEBUG_GLOBAL) << "pid" << pid << "isnt skype call dialog for name" << user; + kDebug(SKYPE_DEBUG_GLOBAL) << "pid" << pid << "is not skype call dialog for name" << user; } @@ -173,7 +173,7 @@ void SkypeWindow::hideCallDialog(const QString &user) { kDebug(SKYPE_DEBUG_GLOBAL) << user; WId wid = getCallDialogWId(user); if ( wid == 0 ) { - kDebug(SKYPE_DEBUG_GLOBAL) << "Cant find WId of skype call dialog"; + kDebug(SKYPE_DEBUG_GLOBAL) << "Cannot find WId of skype call dialog"; return; } kDebug(SKYPE_DEBUG_GLOBAL) << "Hide skype call dialog id" << wid; @@ -185,7 +185,7 @@ void SkypeWindow::showCallDialog(const QString &user) { kDebug(SKYPE_DEBUG_GLOBAL) << user; WId wid = d->hiddenWindows.value(user, 0); if ( wid == 0 ) { - kDebug(SKYPE_DEBUG_GLOBAL) << "Cant find WId of skype call dialog, maybe now doesnt exist"; + kDebug(SKYPE_DEBUG_GLOBAL) << "Cannot find WId of skype call dialog, maybe now it does not exist"; return; } kDebug(SKYPE_DEBUG_GLOBAL) << "Show skype call dialog WId" << wid; @@ -198,7 +198,7 @@ void SkypeWindow::deleteCallDialog(const QString &user) { kDebug(SKYPE_DEBUG_GLOBAL) << user; WId wid = d->hiddenWindows.value(user, 0); if ( wid == 0 ) { - kDebug(SKYPE_DEBUG_GLOBAL) << "Cant find WId of skype call dialog, maybe is now deleted"; + kDebug(SKYPE_DEBUG_GLOBAL) << "Cannot find WId of skype call dialog, maybe it is now deleted"; return; } kDebug(SKYPE_DEBUG_GLOBAL) << "Delete skype call dialog id" << wid; @@ -250,7 +250,7 @@ void SkypeWindow::moveWebcamWidget(const QString &user, WId otherWId, int x, int } WId webcamWidgetWId = getWebcamWidgetWId(callDialogWId); if ( webcamWidgetWId == 0 ) { - kDebug(SKYPE_DEBUG_GLOBAL) << "Cant find WId of skype webcam widget, maybe isnt incomming webcam stream"; + kDebug(SKYPE_DEBUG_GLOBAL) << "Cannot find WId of skype webcam widget, maybe it is not an incoming webcam stream"; return; } //get parent of webcam stream widget @@ -259,7 +259,7 @@ void SkypeWindow::moveWebcamWidget(const QString &user, WId otherWId, int x, int unsigned int nchildren; int status = XQueryTree(QX11Info::display(), webcamWidgetWId, &root, &parent, &children, &nchildren); if ( status == 0 ) { - kDebug(SKYPE_DEBUG_GLOBAL) << "Cant find parent of skype webcam widget"; + kDebug(SKYPE_DEBUG_GLOBAL) << "Cannot find parent of skype webcam widget"; return; } XFree(children); @@ -273,17 +273,17 @@ void SkypeWindow::revertWebcamWidget(const QString &user) { kDebug(SKYPE_DEBUG_GLOBAL) << user; WId callDialogWId = getCallDialogWId(user); if ( callDialogWId == 0 ) { - kDebug(SKYPE_DEBUG_GLOBAL) << "Cant find WId of skype call dialog"; + kDebug(SKYPE_DEBUG_GLOBAL) << "Cannot find WId of skype call dialog"; return; } WId webcamWidgetWId = getWebcamWidgetWId(callDialogWId); if ( callDialogWId == 0 ) { - kDebug(SKYPE_DEBUG_GLOBAL) << "Cant find WId of skype webcam widget, maybe isnt incomming webcam stream"; + kDebug(SKYPE_DEBUG_GLOBAL) << "Cannot find WId of skype webcam widget, maybe it is not an incoming webcam stream"; return; } WId parentWId = d->webcamStreams.value(webcamWidgetWId, 0); if ( parentWId == 0 ) { - kDebug(SKYPE_DEBUG_GLOBAL) << "Cant find parent of skype webcam widget"; + kDebug(SKYPE_DEBUG_GLOBAL) << "Cannot find parent of skype webcam widget"; return; } d->webcamStreams.remove(webcamWidgetWId); diff --git a/protocols/skype/libskype/skypewindow.h b/protocols/skype/libskype/skypewindow.h index 10683ed..81592b5 100644 --- a/protocols/skype/libskype/skypewindow.h +++ b/protocols/skype/libskype/skypewindow.h @@ -101,7 +101,7 @@ class SkypeWindow : public QObject ///Called when new window is added to kwin manager void windowAdded(WId wid); signals: - ///Emited when we found skype call dialog + ///Emitted when we found skype call dialog void foundCallDialog(); }; diff --git a/protocols/skype/skypeaccount.cpp b/protocols/skype/skypeaccount.cpp index 6a486e3..b9fcff6 100644 --- a/protocols/skype/skypeaccount.cpp +++ b/protocols/skype/skypeaccount.cpp @@ -367,11 +367,11 @@ void SkypeAccount::newUser(const QString &name, int groupID) { Kopete::Group * skypeGroup; bool root = false; - if (group.isEmpty() || groupID == -1) { // If skype group hasnt name, in kopete will be in top + if (group.isEmpty() || groupID == -1) { // If skype group has not name, in kopete will be in top skypeGroup = Kopete::Group::topLevel(); root = true; } else { - skypeGroup = Kopete::ContactList::self()->findGroup(group); //get kopete group by skype group name. If skype group in kopete doesnt exist, create it automatically + skypeGroup = Kopete::ContactList::self()->findGroup(group); //get kopete group by skype group name. If skype group in kopete does not exist, create it automatically if ( skypeGroup == Kopete::Group::topLevel() ){ //if group in skype has name i18n("Top Level") kopete get top level group, but in skype top level group is group without name QList <Kopete::Group *> groups = Kopete::ContactList::self()->groups(); //get all groups bool found = false; @@ -1012,7 +1012,7 @@ void SkypeAccount::deleteGroup (Kopete::Group * group){ if ( groupID != -1 ) d->skype.deleteGroup(groupID); else - kDebug(SKYPE_DEBUG_GLOBAL) << "Group" << group->displayName() << "in skype doesnt exist, skipping"; + kDebug(SKYPE_DEBUG_GLOBAL) << "Group" << group->displayName() << "in skype does not exist, skipping"; } void SkypeAccount::renameGroup (Kopete::Group * group, const QString &oldname){ @@ -1021,7 +1021,7 @@ void SkypeAccount::renameGroup (Kopete::Group * group, const QString &oldname){ if ( groupID != -1 ) d->skype.renameGroup( groupID, group->displayName() ); else - kDebug(SKYPE_DEBUG_GLOBAL) << "Old group" << oldname << "in skype doesnt exist, skipping"; + kDebug(SKYPE_DEBUG_GLOBAL) << "Old group" << oldname << "in skype does not exist, skipping"; } void SkypeAccount::openFileTransfer(const QString &user, const QString &url) { diff --git a/protocols/skype/skypeaccount.h b/protocols/skype/skypeaccount.h index cbaaba5..79b73b8 100644 --- a/protocols/skype/skypeaccount.h +++ b/protocols/skype/skypeaccount.h @@ -567,7 +567,7 @@ Q_OBJECT void SkypeActionHandler(const QString &message); signals: /** - * This is emited when the message has been sent by skype + * This is emitted when the message has been sent by skype * @param messageId Id of the message that has been sent */ void sentMessage(const QString &messageId); diff --git a/protocols/skype/skypebuttons/qtbrowserplugin/qtbrowserplugin.cpp b/protocols/skype/skypebuttons/qtbrowserplugin/qtbrowserplugin.cpp index ee07d6d..03784ba 100644 --- a/protocols/skype/skypebuttons/qtbrowserplugin/qtbrowserplugin.cpp +++ b/protocols/skype/skypebuttons/qtbrowserplugin/qtbrowserplugin.cpp @@ -1470,7 +1470,7 @@ bool QtNPBindable::readData(QIODevice *source, const QString &format) Requests that the \a url be retrieved and sent to the named \a window (or a new window if \a window is empty), and returns the ID of the request that is delivered to transferComplete() when the get-operation has finished. Returns 0 when - the browser or the system doesn't support notification, or -1 when an error occured. + the browser or the system doesn't support notification, or -1 when an error occurred. \code void MyPlugin::aboutTrolltech() @@ -1509,7 +1509,7 @@ int QtNPBindable::openUrl(const QString &url, const QString &window) /*! Posts \a data to \a url, and displays the result in \a window. Returns the ID of the request that is delivered to transferComplete() when the post-operation has finished. Returns 0 when - the browser or the system doesn't support notification, or -1 when an error occured. + the browser or the system doesn't support notification, or -1 when an error occurred. \code void MyPlugin::sendMail() @@ -1538,7 +1538,7 @@ int QtNPBindable::uploadData(const QString &url, const QString &window, const QB Posts \a filename to \a url, and displays the result in \a window. Returns the ID of the request that is delivered to transferComplete() when the post-operation has finished. Returns 0 when the browser or the system doesn't support notification, or -1 when an - error occured. + error occurred. \code void MyPlugin::uploadFile() diff --git a/protocols/skype/skypecalldialog.h b/protocols/skype/skypecalldialog.h index 347d6e2..bd83a2f 100644 --- a/protocols/skype/skypecalldialog.h +++ b/protocols/skype/skypecalldialog.h @@ -110,7 +110,7 @@ class SkypeCallDialog : public KDialog, private Ui::SkypeCallDialogBase */ void updateSkypeOut(); /** - * This is emited when a call dialog is closed and is going to be deleted + * This is emitted when a call dialog is closed and is going to be deleted * @param callId Id of it's call */ void callFinished(const QString &callId); diff --git a/protocols/skype/skypechatsession.cpp b/protocols/skype/skypechatsession.cpp index 2cc00db..93310ea 100644 --- a/protocols/skype/skypechatsession.cpp +++ b/protocols/skype/skypechatsession.cpp @@ -130,7 +130,7 @@ SkypeChatSession::SkypeChatSession(SkypeAccount *account, SkypeContact *contact) setMayInvite(true);//It is possible to invite people to chat with Skype - if ( account->leaveOnExit() )//dont open warn dialog on leaving chat window, if user doesnt set it + if ( account->leaveOnExit() )//do not open warn dialog on leaving chat window, if user does not set it setWarnGroupChat(false); setXMLFile("skypechatui.rc"); @@ -168,7 +168,7 @@ SkypeChatSession::SkypeChatSession(SkypeAccount *account, const QString &session setMayInvite(true);//It is possible to invite people to chat with Skype - if ( account->leaveOnExit() )//dont open warn dialog on leaving chat window, if user doesnt set it + if ( account->leaveOnExit() )//do not open warn dialog on leaving chat window, if user does not set it setWarnGroupChat(false); setXMLFile("skypechatui.rc"); diff --git a/protocols/skype/skypechatsession.h b/protocols/skype/skypechatsession.h index 7d9cbd2..3643375 100644 --- a/protocols/skype/skypechatsession.h +++ b/protocols/skype/skypechatsession.h @@ -117,14 +117,14 @@ class SkypeChatSession : public Kopete::ChatSession virtual void inviteContact(const QString &contactId); signals: /** - * This is emited when it become a multi-user chat. It should be removed from the contact so when user clicks on the contact, new one with only that one should be created + * This is emitted when it become a multi-user chat. It should be removed from the contact so when user clicks on the contact, new one with only that one should be created * @param chatSession Identificator of the chat * @param previousUser Id of the other user before it became a multichat or empty string if no such user ever was - * @param sender Pointer to the chat session that emited this + * @param sender Pointer to the chat session that emitted this */ void becameMultiChat(const QString &chatSession, SkypeChatSession *sender); /** - * This is emited when there is an request to get a frindly name of a chat + * This is emitted when there is an request to get a frindly name of a chat * @param chat Id of that chat */ void wantTopic(const QString &chat); diff --git a/protocols/skype/skypecontact.cpp b/protocols/skype/skypecontact.cpp index 6fd9bfe..bd81911 100644 --- a/protocols/skype/skypecontact.cpp +++ b/protocols/skype/skypecontact.cpp @@ -54,7 +54,7 @@ typedef enum { class SkypeContactPrivate { public: - ///Acount that this contact belongs to + ///Account that this contact belongs to SkypeAccount *account; ///Is it some user or is it something special (myself contact or such) bool user; diff --git a/protocols/skype/skypeprotocol.cpp b/protocols/skype/skypeprotocol.cpp index b209160..4b77194 100644 --- a/protocols/skype/skypeprotocol.cpp +++ b/protocols/skype/skypeprotocol.cpp @@ -40,7 +40,7 @@ K_EXPORT_PLUGIN( SkypeProtocolFactory( "kopete_skype" ) ) SkypeProtocol *SkypeProtocol::s_protocol = 0L; SkypeProtocolHandler::SkypeProtocolHandler() : Kopete::MimeTypeHandler(false) { - registerAsMimeHandler("x-skype"); //This is still not enought for javascript web buttons checker, we still need skypebuttons netscape plugin + registerAsMimeHandler("x-skype"); //This is still not enough for javascript web buttons checker, we still need skypebuttons netscape plugin registerAsProtocolHandler("callto"); registerAsProtocolHandler("skype"); registerAsProtocolHandler("tell"); @@ -49,7 +49,7 @@ SkypeProtocolHandler::SkypeProtocolHandler() : Kopete::MimeTypeHandler(false) { void SkypeProtocolHandler::handleURL(const QString &, const KUrl &url) const { kDebug(SKYPE_DEBUG_GLOBAL); if ( ! SkypeProtocol::protocol()->hasAccount() ) { - kDebug(SKYPE_DEBUG_GLOBAL) << "No Skype account registred"; + kDebug(SKYPE_DEBUG_GLOBAL) << "No Skype account registered"; return; } SkypeProtocol::protocol()->account()->SkypeActionHandler(url.url()); diff --git a/protocols/skype/skypeprotocol.h b/protocols/skype/skypeprotocol.h index 13147c3..47670e8 100644 --- a/protocols/skype/skypeprotocol.h +++ b/protocols/skype/skypeprotocol.h @@ -137,7 +137,7 @@ class SkypeProtocol : public Kopete::Protocol static SkypeProtocol *protocol(); /** * Access to account (at the moment skype can have only one account) - * @return account or null if account inst registred + * @return account or null if account inst registered */ SkypeAccount * account(); public slots: diff --git a/protocols/winpopup/libwinpopup/libwinpopup.cpp b/protocols/winpopup/libwinpopup/libwinpopup.cpp index 105bf39..8d2fe07 100644 --- a/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -249,8 +249,8 @@ void WinPopupLib::slotReadProcessExited(int i, QProcess::ExitStatus status) passedInitialHost = true; if ( currentGroups.isEmpty() && currentHost.toUpper() == "LOCALHOST" ) { kDebug(14170) << "Cant get workgroup for localhost"; - //Samba on localhost in up but doesnt receive workgroups or security in smb.conf in not share - //Sometimes samba recive workgroups in 2min. + //Samba on localhost in up but does not receive workgroups or security in smb.conf in not share + //Sometimes samba receive workgroups in 2min. //TODO: Fix it better //try get host name diff --git a/protocols/winpopup/winpopup-install b/protocols/winpopup/winpopup-install index d48dfa0..6541c62 100755 --- a/protocols/winpopup/winpopup-install +++ b/protocols/winpopup/winpopup-install @@ -22,12 +22,12 @@ i=`find /etc -name smb.conf` # Check if smb.conf exist if [ ! -f "$i" ]; then - echo "Samba configuration file smb.conf doesnt exist in /etc" + echo "Samba configuration file smb.conf does not exist in /etc" exit 1 fi # Create new smb.conf file with updated message command line and security section -# If security isnt share, smbclient doesnt get SERVER and WORKGROUP for browsing network +# If security isnt share, smbclient does not get SERVER and WORKGROUP for browsing network echo "[global]" > ~/smb.conf.new echo " message command = $WPSEND %s %m %t &" >> ~/smb.conf.new echo " security = share" ~/smb.conf.new diff --git a/protocols/wlm/wlmprotocol.cpp b/protocols/wlm/wlmprotocol.cpp index f0f2bc7..6fee516 100644 --- a/protocols/wlm/wlmprotocol.cpp +++ b/protocols/wlm/wlmprotocol.cpp @@ -70,7 +70,7 @@ wlmUnknown (Kopete::OnlineStatus::Unknown, 25, this, 0, wlmConnecting (Kopete::OnlineStatus::Connecting, 2, this, 10, QStringList ("wlm_connecting"), i18n ("Connecting")), currentSong ("currentSong", i18nc ("This is used in the tooltip of a contact", "Listening To")), -contactCapabilities ("contactCapabilities", "Used to keep track of the contact capabilites", QString(), +contactCapabilities ("contactCapabilities", "Used to keep track of the contact capabilities", QString(), Kopete::PropertyTmpl::PrivateProperty), displayPhotoSHA1("displayPhotoSHA1", "Display Photo SHA-1 Hash", QString(), Kopete::PropertyTmpl::PersistentProperty | Kopete::PropertyTmpl::PrivateProperty)
