push and pull po{t}s, typo fixes

12 files changed, 14 insertions, 14 deletions

diff --git a/src/modules/addon/WebAddonInterfaceDialog.cpp b/src/modules/addon/WebAddonInterfaceDialog.cpp
index 8eabd0268..5d31f7c81 100644
--- a/src/modules/addon/WebAddonInterfaceDialog.cpp
+++ b/src/modules/addon/WebAddonInterfaceDialog.cpp
@@ -62,7 +62,7 @@ bool WebAddonInterfaceDialog::packageIsInstalled(const QString & szId, const QSt
 	if(szVersion.isEmpty())
 		return true; // hum.... shouldn't happen ?
 
-	// FIXME: If the version of the installed addon is lower then allow upgrading!
+	// FIXME: If the version of the installed addon is lower than allow upgrading!
 	return KviMiscUtils::compareVersions(pAddon->version(), szVersion) < 0;
 }
 
diff --git a/src/modules/dcc/DccChatWindow.h b/src/modules/dcc/DccChatWindow.h
index 055dc089d..b23da0943 100644
--- a/src/modules/dcc/DccChatWindow.h
+++ b/src/modules/dcc/DccChatWindow.h
@@ -60,7 +60,7 @@ protected:
 	// to the beginning, kvi_realloc data.buffer and update data.iLen
 	// If bCritical is true, it should handle the whole data buffer
 	// since the thread is going to die
-	// It should return true if the handing was succesfull
+	// It should return true if the handing was successful
 	// or false if the thread should be stopped
 	virtual bool handleIncomingData(KviDccThreadIncomingData * data, bool bCritical);
 
diff --git a/src/modules/editor/ScriptEditorImplementation.cpp b/src/modules/editor/ScriptEditorImplementation.cpp
index 99a9ebb7e..c05308977 100644
--- a/src/modules/editor/ScriptEditorImplementation.cpp
+++ b/src/modules/editor/ScriptEditorImplementation.cpp
@@ -295,7 +295,7 @@ void ScriptEditorWidget::slotHelp()
 void ScriptEditorWidget::enableSyntaxHighlighter()
 {
 	// we currently delete and re-create the m_pSyntaxHighlighter
-	// as a trick to ensure proper re-highlightning to occur
+	// as a trick to ensure proper re-highlighting to occur
 	if(!m_pSyntaxHighlighter)
 		m_pSyntaxHighlighter = new ScriptEditorSyntaxHighlighter(this);
 }
diff --git a/src/modules/mediaplayer/MpInterface.h b/src/modules/mediaplayer/MpInterface.h
index aae380f5c..a82016b24 100644
--- a/src/modules/mediaplayer/MpInterface.h
+++ b/src/modules/mediaplayer/MpInterface.h
@@ -122,7 +122,7 @@ public:
 	// 0 if the player isn't playing anything and -1 if unknown
 	virtual int position();
 	// total length of the media (msecs)
-	// 0 if the player isn't playing anyting and -1 if unknown (e.g. a stream)
+	// 0 if the player isn't playing anything and -1 if unknown (e.g. a stream)
 	virtual int length();
 	// jump to position
 	virtual bool jumpTo(kvs_int_t & iPos);
diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp
index bf2270590..e7ef52181 100644
--- a/src/modules/objects/KvsObject_popupMenu.cpp
+++ b/src/modules/objects/KvsObject_popupMenu.cpp
@@ -59,7 +59,7 @@
 		!fn: $setTitle(<text:string>)
 		Sets the popupmenu title to text.
 		!fn: $exec([<widget:objects>,<x:uinteger>,<y:integer>])
-		If called without paramaters show the popup menu at the current pointer position.[br]
+		If called without parameters show the popup menu at the current pointer position.[br]
 		With the optional parameters show the popup menu at the coordinate x,y widget parameter relative.
 		!fn: $removeItem(<popup_id:Uinteger>)
 		Removes the menu item that has the identifier ID.
diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.cpp b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
index 1770f27eb..dc38fc591 100644
--- a/src/modules/objects/KvsObject_treeWidgeteItem.cpp
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
@@ -80,7 +80,7 @@ const char * const itemflags_tbl[] = {
 		!fn: $setText(<column:integer>,<text:string>)
 		Sets the text in column column to text, if column is a valid column number and text is different from the existing text.
 		!fn: <string> $text(<column:integer>)
-		Returs the text of the specified column.
+		Returns the text of the specified column.
 		!fn: $setPixmap(<column:integer>,<pixmap:hobject or imageID>)
 		Sets the pixmap in column column to pm, if pm is non-null and different from the current pixmap, and if column is non-negative.
 		Pixmap can be a KVIrc image ID, an image file or a [class]pixmap[/class] object.
diff --git a/src/modules/package/libkvipackage.cpp b/src/modules/package/libkvipackage.cpp
index af9b3b9a5..678df3230 100644
--- a/src/modules/package/libkvipackage.cpp
+++ b/src/modules/package/libkvipackage.cpp
@@ -69,11 +69,11 @@ static QString createRandomDir()
 	@title:
 		$package.info
 	@short:
-		Returns informations about a KVIrc package file
+		Returns information about a KVIrc package file
 	@syntax:
 		<hash> $package.info(<package_path:string>)
 	@description:
-		Returns a set of informations about a KVIrc package file (*.kvt or *.kva).
+		Returns a set of information about a KVIrc package file (*.kvt or *.kva).
 		The set is a structured hash.
 		If the specified path does not lead to a valid KVIrc package
 		the returned hash will contain a single element with key "error".
diff --git a/src/modules/rijndael/BlowFish.cpp b/src/modules/rijndael/BlowFish.cpp
index 8e9ac39ba..e56178276 100644
--- a/src/modules/rijndael/BlowFish.cpp
+++ b/src/modules/rijndael/BlowFish.cpp
@@ -315,7 +315,7 @@ BlowFish::BlowFish(unsigned char * ucKey, unsigned int keysize, const SBlock & r
 	/*
 	 * BRAINDEAD DEVELOPER DISCLAIMER:
 	 * Blowfish can accept keys up to 72 bytes, but the common value is 56:
-	 * Using keylenghts of 72 chars offers a small amount of added security,
+	 * Using keylengths of 72 chars offers a small amount of added security,
 	 * but adds also the possibility of choosing a weak key that resulted in all
 	 * 18 P sub−keys turning into 0 after being XORed with a 576 bit key
 	 * (Short version: someone can trick you into using an empty password, and you won't notice)
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index 606ca9ac6..f7e77ce86 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -38,7 +38,7 @@
 #include <QFile>
 
 // this will be chosen during the setup process
-QString g_szChoosenIncomingDirectory;
+QString g_szChosenIncomingDirectory;
 int g_iThemeToApply = THEME_APPLY_NONE;
 bool bNeedToApplyDefaults;
 unsigned int uPort;
@@ -67,7 +67,7 @@ KVIMODULEEXPORTFUNC void setup_finish()
 {
 	if(bNeedToApplyDefaults)
 	{
-		KVI_OPTION_STRING(KviOption_stringIncomingPath) = g_szChoosenIncomingDirectory;
+		KVI_OPTION_STRING(KviOption_stringIncomingPath) = g_szChosenIncomingDirectory;
 		// Reset the quit message and the real name... if they contain the KVIrc version
 		// then probably the user hasn't even edited them.
 		if(KVI_OPTION_STRING(KviOption_stringQuitMessage).indexOf("KVIrc", 0, Qt::CaseInsensitive) != -1)
diff --git a/src/modules/upnp/RootService.cpp b/src/modules/upnp/RootService.cpp
index e1cab77ee..efce5e6da 100644
--- a/src/modules/upnp/RootService.cpp
+++ b/src/modules/upnp/RootService.cpp
@@ -42,7 +42,7 @@
 
 namespace UPnP
 {
-	// The contructor
+	// The constructor
 	RootService::RootService(const QString & hostname, int port, const QString & rootUrl)
 	    : Service(hostname, port, rootUrl), m_szHostname(hostname), m_iPort(port)
 	{
diff --git a/src/modules/upnp/igdcontrolpoint.h b/src/modules/upnp/igdcontrolpoint.h
index 91c46e1e4..e292c0e72 100644
--- a/src/modules/upnp/igdcontrolpoint.h
+++ b/src/modules/upnp/igdcontrolpoint.h
@@ -81,7 +81,7 @@ namespace UPnP
 		// A WAN connection query was finished
 		void slotWanQueryFinished(bool error);
 
-	private: // private attibutes
+	private: // private attributes
 		// Is a gateway available?
 		bool m_bGatewayAvailable;
 		// The host of the gateway
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 1a2ca1a68..4a3640639 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -77,7 +77,7 @@ void loadBanList();
 UrlDlgList * findFrame();
 void url_module_help();
 
-#define KVI_URL_EXTENSION_NAME "URL module extenstion"
+#define KVI_URL_EXTENSION_NAME "URL module extension"
 
 UrlDialogTreeWidget::UrlDialogTreeWidget(QWidget * par)
     : QTreeWidget(par)