src/modules typos: capitalize, formatting, consistency and syntax fixes

115 files changed, 784 insertions, 767 deletions

diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp
index c5b1ef933..659eb77d1 100644
--- a/src/modules/action/libkviaction.cpp
+++ b/src/modules/action/libkviaction.cpp
@@ -112,7 +112,7 @@ static bool action_kvs_cmd_trigger(KviKvsModuleCommandCall * c)
 				c->warning(__tr2qs("The action \"%1\" is disabled").arg(szName));
 		}
 	} else {
-		c->warning(__tr2qs("The action \"%1\" does not exist").arg(szName));
+		c->warning(__tr2qs("The action \"%1\" doesn't exist").arg(szName));
 	}
 
 	return true;
@@ -158,7 +158,7 @@ static bool action_kvs_cmd_enable(KviKvsModuleCommandCall * c)
 		if(!a->isEnabled())a->setEnabled(true);
 	} else {
 		if(!c->switches()->find('q',"quiet"))
-			c->warning(__tr2qs("The action \"%1\" does not exist").arg(szName));
+			c->warning(__tr2qs("The action \"%1\" doesn't exist").arg(szName));
 	}
 
 	return true;
@@ -206,7 +206,7 @@ static bool action_kvs_cmd_disable(KviKvsModuleCommandCall * c)
 		if(a->isEnabled())a->setEnabled(false);
 	} else {
 		if(!c->switches()->find('q',"quiet"))
-			c->warning(__tr2qs("The action \"%1\" does not exist").arg(szName));
+			c->warning(__tr2qs("The action \"%1\" doesn't exist").arg(szName));
 	}
 
 	return true;
@@ -256,7 +256,7 @@ static bool action_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
 		}
 	} else {
 		if(!c->switches()->find('q',"quiet"))
-			c->warning(__tr2qs("The action \"%1\" does not exist").arg(szName));
+			c->warning(__tr2qs("The action \"%1\" doesn't exist").arg(szName));
 	}
 
 	return true;
diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp
index b8ff5e6a3..0ca479c00 100644
--- a/src/modules/addon/AddonFunctions.cpp
+++ b/src/modules/addon/AddonFunctions.cpp
@@ -51,7 +51,7 @@ namespace AddonFunctions
 {
 	bool notAValidAddonPackage(QString &szError)
 	{
-		szError = __tr2qs_ctx("The selected file does not seem to be a valid KVIrc addon package","addon");
+		szError = __tr2qs_ctx("The selected file doesn't seem to be a valid KVIrc addon package","addon");
 		return false;
 	}
 
@@ -72,7 +72,7 @@ namespace AddonFunctions
 		if(!r.readHeader(szAddonPackageFileName))
 		{
 			szErr = r.lastError();
-			szError = QString(__tr2qs_ctx("The selected file does not seem to be a valid KVIrc package: %1","addon")).arg(szErr);
+			szError = QString(__tr2qs_ctx("The selected file doesn't seem to be a valid KVIrc package: %1","addon")).arg(szErr);
 			return false;
 		}
 
@@ -277,14 +277,14 @@ namespace AddonFunctions
 		QDir addon(szDirPath);
 		if(!addon.exists())
 		{
-			*pszError = __tr2qs_ctx("The selected directory does not exist.","addon");
+			*pszError = __tr2qs_ctx("The selected directory doesn't exist.","addon");
 			return false;
 		}
 
 		QFileInfo init(szDirPath + "/install.kvs");
 		if(!init.exists())
 		{
-			*pszError = __tr2qs_ctx("The initialization script (install.kvs) does not exist.","addon");
+			*pszError = __tr2qs_ctx("The initialization script (install.kvs) doesn't exist.","addon");
 			return false;
 		}
 
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index 911a9e064..8fb7ba377 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -197,7 +197,7 @@ static bool addon_kvs_cmd_uninstall(KviKvsModuleCommandCall * c)
 		KviKvsScriptAddonManager::instance()->unregisterAddon(szName,c->window(),!c->switches()->find('n',"no-callback"));
 	} else {
 		if(!c->switches()->find('q',"quiet"))
-			c->warning(__tr2qs_ctx("The addon \"%1\" does not exist","addon").arg(szName));
+			c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist","addon").arg(szName));
 	}
 
 	return true;
@@ -243,7 +243,7 @@ static bool addon_kvs_cmd_configure(KviKvsModuleCommandCall * c)
 		}
 	} else {
 		if(!c->switches()->find('q',"quiet"))
-			c->warning(__tr2qs_ctx("The addon \"%1\" does not exist","addon").arg(szName));
+			c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist","addon").arg(szName));
 	}
 
 	return true;
@@ -290,7 +290,7 @@ static bool addon_kvs_cmd_help(KviKvsModuleCommandCall * c)
 		}
 	} else {
 		if(!c->switches()->find('q',"quiet"))
-			c->warning(__tr2qs_ctx("The addon \"%1\" does not exist","addon").arg(szName));
+			c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist","addon").arg(szName));
 	}
 
 	return true;
@@ -336,7 +336,7 @@ static bool addon_kvs_cmd_setconfigurecallback(KviKvsModuleCallbackCommandCall *
 		a->setConfigureCallback(c->callback()->code());
 	} else {
 		if(!c->switches()->find('q',"quiet"))
-			c->warning(__tr2qs_ctx("The addon \"%1\" does not exist","addon").arg(szName));
+			c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist","addon").arg(szName));
 	}
 
 	return true;
@@ -383,7 +383,7 @@ static bool addon_kvs_cmd_sethelpcallback(KviKvsModuleCallbackCommandCall * c)
 		a->setHelpCallback(c->callback()->code());
 	} else {
 		if(!c->switches()->find('q',"quiet"))
-			c->warning(__tr2qs_ctx("The addon \"%1\" does not exist","addon").arg(szName));
+			c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist","addon").arg(szName));
 	}
 
 	return true;
@@ -646,7 +646,7 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c)
 	if(!a)
 	{
 		if(!bQuiet)
-			c->warning(__tr2qs_ctx("The addon \"%1\" does not exist","addon").arg(szName));
+			c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist","addon").arg(szName));
 		return true;
 	}
 
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index d96cbb8f6..367cb3479 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -47,7 +47,7 @@ static KviChannelWindow * chan_kvs_find_channel(KviKvsModuleFunctionCall * c, QS
 		KviWindow * w = g_pApp->findWindow(szChan);
 		if(!w)
 		{
-			if(!bNoWarnings) c->warning(__tr2qs("Can't find the window with id '%Q'"),&szChan);
+			if(!bNoWarnings) c->warning(__tr2qs("Can't find the window with ID '%Q'"),&szChan);
 			return 0;
 		}
 		if(w->type() == KviWindow::Channel)return (KviChannelWindow *)w;
@@ -1280,7 +1280,7 @@ static bool chan_kvs_fnc_banlist(KviKvsModuleFunctionCall * c)
 	@syntax:
 		<array> $chan.banexceptionlist([window_id])
 	@description:
-		Returns an array of ban exception masks set ont the channel identified by [window_id].[br]
+		Returns an array of ban exception masks set on the channel identified by [window_id].[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty array is returned.[br]
 	@seealso:
@@ -1327,7 +1327,7 @@ static bool chan_kvs_fnc_banexceptionlist(KviKvsModuleFunctionCall * c)
 	@syntax:
 		<array> $chan.banexceptionlist([window_id])
 	@description:
-		Returns an array of invite masks set ont the channel identified by [window_id].[br]
+		Returns an array of invite masks set on the channel identified by [window_id].[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty array is returned.[br]
 	@seealso:
diff --git a/src/modules/config/libkviconfig.cpp b/src/modules/config/libkviconfig.cpp
index 3724929cf..dea42cce8 100644
--- a/src/modules/config/libkviconfig.cpp
+++ b/src/modules/config/libkviconfig.cpp
@@ -66,7 +66,7 @@ static int g_iNextConfigId = 0;
 		[fnc]$config.id[/fnc]() function.[br]
 	@examples:
 		[example]
-		# It is a good idea to store the returned id to a variable :)
+		# It is a good idea to store the returned ID to a variable :)
 		%cfg = $config.open(myscript.kvc)
 		%num = [fnc]$config.read[/fnc](%cfg,Number,0)
 		[cmd]echo[/cmd] Number of entries is %num
@@ -136,12 +136,12 @@ static bool config_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 	@title:
 		$config.id
 	@short:
-		Returns the id of an open config file
+		Returns the ID of an open config file
 	@syntax:
 		$config.id(<filename>)
 	@description:
-		Returns the id of an open config file specified by <filename>.[br]
-		(This is the same id that is returned by [fnc]$config.open[/fnc].[br]
+		Returns the ID of an open config file specified by <filename>.[br]
+		(This is the same ID that is returned by [fnc]$config.open[/fnc].[br]
 		If no such file is open, 0 is returned (that is an invalid config identifier).[br]
 	@seealso:
 		[module:config]Config module documentation[/module]
@@ -216,7 +216,7 @@ static bool config_kvs_fnc_read(KviKvsModuleFunctionCall * c)
 	{
 		c->returnValue()->setString(cfg->readEntry(szKey,szDefault));
 	} else {
-		c->warning(__tr2qs("The config file with id '%Q' is not open"),&szId);
+		c->warning(__tr2qs("The config file with ID '%Q' is not open"),&szId);
 	}
 	return true;
 }
@@ -252,7 +252,7 @@ static bool config_kvs_fnc_section(KviKvsModuleFunctionCall * c)
 	{
 		c->returnValue()->setString(cfg->group());
 	} else {
-		c->warning(__tr2qs("The config file with id '%Q' is not open"),&szId);
+		c->warning(__tr2qs("The config file with ID '%Q' is not open"),&szId);
 	}
 	return true;
 }
@@ -290,7 +290,7 @@ static bool config_kvs_fnc_readonly(KviKvsModuleFunctionCall * c)
 	{
 		c->returnValue()->setBoolean(cfg->readOnly());
 	} else {
-		c->warning(__tr2qs("The config file with id '%Q' is not open"),&szId);
+		c->warning(__tr2qs("The config file with ID '%Q' is not open"),&szId);
 		c->returnValue()->setInteger(false);
 	}
 	return true;
@@ -365,7 +365,7 @@ static bool config_kvs_fnc_hassection(KviKvsModuleFunctionCall * c)
 	{
 		c->returnValue()->setBoolean(cfg->hasGroup(szSect));
 	} else {
-		c->warning(__tr2qs("The config file with id '%Q' is not open"),&szId);
+		c->warning(__tr2qs("The config file with ID '%Q' is not open"),&szId);
 	}
 	return true;
 }
@@ -409,7 +409,7 @@ static bool config_kvs_fnc_sectionlist(KviKvsModuleFunctionCall * c)
 		}
 		c->returnValue()->setArray(pArray);
 	} else {
-		c->warning(__tr2qs("The config file with id '%Q' is not open"),&szId);
+		c->warning(__tr2qs("The config file with ID '%Q' is not open"),&szId);
 	}
 	return true;
 }
@@ -458,7 +458,7 @@ static bool config_kvs_fnc_keylist(KviKvsModuleFunctionCall * c)
 		}
 		c->returnValue()->setArray(pArray);
 	} else {
-		c->warning(__tr2qs("The config file with id '%Q' is not open"),&szId);
+		c->warning(__tr2qs("The config file with ID '%Q' is not open"),&szId);
 	}
 	return true;
 }
@@ -542,12 +542,12 @@ static bool config_kvs_cmd_close(KviKvsModuleCommandCall * c)
 			// we force a save here
 			if(!cfg->sync())
 				if(!c->hasSwitch('q',"quiet"))
-					c->warning(__tr2qs("An error has occurred while trying to save the config file with id '%Q'"),&szId);
+					c->warning(__tr2qs("An error has occurred while trying to save the config file with ID '%Q'"),&szId);
 		}
 		g_pConfigDict->remove(szId);
 	} else {
 		if(!c->hasSwitch('q',"quiet"))
-			c->warning(__tr2qs("The config file with id '%Q' is not open"),&szId);
+			c->warning(__tr2qs("The config file with ID '%Q' is not open"),&szId);
 	}
 
 	return true;
@@ -587,12 +587,12 @@ static bool config_kvs_cmd_flush(KviKvsModuleCommandCall * c)
 	if(cfg)
 	{
 		if(cfg->readOnly())
-			c->warning(__tr2qs("The config file with id '%Q' is read-only"),&szId);
+			c->warning(__tr2qs("The config file with ID '%Q' is read-only"),&szId);
 		else
 			if(!cfg->sync())
-				c->warning(__tr2qs("An error has occurred while trying to save the config file with id '%Q'"),&szId);
+				c->warning(__tr2qs("An error has occurred while trying to save the config file with ID '%Q'"),&szId);
 	} else {
-		c->warning(__tr2qs("The config file with id '%Q' is not open"),&szId);
+		c->warning(__tr2qs("The config file with ID '%Q' is not open"),&szId);
 	}
 
 	return true;
@@ -633,7 +633,7 @@ static bool config_kvs_cmd_clear(KviKvsModuleCommandCall * c)
 	{
 		cfg->clear();
 	} else {
-		c->warning(__tr2qs("The config file with id '%Q' is not open"),&szId);
+		c->warning(__tr2qs("The config file with ID '%Q' is not open"),&szId);
 	}
 
 	return true;
@@ -677,7 +677,7 @@ static bool config_kvs_cmd_clearsection(KviKvsModuleCommandCall * c)
 	{
 		cfg->clearGroup(szSect);
 	} else {
-		c->warning(__tr2qs("The config file with id '%Q' is not open"),&szId);
+		c->warning(__tr2qs("The config file with ID '%Q' is not open"),&szId);
 	}
 
 	return true;
@@ -697,7 +697,7 @@ static bool config_kvs_cmd_clearsection(KviKvsModuleCommandCall * c)
 		config.write <id> <key> <value>
 	@description:
 		Writes the <key>=<value> pair to the config file identifier by <id>.[br]
-		<id> must be a valid config file id returned by [fnc]$config.open[/fnc]().[br]
+		<id> must be a valid config file ID returned by [fnc]$config.open[/fnc]().[br]
 		<key> and <value> can be any strings.[br]
 		The <key>=<value> pair is written in the current section of the config file.[br]
 		If <key> already exists in the current section of the config, the corresponding value is replaced with <value>.[br]
@@ -730,7 +730,7 @@ static bool config_kvs_cmd_write(KviKvsModuleCommandCall * c)
 		else
 			cfg->clearKey(szKey);
 	} else {
-		c->warning(__tr2qs("The config file with id '%Q' is not open"),&szId);
+		c->warning(__tr2qs("The config file with ID '%Q' is not open"),&szId);
 	}
 
 	return true;
@@ -752,7 +752,7 @@ static bool config_kvs_cmd_write(KviKvsModuleCommandCall * c)
 		Changes the current section of the config file <id> to <section_name>.[br]
 		Sections are effectively namespaces for the keys: each section can contain
 		a set of keys and equal keys in different sections do not collide.[br]
-		<id> must be a valid config file id returned by [fnc]$config.open[/fnc]().[br]
+		<id> must be a valid config file ID returned by [fnc]$config.open[/fnc]().[br]
 	@seealso:
 		[module:config]Config module documentation[/module]
 */
@@ -773,7 +773,7 @@ static bool config_kvs_cmd_setsection(KviKvsModuleCommandCall * c)
 	{
 		cfg->setGroup(szSect);
 	} else {
-		c->warning(__tr2qs("The config file with id '%Q' is not open"),&szId);
+		c->warning(__tr2qs("The config file with ID '%Q' is not open"),&szId);
 	}
 
 	return true;
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index f98dc738e..ee0fb6429 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -444,7 +444,7 @@ static void dccModuleParseDccSend(KviDccRequest *dcc)
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
 			dcc->ctcpMsg->msg->console()->output(KVI_OUT_DCCMSG,
-				__tr2qs_ctx("The above request is broken: the fourth parameter should be the file size but does not appear to be an unsigned number; trying to continue","dcc"),dcc->szParam4.ptr());
+				__tr2qs_ctx("The above request is broken: the fourth parameter should be the file size but doesn't appear to be an unsigned number; trying to continue","dcc"),dcc->szParam4.ptr());
 		}
 		dcc->szParam4 = __tr2qs_ctx("<unknown size>","dcc");
 	}
@@ -737,7 +737,7 @@ static void dccModuleParseDccRSend(KviDccRequest *dcc)
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
 			dcc->ctcpMsg->msg->console()->output(KVI_OUT_DCCMSG,
-				__tr2qs_ctx("The above request is broken: the fourth parameter should be the file size but does not appear to be an unsigned number; trying to continue","dcc"),dcc->szParam2.ptr());
+				__tr2qs_ctx("The above request is broken: the fourth parameter should be the file size but doesn't appear to be an unsigned number; trying to continue","dcc"),dcc->szParam2.ptr());
 		}
 		dcc->szParam2 = __tr_ctx("<unknown size>","dcc");
 	}
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index b4719e98f..d07ac9d15 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -581,7 +581,7 @@ static bool file_kvs_fnc_allSizes(KviKvsModuleFunctionCall * c)
 	QDir d(szDir);
 	if(!d.exists())
 	{
-		c->warning(__tr2qs("The specified directory does not exist '%Q'"),&szDir);
+		c->warning(__tr2qs("The specified directory doesn't exist '%Q'"),&szDir);
 		return true;
 	}
 
@@ -718,7 +718,7 @@ static bool file_kvs_fnc_ls(KviKvsModuleFunctionCall * c)
 	QDir d(szDir);
 	if(!d.exists())
 	{
-		c->warning(__tr2qs("The specified directory does not exist '%Q'"),&szDir);
+		c->warning(__tr2qs("The specified directory doesn't exist '%Q'"),&szDir);
 		return true;
 	}
 
diff --git a/src/modules/fish/libkvifish.cpp b/src/modules/fish/libkvifish.cpp
index 9917aac67..68e2509ce 100644
--- a/src/modules/fish/libkvifish.cpp
+++ b/src/modules/fish/libkvifish.cpp
@@ -258,7 +258,7 @@
 				g_pCryptEngineManager->deallocateEngine(e);
 			}
 		} else {
-			c->warning(__tr2qs("The Mircryption encryption engine does not exist"));
+			c->warning(__tr2qs("The Mircryption encryption engine doesn't exist"));
 		}
 
 		c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("FiSH: key for %1 successfully set!").arg(szNick));
diff --git a/src/modules/log/libkvilog.cpp b/src/modules/log/libkvilog.cpp
index 5a0cb1c49..1789df7ef 100644
--- a/src/modules/log/libkvilog.cpp
+++ b/src/modules/log/libkvilog.cpp
@@ -104,7 +104,7 @@ static bool log_kvs_cmd_start(KviKvsModuleCommandCall * c)
 				return true;
 			}
 		} else {
-			c->warning(__tr2qs_ctx("Missing window id after the 'w' switch","log"));
+			c->warning(__tr2qs_ctx("Missing window ID after the 'w' switch","log"));
 			return true;
 		}
 	}
@@ -158,7 +158,7 @@ static bool log_kvs_cmd_stop(KviKvsModuleCommandCall * c)
 				return true;
 			}
 		} else {
-			c->warning(__tr2qs_ctx("Missing window id after the 'w' switch","log"));
+			c->warning(__tr2qs_ctx("Missing window ID after the 'w' switch","log"));
 			return true;
 		}
 	}
@@ -208,7 +208,7 @@ static bool log_kvs_cmd_flush(KviKvsModuleCommandCall * c)
 				return true;
 			}
 		} else {
-			c->warning(__tr2qs_ctx("Missing window id after the 'w' switch","log"));
+			c->warning(__tr2qs_ctx("Missing window ID after the 'w' switch","log"));
 			return true;
 		}
 	}
@@ -262,7 +262,7 @@ static bool log_kvs_fnc_file(KviKvsModuleFunctionCall * c)
 		pWnd = g_pApp->findWindow(szWindow);
 		if(!pWnd)
 		{
-			c->warning(__tr2qs_ctx("Window with id '%1' not found, returning empty string","log").arg(szWindow));
+			c->warning(__tr2qs_ctx("Window with ID '%1' not found, returning empty string","log").arg(szWindow));
 			return true;
 		}
 	}
diff --git a/src/modules/mask/libkvimask.cpp b/src/modules/mask/libkvimask.cpp
index 26648a90b..d5d856821 100644
--- a/src/modules/mask/libkvimask.cpp
+++ b/src/modules/mask/libkvimask.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : libkvistr.cpp
+//   File : libkvimask.cpp
 //   Creation date : Thu Dec 27 2001 17:13:12 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -34,7 +34,7 @@
 	@title:
 		$mask.match
 	@short:
-		Matches a mask agains a wildcarded one
+		Matches a mask against a wildcarded one
 	@syntax:
 		<boolean> $mask.match(<wildcard_mask:string>,<fixed_mask:string>)
 	@description:
@@ -148,7 +148,7 @@ static bool mask_kvs_fnc_host(KviKvsModuleFunctionCall * c)
 	@syntax:
 		<boolean> $mask.hasNumericHost(<mask: string>)
 	@description:
-		Returns 1 if the hostname part of the mask is numeric (e.g: unresolved IPv4 or IPv6 address).
+		Returns 1 if the hostname part of the mask is numeric (e.g. unresolved IPv4 or IPv6 address).
 */
 
 
diff --git a/src/modules/math/libkvimath.cpp b/src/modules/math/libkvimath.cpp
index 1a614159a..61af55c97 100644
--- a/src/modules/math/libkvimath.cpp
+++ b/src/modules/math/libkvimath.cpp
@@ -381,7 +381,7 @@ static bool math_kvs_fnc_pi(KviKvsModuleFunctionCall * c)
 	@syntax:
 		<real> $math.e()
 	@description:
-		Returns the value of the euler constant e.
+		Returns the value of the Euler constant e.
 */
 
 
diff --git a/src/modules/mediaplayer/MpAmipInterface.cpp b/src/modules/mediaplayer/MpAmipInterface.cpp
index c3bba45cb..4b41ff9c2 100644
--- a/src/modules/mediaplayer/MpAmipInterface.cpp
+++ b/src/modules/mediaplayer/MpAmipInterface.cpp
@@ -110,10 +110,10 @@ MP_IMPLEMENT_DESCRIPTOR(
 	MpAmipInterface,
 	"amip",
 	__tr2qs_ctx(
-		"An interface to the AMIP plug-in.\n" \
+		"An interface for the AMIP plugin.\n" \
 		"You can download it from http://amip.tools-for.net\n" \
 		"To use this interface you must " \
-		"install AMIP plug-in for your player."
+		"install AMIP plugin for your player."
 		,
 		"mediaplayer"
 	)
diff --git a/src/modules/mediaplayer/MpMprisInterface.cpp b/src/modules/mediaplayer/MpMprisInterface.cpp
index 75f14e7d5..0f042c8ee 100644
--- a/src/modules/mediaplayer/MpMprisInterface.cpp
+++ b/src/modules/mediaplayer/MpMprisInterface.cpp
@@ -317,7 +317,7 @@ MP_IMPLEMENT_DESCRIPTOR(
 	MpAudaciousInterface,
 	"audacious",
 	__tr2qs_ctx(
-		"An interface to the popular audacious media player.\n" \
+		"An interface for the popular Audacious media player.\n" \
 		"Download it from http://audacious-media-player.org\n"
 		,
 		"mediaplayer"
@@ -443,7 +443,7 @@ MP_IMPLEMENT_DESCRIPTOR(
 	MpBmpxInterface,
 	"bmpx",
 	__tr2qs_ctx(
-		"An interface to BMPx.\n" \
+		"An interface for BMPx.\n" \
 		"Download it from http://sourceforge.net/projects/beepmp\n"
 		,
 		"mediaplayer"
@@ -467,7 +467,7 @@ MP_IMPLEMENT_DESCRIPTOR(
 	MpAmarok2Interface,
 	"amarok2",
 	__tr2qs_ctx(
-		"An interface to Amarok2.\n" \
+		"An interface for Amarok2.\n" \
 		"Download it from http://amarok.kde.org\n"
 		,
 		"mediaplayer"
@@ -485,7 +485,7 @@ MP_IMPLEMENT_DESCRIPTOR(
         MpQmmpInterface,
         "Qmmp",
         __tr2qs_ctx(
-                "An interface to Qmmp.\n" \
+                "An interface for Qmmp.\n" \
                 "Download it from http://qmmp.ylsoftware.com\n"
                ,
                 "mediaplayer"
@@ -503,7 +503,7 @@ MP_IMPLEMENT_DESCRIPTOR(
 	MpXmms2Interface,
 	"xmms2",
 	__tr2qs_ctx(
-		"An interface to the Xmms2 media player.\n" \
+		"An interface for the XMMS2 media player.\n" \
 		"Download it from http://xmms2.org\n",
 		"mediaplayer"
 	)
@@ -520,7 +520,7 @@ MP_IMPLEMENT_DESCRIPTOR(
 	MpSongbirdInterface,
 	"songbird",
 	__tr2qs_ctx(
-		"An interface to the Mozilla Songbird media player.\n" \
+		"An interface for the Mozilla Songbird media player.\n" \
 		"Download it from http://www.getsongbird.com.\n" \
 		"To use it you have to install also the MPRIS addon " \
 		"available at http://addons.songbirdnest.com/addon/1626.\n",
@@ -544,7 +544,7 @@ MP_IMPLEMENT_DESCRIPTOR(
 	MpTotemInterface,
 	"totem",
 	__tr2qs_ctx(
-		"An interface to Totem.\n" \
+		"An interface for Totem.\n" \
 		"Download it from http://projects.gnome.org/totem/\n"
 		,
 		"mediaplayer"
@@ -562,10 +562,10 @@ MP_IMPLEMENT_DESCRIPTOR(
 	MpVlcInterface,
 	"vlc",
 	__tr2qs_ctx(
-		"An interface to Vlc.\n" \
+		"An interface for VLC.\n" \
 		"Download it from http://www.videolan.org/\n" \
-		"You need to manually enable the DBus control\n" \
-		"interface in the Vlc preferences\n" \
+		"You need to manually enable the D-Bus control\n" \
+		"interface in the VLC preferences\n" \
 		,
 		"mediaplayer"
 	)
@@ -582,7 +582,7 @@ MP_IMPLEMENT_DESCRIPTOR(
 	MpClementineInterface,
 	"clementine",
 	__tr2qs_ctx(
-		"An interface to Clementine.\n" \
+		"An interface for Clementine.\n" \
 		"Download it from http://www.clementine-player.org/\n" \
 		,
 		"mediaplayer"
diff --git a/src/modules/mediaplayer/MpSpotifyInterface.cpp b/src/modules/mediaplayer/MpSpotifyInterface.cpp
index ba1e8fa5e..9bc2c8b1c 100644
--- a/src/modules/mediaplayer/MpSpotifyInterface.cpp
+++ b/src/modules/mediaplayer/MpSpotifyInterface.cpp
@@ -47,7 +47,7 @@ MP_IMPLEMENT_DESCRIPTOR(
 	KviSpotifyInterface,
 	"spotify",
 	__tr2qs_ctx(
-		"An interface to the Spotify music streaming service.\n" \
+		"An interface for the Spotify music streaming service.\n" \
 		"It is only available for certain countries in Europe.\n" \
 		"You can download it from http://www.spotify.com.\n"
 		,
diff --git a/src/modules/mediaplayer/MpWinampInterface.cpp b/src/modules/mediaplayer/MpWinampInterface.cpp
index e31880746..c842e4ed6 100644
--- a/src/modules/mediaplayer/MpWinampInterface.cpp
+++ b/src/modules/mediaplayer/MpWinampInterface.cpp
@@ -185,7 +185,7 @@ static HWND find_winamp(KviWinampInterface * i)
 	if(!hWnd)
 	{
 		// try to start the process ?
-		i->setLastError(__tr2qs_ctx("Can't find a running winamp window","mediaplayer"));
+		i->setLastError(__tr2qs_ctx("Can't find a running Winamp window","mediaplayer"));
 	}
 	return hWnd;
 }
@@ -195,7 +195,7 @@ MP_IMPLEMENT_DESCRIPTOR(
 	KviWinampInterface,
 	"winamp",
 	__tr2qs_ctx(
-		"An interface to the popular Winamp media player.\n" \
+		"An interface for the popular Winamp media player.\n" \
 		"You can download it from http://www.winamp.com.\n" \
 		"To use all the features of this interface you must " \
 		"copy the gen_kvirc.dll plugin found in the KVIrc " \
@@ -317,7 +317,7 @@ QString KviWinampInterface::mrl()
 
 		if(ret2 != KVIRC_WM_USER_CHECK_REPLY)
 		{
-			setLastError(__tr2qs_ctx("The winamp plugin has not been installed properly. Check /help mediaplayer.nowplaying","mediaplayer"));
+			setLastError(__tr2qs_ctx("The Winamp plugin has not been installed properly. Check /help mediaplayer.nowplaying","mediaplayer"));
 			return ret;
 		}
 
@@ -351,7 +351,7 @@ QString KviWinampInterface::nowPlaying()
 		int retpippo = SendMessage(hWinamp,WM_USER,KVIRC_WM_USER,KVIRC_WM_USER_CHECK);
 		if(retpippo != KVIRC_WM_USER_CHECK_REPLY)
 		{
-			setLastError(__tr2qs_ctx("The winamp plugin has not been installed properly. Check /help mediaplayer.nowplaying","mediaplayer") );
+			setLastError(__tr2qs_ctx("The Winamp plugin has not been installed properly. Check /help mediaplayer.nowplaying","mediaplayer") );
 			return ret;
 		}
 
diff --git a/src/modules/mediaplayer/MpXmmsInterface.cpp b/src/modules/mediaplayer/MpXmmsInterface.cpp
index b5217fad8..20cba7c5c 100644
--- a/src/modules/mediaplayer/MpXmmsInterface.cpp
+++ b/src/modules/mediaplayer/MpXmmsInterface.cpp
@@ -35,7 +35,7 @@ MP_IMPLEMENT_DESCRIPTOR(
 	KviXmmsInterface,
 	"xmms",
 	__tr2qs_ctx(
-		"An interface to the popular UNIX xmms media player.\n" \
+		"An interface for the popular UNIX XMMS media player.\n" \
 		"Download it from http://legacy.xmms2.org\n"
 		,
 		"mediaplayer"
@@ -46,7 +46,7 @@ MP_IMPLEMENT_DESCRIPTOR(
 	KviAudaciousClassicInterface,
 	"audacious classic",
 	__tr2qs_ctx(
-		"An interface to the popular UNIX audacious media player.\n" \
+		"An interface for the popular UNIX Audacious media player.\n" \
 		"Download it from http://audacious-media-player.org\n"
 		,
 		"mediaplayer"
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index 2445f2d1a..908f7914d 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -71,7 +71,7 @@ static MpInterface * auto_detect_player(KviWindow * pOut = 0)
 	if(iBest < 90)
 	{
 		if(pOut)
-			pOut->outputNoFmt(KVI_OUT_MULTIMEDIA,__tr2qs_ctx("Not sure about the results, trying a second, more agressive detection pass","mediaplayer"));
+			pOut->outputNoFmt(KVI_OUT_MULTIMEDIA,__tr2qs_ctx("Not sure about the results, trying a second, more aggressive detection pass","mediaplayer"));
 		// no sure player found... try again with a destructive test
 		for(d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
 		{
@@ -230,7 +230,7 @@ MP_KVS_SIMPLE_COMMAND(hide,hide)
 	@description:
 		Show the player interface.[br]
 		When you use this function in your script, remember to reshow mediaplayer's window [br]
-		or quit the mediplayerwindow to the exit.[br]
+		or quit the mediaplayer window to the exit.[br]
 		Take a look at the [module:mediaplayer]mediaplayer module documentation[/module]
 		for more details about how it works.[br]
 	@seealso:
@@ -543,9 +543,14 @@ MP_KVS_FUNCTION(playerList)
 		mediaplayer.playMrl <mrl>
 	@description:
 		Plays the media specified by the <mrl> on the currently
-		selected media player interface. <mrl> is a standard Media Resource
-		Locator. Examples of such locators are: 'file:///home/myfile.mp3',
-		'http://streaming.server.top:123', 'dvd:// or dvb://channelname'.
+		selected media player interface. MRL is a standard Media Resource Locator.
+		Examples of such locators are:
+		[example]
+		file:///home/myfile.mp3
+		http://streaming.server.top:123
+		dvd:///dev/dvd
+		dvb://channelname
+		[/example]
 		Take a look at the [module:mediaplayer]mediaplayer module documentation[/module]
 		for more details about how it works.[br]
 	@seealso:
@@ -736,15 +741,20 @@ MP_KVS_SIMPLE_COMMAND(mute,mute)
 	@title:
 		$mediaplayer.mrl
 	@short:
-		Returns the mrl of the currently played media
+		Returns the MRL of the currently playing media
 	@syntax:
 		$mediaplayer.mrl()
 	@description:
-		Returns the mrl of the media currently played by the selected media player interface.
-		The mrl is a standard Media Resource Locator.
-		Examples of such locators are: 'file:///home/myfile.mp3',
-		'http://streaming.server.top:123', 'dvd:// or dvb://channelname'.
-		This means that the returned string may NOT refer to a local file:
+		Returns the MRL of the media currently played by the selected media player interface.
+		The MRL is a standard Media Resource Locator.
+		Examples of such locators are: 
+		[example]
+		file:///home/myfile.mp3
+		http://streaming.server.top:123
+		dvd:///dev/dvd
+		dvb://channelname
+		[/example]
+		This means that the returned string may [b]not[/b] refer to a local file:
 		it refers to the local file only if the 'file://' prefix is found ([fnc]$mediaplayer.localFile()[/fnc]
 		checks that for you).
 		The returned string is empty if the player isn't currently playing.[br]
@@ -769,7 +779,7 @@ MP_KVS_SIMPLE_STRING_FUNCTION(mrl,mrl)
 	@syntax:
 		$mediaplayer.nowPlaying()
 	@description:
-		Returns a description fo the media currently played
+		Returns a description for the media currently played
 		by the selected media player interface. The description
 		will usually contain the title of the media and eventually
 		some additional information like the artist name or album.
@@ -1261,7 +1271,7 @@ MP_KVS_SIMPLE_INT_FUNCTION(getRepeat,getRepeat)
 	@title:
 		$mediaplayer.getShuffle
 	@short:
-		Return if "Shuffle" is on.
+		Return if "shuffle" is on.
 	@syntax:
 		$mediaplayer.getShuffle()
 	@description:
@@ -1283,11 +1293,11 @@ MP_KVS_SIMPLE_BOOL_FUNCTION(getShuffle,getShuffle)
 	@title:
 		$mediaplayer.getEqData
 	@short:
-		Return the Equalizer Value.
+		Return the equalizer value.
 	@syntax:
 		$mediaplayer.getEqData(<item:integer>,<options:string>)
 	@description:
-		Return the value of the Eq <item>.[br]
+		Return the value of the EQ <item>.[br]
 		if 'q' is given as an option, it runs in quiet mode.[br]
 		Take a look at the [module:mediaplayer]mediaplayer module documentation[/module]
 		for more details about how it works.[br]
@@ -1333,11 +1343,11 @@ MP_KVS_FUNCTION(getEqData)
 	@title:
 		mediaplayer.setEqData
 	@short:
-		Return the Equalizer Value.
+		Return the equalizer value.
 	@syntax:
 		mediaplayer.setEqData [-q] <item:integer> <value:integer>
 	@description:
-		Set the value of the Eq <item> to <value>.[br]
+		Set the value of the EQ <item> to <value>.[br]
 		Take a look at the [module:mediaplayer]mediaplayer module documentation[/module]
 		for more details about how it works.[br]
 	@seealso:
@@ -1491,15 +1501,15 @@ MP_KVS_FUNCTION(status)
 		the information about the currently played media (in order to implement the nice /playing
 		scripts). The module has replaced the old mediaplayer module which after
 		years of development had developed some design flaws and needed a complete rewrite.
-		At the moment of writing the supported players are: xmms (unix), audacious (unix), winamp (windows),
-		every player supported by the amip project (windows), every player using the mpris interface
-		(amarok2, juk under kde). You choose the player interface by either setting
+		At the moment of writing the supported players are: XMMS (UNIX), Audacious (UNIX), Winamp (Windows),
+		every player supported by the AMIP project (Windows), every player using the MPRIS D-Bus interface
+		(Amarok2, JuK under KDE). You choose the player interface by either setting
 		the option in the settings dialog, by manually setting [cmd]option[/cmd] stringPreferredMediaPlayer
 		or by running [cmd]mediaplayer.detect[/cmd] that will guess the media player interface for you.[br]
 		If you're going to use the Winamp media player then you must install the "gen_kvirc.dll" plugin
-		(included in the kvirc distribution) as a "general" winamp plugin.
-		This is achieved by simpy copying the file gen_kvirc.dll
-		to the winamp plugins directory and restarting winamp.[br]
+		(included in the KVIrc distribution) as a "general" Winamp plugin.
+		This is achieved by simply copying the file gen_kvirc.dll
+		to the Winamp plugins directory and restarting Winamp.[br]
 		[br]
 		The commands and functions exported by this module serve mainly for two
 		purposes: control the playback and get information about the currently played media.
@@ -1510,7 +1520,7 @@ MP_KVS_FUNCTION(status)
 		[fnc]$mediaplayer.nowplaying()[/fnc] and [fnc]$mediaplayer.mrl()[/fnc].
 		Several other informative function are available as well but they are not
 		granted to work with all the supported media players or media types (e.g.
-		with winamp you can play video files that probably have no album, genre
+		with Winamp you can play video files that probably have no album, genre
 		or sampleRate information...).[br]
 		If you intend to write portable code, you should check the return value
 		of the functions like [fnc]$mediaplayer.artist()[/fnc], [fnc]$mediaplayer.title()[/fnc]
@@ -1531,7 +1541,7 @@ MP_KVS_FUNCTION(status)
 	@syntax:
 		mediaplayer.setRepeat [-q] <repeat:bool>
 	@description:
-		Set the Repeat flag to "repeat" (1 for ON, 0 for OFF).[br]
+		Set the repeat flag to "repeat" (1 for ON, 0 for OFF).[br]
 		Take a look at the [module:mediaplayer]mediaplayer module documentation[/module]
 		for more details about how it works.[br]
 	@seealso:
diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp
index 0fbe9f5b2..24456c6b2 100644
--- a/src/modules/my/libkvimy.cpp
+++ b/src/modules/my/libkvimy.cpp
@@ -162,8 +162,8 @@ static bool my_kvs_fnc_globalIdle(KviKvsModuleFunctionCall * c)
 	@syntax:
 		<string> $my.umode([irc_context_id:uint])
 	@description:
-		Returns the user mode flags of the current irc context.[br]
-		If the irc context is not connected then an empty string is returned.[br]
+		Returns the user mode flags of the current IRC context.[br]
+		If the IRC context is not connected then an empty string is returned.[br]
 		If <irc_context_id> is specified this function returns acts as it was called
 		in that irc_context.[br]
 */
@@ -190,8 +190,8 @@ static bool my_kvs_fnc_umode(KviKvsModuleFunctionCall * c)
 	@syntax:
 		<string> $my.user([irc_context_id:uint])
 	@description:
-		Returns the username of the current irc context.[br]
-		If the irc context is not connected then an empty string is returned.[br]
+		Returns the username of the current IRC context.[br]
+		If the IRC context is not connected then an empty string is returned.[br]
 		If <irc_context_id> is specified this function returns acts as it was called
 		in that irc_context.[br]
 */
@@ -218,8 +218,8 @@ static bool my_kvs_fnc_user(KviKvsModuleFunctionCall * c)
 	@syntax:
 		<string> $my.host([irc_context_id:uint])
 	@description:
-		Returns the hostname of the current irc context as known by the IRC server.[br]
-		If the irc context is not connected then an empty string is returned.[br]
+		Returns the hostname of the current IRC context as known by the IRC server.[br]
+		If the IRC context is not connected then an empty string is returned.[br]
 		If <irc_context_id> is specified this function returns acts as it was called
 		in that irc_context.[br]
 */
@@ -243,15 +243,15 @@ static bool my_kvs_fnc_host(KviKvsModuleFunctionCall * c)
 	@title:
 		$my.ip
 	@short:
-		Returns the current ip address
+		Returns the current IP address
 	@syntax:
 		<string> $my.ip([irc_context_id:uint])
 	@description:
-		Returns the ip address of the current irc context as known by the IRC server.[br]
-		The ip address is resolved as soon as the hostname is received from the server.
+		Returns the IP address of the current IRC context as known by the IRC server.[br]
+		The IP address is resolved as soon as the hostname is received from the server.
 		If the hostname is masked or there is an error in the DNS lookup then
-		you may get the real local host ip address as determined at connection startup.[br]
-		If the irc context is not connected then an empty string is returned.[br]
+		you may get the real local host IP address as determined at connection startup.[br]
+		If the IRC context is not connected then an empty string is returned.[br]
 		If <irc_context_id> is specified this function returns acts as it was called
 		in that irc_context.[br]
 */
@@ -275,12 +275,12 @@ static bool my_kvs_fnc_ip(KviKvsModuleFunctionCall * c)
 	@title:
 		$my.serverIsIPV6
 	@short:
-		Returns 1 if the current server connection use IPV6.
+		Returns 1 if the current server connection use IPv6.
 	@syntax:
 		<boolean> $my.serverIsIPV6([irc_context_id:uint])
 	@description:
-		Returns 1 if the server connection use IPV6.[br]
-		If the irc context is not connected then an empty string is returned.[br]
+		Returns 1 if the server connection use IPv6.[br]
+		If the IRC context is not connected then an empty string is returned.[br]
 		If <irc_context_id> is specified this function returns acts as it was called
 		in that irc_context.[br]
 */
@@ -310,7 +310,7 @@ static bool my_kvs_fnc_serverIsIPV6(KviKvsModuleFunctionCall * c)
 		<boolean> $my.serverIsSSL([irc_context_id:uint])
 	@description:
 		Returns 1 if the server connection uses SSL.[br]
-		If the irc context is not connected then an empty string is returned.[br]
+		If the IRC context is not connected then an empty string is returned.[br]
 		If <irc_context_id> is specified this function returns acts as it was called
 		in that irc_context.[br]
 */
@@ -338,8 +338,8 @@ static bool my_kvs_fnc_serverIsSSL(KviKvsModuleFunctionCall * c)
 	@syntax:
 		<string> $my.server([irc_context_id:uint])
 	@description:
-		Returns the server name of the current irc context.[br]
-		If the irc context is not connected then an empty string is returned.[br]
+		Returns the server name of the current IRC context.[br]
+		If the IRC context is not connected then an empty string is returned.[br]
 		If <irc_context_id> is specified this function returns acts as it was called
 		in that irc_context.[br]
 		Please note that this function returns the name of the server as reported
@@ -372,8 +372,8 @@ static bool my_kvs_fnc_server(KviKvsModuleFunctionCall * c)
 	@syntax:
 		<string> $my.network([irc_context_id:uint])
 	@description:
-		Returns the network name of the current irc context.[br]
-		If the irc context is not connected then an empty string is returned.[br]
+		Returns the network name of the current IRC context.[br]
+		If the IRC context is not connected then an empty string is returned.[br]
 		If <irc_context_id> is specified this function returns acts as it was called
 		in that irc_context.[br]
 */
diff --git a/src/modules/notifier/libkvinotifier.cpp b/src/modules/notifier/libkvinotifier.cpp
index 6aa77690c..b6c6584e7 100644
--- a/src/modules/notifier/libkvinotifier.cpp
+++ b/src/modules/notifier/libkvinotifier.cpp
@@ -61,7 +61,7 @@ kvi_time_t g_tNotifierDisabledUntil = 0;
 		In that case the message is appended at the end of the
 		message queue and the user will be able to scroll to it
 		by using the proper notifier buttons.[br]
-		The &lt;message&gt; text can contain simple html tags: basically you are
+		The &lt;message&gt; text can contain simple HTML tags: basically you are
 		allowed to use &lt;b&gt; and &lt;i&gt;. The usage of other
 		tags is possible but is discouraged since it tends to
 		mess up the message display. In particular you should avoid
@@ -73,7 +73,7 @@ kvi_time_t g_tNotifierDisabledUntil = 0;
 		!sw: -n | --noanim
 		Do not animate
 		!sw: -w | --windowid
-		Causes the message gets attacched to the specified window and
+		Causes the message gets attached to the specified window and
 		the user is able to type commands in that window after
 		showing up the notifier input. If the "=&lt;window_id&gt;" part
 		is omitted then the current window is used.[br]
@@ -91,7 +91,7 @@ kvi_time_t g_tNotifierDisabledUntil = 0;
 		!sw: -t | --timeout
 		Set the message lifetime to <timeout>
 		Obviously this option has no meaning if the window is not going to be shown.
-		The timeout may be overriddent by new messages but only in the future.
+		The timeout may be overridden by new messages but only in the future.
 		If the timeout expires and is not overridden by any new message
 		then the window will be automatically hidden.
 		A zero timeout disables auto-hiding.
@@ -205,7 +205,7 @@ static bool notifier_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 		Shows the notifier window if it is not already visible
 		If the -n switch is present then the show operation is
 		not animated.[br]
-		The notifier is shown ONLY if it contains some messages.
+		The notifier is shown [b]only[/b] if it contains some messages.
 		[b]Please note that the user can forcibly disable the notifier
 		for a limited period of time (a sort of "don't bug me" option).[/b]
 	@seealso:
@@ -239,12 +239,12 @@ static bool notifier_kvs_cmd_show(KviKvsModuleCommandCall * c)
 		The user can forcibly disable the notifier as a sort of "don't bug me"
 		feature for a limited period of time. When the notifier
 		is disabled the messages sent to it will not be shown.[br]
-		The only method that you (scripter) can use to forcibly
+		The only method that you (the scripter) can use to forcibly
 		re-enable the notifier is to unload the module and
-		reload it...but [b]DON'T do it[/b] :)[br]
+		reload it...but [b]don't do it[/b] :)[br]
 		There is also a global option that allows forcibly disabling
 		the notifier forever, this option could be overridden with [cmd]option[/cmd]
-		instead.. but again [b]DON'T do it[/b] :)[br]
+		instead.. but again [b]don't do it[/b] :)[br]
 
 */
 static bool notifier_kvs_fnc_isEnabled(KviKvsModuleFunctionCall * c)
diff --git a/src/modules/objects/KvsObject_button.cpp b/src/modules/objects/KvsObject_button.cpp
index 40401ed12..75030751f 100644
--- a/src/modules/objects/KvsObject_button.cpp
+++ b/src/modules/objects/KvsObject_button.cpp
@@ -57,7 +57,7 @@
 		See also [classfnc]$setText[/classfnc]().
 		!fn: $setImage(<image_id_or_pixmap_object>)
 		Sets the icon for this button.
-		See the [doc:image_id]image identifier[/doc] documentation for the explaination	of the <image_id> parameter.
+		See the [doc:image_id]image identifier[/doc] documentation for the explanation	of the <image_id> parameter.
 		!fn: $clickEvent()
 		Called by KVIrc when the mouse button is clicked.
 		The default implementation emits the [classfnc]$clicked[/classfnc]()signal.
@@ -138,7 +138,7 @@ KVSO_CLASS_FUNCTION(button,setImage)
 		if(pObject->inheritsClass("pixmap"))
 			((QPushButton *)widget())->setIcon(QIcon(*((KvsObject_pixmap *)pObject)->getPixmap()));
 		else
-			c->warning(__tr2qs_ctx("Object Pixmap required!","object"));
+			c->warning(__tr2qs_ctx("Object pixmap required!","object"));
 		return true;
 	}
 	QString szIcon;
diff --git a/src/modules/objects/KvsObject_colorDialog.cpp b/src/modules/objects/KvsObject_colorDialog.cpp
index 89b3f3673..2d37bbadc 100644
--- a/src/modules/objects/KvsObject_colorDialog.cpp
+++ b/src/modules/objects/KvsObject_colorDialog.cpp
@@ -136,12 +136,12 @@ KVSO_CLASS_FUNCTION(colorDialog,setCurrentColor)
 	{
 		if(c->paramCount()<3)
 		{
-			c->error(__tr2qs_ctx("Color name or triplette rgb/hsv value required","objects"));
+			c->error(__tr2qs_ctx("Color name or triplet RGB/HSV value required","objects"));
 			return true;
 		}
 		if (!var2->asInteger(iCol2)||!var3->asInteger(iCol3))
 		{
-			c->error(__tr2qs_ctx("One of the triplette parameters didn't evaluate to an integer","objects"));\
+			c->error(__tr2qs_ctx("One of the triplet parameters didn't evaluate to an integer","objects"));\
 				return true;
 		}
 		if (c->paramCount()<4)
diff --git a/src/modules/objects/KvsObject_comboBox.cpp b/src/modules/objects/KvsObject_comboBox.cpp
index 3a1eb9e90..f85f1f249 100644
--- a/src/modules/objects/KvsObject_comboBox.cpp
+++ b/src/modules/objects/KvsObject_comboBox.cpp
@@ -71,7 +71,7 @@
 		!fn: $setEditable(<bflag:boolean>)
 		Make the input field editable, if <bflag>. Otherwise the
 		user may only choose one of the items in the combo box.[br]
-		If the parameter is ommited, it is assumed to be false.
+		If the parameter is omitted, it is assumed to be false.
 		!fn: <boolean> $editable()
 		Returns whether the combobox is editable or not.
 		!fn: $setEditText(<text:string>,[<quiet:bool>])
@@ -328,7 +328,7 @@ KVSO_CLASS_FUNCTION(comboBox,setInsertionPolicy)
 			((QComboBox *)widget())->setInsertPolicy(QComboBox::InsertAfterCurrent);
 	else if(KviQString::equalCI(szPolicy,"BeforeCurrent"))
 			((QComboBox *)widget())->setInsertPolicy(QComboBox::InsertBeforeCurrent);
-	else c->warning(__tr2qs_ctx("Invalid insertion Policy '%Q'","objects"),&szPolicy);
+	else c->warning(__tr2qs_ctx("Invalid insertion policy '%Q'","objects"),&szPolicy);
 	return true;
 }
 
diff --git a/src/modules/objects/KvsObject_dateTimeEdit.cpp b/src/modules/objects/KvsObject_dateTimeEdit.cpp
index 7cea13fae..b75fba824 100644
--- a/src/modules/objects/KvsObject_dateTimeEdit.cpp
+++ b/src/modules/objects/KvsObject_dateTimeEdit.cpp
@@ -45,7 +45,7 @@
 		[class]object[/class]
 		[class]widget[/class]
 	@description:
-		This widget provides a datetimeedit.
+		This widget provides a datetimeedit class.
 	@functions:
 		!fn: $setDate(<text:string>,<format:string>)
 		Sets the date of the widget using the format <format>. Possible values for format are:
@@ -62,7 +62,7 @@
 		!fn: <string> $date(<format:string>)
 		Returns the widget date according to format.
 		!fn: $setTime(<text:string>,<format:string>)
-		Sets the date of the widget using the format <format>. Possibile values for format are:
+		Sets the date of the widget using the format <format>. Possible values for format are:
 		[br]h the hour without a leading zero
 		[br]hh the hour with a leading zero
 		[br]m the minute without a leading zero
diff --git a/src/modules/objects/KvsObject_dialog.cpp b/src/modules/objects/KvsObject_dialog.cpp
index d2ed0cf6a..afda7bb4a 100644
--- a/src/modules/objects/KvsObject_dialog.cpp
+++ b/src/modules/objects/KvsObject_dialog.cpp
@@ -39,7 +39,7 @@
 	@type:
 		class
 	@short:
-		A toplevel dialog object
+		A top-level dialog object class.
 	@inherits:
 		[class]object[/class]
 		[class]widget[/class]
diff --git a/src/modules/objects/KvsObject_dockWindow.cpp b/src/modules/objects/KvsObject_dockWindow.cpp
index 2c0661f00..dcc97379e 100644
--- a/src/modules/objects/KvsObject_dockWindow.cpp
+++ b/src/modules/objects/KvsObject_dockWindow.cpp
@@ -33,7 +33,7 @@
 #include <QLayout>
 
 /*
-	@doc:   dockwindow
+	@doc: dockwindow
 	@title:
 		dockwindow class
 	@type:
@@ -100,7 +100,7 @@ KVSO_CLASS_FUNCTION(dockWindow,addWidget)
 	KviKvsObject * pWidget = KviKvsKernel::instance()->objectController()->lookupObject(hWidget);
 	if(!pWidget)
 	{
-		c->warning(__tr2qs_ctx("Invalid object handle passed as parameter (the object is no longer existing ?)","objects"));
+		c->warning(__tr2qs_ctx("Invalid object handle passed as parameter (the object no longer exists?)","objects"));
 		return true;
 	}
 
diff --git a/src/modules/objects/KvsObject_file.cpp b/src/modules/objects/KvsObject_file.cpp
index ef13cac74..ba5c5d6ce 100644
--- a/src/modules/objects/KvsObject_file.cpp
+++ b/src/modules/objects/KvsObject_file.cpp
@@ -90,7 +90,7 @@ const QIODevice::OpenMode mod_cod[] = {
 		Attempts to open the file in specified mode or modes "sum".
 		Valid modes are:[br]
 		[pre]
-		Raw	  - raw, non-buffered access[br]
+		RAW     - RAW, non-buffered access[br]
 		ReadOnly     - opens the file read-only[br]
 		WriteOnly    - opens the file write-only[br]
 		ReadWrite    - opens the file in read-write mode[br]
@@ -98,7 +98,7 @@ const QIODevice::OpenMode mod_cod[] = {
 		Truncate     - truncates the file[br]
 		[/pre]
 		If you call this function without any parameters, the file is
-		opened in ReadOnly mode.[br]
+		opened in read-only mode.[br]
 		When working with buffered files, data is not written directly
 		to the file at once. You must call [classfnc]$flush[/classfnc]() to force it.[br]
 		See also: [classfnc]$close[/classfnc](),
@@ -110,7 +110,7 @@ const QIODevice::OpenMode mod_cod[] = {
 		See also: [classfnc]$flush[/classfnc]().
 		!fn: $flush()
 		Flushes the file buffer to disk. Calling this after opening the
-		file in 'Raw' mode doesn't make much sense.[br]
+		file in RAW mode doesn't make much sense.[br]
 		See also: [classfnc]$open[/classfnc](),
 		[classfnc]$close[/classfnc]().
 		!fn: <integer> $size()
@@ -445,7 +445,7 @@ KVSO_CLASS_FUNCTION(file,read)
 		if (pVar->isArray())
 			c->returnValue()->setArray(pVar->array());
 		else
-			c->warning(__tr2qs_ctx("The incoming data isn't an array","objects"));
+			c->warning(__tr2qs_ctx("The incoming data is not an array","objects"));
 	}
 	else if(KviQString::equalCI(szType, "Dict"))
 	{
@@ -455,7 +455,7 @@ KVSO_CLASS_FUNCTION(file,read)
 		if (pVar->isHash())
 			c->returnValue()->setHash(pVar->hash());
 		else
-			c->warning(__tr2qs_ctx("The incoming data isn't a Dictionary","objects"));
+			c->warning(__tr2qs_ctx("The incoming data is not a dictionary","objects"));
 	}
 	else if(KviQString::equalCI(szType, "String"))
 	{
@@ -584,7 +584,7 @@ KVSO_CLASS_FUNCTION(file,readHexBlock)
 	CHECK_FILE_IS_OPEN
 	kvs_uint_t uLen;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("lenght",KVS_PT_UNSIGNEDINTEGER,0,uLen)
+		KVSO_PARAMETER("length",KVS_PT_UNSIGNEDINTEGER,0,uLen)
 	KVSO_PARAMETERS_END(c)
 	if (uLen>(kvs_uint_t)m_pFile->size()) uLen=m_pFile->size();
 	char * buff = new char[uLen];
@@ -618,7 +618,7 @@ KVSO_CLASS_FUNCTION(file,writeHexBlock)
 	kvs_uint_t uLen;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("text_block",KVS_PT_STRING,0,szBlock)
-		KVSO_PARAMETER("lenght",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uLen)
+		KVSO_PARAMETER("length",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uLen)
 	KVSO_PARAMETERS_END(c)
 	if (szBlock.length()%2)
 	{
diff --git a/src/modules/objects/KvsObject_ftp.cpp b/src/modules/objects/KvsObject_ftp.cpp
index 6b9445269..adfebfa36 100644
--- a/src/modules/objects/KvsObject_ftp.cpp
+++ b/src/modules/objects/KvsObject_ftp.cpp
@@ -78,7 +78,7 @@
 		!fn:<id:integer> $list()
 		Lists the contents of the directory on the FTP server.
 		!fn: $commandFinishedEvent(<id:integer>,<error:boolean>)
-		Called by KVIrc when the FTP command identified by id has finished.[br]
+		Called by KVIrc when the FTP command identified by ID has finished.[br]
 		Error is true if an error occurred during the processing; otherwise error is false.[br]
 		The default implementation emits the [classfnc]$commandFinished[/classfnc]() signal.[br]
 		!fn: $listInfoEvent(<dir_entry_name:string>)
diff --git a/src/modules/objects/KvsObject_groupBox.h b/src/modules/objects/KvsObject_groupBox.h
index a54a300a8..610a9c1e9 100644
--- a/src/modules/objects/KvsObject_groupBox.h
+++ b/src/modules/objects/KvsObject_groupBox.h
@@ -2,7 +2,7 @@
 #define _CLASS_GROUPBOX_H_
 //=============================================================================
 //
-//   File : KvsObject_groupBox.cpp
+//   File : KvsObject_groupBox.h
 //   Creation date : Fri Jan 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp
index 7f126922e..3d01509d2 100644
--- a/src/modules/objects/KvsObject_http.cpp
+++ b/src/modules/objects/KvsObject_http.cpp
@@ -119,7 +119,7 @@
 		This event is triggered by KVIrc when he HTTP header of a server response is available.
 		The response is passed ad string.
 		!fn: $doneEvent(<error:boolean>)
-		This event is triggered when the last pending request has finished; (it is emitted after the last request's requestFinished() signal).
+		This event is triggered when the last pending request has finished; (it is emitted after the last requests requestFinished() signal).
 		!fn: $dataReadProgressEvent(<done:integer>,<total:integer>)
 		This event is triggered when reads data from a HTTP server.
 		<done> is the amount of data has already arrived and <total> is the total amount of data.
@@ -233,7 +233,7 @@ bool  KvsObject_http::functionSetHost(KviKvsObjectFunctionCall *c)
 	QUrl url(szHost);
 	if (!url.isValid())
 	{
-		c->warning(__tr2qs_ctx("Host '%Q' is not a valid url","objects"),&szHost);
+		c->warning(__tr2qs_ctx("Host '%Q' is not a valid URL","objects"),&szHost);
 		return true;
 	}
 	if (!szHost.isEmpty() && url.host().isEmpty()) url.setHost(szHost);
@@ -477,7 +477,7 @@ void KvsObject_http::slotResponseHeaderReceived(const QHttpResponseHeader &r)
 {
 	QString szResponse;
 	switch (r.statusCode()) {
-		case 200:	szResponse="Ok"  ;break;
+		case 200:	szResponse="OK"  ;break;
 		case 301:	szResponse="Moved Permanently" ;break;
 		case 302:	szResponse="Found" ;break;
 		case 303:	szResponse="See Other" ;break;
@@ -499,7 +499,7 @@ void KvsObject_http::slotReadyRead(const QHttpResponseHeader &r)
 {
 	QString szResponse;
 	switch (r.statusCode()) {
-		case 200:	szResponse="Ok"  ;break;
+		case 200:	szResponse="OK"  ;break;
 		case 301:	szResponse="Moved Permanently" ;break;
 		case 302:	szResponse="Found" ;break;
 		case 303:	szResponse="See Other" ;break;
diff --git a/src/modules/objects/KvsObject_label.cpp b/src/modules/objects/KvsObject_label.cpp
index 570dfb5ba..57e35b0e2 100644
--- a/src/modules/objects/KvsObject_label.cpp
+++ b/src/modules/objects/KvsObject_label.cpp
@@ -6,8 +6,8 @@
 //   This file is part of the KVIrc IRC client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
 //   Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
-//   Copyright (C) 2014 OmegaPhil (OmegaPhil@startmail.com)
-//LinkDelegationPolicy
+//   Copyright (C) 2014 OmegaPhil (OmegaPhil at startmail dot com)
+//
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
 //   as published by the Free Software Foundation; either version 2
@@ -103,12 +103,12 @@ const int frame_cod[] = {
 		[class]object[/class]
 		[class]widget[/class]
 	@description:
-		This widget can be used to display a text or an image. It can
-		have different frame styles and text/image alignment.
+		This widget can be used to display a text or an image.[br]
+		It can have different frame styles and text/image alignment.
 	@functions:
 		!fn: $setText(<text:string>)
 		Sets the text to be displayed by the label.
-		The text can contain limited html tags.
+		The text can contain limited HTML tags.
 		See also [classfnc]$text[/classfnc]().
 		!fn: <string> $text()
 		Returns the text currently displayed by the label.
@@ -121,8 +121,8 @@ const int frame_cod[] = {
 		See also [classfnc]$margin[/classfnc]().
 		!fn: <string> $alignment()
 		Returns a string containing alignment flags that are set for
-		this label. The flags are separated by commas. An example output
-		could look like this:[br]
+		this label. The flags are separated by commas.[br]
+		An example output could look like this:[br]
 		[pre]Bottom, Right[/pre][br]
 		See [classfnc]$setAlignment[/classfnc]() for explanation of all
 		alignment flags.
@@ -140,7 +140,7 @@ const int frame_cod[] = {
 		Justify   - Text is spaced apart to cover available room[br]
 		[/pre]
 		It is obvious that you can not set [i]Right[/i]
-		and [i]Left[/i] simoultaneously - this will [b]NOT[/b]
+		and [i]Left[/i] simultaneously - this will [b]not[/b]
 		result in an error message - it will simply not work :)
 		!fn: $clear()
 		Clears the label. Equal to calling [classfnc]$setText[/classfnc]("")
@@ -156,22 +156,21 @@ const int frame_cod[] = {
 		The flags determine the shape or shadow of the
 		label's frame. Valid shape flags are:[br]
 		[pre]
-		NoFrame     - draw no frame. You shouldn't specify a shadow when
+		NoFrame   - Draw no frame. You shouldn't specify a shadow when
 		using this.[br]
-		Box         - draws a rectangular box. Its borders can be
+		Box       - Draws a rectangular box. Its borders can be
 		[i]Raised[/i] or [i]Sunken[/i][br]
-		Panel       - draws a rectangular panel which can be
+		Panel     - Draws a rectangular panel which can be
 		[i]Raised[/i] or [i]Sunken[/i][br]
-		WinPanel    - similar to [i]Panel[/i], but is more in Win95
-		style[br]
-		Hline        - draws a horizontal line that frames nothing (useful as separator)
+		WinPanel  - Similar to [i]Panel[/i], but is more in Win95 style[br]
+		Hline     - Draws a horizontal line that frames nothing (useful as separator)
 		[/pre]
 		Valid shadow flags are:[br]
 		[pre]
-		Plain       - no 3D effect (draws using foreground color)[br]
-		Raised      - makes the label look like it was raised above the
+		Plain     - No 3D effect (draws using foreground color)[br]
+		Raised    - Makes the label look like it was raised above the
 		parent widget[br]
-		Sunken      - makes the label look like it was "pushed" inside
+		Sunken    - Makes the label look like it was [i]pushed[/i] inside
 		the parent widget[br]
 		[/pre]
 		!fn: $setImage(<image_id>)
diff --git a/src/modules/objects/KvsObject_memoryBuffer.cpp b/src/modules/objects/KvsObject_memoryBuffer.cpp
index 3be853bb5..8d6bf7ff9 100644
--- a/src/modules/objects/KvsObject_memoryBuffer.cpp
+++ b/src/modules/objects/KvsObject_memoryBuffer.cpp
@@ -107,9 +107,9 @@ KVSO_CLASS_FUNCTION(memoryBuffer,loadFromFile)
 			f.read(m_pBuffer->data(),f.size());
 			f.close();
 		}
-		else qDebug("Error in load file!");
+		else qDebug("Error in loaded file!");
 	}
-	else c->warning(__tr2qs_ctx("The file '%Q' does not exist","objects"),&szFileName);
+	else c->warning(__tr2qs_ctx("The file '%Q' doesn't exist","objects"),&szFileName);
 	return true;
 }
 KVSO_CLASS_FUNCTION(memoryBuffer,size)
@@ -150,7 +150,7 @@ KVSO_CLASS_FUNCTION(memoryBuffer,saveToFile)
 	}
 	else
 	{
-		c->warning(__tr2qs_ctx("Cannot open file '%Q' for writing","objects"),&szFileName);
+		c->warning(__tr2qs_ctx("Can't open file '%Q' for writing","objects"),&szFileName);
 	}
 	return true;
 }
diff --git a/src/modules/objects/KvsObject_process.cpp b/src/modules/objects/KvsObject_process.cpp
index 6958aa9ff..e7c4b1931 100644
--- a/src/modules/objects/KvsObject_process.cpp
+++ b/src/modules/objects/KvsObject_process.cpp
@@ -47,20 +47,22 @@
 		!WARNING AT LAST YOU HAVE TO CLOSE THE PROCESS!
 	@functions:
 		!fn: $addArgument(<process-name:string>)
-		With this command you give the process name (or more arguments) for comunication.
-		Es: see the next example.
+		With this command you give the process name (or more arguments) for communication.
+		See the next example.
 		!fn: $startProcess()
 		Tries to run the process.[br]
-		Es: [br]
+		[b]e.g.[/b]
+		[example]
 		%process=$new(process);[br]
 		%process->$addArg("cmd.exe");[br]
 		%process->$start();[br]
+		[/example]
 		!fn: <string> $readStdout()
 		Reads the data that the process has written to standard output.
 		!fn: <string> $readStderr()
 		Reads the data that the process has written to standard error.
-		Es:[br]
-		-------------------Start:[br]
+		[b]e.g.[/b]
+		[example]
 		class (test,object)[br]
 		{[br]
 			slotReadStdout()[br]
@@ -82,7 +84,7 @@
 		%A->$setGeometry(100,100,400,300)[br]
 		%layoutA=$new(layout,%A)[br]
 		%Ainput=$new(lineedit,%A)[br]
-		#%Aoutput=$new(textedit,%A)// coming soon in the new texteditor class[br]
+		#%Aoutput=$new(textedit,%A) [comment]//coming soon in the new texteditor class[/commnet][br]
 		%Aoutput=$new(label,%A)[br]
 		%bclosekill=$new(button,%A)[br]
 		%bclosekill->$settext("&CloseKill ")[br]
@@ -125,32 +127,33 @@
 			delete %A;[br]
 		}[br]
 		%A->$show();[br]
-		--------------------End.[br]
+		[/example]
 		!fn: $writeToStdin(<command:string>)
-		Whit this command you send a command to the process:
+		With this command you send a command to the process:
 		!fn: $closekill()
 		This tries to terminate the process the nice way.[br]
 		If the process is still running after 5 seconds, it terminates the process the hard way.[br]
 		(I think that this is the better way.)[br]
-		Es:
+		[b]e.g.[/b]
+		[pre]
 		%Process->close_kill();
+		[/pre]
 		!fn: $kill()
-		Kill the process in hard way.(Bad Idea)
+		Kill the process the hard way (Bad Idea).
 		!fn: $tryTerminate()
-		Tries to terminate the process.(It could be well but...)
+		Tries to terminate the process (It could end well, but...).
 		!fn: $closeStdin()
-		Close the standard Input.
+		Close the standard input.
 		!fn: <boolean> $isRunning()
 		Return 1 if the process is running, else return 0.
 		!fn: <boolean> $normalExit()
 		Returns true if the process has exited normally; otherwise returns false.
 		!fn: $readyReadStdoutEvent()
-		This function is invoched by the process when there are new datas.[br]
+		This function is invoked by the process when there is new data.[br]
 		The default implementation emits the [classfnc]$readyReadStdout[/classfnc]() signal.
 		!fn: $readyReadStderrEvent()
-		This function is invoched by the process when there are new error messages.[br]
+		This function is invoked by the process when there are new error messages.[br]
 		The default implementation emits the [classfnc]$readyReadStderr[/classfnc]() signal.
-
 	@signals:
 		!sg: $readyReadStdout()
 		This signal is emitted by the default implementation of [classfnc]$readyReadStdoutEvent[/classfnc]().[br]
diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp
index 02220d3d0..b41c77999 100644
--- a/src/modules/objects/KvsObject_socket.cpp
+++ b/src/modules/objects/KvsObject_socket.cpp
@@ -92,35 +92,36 @@ const char * const sockerrors_tbl[] = {
 	@type:
 		class
 	@short:
-		A Ipv4/Ipv6 TCP socket
+		A IPv4/IPv6 TCP socket
 	@inherits:
 		[class]object[/class]
 	@description:
 		This class provides a standard TCP/IP socket functionality.[br]
 		It can be used either for connecting to a remote host or to listening for incoming connections.[br]
-		If the KVIrc executable has been compiled with the IPV6 protocol support, this socket also supports it.[br]
+		If the KVIrc executable has been compiled with the IPv6 protocol support, this socket also supports it.[br]
 	@functions:
 		!fn: <integer or string> $status(<asString:boolean>)
 		Returns the status of the socket :[br]
-		0=Unconnected
-		1=HostLookUp
-		2=Connecting[br]
-		3=Connected[br]
-		4=Bound[br]
-		5=Closing[br]
-		6=Listening
-
+		[pre]
+		0 = Unconnected
+		1 = HostLookUp
+		2 = Connecting[br]
+		3 = Connected[br]
+		4 = Bound[br]
+		5 = Closing[br]
+		6 = Listening
+		[/pre]
 		!fn: $connect(<host>,<port>)
 		Attempts a connection to <host> on port <port>.[br]
-		<host> can be a numeric internet address (either Ipv4 or Ipv6 (if supported)) or a hostname.[br]
-		If a hostname is used, a DNS lookup is performed (the socket enters the "dns call" state).[br]
+		<host> can be a numeric internet address (either IPv4 or IPv6 (if supported)) or a hostname.[br]
+		If a hostname is used, a DNS lookup is performed (the socket enters the "DNS call" state).[br]
 		This function returns 1 if the connect attempt can be successfully initiated,
 		0 otherwise.[br] In fact, this function returns 0 only if the supplied <port> parameter
 		is invalid or the socket is in an incoherent state (already connected or listening):
 		for a newly created socket and with a valid <port> number you can safely ignore
 		the return value.[br]
 		Please note that the connection is asynchronous: when this function returns
-		the socket is NOT connected: it has just initiated the connect attempt
+		the socket is [b]not[/b] connected: it has just initiated the connect attempt
 		and you will be notified of the attempt result by an asynchronous event call:
 		in case of failure, $connectFailedEvent() will be called, in case of
 		succes, $connectEvent() will be called.
@@ -129,12 +130,12 @@ const char * const sockerrors_tbl[] = {
 		Attempts to listen on the specified <port> and <interface>.[br]
 		If <port> is not passed it is assumed to be 0, if <interface> is not passed, it is assumed to be
 		"any interface" (INADDR_ANY).[br] Port 0 means that the kernel should choose a "random" port to listen on.[br]
-		If the <interface> is recognized as IPV6 address, and IPV6 is supported, the socket listens
-		in IPV6 mode. If <interface> is an empty string and <force_ipv6> is 1 the socket listens
+		If the <interface> is recognized as IPv6 address, and IPv6 is supported, the socket listens
+		in IPv6 mode. If <interface> is an empty string and <force_ipv6> is 1 the socket listens
 		on "any ipv6 interface".[br]
 		This function returns '1' in case of success and '0' in case of failure.[br]
-		On some systems listening in the IPV6 namespace allows to accept also IPV4 connections (this includes
-		linux but not windows afaik).[br]
+		On some systems listening in the IPv6 namespace allows to accept also IPV4 connections (this includes
+		Linux but not windows afaik).[br]
 		When an incoming connection will arrive, $incomingConnectionEvent() will be called.
 
 		!fn: $connectedEvent()
@@ -146,7 +147,7 @@ const char * const sockerrors_tbl[] = {
 
 		!fn: $incomingConnectionEvent(<socket:h_object>)
 		This function is called when an incoming connection arrives over a socket in listening state.[br]
-		You must return 1 if you to terminad this incoming connectioncall [classfnc:socket]$accept[/classfnc]() passing a newly created socket object
+		You must return 1 if you to terminated this incoming connection call [classfnc:socket]$accept[/classfnc]() passing a newly created socket object
 		to accept and handle the connection.[br] If you don't call [classfnc:socket]$accept[/classfnc]()
 		the incoming connection will be automatically terminated.
 
@@ -170,7 +171,7 @@ const char * const sockerrors_tbl[] = {
 		Reads at most <length> bytes of data from the socket. If <length> is anything "outside" the
 		available data range (<length> < 0 or <length> > available_data_length), this function
 		returns all the available data.[br]
-		By default this function can deal ascii data only: NULL characters are transformed to
+		By default this function can deal ASCII data only: NULL characters are transformed to
 		ASCII characters 255. You can pass a [class]memorybuffer[/class] object to read binary data.
 
 		!fn: $write(<data, array,files or hobject>[,length])
@@ -189,7 +190,7 @@ const char * const sockerrors_tbl[] = {
 		If there is an active connection, there is a last attempt to flush the pending outgoing data.[br]
 		You don't need to call $close() if you [cmd]delete[/cmd] the socket: KVIrc will
 		reset the socket state automatically and free the memory. But if you want to ensure data delivery
-		after a $write call sequece and just before a [cmd]delete[/cmd], $close() is the only chance to do it.
+		after a $write call sequence and just before a [cmd]delete[/cmd], $close() is the only chance to do it.
 
 		!fn: $remoteIp()
 		Returns the IP address of the remote end of this socket.[br]
diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp
index 3bb2016ca..5083a4f9f 100644
--- a/src/modules/objects/KvsObject_sql.cpp
+++ b/src/modules/objects/KvsObject_sql.cpp
@@ -50,7 +50,7 @@
 		@type:
 			class
 		@short:
-			A sql database interface.
+			A SQL database interface.
 		@inherits:
 			[class]object[/class]
 		@description:
@@ -75,7 +75,7 @@
 			!fn: $closeConnection(<connection_name:string>)
 			Closes the connection <connection_name>.
 			!fn: <size:integer> $queryResultsSize()
-			Returns the query size in rows or -1 if the query is empty or the database driver doesn' support the function.
+			Returns the query size in rows or -1 if the query is empty or the database driver doesn't support the function.
 			!fn: <error:string> $lastError(<more_details:boolean>)
 			Returns last error occurred. Use the more_details flag for more info about the error.
 			!fn: <ok:boolean> $queryExec([<query:string>])
@@ -91,7 +91,7 @@
 			See also [classfnc]$queryExec[/classfnc]and[classfnc]$queryBindValue[/classfnc].
 			!fn: $queryBindValue()
 			Sets the placeholder <placeholder> to be bound to the value <val> in the prepared statement.
-			Note that the placeholder mark (e.g :) must be included when specifing the placeholder name.
+			Note that the placeholder mark (e.g :) must be included when specifying the placeholder name.
 			!fn: <boolean> $queryPrevious()
 			Sets the current query position to the previous resulting record.
 			Returns true if the operation is successful, false otherwise.
@@ -226,7 +226,7 @@ KVSO_CLASS_FUNCTION(sql,features)
 	QStringList connections = QSqlDatabase::connectionNames();
 	if (!connections.contains(szConnectionName))
 	{
-		c->warning(__tr2qs_ctx("Connection %Q does not exist","objects"),&szConnectionName);
+		c->warning(__tr2qs_ctx("Connection %Q doesn't exist","objects"),&szConnectionName);
 		return true;
 	}
 	QSqlDatabase db=QSqlDatabase::database(szConnectionName);
@@ -283,7 +283,7 @@ KVSO_CLASS_FUNCTION(sql,closeConnection)
 	    QStringList connections = QSqlDatabase::connectionNames();
 	    if (!connections.contains(szConnectionName))
 	    {
-		c->warning(__tr2qs_ctx("Connection %Q does not exist","objects"),&szConnectionName);
+		c->warning(__tr2qs_ctx("Connection %Q doesn't exist","objects"),&szConnectionName);
 		return true;
 	    }
 	    if(m_pCurrentSQlQuery)
diff --git a/src/modules/objects/KvsObject_tabWidget.cpp b/src/modules/objects/KvsObject_tabWidget.cpp
index 043100718..4eef1a790 100644
--- a/src/modules/objects/KvsObject_tabWidget.cpp
+++ b/src/modules/objects/KvsObject_tabWidget.cpp
@@ -85,25 +85,25 @@
 		!fn: $setTabsClosable(<enable:bool>)
 		Sets whether close buttons are automatically added to each tab
 		!fn: $currentChangedEvent()
-		This function is invoched when the current tab was changed.[br]
+		This function is invoked when the current tab was changed.[br]
 		The default implementation emits the [classfnc]$currentChange[/classfnc]() signal.
 		!fn: $tabCloseRequestEvent()
-		This function is invoched when when the close button on a tab is clicked.
+		This function is invoked when when the close button on a tab is clicked.
 		The index is the index of the tab that should be removed.[br]
 		The default implementation emits the [classfnc]$tabCloseRequest[/classfnc]() signal.
 		See also [classfnc]$setTabsClosable[/classfnc]().
 	@examples:
 		[example]
-			// First we'll create the main tabWidget.
+			[comment]// First we'll create the main tabWidget.[/comment]
 			%Tabwidget=$new(tabWidget)
 			%Tabwidget->$setToolTip("Example of TabWidget class")
 			%Tabwidget->$setTabPosition(Top)
 			%Tabwidget->$resize(300,200)
-			// Now we'll create the new widgets and put they in to the main tabWidget.
+			[comment]// Now we'll create the new widgets and put they in to the main tabWidget.[/comment]
 			%firsttab=$new(vbox)
 			%secondtab=$new(vbox)
-			// Now we'll create the item to put in to tab's pages.
-			// First tab
+			[comment]// Now we'll create the item to put in to tab's pages.[/comment]
+			[comment]// First tab[/comment]
 			%hbox=$new(hbox,%firsttab)
 			%labelbt=$new(label,%hbox)
 			%labelbt->$settext(Botton Tab)
@@ -114,11 +114,11 @@
 			%buttontb->$settext("To &Botton")
 			%buttontt=$new(button,%hbox)
 			%buttontt->$settext("To &Top")
-			// Now we'll give a layout to all items.
-			// This also allows to use privateimpl without making buttons global variables
-			// Add the page to the main tab.
+			[comment]// Now we'll give a layout to all items.[/comment]
+			[comment]// This also allows to use privateimpl without making buttons global variables[/comment]
+			[comment]// Add the page to the main tab.[/comment]
 			%Tabwidget->$addTab(%firsttab,Top&Button,33)
-			// Implementing the action to do when the user click the buttons.
+			[comment]// Implementing the action to do when the user click the buttons.[/comment]
 			privateimpl(%buttontb,mousepressevent)
 			{
 				%Tabwidget->$setTabPosition(Bottom)
@@ -127,7 +127,7 @@
 			{
 				%Tabwidget->$setTabPosition(Top)
 			}
-			// We do the same work  with the second tab's page.
+			[comment]// We do the same work  with the second tab's page.[/comment]
 			%labelwp=$new(label,%secondtab)
 			%labelwp->$settext("Enjoy the new Class provided by")
 			%labelwp->$setalignment("Center")
@@ -135,7 +135,7 @@
 			%labelgen->$settext(Grifisx \& Noldor)
 			%labelgen->$setalignment("Center")
 			%Tabwidget->$addTab(%secondtab,&About,50)
-			// Let's show our example.
+			[comment]// Let's show our example.[/comment]
 			%Tabwidget->$show()
 		[/example]
 	@signals:
diff --git a/src/modules/objects/KvsObject_tabWidget.h b/src/modules/objects/KvsObject_tabWidget.h
index 48db4ba78..68f83a76f 100644
--- a/src/modules/objects/KvsObject_tabWidget.h
+++ b/src/modules/objects/KvsObject_tabWidget.h
@@ -2,7 +2,7 @@
 #define _CLASS_TABWIDGET_H_
 //=============================================================================
 //
-//   File : KvsObject_tabWidget.cpp
+//   File : KvsObject_tabWidget.h
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp
index 9e1e12b76..3289d3e99 100644
--- a/src/modules/objects/KvsObject_tableWidget.cpp
+++ b/src/modules/objects/KvsObject_tableWidget.cpp
@@ -102,7 +102,7 @@ const char * const itemflags_tbl[] = {
 		!fn: $hideVerticalHeader()
 		Hides the vertical header.
 		!fn: $setRowCount(<integer>)
-		Sets  the number of rows in the table.
+		Sets the number of rows in the table.
 		!fn: <integer> $rowCount()
 		Returns the number of rows in the table.
 		!fn: <integer> $currentRow()
@@ -117,9 +117,9 @@ const char * const itemflags_tbl[] = {
 		!fn: $removeColumn(<column:uinteger>)
 		Remove the column at <column> and all its items from the table.
 		!fn: $setColumnCount(<uinteger>)
-		Sets  the number of columns in the table.
+		Sets the number of columns in the table.
 		!fn: <integer> $columnCount()
-		Returns  the number of columns in the table.
+		Returns the number of columns in the table.
 		!fn: <integer> $currentRow()
 		Returns the current column.
 		Useful in the [classfnc]customContextMenuRequestedEvent[/classfnc]
@@ -135,6 +135,7 @@ const char * const itemflags_tbl[] = {
 		Sets the flags for the cell pointed by row and col to the given flags.
 		These determine whether the cell can be selected or modified.
 		Supported flags are:
+		[pre]
 		[br]- noitemflag : no flag sets;
 		[br]- selectable : cell is selecatble;
 		[br]- editable : cell is editable;
@@ -143,6 +144,7 @@ const char * const itemflags_tbl[] = {
 		[br]- userCheckable : cell is checkable;
 		[br]- enabled :cell is enabled;
 		[br]- tristate : cell is checkable with three separate states.
+		[/pre]
 		!fn: $setCellWidget(<row:uint>,<column:uint>,<widget:hobject>)
 		Sets the given widget to be displayed in the cell in the given row and column, passing the ownership of the widget to the table.
 		!fn: $setIcon(<row:uint>,<column:uint>,<icon:imageid or hobject>)
diff --git a/src/modules/objects/KvsObject_textBrowser.cpp b/src/modules/objects/KvsObject_textBrowser.cpp
index fbd2628ef..428fa9644 100644
--- a/src/modules/objects/KvsObject_textBrowser.cpp
+++ b/src/modules/objects/KvsObject_textBrowser.cpp
@@ -42,11 +42,11 @@
 	@type:
 		class
 	@short:
-		Provides a class that can display html pages.
+		Provides a class that can display HTML pages.
 	@inherits:
 		[class]widget[/class]
 	@description:
-		Provides a class that can display html pages with hypertext navigation.
+		Provides a class that can display HTML pages with hypertext navigation.
 	@functions:
 		!fn: $setSource(<file_name:string>)
 		With this you can display the page at szFile location (szFile include the path).
diff --git a/src/modules/objects/KvsObject_toolButton.cpp b/src/modules/objects/KvsObject_toolButton.cpp
index a827f2816..d768ff30a 100644
--- a/src/modules/objects/KvsObject_toolButton.cpp
+++ b/src/modules/objects/KvsObject_toolButton.cpp
@@ -45,7 +45,7 @@
 		[class]object[/class]
 		[class]widget[/class]
 	@description:
-		The toolbutton class provides a quick-access button to commands or options, usually used inside a ToolBar.
+		The toolbutton class provides a quick-access button to commands or options, usually used inside a toolBar.
 	@functions:
 		!fn:$setImage(<icon_id:string>)
 		Sets the image for this button.
@@ -58,9 +58,9 @@
 		!fn:$usesTextLabel()
 		Return 1 if the setUsesTextLabel is enabled, otherwise return 0.
 		!fn:$setTextLabel(<text:String>,[tooltip:string])
-		Sets the label of this button to <text> and automatically sets it as a tool tip if <tip> is true.
+		Sets the label of this button to <text> and automatically sets it as a tooltip if <tip> is true.
 		!fn:<string> $textLabel()
-		Returns the label of tthe button.
+		Returns the label of the button.
 		!fn:$setAutoRaise(<bAutoraise:boolean>)
 		Sets whether auto-raising is enabled.
 		!fn:<boolean> $autoRaise()
diff --git a/src/modules/objects/KvsObject_toolButton.h b/src/modules/objects/KvsObject_toolButton.h
index 0be4e2681..d4b35b2a1 100644
--- a/src/modules/objects/KvsObject_toolButton.h
+++ b/src/modules/objects/KvsObject_toolButton.h
@@ -2,7 +2,7 @@
 #define _CLASS_TOOLBUTTON_H_
 //=============================================================================
 //
-//   File : KvsObject_toolButton.cpp
+//   File : KvsObject_toolButton.h
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
diff --git a/src/modules/objects/KvsObject_wizard.cpp b/src/modules/objects/KvsObject_wizard.cpp
index 5883cf40d..a4db80553 100644
--- a/src/modules/objects/KvsObject_wizard.cpp
+++ b/src/modules/objects/KvsObject_wizard.cpp
@@ -47,42 +47,42 @@
 		[class]object[/class]
 		[class]widget[/class]
 	@description:
-		A wizard is an input dialog that consists of a sequence of dialog pages.It walks the user through a process step by step.[br]
+		A wizard is an input dialog that consists of a sequence of dialog pages. It walks the user through a process step by step.[br]
 	@functions:
 	!fn: $addPage(<page_widget:object>,<title:string>)
 	Add a page with title.<page_widget> must be a widget's object.
 	!fn: $insertPage(<page_widget>,<title:string>,<index:integer>)
-	Inserts a page at the position <index>. If index is -1, page will appended to the end of the wizard's page sequenze.
+	Inserts a page at the position <index>. If index is -1, page will appended to the end of the wizard's page sequence.
 	!fn: $setTitle(<page>,<title:string>)
 	Sets the title for page page to title text.
 	!fn: $setBackEnabled(<page_widget>,<bEnabled:boolean>)
-	If enable is set to 1, page page has a Back button; otherwise page has no Back button.[br]
+	If enable is set to 1, page page has a [i]back[/i] button; otherwise page has no [i]back[/i] button.[br]
 	By default all pages have this button.
 	!fn: $setNextEnabled(<page_widget>,<bEnabled:boolean>)
-	If enable is set to 1, page page has a Next button; otherwise the Next button on page is disabled.[br]
+	If enable is set to 1, page page has a [i]next[/i] button; otherwise the [i]next[/i] button on page is disabled.[br]
 	By default all pages have this button.
 	!fn: $setFinishEnabled(<page_widget>,<bEnabled:boolean>)
-	If enable is set to 1, page page has a Finish button; otherwise the Finish button on page is disabled.[br]
+	If enable is set to 1, page page has a [i]finish[/i] button; otherwise the [i]finish[/i] button on page is disabled.[br]
 	By default NO pages have this button.
 	!fn: $setHelpEnabled(<page_widget>,<bEnabled:boolean>)
-	If enable is set to 1, page page has a Help button; otherwise the Help button on page is disabled.[br]
+	If enable is set to 1, page page has a Help button; otherwise the [i]help[/i] button on page is disabled.[br]
 	By default all pages have this button.
 	!fn: $setNextBtnText(<text:string>)
-	Set the text for button Next.
+	Set the text for button [i]next[/i].
 	!fn: $setBackBtnText(<text:string>)
-	Set the text for button Back.
+	Set the text for button [i]back[/i].
 	!fn: $setFinishBtnText(<text:string>)
-	Set the text for button Finish.
+	Set the text for button [i]finish[/i].
 	!fn: $setHelpBtnText(<text:string>)
 	Set the text for button Help.
 	!fn: $acceptEvent()
-	This function is called when the user click on the Finish button.
+	This function is called when the user clicks on the [i]finish[/i] button.
 	!fn: $rejectEvent()
-	This function is called when thie user click on the Reject button.
+	This function is called when the user clicks on the [i]reject[/i] button.
 	!fn: $nextClickedEvent()
-	This function is called when the user click on the Next button.
+	This function is called when the user clicks on the [i]next[/i] button.
 	!fn: $backClickedEvent()
-	This function is called when thie user click on the Back button.
+	This function is called when the user clicks on the [i]back[/i] button.
 	@signals:
 	!sg: $nextClicked()
 	This signal is emitted by the default implementation of [classfnc]$nextClickedEvent[/classfnc]().
diff --git a/src/modules/objects/KvsObject_wrapper.cpp b/src/modules/objects/KvsObject_wrapper.cpp
index 11c4d00a6..0faaed22b 100644
--- a/src/modules/objects/KvsObject_wrapper.cpp
+++ b/src/modules/objects/KvsObject_wrapper.cpp
@@ -51,9 +51,9 @@
 		[class]widget[/class]
 	@description:
 		[p]
-		This class "wraps" existing kvirc widgets and allows using the [class]widget[/class]
+		This class "wraps" existing KVIrc widgets and allows using the [class]widget[/class]
 		class API to manipulate them. You can use it, for example, to set the geometry of the
-		kvirc main window or to apply some crazy graphical changes to the UI.
+		KVIrc main window or to apply some crazy graphical changes to the UI.
 		[/p]
 		[p]
 		The KVIrc Qt widgets are arranged in trees (just as the objects). The difference is that there can be more than one
@@ -98,11 +98,11 @@
 		(5) !Parent::N
 		[/example]
 		[p]
-		The first three forms may be preceeded by the prefix '*' which will tell KVS to perform
+		The first three forms may be preceded by the prefix '*' which will tell KVS to perform
 		a recursive search from this point. Let's see some examples.
 		[/p]
 		[p]
-		The form (1) mathches the first widget with the specified class name. For instance:
+		The form (1) matches the first widget with the specified class name. For instance:
 		[/p]
 		[example]
 		%Frame = $new(wrapper,0,test,KviMainWindow)
@@ -116,7 +116,7 @@
 		%Frame->$setGeometry(20,20,400,400);
 		[/example]
 		[p]
-		If you want to wrap the kvirc status bar you can use a composite path:
+		If you want to wrap the KVIrc status bar you can use a composite path:
 		[/p]
 		[example]
 		%StatusBar = $new(wrapper,0,test,KviMainWindow,KviStatusBar)
@@ -167,7 +167,7 @@
 		%Chan->$setBackgroundColor(80,0,0);
 		[/example]
 		[p]
-		The form (4) allows you to jump directly to a specific kvirc channel/query/console window,
+		The form (4) allows you to jump directly to a specific KVIrc channel/query/console window,
 		without the need of looking it up in the tree.
 		[/p]
 		[example]
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index d9663b619..8eb15a6d1 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -172,11 +172,11 @@ static bool objects_kvs_cmd_killClass(KviKvsModuleCommandCall * c)
 			Suppresses any warning message
 		@description:
 			Removes the definition of the class <class_name>.[br]
-			All the instances of the class are killed (thus children objects are killed too).[br]
+			All the instances of the class are killed (thus child objects are killed too).[br]
 			All the derived class definitions are removed as well.[br]
 			Builtin class definitions cannot be removed and this commands
 			kills only all the instances of that class (derived class definitions
-			and instances in this case are NOT killed).[br]
+			and instances in this case are [b]not[/b] killed).[br]
 		@seealso:
 			[cmd]class[/cmd], [cmd]objects.clear[/cmd], [fnc]$classDefined[/fnc](),
 			[doc:objects]Objects documentation[/doc]
@@ -219,7 +219,7 @@ static bool objects_kvs_cmd_clearObjects(KviKvsModuleCommandCall * c)
 			If the -i switch is used, only the object instances are cleared
 			but the class definitions are left unchanged.[br]
 			This command should be used only for debugging & testing purposes
-			and in particular should be NEVER used from inside an object
+			and in particular should be [b]never[/b] used from inside an object
 			function handler (leads to SIGSEGV :).[br]
 		@seealso:
 			[cmd]class[/cmd], [cmd]objects.killclass[/cmd],
@@ -249,7 +249,7 @@ static bool objects_kvs_cmd_connect(KviKvsModuleCommandCall * c)
 			<target_object>'s slot <slot_name>.
 			When one of the two objects is destroyed, the signal/slot
 			connection is automatically removed.[br]
-			WARNING: This command name collides with the [doc:rfc2812]RFC2812[/doc]
+			WARNING: this command name collides with the [doc:rfc2812]RFC2812[/doc]
 			CONNECT IRC Op command: this IRC command is available to operators only
 			and is rather rarely used: you can use it by the means of [doc:raw]raw[/doc].
 		@seealso:
@@ -271,17 +271,17 @@ static bool objects_kvs_cmd_connect(KviKvsModuleCommandCall * c)
 	obSrc=KviKvsKernel::instance()->objectController()->lookupObject(hSrc);
 	if(!obTrg)
 	{
-		c->warning(__tr2qs_ctx("Inexistant target object for objects.connect","objects"));
+		c->warning(__tr2qs_ctx("non-existent target object for objects.connect","objects"));
 		return true;
 	}
 	if(!obSrc)
 	{
-		c->warning(__tr2qs_ctx("Inexistant source object for objects.connect","objects"));
+		c->warning(__tr2qs_ctx("non-existent source object for objects.connect","objects"));
 		return true;
 	}
 	if(!obSrc->connectSignal(szSignal,obTrg,szSlot))
 	{
-		c->warning(__tr2qs_ctx("Inexistant target slot '%Q' for objects.connect","objects"),&szSlot);
+		c->warning(__tr2qs_ctx("non-existent target slot '%Q' for objects.connect","objects"),&szSlot);
 		return true;
 	}
 	return true;
@@ -298,7 +298,7 @@ static bool objects_kvs_fnc_exists(KviKvsModuleFunctionCall * c)
 		@short:
 			Check if an object exists.
 		@syntax:
-			<boolean> $objects.exists(<obejct id:hobject>)
+			<boolean> $objects.exists(<object id:hobject>)
 		@description:
 			Check if an objects exists and return a boolean value.
 		@seealso:
@@ -332,7 +332,7 @@ static bool objects_kvs_fnc_instances(KviKvsModuleFunctionCall * c)
 			of objects of the specified class. <flags> is a
 			string containing modifiers for the function behaviour.[br]
 			If <flags> contains the letter "s" then
-			only unsubclassed instances of the specified
+			only non-subclassed instances of the specified
 			class are returned. This means that if B is
 			a subclass of A then when asked for instances
 			of A without the flag "s" this function will return
@@ -366,7 +366,7 @@ static bool objects_kvs_fnc_instances(KviKvsModuleFunctionCall * c)
 	if(!pClass)
 	{
 		if(!szFlags.contains(QChar('q')))
-			c->warning(__tr2qs_ctx("The class '%Q' does not exist","objects"),&szClassName);
+			c->warning(__tr2qs_ctx("The class '%Q' doesn't exist","objects"),&szClassName);
 		return true;
 	}
 	KviPointerHashTable<void *,KviKvsObject> * od = KviKvsKernel::instance()->objectController()->objectDict();
@@ -423,7 +423,7 @@ static bool objects_kvs_fnc_variables(KviKvsModuleFunctionCall * c)
 	KviKvsObject *ob=KviKvsKernel::instance()->objectController()->lookupObject(hObj);
 	if (!ob)
 	{
-		c->warning(__tr2qs_ctx("Object does not exist","objects"));
+		c->warning(__tr2qs_ctx("Object doesn't exist","objects"));
 		return true;
 	}
 	KviPointerHashTableIterator<QString,KviKvsVariant> it(* ob->dataContainer()->dict());
@@ -465,7 +465,7 @@ static bool objects_kvs_fnc_classAllHandlers(KviKvsModuleFunctionCall * c)
 	KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass(szClassName);
 	if(!pClass)
 	{
-		c->warning(__tr2qs_ctx("The class '%Q' does not exist","objects"),&szClassName);
+		c->warning(__tr2qs_ctx("The class '%Q' doesn't exist","objects"),&szClassName);
 		return true;
 	}
 
@@ -567,7 +567,7 @@ static bool objects_kvs_fnc_name(KviKvsModuleFunctionCall * c)
 	obSrcClass = KviKvsKernel::instance()->objectController()->lookupObject(hClass);
 	if(!obSrcClass)
 	{
-		c->warning(__tr2qs_ctx("Inexistant class object for objects.name","objects"));
+		c->warning(__tr2qs_ctx("non-existent class object for objects.name","objects"));
 		return true;
 	}
 
@@ -610,12 +610,12 @@ static bool objects_kvs_cmd_disconnect(KviKvsModuleCommandCall * c)
 	obSrc=KviKvsKernel::instance()->objectController()->lookupObject(hSrc);
 	if(!obTrg)
 	{
-		c->warning(__tr2qs_ctx("Inexistant target object for objects.disconnect","objects"));
+		c->warning(__tr2qs_ctx("non-existent target object for objects.disconnect","objects"));
 		return true;
 	}
 	if(!obSrc)
 	{
-		c->warning(__tr2qs_ctx("Inexistant source object for objects.disconnect","objects"));
+		c->warning(__tr2qs_ctx("non-existent source object for objects.disconnect","objects"));
 		return true;
 	}
 	obSrc->disconnectSignal(szSignal,obTrg,szSlot);
@@ -633,11 +633,11 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
 	@keyterms:
 		dump objects
 	@short:
-		Dump the kvirc widgets.
+		Dump the KVIrc widgets.
 	@syntax:
 		<array> $objects.dump(<print:boolean>)
 	@description:
-		This function return an array containing a representation of the widgets tree in kvirc;[br]
+		This function return an array containing a representation of the widgets tree in KVIrc;[br]
 		If the <print> flag is enabled, the array will be printed in the current window, too.
 	@examples:
 		[example]
diff --git a/src/modules/objects/qtftp/qftp.cpp b/src/modules/objects/qtftp/qftp.cpp
index d6b0ce783..f0fcecb57 100644
--- a/src/modules/objects/qtftp/qftp.cpp
+++ b/src/modules/objects/qtftp/qftp.cpp
@@ -997,7 +997,7 @@ bool QFtpPI::startNextCmd()
 
 #if defined(QFTPPI_DEBUG)
     if (state != Idle)
-        qDebug("QFtpPI startNextCmd: Internal error! QFtpPI called in non-Idle state %d", state);
+        qDebug("QFtpPI startNextCmd: internal error! QFtpPI called in non-idle state %d", state);
 #endif
     if (pendingCommands.isEmpty()) {
         currentCmd.clear();
diff --git a/src/modules/options/OptionsWidget_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp
index 9674351ee..be6ff706b 100644
--- a/src/modules/options/OptionsWidget_dcc.cpp
+++ b/src/modules/options/OptionsWidget_dcc.cpp
@@ -115,7 +115,7 @@ OptionsWidget_dccAdvanced::OptionsWidget_dccAdvanced(QWidget * parent)
 	mergeTip(b2,__tr2qs_ctx("<center>You can enable this option if you are behind a router that forwards all or a range of ports.<br>" \
 			"KVIrc will try to guess the IP address to use for DCC by looking up the local hostname as seen " \
 			"by the IRC server you're connected to.<br>This method is an exclusive alternative to the \"fixed address\" above.<br>" \
-			"It might guess the correct address automatically if certain conditions are met (e.g. the IRC server does not mask hostnames).</center>","options"));
+			"It might guess the correct address automatically if certain conditions are met (e.g. the IRC server doesn't mask hostnames).</center>","options"));
 
 	b = addBoolSelector(g,__tr2qs_ctx("Use \"broken bouncer hack\" to detect address","options"),KviOption_boolDccBrokenBouncerHack,KVI_OPTION_BOOL(KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable));
 	mergeTip(b,__tr2qs_ctx("<center>When you're behind a dialup router and also tunneling through a psyBNC bouncer, " \
@@ -128,12 +128,12 @@ OptionsWidget_dccAdvanced::OptionsWidget_dccAdvanced(QWidget * parent)
 	mergeTip(b,__tr2qs_ctx("<center>If you enable this option, when a DCC request from a remote " \
 					"user can't be satisfied KVIrc will notify him by a CTCP ERRMSG. This is " \
 					"a nice feature so it is a good idea to leave it on unless for some reason " \
-					"you have deactivated the antiflood system: in this case turning off this option " \
+					"you have deactivated the anti-flood system: in this case turning off this option " \
 					"might help if you often get attacked by CTCP floods.</center>","options"));
 
 	u = addUIntSelector(0,2,1,2,__tr2qs_ctx("Maximum number of DCC sessions","options"),KviOption_uintMaxDccSlots,0,1000,64);
 	mergeTip(u,__tr2qs_ctx("<center>This is the maximum number of concurrent DCC sessions " \
-					"and it includes all the DCC types (send,chat,recv...). " \
+					"and it includes all the DCC types (send, chat, recv...). " \
 					"KVIrc will refuse the requests when this limit is reached.</center>","options"));
 
 	u = addUIntSelector(0,3,1,3,__tr2qs_ctx("DCC socket timeout:","options"),KviOption_uintDccSocketTimeout,10,65536,180);
@@ -271,7 +271,7 @@ OptionsWidget_dccSendAdvanced::OptionsWidget_dccSendAdvanced(QWidget * parent)
 
 	b = addBoolSelector(hb,__tr2qs_ctx("Force idle step","options"),KviOption_boolDccSendForceIdleStep);
 	mergeTip(b,
-		__tr2qs_ctx("<center>Enable this option when the dcc file transfers " \
+		__tr2qs_ctx("<center>Enable this option when the DCC file transfers " \
 				"tend to block your computer by consuming too much CPU time. " \
 				"When this option is enabled the idle interval below will be " \
 				"forcibly inserted between each sent/received data packet.</center>","options"));
diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index 4db01563c..a6c6a9809 100644
--- a/src/modules/options/OptionsWidget_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -389,7 +389,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	sel = addStringSelector(gbox,__tr2qs_ctx("Location:","options"),KviOption_stringCtcpUserInfoLocation);
 	sel->setMinimumLabelWidth(120);
 	mergeTip(sel,szCenterBegin + __tr2qs_ctx("You can describe here your approximate physical location. " \
-				"Something like \"Region, Country\" will be ok. Please note that this information will be viewable " \
+				"Something like \"Region, Country\" will be OK. Please note that this information will be viewable " \
 				"by anyone so putting more data (like the exact address), generally, <b>is not a good idea</b>.","options") + szTrailing);
 
 	sel = addStringSelector(gbox,__tr2qs_ctx("Languages:","options"),KviOption_stringCtcpUserInfoLanguages);
@@ -400,7 +400,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	sel = addStringSelector(gbox,__tr2qs_ctx("Other:","options"),KviOption_stringCtcpUserInfoOther);
 	sel->setMinimumLabelWidth(120);
 	mergeTip(sel,szCenterBegin + __tr2qs_ctx("You can put here some additional personal data. " \
-				"It might be a funny quote or your homepage url... " \
+				"It might be a funny quote or your homepage URL... " \
 				"Please note that this information will be viewable " \
 				"by anyone so <b>don't put any sensible data</b> (passwords, telephone or credit card numbers).","options") + szTrailing);
 
diff --git a/src/modules/options/OptionsWidget_input.cpp b/src/modules/options/OptionsWidget_input.cpp
index 5ababb626..5d72facdb 100644
--- a/src/modules/options/OptionsWidget_input.cpp
+++ b/src/modules/options/OptionsWidget_input.cpp
@@ -35,15 +35,15 @@ OptionsWidget_inputLook::OptionsWidget_inputLook(QWidget * parent)
 	setObjectName("inputlook_options_widget");
 	createLayout();
 
-	addFontSelector(0,0,1,0,__tr2qs_ctx("Font","options"),KviOption_fontInput);
-	addColorSelector(0,1,1,1,__tr2qs_ctx("Background color","options"),KviOption_colorInputBackground);
-	addColorSelector(0,2,1,2,__tr2qs_ctx("Foreground color","options"),KviOption_colorInputForeground);
-	addColorSelector(0,3,1,3,__tr2qs_ctx("Selection background color","options"),KviOption_colorInputSelectionBackground);
-	addColorSelector(0,4,1,4,__tr2qs_ctx("Selection foreground color","options"),KviOption_colorInputSelectionForeground);
-	addColorSelector(0,5,1,5,__tr2qs_ctx("Control char color","options"),KviOption_colorInputControl);
-	addColorSelector(0,6,1,6,__tr2qs_ctx("Cursor color","options"),KviOption_colorInputCursor);
+	addFontSelector(0,0,1,0,__tr2qs_ctx("Font:","options"),KviOption_fontInput);
+	addColorSelector(0,1,1,1,__tr2qs_ctx("Background color:","options"),KviOption_colorInputBackground);
+	addColorSelector(0,2,1,2,__tr2qs_ctx("Foreground color:","options"),KviOption_colorInputForeground);
+	addColorSelector(0,3,1,3,__tr2qs_ctx("Selection background color:","options"),KviOption_colorInputSelectionBackground);
+	addColorSelector(0,4,1,4,__tr2qs_ctx("Selection foreground color:","options"),KviOption_colorInputSelectionForeground);
+	addColorSelector(0,5,1,5,__tr2qs_ctx("Control char color","options:"),KviOption_colorInputControl);
+	addColorSelector(0,6,1,6,__tr2qs_ctx("Cursor color:","options"),KviOption_colorInputCursor);
 
-	addPixmapSelector(0,7,1,7,__tr2qs_ctx("Background image","options"),KviOption_pixmapInputBackground);
+	addPixmapSelector(0,7,1,7,__tr2qs_ctx("Background image:","options"),KviOption_pixmapInputBackground);
 
 	addLabel(0,8,0,8,__tr2qs_ctx("Horizontal align:","options"));
 	m_pHorizontalAlign=new QComboBox(this);
diff --git a/src/modules/options/OptionsWidget_lag.cpp b/src/modules/options/OptionsWidget_lag.cpp
index 673ca5246..f82f7ebf6 100644
--- a/src/modules/options/OptionsWidget_lag.cpp
+++ b/src/modules/options/OptionsWidget_lag.cpp
@@ -46,7 +46,7 @@ OptionsWidget_lag::OptionsWidget_lag(QWidget * parent)
 	mergeTip(pInterval,
 		__tr2qs_ctx("<center>This option allows you to set the lag meter heartbeat interval.<br>" \
 			"The lower the heartbeat interval the higher will be the accuracy of the lag check " \
-			"but also higher cpu usage and data traffic to the server.<br>" \
+			"but also higher CPU usage and data traffic to the server.<br>" \
 			"Please note that this is NOT the interval between pings sent to the server: " \
 			"the pings (if any) will be sent really less often. " \
 			"5000 is a reasonable value.</center>","options"));
diff --git a/src/modules/options/OptionsWidget_mediaTypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp
index 935731d1d..129048e87 100644
--- a/src/modules/options/OptionsWidget_mediaTypes.cpp
+++ b/src/modules/options/OptionsWidget_mediaTypes.cpp
@@ -226,7 +226,7 @@ void OptionsWidget_mediaTypes::currentItemChanged(QTreeWidgetItem *it,QTreeWidge
 void OptionsWidget_mediaTypes::newMediaType()
 {
 	KviMediaType empty;
-	empty.szDescription = __tr2qs_ctx("New Media Type","options");
+	empty.szDescription = __tr2qs_ctx("New media type","options");
 	MediaTypeTreeWidgetItem * it = new MediaTypeTreeWidgetItem(m_pTreeWidget,&empty);
 	m_pTreeWidget->setCurrentItem(it);
 	it->setSelected(true);
diff --git a/src/modules/options/OptionsWidget_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp
index 26e450dc8..2844ee287 100644
--- a/src/modules/options/OptionsWidget_nickserv.cpp
+++ b/src/modules/options/OptionsWidget_nickserv.cpp
@@ -185,7 +185,7 @@ bool NickServRuleEditor::validate()
 
 	if(s.isEmpty())
 	{
-		QMessageBox::warning(this,m,__tr2qs_ctx("The identify command can't be empty!","options"),o);
+		QMessageBox::warning(this,m,__tr2qs_ctx("The IDENTIFY command can't be empty!","options"),o);
 		return false;
 	}
 
diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp
index 9350818ee..34af0898c 100644
--- a/src/modules/options/OptionsWidget_notifier.cpp
+++ b/src/modules/options/OptionsWidget_notifier.cpp
@@ -35,13 +35,13 @@ OptionsWidget_notifierLook::OptionsWidget_notifierLook(QWidget * parent)
 	setObjectName("notifierlook_options_widget");
 	createLayout();
 
-	addFontSelector(0,0,1,0,__tr2qs_ctx("Font","options"),KviOption_fontNotifier);
-	addColorSelector(0,1,1,1,__tr2qs_ctx("Background color","options"),KviOption_colorNotifierBackground);
-	addColorSelector(0,2,1,2,__tr2qs_ctx("Foreground color","options"),KviOption_colorNotifierForeground);
-	addFontSelector(0,3,1,3,__tr2qs_ctx("Title Font","options"),KviOption_fontNotifierTitle);
-	addColorSelector(0,4,1,4,__tr2qs_ctx("Title Foreground color","options"),KviOption_colorNotifierTitleForeground);
+	addFontSelector(0,0,1,0,__tr2qs_ctx("Font:","options"),KviOption_fontNotifier);
+	addColorSelector(0,1,1,1,__tr2qs_ctx("Background color:","options"),KviOption_colorNotifierBackground);
+	addColorSelector(0,2,1,2,__tr2qs_ctx("Foreground color:","options"),KviOption_colorNotifierForeground);
+	addFontSelector(0,3,1,3,__tr2qs_ctx("Title font:","options"),KviOption_fontNotifierTitle);
+	addColorSelector(0,4,1,4,__tr2qs_ctx("Title foreground color:","options"),KviOption_colorNotifierTitleForeground);
 
-	addPixmapSelector(0,5,1,5,__tr2qs_ctx("Background image","options"),KviOption_pixmapNotifierBackground);
+	addPixmapSelector(0,5,1,5,__tr2qs_ctx("Background image:","options"),KviOption_pixmapNotifierBackground);
 
 	addLabel(0,6,0,6,__tr2qs_ctx("Horizontal align:","options"));
 	m_pHorizontalAlign=new QComboBox(this);
diff --git a/src/modules/options/OptionsWidget_protection.cpp b/src/modules/options/OptionsWidget_protection.cpp
index 2590b8f64..2376de59a 100644
--- a/src/modules/options/OptionsWidget_protection.cpp
+++ b/src/modules/options/OptionsWidget_protection.cpp
@@ -1,7 +1,7 @@
 //=============================================================================
 //
 //   File : OptionsWidget_protection.cpp
-//   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
+//   Creation date : Wed Oct 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc IRC client distribution
 //   Copyright (C) 2005-2008 Alessandro Carbone (elfonol at gmail dot com)
diff --git a/src/modules/options/OptionsWidget_protection.h b/src/modules/options/OptionsWidget_protection.h
index 31f8c7008..a67fbcc5c 100644
--- a/src/modules/options/OptionsWidget_protection.h
+++ b/src/modules/options/OptionsWidget_protection.h
@@ -3,7 +3,7 @@
 //=============================================================================
 //
 //   File : OptionsWidget_protection.h
-//   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
+//   Creation date : Wed Oct 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc IRC client distribution
 //   Copyright (C) 2005-2008 Alessandro Carbone (elfonol at gmail dot com)
diff --git a/src/modules/options/OptionsWidget_query.cpp b/src/modules/options/OptionsWidget_query.cpp
index 3a13b3802..6d49078af 100644
--- a/src/modules/options/OptionsWidget_query.cpp
+++ b/src/modules/options/OptionsWidget_query.cpp
@@ -80,12 +80,12 @@ OptionsWidget_query::OptionsWidget_query(QWidget * parent)
 	b = addBoolSelector(0,4,1,4, __tr2qs_ctx("Popup notifier on new query message","options"),KviOption_boolPopupNotifierOnNewQueryMessages);
 	mergeTip(b,
 		__tr2qs_ctx("<center>This option causes a small notifier window to pop up " \
-			"in the low right corner of the screen when a new message is received " \
+			"in the lower right corner of the screen when a new message is received " \
 			"and the KVIrc window is not active.</center>","options"));
 	b = addBoolSelector(0,5,1,5, __tr2qs_ctx("Popup notifier on new notice","options"),KviOption_boolPopupNotifierOnNewNotices);
 	mergeTip(b,
 		__tr2qs_ctx("<center>This option causes a small notifier window to pop up " \
-			"in the low right corner of the screen when a new notice is received " \
+			"in the lower right corner of the screen when a new notice is received " \
 			"and the KVIrc window is not active.</center>","options"));
 	b = addBoolSelector(0,6,1,6, __tr2qs_ctx("Show information about query target at the top of the query","options"),KviOption_boolShowExtendedInfoInQueryLabel);
 	mergeTip(b,
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index d48c4d131..279d449e1 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -203,7 +203,7 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	gl->addWidget(m_pEncodingEditor,1,1);
 	KviTalToolTip::add(m_pEncodingEditor,__tr2qs_ctx("<center>This box allows you to choose the preferred encoding for the servers in this network. " \
 		"This encoding will be used for server specific needs, like referencing nicknames and channel names." \
-		"If you choose \"Use System Encoding\" then the encoding will be set to the systemwide " \
+		"If you choose \"Use System Encoding\" then the encoding will be set to the system-wide " \
 		"value that you choose in the \"Encoding\" page of the options dialog.</center>","options"));
 
 	//text encoding
@@ -215,7 +215,7 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	gl->addWidget(m_pTextEncodingEditor,2,1);
 	KviTalToolTip::add(m_pTextEncodingEditor,__tr2qs_ctx("<center>This box allows you to choose the preferred encoding for the servers in this network. " \
 		"This encoding will be used as the default for text messages." \
-		"If you choose \"Use System Encoding\" then the encoding will be set to the systemwide " \
+		"If you choose \"Use System Encoding\" then the encoding will be set to the system-wide " \
 		"value that you choose in the \"Encoding\" page of the options dialog.</center>","options"));
 
 	//common between server encoding and text encoding
@@ -980,7 +980,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pIdEditor->setText(s->id());
 	gl->addWidget(m_pIdEditor,iRow,1);
 
-	KviTalToolTip::add(m_pIdEditor,__tr2qs_ctx("<center>This field allows you to specify a really unique id for this server. " \
+	KviTalToolTip::add(m_pIdEditor,__tr2qs_ctx("<center>This field allows you to specify a really unique ID for this server. " \
 		"You will then be able to use /server -x &lt;this_id&gt; to make the connection. This is especially " \
 		"useful when you have multiple server entries with the same hostname and port in different networks (bouncers?)</center>","options"));
 
diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp
index e57a6df30..415a8c460 100644
--- a/src/modules/options/OptionsWidget_textEncoding.cpp
+++ b/src/modules/options/OptionsWidget_textEncoding.cpp
@@ -219,7 +219,7 @@ void OptionsWidget_textEncoding::commit()
 		g_szPrevSettedLocale=m_pForcedLocaleCombo->itemText(idx);
 		if(!KviFileUtils::writeFile(szLangFile,m_pForcedLocaleCombo->itemText(idx)))
 		{
-			QMessageBox::critical(this,"KVIrc",__tr2qs_ctx("Unable to write language information to","options")+"\n"+szLangFile,__tr2qs_ctx("Ok","options"));
+			QMessageBox::critical(this,"KVIrc",__tr2qs_ctx("Unable to write language information to","options")+"\n"+szLangFile,__tr2qs_ctx("OK","options"));
 		}
 	}
 /*	if(!KviQString::equalCI(m_pForcedLocaleCombo->text(idx),m_szLanguage))
diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp
index 0a3faf99a..81ea5b281 100644
--- a/src/modules/options/OptionsWidget_textIcons.cpp
+++ b/src/modules/options/OptionsWidget_textIcons.cpp
@@ -191,7 +191,7 @@ void OptionsWidget_textIcons::iconSelected(KviIconManager::SmallIcon eIcon)
 void OptionsWidget_textIcons::chooseFromFile()
 {
 	QString szFile;
-	KviFileDialog::askForOpenFileName(szFile,__tr2qs_ctx("Choose icon filename","options"),QString(),KVI_FILTER_IMAGE,false,true,this);
+	KviFileDialog::askForOpenFileName(szFile,__tr2qs_ctx("Choose Icon Filename","options"),QString(),KVI_FILTER_IMAGE,false,true,this);
 	if(!szFile.isEmpty())
 	{
 		if(g_pIconManager->getPixmap(szFile))
@@ -209,7 +209,7 @@ void OptionsWidget_textIcons::chooseFromFile()
 				KviFileUtils::makeDir(szCurrentThemePath);
 			KviFileUtils::copyFile(szFile,szCurrentThemePath+szFileName);
 			m_pCurrentItem->icon()->setFilename(szFileName);
-			qDebug("set Icon");
+			qDebug("Set icon");
 			QPixmap *p=m_pCurrentItem->icon()->pixmap();
 			m_pCurrentItem->setIcon(QIcon(*p));
 			if(m_pCurrentIconButton)
diff --git a/src/modules/options/OptionsWidget_theme.cpp b/src/modules/options/OptionsWidget_theme.cpp
index c96a11d2b..9655518f7 100644
--- a/src/modules/options/OptionsWidget_theme.cpp
+++ b/src/modules/options/OptionsWidget_theme.cpp
@@ -162,17 +162,17 @@ OptionsWidget_themeToolBarApplets::OptionsWidget_themeToolBarApplets(QWidget * p
 {
 	createLayout();
 
-	addFontSelector(0,0,0,0,__tr2qs_ctx("Font","options"),KviOption_fontIrcToolBarApplet);
+	addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontIrcToolBarApplet);
 
-	addColorSelector(0,1,0,1,__tr2qs_ctx("Background","options"),KviOption_colorIrcToolBarAppletBackground);
-	addColorSelector(0,2,0,2,__tr2qs_ctx("Low-Contrast Foreground","options"),KviOption_colorIrcToolBarAppletForegroundLowContrast);
-	addColorSelector(0,3,0,3,__tr2qs_ctx("Mid-Contrast Foreground","options"),KviOption_colorIrcToolBarAppletForegroundMidContrast);
-	addColorSelector(0,4,0,4,__tr2qs_ctx("Active High-Contrast Foreground (Primary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastActive1);
-	addColorSelector(0,5,0,5,__tr2qs_ctx("Active High-Contrast Foreground (Secondary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastActive2);
-	addColorSelector(0,6,0,6,__tr2qs_ctx("Inactive High-Contrast Foreground (Primary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastInactive1);
-	addColorSelector(0,7,0,7,__tr2qs_ctx("Inactive High-Contrast Foreground (Secondary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastInactive2);
+	addColorSelector(0,1,0,1,__tr2qs_ctx("Background:","options"),KviOption_colorIrcToolBarAppletBackground);
+	addColorSelector(0,2,0,2,__tr2qs_ctx("Low-contrast foreground:","options"),KviOption_colorIrcToolBarAppletForegroundLowContrast);
+	addColorSelector(0,3,0,3,__tr2qs_ctx("Mid-contrast foreground:","options"),KviOption_colorIrcToolBarAppletForegroundMidContrast);
+	addColorSelector(0,4,0,4,__tr2qs_ctx("Active high-contrast foreground (primary):","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastActive1);
+	addColorSelector(0,5,0,5,__tr2qs_ctx("Active high-contrast foreground (secondary):","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastActive2);
+	addColorSelector(0,6,0,6,__tr2qs_ctx("Inactive high-contrast foreground (primary):","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastInactive1);
+	addColorSelector(0,7,0,7,__tr2qs_ctx("Inactive high-contrast foreground (secondary):","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastInactive2);
 
-	addPixmapSelector(0,8,0,8,__tr2qs_ctx("Background Image","options"),KviOption_pixmapIrcToolBarAppletBackground);
+	addPixmapSelector(0,8,0,8,__tr2qs_ctx("Background image:","options"),KviOption_pixmapIrcToolBarAppletBackground);
 
 	layout()->setRowStretch(8,1);
 }
diff --git a/src/modules/options/OptionsWidget_tools.cpp b/src/modules/options/OptionsWidget_tools.cpp
index 37b17faf6..924402655 100644
--- a/src/modules/options/OptionsWidget_tools.cpp
+++ b/src/modules/options/OptionsWidget_tools.cpp
@@ -1,7 +1,7 @@
 //=============================================================================
 //
 //   File : OptionsWidget_tools.cpp
-//   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
+//   Creation date : Wed Oct 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc IRC client distribution
 //   Copyright (C) 2005-2008 Alessandro Carbone (elfonol at gmail dot com)
diff --git a/src/modules/options/OptionsWidget_tools.h b/src/modules/options/OptionsWidget_tools.h
index 2fc59e0b4..95a346b08 100644
--- a/src/modules/options/OptionsWidget_tools.h
+++ b/src/modules/options/OptionsWidget_tools.h
@@ -4,7 +4,7 @@
 //=============================================================================
 //
 //   File : OptionsWidget_tools.h
-//   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
+//   Creation date : Wed Oct 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc IRC client distribution
 //   Copyright (C) 2005-2008 Alessandro Carbone (elfonol at gmail dot com)
diff --git a/src/modules/options/OptionsWidget_topicLabel.cpp b/src/modules/options/OptionsWidget_topicLabel.cpp
index abe9992b0..7385b5094 100644
--- a/src/modules/options/OptionsWidget_topicLabel.cpp
+++ b/src/modules/options/OptionsWidget_topicLabel.cpp
@@ -33,10 +33,10 @@ OptionsWidget_topicLabel::OptionsWidget_topicLabel(QWidget *p):KviOptionsWidget(
 {
 	createLayout();
 
-	addFontSelector(0, 0, 0, 0, __tr2qs_ctx("Font","options"), KviOption_fontLabel);
-	addColorSelector(0, 1, 0, 1, __tr2qs_ctx("Foreground color","options"), KviOption_colorLabelForeground);
-	addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Background color","options"), KviOption_colorLabelBackground);
-	addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image","options"), KviOption_pixmapLabelBackground);
+	addFontSelector(0, 0, 0, 0, __tr2qs_ctx("Font:","options"), KviOption_fontLabel);
+	addColorSelector(0, 1, 0, 1, __tr2qs_ctx("Foreground color:","options"), KviOption_colorLabelForeground);
+	addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Background color:","options"), KviOption_colorLabelBackground);
+	addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image:","options"), KviOption_pixmapLabelBackground);
 
 	layout()->setRowStretch(3, 1);
 }
diff --git a/src/modules/options/OptionsWidget_userList.cpp b/src/modules/options/OptionsWidget_userList.cpp
index ccf252bb1..bc7375dbc 100644
--- a/src/modules/options/OptionsWidget_userList.cpp
+++ b/src/modules/options/OptionsWidget_userList.cpp
@@ -135,11 +135,11 @@ OptionsWidget_userListBackground::OptionsWidget_userListBackground(QWidget * par
 
 	addPixmapSelector(0,1,1,1,__tr2qs_ctx("Background image:","options"),KviOption_pixmapUserListViewBackground);
 
-	addLabel(0,2,0,2,__tr2qs_ctx("Horizontal Alignment:","options"));
+	addLabel(0,2,0,2,__tr2qs_ctx("Horizontal alignment:","options"));
 	m_pHorizontalAlign=new QComboBox(this);
 	addWidgetToLayout(m_pHorizontalAlign,1,2,1,2);
 
-	addLabel(0,3,0,3,__tr2qs_ctx("Vertical Alignment:","options"));
+	addLabel(0,3,0,3,__tr2qs_ctx("Vertical alignment:","options"));
 	m_pVerticalAlign=new QComboBox(this);
 	addWidgetToLayout(m_pVerticalAlign,1,3,1,3);
 
diff --git a/src/modules/options/OptionsWidget_windowList.cpp b/src/modules/options/OptionsWidget_windowList.cpp
index fb625be7a..a1b7b1f55 100644
--- a/src/modules/options/OptionsWidget_windowList.cpp
+++ b/src/modules/options/OptionsWidget_windowList.cpp
@@ -89,11 +89,11 @@ OptionsWidget_windowListTreeForeground::OptionsWidget_windowListTreeForeground(Q
 
 	addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeWindowListForeground);
 	addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeWindowListActiveForeground);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 1:","options"),KviOption_colorTreeWindowListHighlight1Foreground);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 2:","options"),KviOption_colorTreeWindowListHighlight2Foreground);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 3:","options"),KviOption_colorTreeWindowListHighlight3Foreground);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 4:","options"),KviOption_colorTreeWindowListHighlight4Foreground);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 5:","options"),KviOption_colorTreeWindowListHighlight5Foreground);
+	addColorSelector(g,__tr2qs_ctx("Alert level 1:","options"),KviOption_colorTreeWindowListHighlight1Foreground);
+	addColorSelector(g,__tr2qs_ctx("Alert level 2:","options"),KviOption_colorTreeWindowListHighlight2Foreground);
+	addColorSelector(g,__tr2qs_ctx("Alert level 3:","options"),KviOption_colorTreeWindowListHighlight3Foreground);
+	addColorSelector(g,__tr2qs_ctx("Alert level 4:","options"),KviOption_colorTreeWindowListHighlight4Foreground);
+	addColorSelector(g,__tr2qs_ctx("Alert level 5:","options"),KviOption_colorTreeWindowListHighlight5Foreground);
 
 	addColorSelector(0,2,0,2,__tr2qs_ctx("Progress bar color:","options"),KviOption_colorTreeWindowListProgress);
 
@@ -246,11 +246,11 @@ OptionsWidget_windowListClassic::OptionsWidget_windowListClassic(QWidget * paren
 	KviTalGroupBox *g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options"));
 	addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorWindowListNormalText);
 	addColorSelector(g,__tr2qs_ctx("Minimized:","options"), KviOption_colorWindowListMinimizedText);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 1:","options"),KviOption_colorWindowListHighlight1Text);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 2:","options"),KviOption_colorWindowListHighlight2Text);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 3:","options"),KviOption_colorWindowListHighlight3Text);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 4:","options"),KviOption_colorWindowListHighlight4Text);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 5:","options"),KviOption_colorWindowListHighlight5Text);
+	addColorSelector(g,__tr2qs_ctx("Alert level 1:","options"),KviOption_colorWindowListHighlight1Text);
+	addColorSelector(g,__tr2qs_ctx("Alert level 2:","options"),KviOption_colorWindowListHighlight2Text);
+	addColorSelector(g,__tr2qs_ctx("Alert level 3:","options"),KviOption_colorWindowListHighlight3Text);
+	addColorSelector(g,__tr2qs_ctx("Alert level 4:","options"),KviOption_colorWindowListHighlight4Text);
+	addColorSelector(g,__tr2qs_ctx("Alert level 5:","options"),KviOption_colorWindowListHighlight5Text);
 	addColorSelector(0,2,0,2,__tr2qs_ctx("Progress bar color:","options"),KviOption_colorWindowListProgressBar);
 	addUIntSelector(0,3,0,3,__tr2qs_ctx("Minimum width of buttons:","options"),KviOption_uintWindowListButtonMinWidth,24,9999,100);
 	//addUIntSelector(0,4,0,4,__tr2qs_ctx("Maximum number of rows:","options"),KviOption_uintWindowListMaximumRows,1,16,2);
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 8a086bad1..f5bcba8a3 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -58,7 +58,7 @@ extern int g_iOptionWidgetInstances;
 	@description:
 		Saves the options to disk; this includes aliases, popups,
 		events and all user preferences. You shouldn't need to
-		call this as KVIrc *should* save the relevant part of
+		call this as KVIrc [i]should[/i] save the relevant part of
 		configuration when it's changed. However you might want it
 		in a debugging session or when testing an unstable version
 		where crashes are possible.
@@ -79,15 +79,15 @@ static bool options_kvs_cmd_save(KviKvsModuleCommandCall *)
 	@title:
 		options.dialog
 	@short:
-		Shows the "options dialog"
+		Shows the preferences dialog
 	@syntax:
 		options.dialog [-t] [options_group]
 	@description:
-		Shows the KVIrc options dialog for the specified options group.
+		Shows the KVIrc preferences dialog and the specified options group.
 		If the [-t] switch is used, the dialog is opened as toplevel window,
-		otherwise it is opened as part of the current frame window.[br]
-		Valid values for [options_group] are "general" and "theme".
-		If [options_group] is omitted, the option group "general" is assumed.
+		otherwise it is opened as part of the current frame window.[br][br]
+		Valid values for [options_group] are [b]general[/b] and [b]theme[/b].
+		If [options_group] is omitted, the option group [i]general[/i] is assumed.
 		This command is exported by the "options" module.
 	@seealso:
 		[fnc]$options.isDialog[/fnc]
@@ -194,7 +194,7 @@ static bool options_kvs_cmd_pages(KviKvsModuleCommandCall * c)
 	@description:
 		Shows an options page as toplevel dialog.
 		The available option pages can be listed by using [cmd]options.pages[/cmd].
-		If the -n switch is used then dialog will appear as NON modal (will not block input).
+		If the -n switch is used then dialog will appear as [b]non[/b] modal (will not block input).
 	@seealso:
 */
 
@@ -256,9 +256,9 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 		<boolean> $options.isdialog([options_group:string])
 	@description:
 		Returns '1' if the options dialog for the specified options_group is open, '0' otherwise.[br]
-		If [options_group] is omitted then the group "general" is assumed.
-		At the moment of writing the valid [options_group] values are "general" and "theme".
-		This command is exported by the "options" module.
+		If [options_group] is omitted then the group [i]general[/i] is assumed.
+		At the moment of writing the valid [options_group] values are [b]general[/b] and [b]theme[/b].
+		This command is exported by the [i]options[/i] module.
 	@seealso:
 		[cmd]options.dialog[/cmd]
 */
@@ -288,8 +288,8 @@ static bool options_kvs_fnc_isdialog(KviKvsModuleFunctionCall * c)
 	@description:
 		Closes the KVIrc options dialog for the specified options group
 		or containing the specified options page.
-		If [options_group] is omitted, the option group "general" is assumed.
-		This command is exported by the "options" module.
+		If [options_group] is omitted, the option group [i]general[/i] is assumed.
+		This command is exported by the [i]options[/i] module.
 	@seealso:
 		[fnc]$options.isDialog[/fnc]
 */
diff --git a/src/modules/package/libkvipackage.cpp b/src/modules/package/libkvipackage.cpp
index 8986463aa..3f7ed0e91 100644
--- a/src/modules/package/libkvipackage.cpp
+++ b/src/modules/package/libkvipackage.cpp
@@ -178,7 +178,7 @@ static bool package_kvs_fnc_info(KviKvsModuleFunctionCall * c)
 	@syntax:
 		package.extractfield <package_path> <field_id> <target_file_name>
 	@description:
-		Extracs a package binary metadata field and saves it to the specified file.
+		Extracts a package binary metadata field and saves it to the specified file.
 		This is useful to extract images from the packages.
 */
 static bool package_kvs_cmd_extractField(KviKvsModuleCommandCall * c)
@@ -203,7 +203,7 @@ static bool package_kvs_cmd_extractField(KviKvsModuleCommandCall * c)
 
 	if(!pField)
 	{
-		c->warning(__tr2qs_ctx("Package does not contain binary field %1","package").arg(szFieldId));
+		c->warning(__tr2qs_ctx("Package doesn't contain binary field %1","package").arg(szFieldId));
 		return true;
 	}
 
diff --git a/src/modules/perl/libkviperl.cpp b/src/modules/perl/libkviperl.cpp
index a6015a852..ef2df64ce 100644
--- a/src/modules/perl/libkviperl.cpp
+++ b/src/modules/perl/libkviperl.cpp
@@ -44,7 +44,7 @@
 		{ \
 			if(!_c->switches()->find('q',"quiet")) \
 			{ \
-				_c->warning(__tr2qs_ctx("The perlcore module can't be loaded: perl support not available","perl")); \
+				_c->warning(__tr2qs_ctx("The perlcore module can't be loaded: Perl support not available","perl")); \
 				_c->warning(__tr2qs_ctx("To see more details about loading failure try /perlcore.load","perl")); \
 				return true; \
 			} \
@@ -58,7 +58,7 @@
 #else // !COMPILE_PERL_SUPPORT
 	#define KVS_CHECK_MODULE_STATE(_m,_c) \
 		if(!_c->switches()->find('q',"quiet")) \
-			_c->warning(__tr2qs_ctx("This KVIrc executable has been compiled without perl scripting support","perl")); \
+			_c->warning(__tr2qs_ctx("This KVIrc executable has been compiled without Perl scripting support","perl")); \
 		return true;
 #endif // !COMPILE_PERL_SUPPORT
 
@@ -67,20 +67,20 @@
 	@type:
 		language
 	@title:
-		Using perl from KVS and vice-versa.
+		Using Perl from KVS and vice-versa.
 	@short:
-		How to use perl from KVS and KVS from perl.
+		How to use Perl from KVS and KVS from Perl.
 	@body:
 		[big]Introduction[/big][br]
-		Starting from version 3.0.2 you can include perl code snippets
-		in KVS code and you can use KVS commands from within perl.
-		This feature is present only if a working perl installation
+		Starting from version 3.0.2 you can include Perl code snippets
+		in KVS code and you can use KVS commands from within Perl.
+		This feature is present only if a working Perl installation
 		has been found at build time.[br]
 		[br]
 
-		[big]Using perl from KVS[/big][br]
-		Using perl from KVIrc is really easy - just enclose
-		your perl code snippet inside [cmd]perl.begin[/cmd] and [cmd]perl.end[/cmd].
+		[big]Using Perl from KVS[/big][br]
+		Using Perl from KVIrc is really easy - just enclose
+		your Perl code snippet inside [cmd]perl.begin[/cmd] and [cmd]perl.end[/cmd].
 		[example]
 		[cmd]perl.begin[/cmd]
 		&lt;perl code goes here&gt;
@@ -94,21 +94,21 @@
 		close(MYFILE);
 		[cmd]perl.end[/cmd]
 		[/example]
-		A perl code snippet can appear anywhere a KVS code snippet can
+		A Perl code snippet can appear anywhere a KVS code snippet can
 		with the only restriction that it must be enclosed in [cmd]perl.begin[/cmd]
-		and [cmd]perl.end[/cmd]. This means that you can write perl code
+		and [cmd]perl.end[/cmd]. This means that you can write Perl code
 		in the commandline, in the aliases, the event handlers, popups...anywhere.[br]
 		If you have already encountered KVIrc's [cmd]eval[/cmd] command
-		then you probably also know how to execute a perl code snippet from a file :)[br]
+		then you probably also know how to execute a Perl code snippet from a file :)[br]
 		[br]
 
-		[big]Using KVS from perl[/big][br]
-		KVIrc exports several commands to the perl namespace
-		that allow you to invoke KVIrc's functions from inside the perl code snippet.[br]
+		[big]Using KVS from Perl[/big][br]
+		KVIrc exports several commands to the Perl namespace
+		that allow you to invoke KVIrc's functions from inside the Perl code snippet.[br]
 		The nicest example is KVIrc::echo():
 		[example]
 		[cmd]perl.begin[/cmd]
-		KVIrc::echo("Hello KVIrc world from perl!");
+		KVIrc::echo("Hello KVIrc world from Perl!");
 		[cmd]perl.end[/cmd]
 		[/example]
 		KVIrc::echo() is the counterpart of the [cmd]echo[/cmd].
@@ -121,21 +121,21 @@
 		[br]
 
 		[big]Perl execution contexts[/big][br]
-		The perl code snippets are executed by a perl interpreter - each
+		The Perl code snippets are executed by a Perl interpreter - each
 		interpreter has its own context and thus its own variables,
 		own function namespace etc.[br]
 		[br]
 		In the example above, KVIrc creates an interpreter when [cmd]perl.begin[/cmd]
 		is invoked and destroys it at [cmd]perl.end[/cmd] parsing time.
-		In fact, KVIrc can mantain multiple persistent interpreters that will
+		In fact, KVIrc can maintain multiple persistent interpreters that will
 		allow you to preserve your context across [cmd]perl.begin[/cmd] invocations.[br]
 		[br]
-		You can invoke a specific perl context by passing it as parameter to the [cmd]perl.begin[/cmd]
+		You can invoke a specific Perl context by passing it as parameter to the [cmd]perl.begin[/cmd]
 		command:[br]
 		[example]
 		[cmd]perl.begin("mycontext")[/cmd]
 		$myvariable = "mycontext";
-		KVIrc::echo("This perl code is executed from ".$myvariable);
+		KVIrc::echo("This Perl code is executed from ".$myvariable);
 		[cmd]perl.end[/cmd]
 		[/example]
 		The nice thing is that at a later time you can invoke this context again
@@ -145,8 +145,8 @@
 		KVIrc::echo("myvariable is still equal to ".$myvariable);
 		[cmd]perl.end[/cmd]
 		[/example]
-		The first time you invoke a named perl context it is automatically created and
-		it persists until KVIrc terminates or the perl context is explicitly destroyed
+		The first time you invoke a named Perl context it is automatically created and
+		it persists until KVIrc terminates or the Perl context is explicitly destroyed
 		by [cmd]perl.destroy[/cmd].[br]
 		[br]
 		There is a third possibility to destroy a context - when the
@@ -154,32 +154,32 @@
 		is however a rare case and should be treated just like a KVIrc restart (the
 		user probably WANTS the contexts to be reinitialized).[br]
 		[br]
-		The nice thing is that not only will your variables be preserved, any perl
+		The nice thing is that not only will your variables be preserved, any Perl
 		function or class you declare in a context will persist.
-		It's just like executing a long perl script file with pauses inside.[br]
+		It's just like executing a long Perl script file with pauses inside.[br]
 		[br]
-		If you omit the perl context name in the [cmd]perl.begin[/cmd] command
+		If you omit the Perl context name in the [cmd]perl.begin[/cmd] command
 		(or if you use an empty string in its place)
 		then KVIrc will create a temporary context for the snippet execution
 		and will destroy it immediately after [cmd]perl.end[/cmd] has been called.[br]
 		[br]
-		The major side effect of keeping persistent perl contexts is that
-		perl's symbol table will grow, and if not used carefully, the interpreter
+		The major side effect of keeping persistent Perl contexts is that
+		Perl's symbol table will grow, and if not used carefully, the interpreter
 		may become a memory hog. So if you're going to use persistent contexts,
 		either try to keep the symbol table clean or explicitly call [cmd]perl.destroy[/cmd]
 		once in a while to recreate the interpreter.[br]
-		If you just execute occasional perl code snippets and don't need to keep
+		If you just execute occasional Perl code snippets and don't need to keep
 		persistent variables, then just use the nameless temporary context provided
 		by [cmd]perl.begin[/cmd]("").[br]
 		[br]
 
-		[big]Passing parameters to the perl script[/big][br]
+		[big]Passing parameters to the Perl script[/big][br]
 		The easiest way to pass parameters to the perl code snippet
 		is to put them as [cmd]perl.begin[/cmd] arguments.
 		In fact the complete syntax of [cmd]perl.begin[/cmd] is:[br]
 		[b]perl.begin(&lt;perl context&gt;,&lt;arg0&gt;,&lt;arg1&gt;,...)[/b][br]
 		Where the &lt;arg0&gt;,&lt;arg1&gt;...&lt;argN&gt; parameters
-		are passed to the perl context as elements of the $_[] array.[br]
+		are passed to the Perl context as elements of the $_[] array.[br]
 		[example]
 		[cmd]perl.begin[/cmd]("","Hello world!","Now I CAN",1,2,3)
 		for($i=0;$i<5;$i++)
@@ -188,7 +188,7 @@
 		[/example]
 		[br]
 
-		[big]Accessing the KVIrc scripting context from perl[/big][br]
+		[big]Accessing the KVIrc scripting context from Perl[/big][br]
 		KVIrc exposes the following functions that manipulate
 		variables of the KVIrc's current KVS execution context:[br]
 		&nbsp; &nbsp; [b]KVIrc::getLocal(&lt;x&gt;)[/b][br]
@@ -217,8 +217,8 @@
 		[/example]
 		[br]
 
-		[big]Executing arbitrary KVIrc commands from perl[/big][br]
-		You can execute arbitrary KVS commands from perl by means of:[br]
+		[big]Executing arbitrary KVIrc commands from Perl[/big][br]
+		You can execute arbitrary KVS commands from Perl by means of:[br]
 		&nbsp; &nbsp; [b]KVIrc::eval(&lt;code&gt;)[/b][br]
 		This function behaves exactly like the ${ &lt;code&gt; } KVS construct -
 		it executes &lt;code&gt; in a child context and returns its evaluation result.[br]
@@ -232,7 +232,7 @@
 		[cmd]perl.end[/cmd]
 		[/example]
 		You can "eval" compound command sequences and variable ones.[br]
-		Remember that the perl code snippet is evaluated in a child KVS context
+		Remember that the Perl code snippet is evaluated in a child KVS context
 		and thus the local variables are NOT visible!
 		The following code snippets may easily fool you:[br]
 		[example]
@@ -251,13 +251,13 @@
 		[cmd]perl.end[/cmd]
 		[/example]
 		Note also that you must either escape the $ at the beginning of KVIrc identifiers
-		or use single quotes to prevent perl from interpreting the $ as the beginning of a variable.
+		or use single quotes to prevent Perl from interpreting the $ as the beginning of a variable.
 		[example]
-		[comment]# This will not work as expected[/comment]
+		[comment]// This will not work as expected[/comment]
 		[cmd]perl.begin[/cmd]
 		KVIrc::echo(KVIrc::eval("return $window.caption"));
 		[cmd]perl.end[/cmd]
-		[comment]# But these will do[/comment]
+		[comment]// But these will do[/comment]
 		[cmd]perl.begin[/cmd]
 		KVIrc::echo(KVIrc::eval("return \$window.caption"));
 		KVIrc::echo(KVIrc::eval('return $window.caption'));
@@ -266,7 +266,7 @@
 
 		[big]A shortcut for KVIrc::eval("/say...")[/big][br]
 		Since KVIrc::eval("/say...") is a common calling pattern, say has been added
-		to the KVIrc perl namespace. You can now call
+		to the KVIrc Perl namespace. You can now call
 		[example]
 		KVIrc::say("Hi all!");
 		[/example]
@@ -280,9 +280,9 @@
 		[br]
 
 		[big]Perl script return values[/big][br]
-		The [cmd]perl.begin[/cmd] command propagates the perl code return
+		The [cmd]perl.begin[/cmd] command propagates the Perl code return
 		value to the KVIrc context (just like a [cmd]setreturn[/cmd]() would do)
-		- this makes it easier to create an alias that executes a perl script and
+		- this makes it easier to create an alias that executes a Perl script and
 		returns its result.[br]
 		[br]
 		Without this automatic propagation, you would be forced to play with variables:
@@ -294,7 +294,7 @@
 		[/ul]
 		[br]
 
-		[big]Executing perl scripts from files[/big][br]
+		[big]Executing Perl scripts from files[/big][br]
 		[example]
 		[cmd]alias[/cmd](perlexec)
 		{
@@ -304,15 +304,15 @@
 			eval %tmp;
 		}
 		perlexec "/home/pragma/myperlscript.pl" "param1" "param2" "param3"
-		[comment]# or even[/comment]
+		[comment]// or even[/comment]
 		[cmd]echo[/cmd] $perlexec("/home/pragma/computeprimelargerthan.pl","10000")
 		[/example]
 		[br]
 
 		[big]Other tricks[/big][br]
-		An interesting feature of persistent perl contexts is that you can prepare a
+		An interesting feature of persistent Perl contexts is that you can prepare a
 		context for later fast execution.[br]
-		The idea is to declare all perl functions in a single perl code snippet
+		The idea is to declare all Perl functions in a single Perl code snippet
 		then call single functions when fast execution is needed.[br]
 		For example you might parse the following snippet at KVIrc's startup:[br]
 		[example]
@@ -336,18 +336,18 @@
 		[br]
 
 		[big]Curiosity[/big][br]
-		The perl support in KVIrc is implemented as a master-slave module pair.
+		The Perl support in KVIrc is implemented as a master-slave module pair.
 		The perl.* module is the master while perlcore is the slave.
-		When perl support isn't compiled in, the perl.* commands
+		When Perl support isn't compiled in, the perl.* commands
 		print some warnings and exit gracefully while the perlcore module
-		refuses to be loaded. When perl support is compiled in but
+		refuses to be loaded. When Perl support is compiled in but
 		for some reason the libperl.so can't be found or loaded, perlcore fails
-		the dynamic loading stage, however perl.* only fails gracefully with warning
-		messages. This trick allows scripters to check for perl
-		support with [fnc]perl.isAvailable[/fnc] and to embed perl code snippets
+		the dynamic loading stage, however Perl.* only fails gracefully with warning
+		messages. This trick allows scripters to check for Perl
+		support with [fnc]perl.isAvailable[/fnc] and to embed Perl code snippets
 		in KVS even if the support is missing - the snippets will be just skipped.[br]
 		[br]
-		Happy perl hacking :)[br]
+		Happy Perl hacking :)[br]
 */
 
 /*
@@ -357,9 +357,9 @@
 	@title:
 		perl.begin
 	@keyterms:
-		Including perl code snippets in KVS
+		Including Perl code snippets in KVS
 	@short:
-		Starts a perl code snippet
+		Starts a Perl code snippet
 	@syntax:
 		perl.begin [-n] [-q] [(<perl_context>[,<arg0>[,<arg1>[...]]])]
 		<perl code>
@@ -368,43 +368,43 @@
 		!sw: -q | --quiet
 		Prevents the command from printing any warnings.
 		!sw: -n | --no-return
-		Prevents the perl script return value to be propagated
+		Prevents the Perl script return value to be propagated
 		to the current context.
 		!sw: -f | --fail-on-error
-		Treat perl errors as KVS errors and abort execution of the
+		Treat Perl errors as KVS errors and abort execution of the
 		current script. Incompatible with -q
 	@description:
-		Indicates the beginning of a snippet of perl code.
+		Indicates the beginning of a snippet of Perl code.
 		The whole code part between perl.begin and perl.end
-		is executed in a perl interpreter.
+		is executed in a Perl interpreter.
 		If perl.end is omitted then it is implicitly assumed
 		that the code from perl.begin to the end of the command
-		buffer is perl.[br]
-		Each perl code execution is bound to a
-		perl context (that is in fact a particular instance
-		of a perl interpreter). If <perl_context> is not specified
-		or it is an empty string then temporary perl interpreter is created
+		buffer is Perl.[br]
+		Each Perl code execution is bound to a
+		Perl context (that is in fact a particular instance
+		of a Perl interpreter). If <perl_context> is not specified
+		or it is an empty string then temporary Perl interpreter is created
 		and destroyed just after the code snippet has terminated execution.
-		If <perl_context> is specified then a perl interpreter
+		If <perl_context> is specified then a Perl interpreter
 		keyed to that context is used: if it was already existing
 		then it is reused otherwise it is created.
 		Any <perl_context> is persistent: it mantains the function
-		declarations and perl variable states until explicitly
+		declarations and Perl variable states until explicitly
 		destroyed with [cmd]perl.destroy[/cmd] (or the perlcore
 		module is forcibly unloaded).[br]
 		The <arg0>,<arg1>,... arguments, if present, are passed
-		to the perl code snippet in the @_ array (accessible as $_[0],$_[1]...).[br]
-		The return value of the perl code is propagated to the current
+		to the Perl code snippet in the @_ array (accessible as $_[0],$_[1]...).[br]
+		The return value of the Perl code is propagated to the current
 		context (just like [cmd]setreturn[/cmd] was called on it) unless
 		the -n switch is used.[br]
 		The -q switch prevents from the command from printing any
 		warning.[br]
-		See the [doc:perl_and_kvs]perl scripting documentation[/doc]
+		See the [doc:perl_and_kvs]Perl scripting documentation[/doc]
 		for more information.
 	@examples:
 		[example]
 			perl.begin
-			KVIrc::eval("echo \"Hello World from perl!\"");
+			KVIrc::eval("echo \"Hello World from Perl!\"");
 			perl.end
 		[/example]
 	@seealso:
@@ -417,13 +417,13 @@
 	@title:
 		perl.end
 	@short:
-		Ends a perl code snippet
+		Ends a Perl code snippet
 	@syntax:
 		perl.begin[(<perl_context>)]
 		<perl code>
 		perl.end
 	@description:
-		Ends a perl code snippet. See [cmd]perl.begin[/cmd].
+		Ends a Perl code snippet. See [cmd]perl.begin[/cmd].
 	@seealso:
 		[cmd]perl.begin[/cmd]
 */
@@ -462,7 +462,7 @@ static bool perl_kvs_cmd_begin(KviKvsModuleCommandCall * c)
 	if(!g_pPerlCoreModule->ctrl(KVI_PERLCORECTRLCOMMAND_EXECUTE,&ex))
 	{
 		if(!c->switches()->find('q',"quiet"))
-			c->warning(__tr2qs_ctx("The perlcore module failed to execute the code: something is wrong with the perl support","perl"));
+			c->warning(__tr2qs_ctx("The perlcore module failed to execute the code: something is wrong with the Perl support","perl"));
 		return true;
 	}
 
@@ -504,11 +504,11 @@ static bool perl_kvs_cmd_begin(KviKvsModuleCommandCall * c)
 	@title:
 		perl.destroy
 	@short:
-		Destroys a perl execution context
+		Destroys a Perl execution context
 	@syntax:
 		perl.destroy [-q] <context_name:string>
 	@description:
-		Destroys the perl execution context <context_name>.
+		Destroys the Perl execution context <context_name>.
 		If the context does not exist then a warning is printed unless the
 		-q switch is used.[br]
 		The destruction will clear any state associated with the context
@@ -536,7 +536,7 @@ static bool perl_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
 	if(!g_pPerlCoreModule->ctrl(KVI_PERLCORECTRLCOMMAND_DESTROY,&ex))
 	{
 		if(!c->switches()->find('q',"quiet"))
-			c->warning(__tr2qs_ctx("The perlcore module failed to execute the code: something is wrong with the perl support","perl"));
+			c->warning(__tr2qs_ctx("The perlcore module failed to execute the code: something is wrong with the Perl support","perl"));
 	}
 #endif //COMPILE_PERL_SUPPORT
 
@@ -551,11 +551,11 @@ static bool perl_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
 	@title:
 		$perl.isAvailable
 	@short:
-		Check if perl scripting support is available
+		Check if Perl scripting support is available
 	@syntax:
 		$perl.isAvailable
 	@description:
-		Returns 1 if the perl scripting support is available and 0 otherwise.
+		Returns 1 if the Perl scripting support is available and 0 otherwise.
 */
 
 static bool perl_kvs_fnc_isAvailable(KviKvsModuleFunctionCall * c)
diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp
index 5ba013f4e..ee591e0b5 100644
--- a/src/modules/perlcore/libkviperlcore.cpp
+++ b/src/modules/perlcore/libkviperlcore.cpp
@@ -200,7 +200,7 @@ bool KviPerlInterpreter::init()
 		"{\n" \
 		"	my($p,$f,$l,$x);\n" \
 		"	($p,$f,$l) = caller;\n" \
-		"	KVIrc::internalWarning(\"At line \".$l.\" of perl code: \");\n" \
+		"	KVIrc::internalWarning(\"At line \".$l.\" of Perl code: \");\n" \
 		"	KVIrc::internalWarning(join(' ',@_));\n" \
 		"}\n").arg(m_szContextName);
 
@@ -237,7 +237,7 @@ bool KviPerlInterpreter::execute(
 {
 	if(!m_pInterpreter)
 	{
-		szError = __tr2qs_ctx("Internal error: perl interpreter not initialized","perl");
+		szError = __tr2qs_ctx("Internal error: Perl interpreter not initialized","perl");
 		return false;
 	}
 
diff --git a/src/modules/popup/libkvipopup.cpp b/src/modules/popup/libkvipopup.cpp
index eda165ad2..b2800b5e7 100644
--- a/src/modules/popup/libkvipopup.cpp
+++ b/src/modules/popup/libkvipopup.cpp
@@ -49,7 +49,7 @@
 	if(!pPopup) \
 	{ \
 		if(!c->hasSwitch('q',"quiet")) \
-			c->warning(__tr2qs_ctx("Popup \"%Q\" does not exist","kvs"),&szPopupName); \
+			c->warning(__tr2qs_ctx("Popup \"%Q\" doesn't exist","kvs"),&szPopupName); \
 		return true; \
 	} \
 	if(pPopup->LOCKING_CHECK()) \
@@ -74,7 +74,7 @@
 		if(!pPopup) \
 		{ \
 			if(!c->hasSwitch('q',"quiet")) \
-				c->warning(__tr2qs_ctx("Popup \"%Q\" does not exist","kvs"),&szTargetPopupName); \
+				c->warning(__tr2qs_ctx("Popup \"%Q\" doesn't exist","kvs"),&szTargetPopupName); \
 			return true; \
 		} \
 		if(pPopup->LOCKING_CHECK()) \
@@ -105,7 +105,7 @@
 	KviKvsPopupMenu * pPopup = KviKvsPopupManager::instance()->lookup(szPopupName); \
 	if(!pPopup) \
 	{ \
-		c->warning(__tr2qs_ctx("Popup \"%Q\" does not exist","kvs"),&szPopupName); \
+		c->warning(__tr2qs_ctx("Popup \"%Q\" doesn't exist","kvs"),&szPopupName); \
 		return true; \
 	} \
 	while(!szSubPopupName.isEmpty()) \
@@ -123,7 +123,7 @@
 		pPopup = pPopup->findChildPopupByName(szSubPopupName); \
 		if(!pPopup) \
 		{ \
-			c->warning(__tr2qs_ctx("Popup \"%Q\" does not exist","kvs"),&szTargetPopupName); \
+			c->warning(__tr2qs_ctx("Popup \"%Q\" doesn't exist","kvs"),&szTargetPopupName); \
 			return true; \
 		} \
 	}
@@ -151,7 +151,7 @@
 		<text> is a string that is evaluated at [cmd]popup[/cmd] call time and may contain
 		identifiers and variables.[br]
 		<icon> is an optional [doc:image_id]image identifier[/doc].[br]
-		<item_id> is the optional item id - if not specified, it will be generated automatically.[br]
+		<item_id> is the optional item ID - if not specified, it will be generated automatically.[br]
 		If <condition> is given, it is evaluated at [cmd]popup.show[/cmd] call time and if the
 		result is 0, the item is not shown in the physical popup.[br]
 		If this item gets clicked, the code inside <command> will be executed.
@@ -202,7 +202,7 @@ static bool popup_kvs_cmd_addItem(KviKvsModuleCallbackCommandCall * c)
 		Adds a menu prologue to an already existing popup or nested popup named <popupname>. If you
 		want to add an item to a nested popup, use the form "popup.addItem", for example,
 		"channeltextview.myNestedItem".[br]
-		<item_id> is the optional item id - if not specified, it will be generated automatically.[br]
+		<item_id> is the optional item ID - if not specified, it will be generated automatically.[br]
 		<command> will be executed just before the popup is filled at [cmd]popup.show[/cmd] command call.
 		<command> can be a simple instruction or an instruction block delimited by curly brackets.[br]
 		Please note that some instructions are not allowed here, You can't delete the prologue's parent
@@ -251,7 +251,7 @@ static bool popup_kvs_cmd_addPrologue(KviKvsModuleCallbackCommandCall * c)
 		Adds a menu epilogue to an already existing popup or nested popup named <popupname>. If you
 		want to add an item to a nested popup, use the form "popup.addItem", for example,
 		"channeltextview.myNestedItem".[br]
-		<item_id> is the optional item id - if not specified, it will be generated automatically.[br]
+		<item_id> is the optional item ID - if not specified, it will be generated automatically.[br]
 		<command> will be executed just after the popup is filled at [cmd]popup.show[/cmd] command call.
 		<command> can be a simple instruction or an instruction block delimited by curly brackets.[br]
 		Please note that some instructions are not allowed here, You can't delete the prologue's parent
@@ -300,7 +300,7 @@ static bool popup_kvs_cmd_addEpilogue(KviKvsModuleCallbackCommandCall * c)
 		<text> is a string that is evaluated at [cmd]popup[/cmd] call time and may contain
 		identifiers and variables.[br]
 		<icon> is an optional [doc:image_id]image identifier[/doc].[br]
-		<item_id> is the optional item id - if not specified, it will be generated automatically.[br]
+		<item_id> is the optional item ID - if not specified, it will be generated automatically.[br]
 		If <condition> is given, it is evaluated at [cmd]popup.show[/cmd] call time and if the
 		result is 0, the item is not shown in the physical popup.[br]
 		If this item is hovered over, the nested popup <external_popup> will be shown.
@@ -349,7 +349,7 @@ static bool popup_kvs_cmd_addExtPopup(KviKvsModuleCommandCall * c)
 		<text> is a string that is evaluated at [cmd]popup[/cmd] call time and may contain
 		identifiers and variables.[br]
 		<icon> is an optional [doc:image_id]image identifier[/doc].[br]
-		<item_id> is the optional item id - if not specified, it will be generated automatically.[br]
+		<item_id> is the optional item ID - if not specified, it will be generated automatically.[br]
 		If <condition> is given, it is evaluated at [cmd]popup.show[/cmd] call time and if the
 		result is 0, the item is not shown in the physical popup.[br]
 	@seealso:
@@ -395,7 +395,7 @@ static bool popup_kvs_cmd_addLabel(KviKvsModuleCommandCall * c)
 		<text> is a string that is evaluated at [cmd]popup[/cmd] call time and may contain
 		identifiers and variables.[br]
 		<icon> is an optional [doc:image_id]image identifier[/doc].[br]
-		<item_id> is the optional item id - if not specified, it will be generated automatically.[br]
+		<item_id> is the optional item ID - if not specified, it will be generated automatically.[br]
 		If <condition> is given, it is evaluated at [cmd]popup.show[/cmd] call time and if the
 		result is 0, the item is not shown in the physical popup.[br]
 		If this item is hovered over, the nested popup will be shown.
@@ -440,7 +440,7 @@ static bool popup_kvs_cmd_addSubPopup(KviKvsModuleCommandCall * c)
 		nested popup named <popupname>. If you want to add an item to a nested popup, use the form
 		"popup.addItem", for example, "channeltextview.myNestedItem". The separator is not selectable
 		or clickable.[br]
-		<item_id> is the optional item id - if not specified, it will be generated automatically.[br]
+		<item_id> is the optional item ID - if not specified, it will be generated automatically.[br]
 		If <condition> is given, it is evaluated at [cmd]popup.show[/cmd] call time and if the
 		result is 0, the item is not shown in the physical popup.[br]
 	@seealso:
@@ -571,7 +571,7 @@ static bool popup_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
 	if(!pPopup)
 	{
 		if(!c->hasSwitch('q',"quiet"))
-			c->warning(__tr2qs_ctx("Popup \"%Q\" does not exist","kvs"),&szPopupName);
+			c->warning(__tr2qs_ctx("Popup \"%Q\" doesn't exist","kvs"),&szPopupName);
 		return true;
 	}
 	if(pPopup->isSoftLocked())
@@ -627,7 +627,7 @@ static bool popup_kvs_cmd_delItem(KviKvsModuleCommandCall * c)
 	if(!pPopup->removeItemByName(szItemId,c->hasSwitch('d',"deep")))
 	{
 		if(!c->hasSwitch('q',"quiet"))
-			c->warning(__tr2qs_ctx("The menu item with id \"%Q\" does not exist in popup \"%Q\"","kvs"),&szItemId,&szPopupName);
+			c->warning(__tr2qs_ctx("The menu item with ID \"%Q\" doesn't exist in popup \"%Q\"","kvs"),&szItemId,&szPopupName);
 	}
 
 	KviKvsPopupManager::instance()->emitRefresh(szPopupName);
@@ -731,9 +731,9 @@ static bool popup_kvs_fnc_isEmpty(KviKvsModuleFunctionCall * c)
 	@syntax:
 		$popup.currentItemId()
 	@short:
-		Returns the popup item id that owns the executing code
+		Returns the popup item ID that owns the executing code
 	@description:
-		When called inside a popup item's callback, this function returns the id of the popup item.
+		When called inside a popup item's callback, this function returns the ID of the popup item.
 		Outside of callback code, $null is returned.
 	@examples:
 		[example]
diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp
index 3b559fd6f..cb4e3b830 100644
--- a/src/modules/popupeditor/PopupEditorWindow.cpp
+++ b/src/modules/popupeditor/PopupEditorWindow.cpp
@@ -261,7 +261,7 @@ SinglePopupEditor::SinglePopupEditor(QWidget * par)
 		__tr2qs_ctx("<center><b>External menu name</b><br>This allows one to nest externally defined popup menus. The popup menu with the specified name will be looked up at menu setup time.</center>","editor"));
 	g->addWidget(m_pExtNameEditor,5,1,1,2);
 
-	l = new QLabel(__tr2qs_ctx("Item Id:","editor"),this);
+	l = new QLabel(__tr2qs_ctx("Item ID:","editor"),this);
 	l->setMargin(2);
 	g->addWidget(l,6,0);
 
@@ -1042,9 +1042,9 @@ PopupEditorWidget::PopupEditorWidget(QWidget * par)
 	m_pTreeWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
 	m_pTreeWidget->header()->setSortIndicatorShown(true);
 
-	QPushButton * pb = new QPushButton(__tr2qs_ctx("&Export All To...","editor"),box);
+	QPushButton * pb = new QPushButton(__tr2qs_ctx("&Export All to...","editor"),box);
 	connect(pb,SIGNAL(clicked()),this,SLOT(exportAll()));
-	QPushButton * gn = new QPushButton(__tr2qs_ctx("&Export selected To...","editor"),box);
+	QPushButton * gn = new QPushButton(__tr2qs_ctx("&Export Selected to...","editor"),box);
 	connect(gn,SIGNAL(clicked()),this,SLOT(exportSelected()));
 
 	m_pEditor = new SinglePopupEditor(spl);
diff --git a/src/modules/proxydb/libkviproxydb.cpp b/src/modules/proxydb/libkviproxydb.cpp
index 7b907de37..ac925082a 100644
--- a/src/modules/proxydb/libkviproxydb.cpp
+++ b/src/modules/proxydb/libkviproxydb.cpp
@@ -68,7 +68,7 @@ static bool proxydb_kvs_fnc_protocol(KviKvsModuleFunctionCall * c)
 	KviProxy * pRecord = g_pProxyDataBase->findProxy(pProxy,true);
 	if(!pRecord)
 	{
-		c->error(__tr2qs_ctx("The specified proxy does not exist","serverdb"));
+		c->error(__tr2qs_ctx("The specified proxy doesn't exist","serverdb"));
 		return false;
 	}
 
@@ -111,7 +111,7 @@ static bool proxydb_kvs_fnc_protocol(KviKvsModuleFunctionCall * c)
 		KviProxy * pRecord = g_pProxyDataBase->findProxy(pProxy,true); \
 		if(!pRecord) \
 		{ \
-			c->error(__tr2qs_ctx("The specified proxy does not exist","serverdb")); \
+			c->error(__tr2qs_ctx("The specified proxy doesn't exist","serverdb")); \
 			return false; \
 		} \
 		\
@@ -144,11 +144,11 @@ PROXYDB_GET_PROPERTY(proxydb_kvs_fnc_hostname,hostName,setString)
 	@title:
 		$proxydb.ip
 	@short:
-		Returns the ip
+		Returns the IP
 	@synthax:
 		<string> $proxydb.ip(<string:proxy>)
 	@description:
-		Returns the ip of the proxy <proxy>
+		Returns the IP of the proxy <proxy>
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
 */
@@ -308,7 +308,7 @@ static bool proxydb_kvs_cmd_addProxy(KviKvsModuleCommandCall * c)
 		else if(tmp == "Socks5") pProxy->setProtocol(KviProxy::Socks5);
 		else if(tmp == "Http") pProxy->setProtocol(KviProxy::Http);
 		else {
-			c->error(__tr2qs_ctx("The specified protocol does not exist","serverdb"));
+			c->error(__tr2qs_ctx("The specified protocol doesn't exist","serverdb"));
 			return false;
 		}
 	}
@@ -371,7 +371,7 @@ static bool proxydb_kvs_cmd_setPort(KviKvsModuleCommandCall * c)
 	if(!pRecord)
 	{
 		if(c->switches()->find('q',"quiet")) return true;
-		c->error(__tr2qs_ctx("The specified proxy does not exist","serverdb"));
+		c->error(__tr2qs_ctx("The specified proxy doesn't exist","serverdb"));
 		return false;
 	}
 
@@ -390,11 +390,11 @@ static bool proxydb_kvs_cmd_setPort(KviKvsModuleCommandCall * c)
 	@title:
 		proxydb.setIp
 	@short:
-		Sets the ip for a proxy
+		Sets the IP for a proxy
 	@syntax:
 		proxydb.setIp [switches] <string:proxy> <string:ip>
 	@description:
-		Sets the ip <ip> for the proxy <proxy>
+		Sets the IP <ip> for the proxy <proxy>
 	@switches:
 		!sw: -q | --quiet
 		Do not print errors if the proxy already exist.[br]
@@ -442,7 +442,7 @@ static bool proxydb_kvs_cmd_setIp(KviKvsModuleCommandCall * c)
 	if(!pRecord)
 	{
 		if(c->switches()->find('q',"quiet")) return true;
-		c->error(__tr2qs_ctx("The specified proxy does not exist","serverdb"));
+		c->error(__tr2qs_ctx("The specified proxy doesn't exist","serverdb"));
 		return false;
 	}
 
@@ -505,7 +505,7 @@ static bool proxydb_kvs_cmd_setIPv6(KviKvsModuleCommandCall * c)
 	if(!pRecord)
 	{
 		if(c->switches()->find('q',"quiet")) return true;
-		c->error(__tr2qs_ctx("The specified proxy does not exist","serverdb"));
+		c->error(__tr2qs_ctx("The specified proxy doesn't exist","serverdb"));
 		return false;
 	}
 
@@ -566,7 +566,7 @@ static bool proxydb_kvs_cmd_setProtocol(KviKvsModuleCommandCall * c)
 	if(!pRecord)
 	{
 		if(c->switches()->find('q',"quiet")) return true;
-		c->error(__tr2qs_ctx("The specified proxy does not exist","serverdb"));
+		c->error(__tr2qs_ctx("The specified proxy doesn't exist","serverdb"));
 		return false;
 	}
 
@@ -574,7 +574,7 @@ static bool proxydb_kvs_cmd_setProtocol(KviKvsModuleCommandCall * c)
 	else if(szProtocol == "Socks5") pProxy->setProtocol(KviProxy::Socks5);
 	else if(szProtocol == "Http") pProxy->setProtocol(KviProxy::Http);
 	else {
-		c->error(__tr2qs_ctx("The specified protocol does not exist","serverdb"));
+		c->error(__tr2qs_ctx("The specified protocol doesn't exist","serverdb"));
 		return false;
 	}
 
@@ -610,7 +610,7 @@ static bool proxydb_kvs_cmd_setProtocol(KviKvsModuleCommandCall * c)
 		if(!pRecord) \
 		{ \
 			if(c->switches()->find('q',"quiet")) return true; \
-			c->error(__tr2qs_ctx("The specified proxy does not exist","serverdb")); \
+			c->error(__tr2qs_ctx("The specified proxy doesn't exist","serverdb")); \
 			return false; \
 		} \
 		\
diff --git a/src/modules/python/libkvipython.cpp b/src/modules/python/libkvipython.cpp
index 6e0fdb2f6..a90c0b071 100644
--- a/src/modules/python/libkvipython.cpp
+++ b/src/modules/python/libkvipython.cpp
@@ -39,7 +39,7 @@
 		{ \
 			if(!_c->switches()->find('q',"quiet")) \
 			{ \
-				_c->warning(__tr2qs_ctx("The pythoncore module can't be loaded: python support not available","python")); \
+				_c->warning(__tr2qs_ctx("The pythoncore module can't be loaded: Python support not available","python")); \
 				_c->warning(__tr2qs_ctx("To see more details about loading failure try /pythoncore.load","python")); \
 				return true; \
 			} \
@@ -53,7 +53,7 @@
 
 	#define KVS_CHECK_MODULE_STATE(_m,_c) \
 		if(!_c->switches()->find('q',"quiet")) \
-			_c->warning(__tr2qs_ctx("This KVIrc executable has been compiled without python scripting support","python")); \
+			_c->warning(__tr2qs_ctx("This KVIrc executable has been compiled without Python scripting support","python")); \
 		return true;
 
 	static KviModule * g_pPythonCoreModule = 0;
@@ -64,23 +64,23 @@
 	@type:
 		language
 	@title:
-		Using python from KVS and vice-versa.
+		Using Python from KVS and vice-versa.
 	@short:
-		How to use python from KVS and KVS from python.
+		How to use Python from KVS and KVS from Python.
 	@body:
 		[big]Introduction[/big][br]
-		Starting from version 4.0.0 you can include python code snippets
-		in KVS code and you can use KVS commands from within python.
-		This feature is present only if a working python installation
+		Starting from version 4.0.0 you can include Python code snippets
+		in KVS code and you can use KVS commands from within Python.
+		This feature is present only if a working Python installation
 		has been found at build time.[br]
-		The python support is very similar to the perl support present
-		since 3.x, so if you have used perl from KVIrc before you'll
-		find the api is almost the same.. otherwise read on :)
+		The Python support is very similar to the Perl support present
+		since 3.x, so if you have used Perl from KVIrc before you'll
+		find the API is almost the same.. otherwise read on :)
 		[br]
 
-		[big]Using python from KVS[/big][br]
-		Using python from KVIrc is really easy - just enclose
-		your python code snippet inside [cmd]python.begin[/cmd] and [cmd]python.end[/cmd].
+		[big]Using Python from KVS[/big][br]
+		Using Python from KVIrc is really easy - just enclose
+		your Python code snippet inside [cmd]python.begin[/cmd] and [cmd]python.end[/cmd].
 		[example]
 		[cmd]python.begin[/cmd]
 		&lt;python code goes here&gt;
@@ -94,17 +94,17 @@
 		f.close()
 		[cmd]python.end[/cmd]
 		[/example]
-		A python code snippet can appear anywhere a KVS code snippet can
+		A Python code snippet can appear anywhere a KVS code snippet can
 		with the only restriction that it must be enclosed in [cmd]python.begin[/cmd]
-		and [cmd]python.end[/cmd]. This means that you can write python code
+		and [cmd]python.end[/cmd]. This means that you can write Python code
 		in the commandline, in the aliases, the event handlers, popups... anywhere.[br]
 		If you have already encountered KVIrc's [cmd]eval[/cmd] command
-		then you probably also know how to execute a python code snippet from a file :)[br]
+		then you probably also know how to execute a Python code snippet from a file :)[br]
 		[br]
 
 		[big]Using KVS from python[/big][br]
-		KVIrc exports several commands to the python namespace
-		that allow you to invoke KVIrc's functions from inside the python code snippet.[br]
+		KVIrc exports several commands to the Python namespace
+		that allow you to invoke KVIrc's functions from inside the Python code snippet.[br]
 		The nicest example is kvirc.echo():
 		[example]
 		[cmd]python.begin[/cmd]
@@ -121,7 +121,7 @@
 		[br]
 
 		[big]Python execution contexts[/big][br]
-		The python code snippets are executed by a python interpreter - each
+		The Python code snippets are executed by a Python interpreter - each
 		interpreter has its own context and thus its own variables,
 		own function namespace etc.[br]
 		[br]
@@ -130,12 +130,12 @@
 		In fact, KVIrc can mantain multiple persistent interpreters that will
 		allow you to preserve your context across [cmd]python.begin[/cmd] invocations.[br]
 		[br]
-		You can invoke a specific python context by passing it as parameter to the [cmd]python.begin[/cmd]
+		You can invoke a specific Python context by passing it as parameter to the [cmd]python.begin[/cmd]
 		command:[br]
 		[example]
 		[cmd]python.begin("mycontext")[/cmd]
 		myvariable = "mycontext"
-		kvirc.echo("This python code is executed from " + myvariable)
+		kvirc.echo("This Python code is executed from " + myvariable)
 		[cmd]python.end[/cmd]
 		[/example]
 		The nice thing is that at a later time you can invoke this context again
@@ -145,8 +145,8 @@
 		kvirc.echo("myvariable is still equal to " + myvariable)
 		[cmd]python.end[/cmd]
 		[/example]
-		The first time you invoke a named python context it is automatically created and
-		persists until KVIrc terminates or the python context is explicitly destroyed
+		The first time you invoke a named Python context it is automatically created and
+		persists until KVIrc terminates or the Python context is explicitly destroyed
 		by [cmd]python.destroy[/cmd].[br]
 		[br]
 		There is a third possibility to destroy a context - when the
@@ -156,30 +156,30 @@
 		[br]
 		The nice thing is that not only will your variables be preserved, any python
 		function or class you declare in a context will persist.
-		It's just like executing a long python script file with pauses inside.[br]
+		It's just like executing a long Python script file with pauses inside.[br]
 		[br]
-		If you omit the python context name in the [cmd]python.begin[/cmd] command
+		If you omit the Python context name in the [cmd]python.begin[/cmd] command
 		(or if you use an empty string in its place)
 		then KVIrc will create a temporary context for the snippet execution
 		and will destroy it immediately after [cmd]python.end[/cmd] has been called.[br]
 		[br]
-		The major side effect of keeping persistent python contexts is that
+		The major side effect of keeping persistent Python contexts is that
 		python's symbol table will grow, and if not used carefully, the interpreter
 		may become a memory hog. So if you're going to use persistent contexts,
 		either try to keep the symbol table clean or explicitly call [cmd]python.destroy[/cmd]
 		once in a while to recreate the interpreter.[br]
-		If you just execute occasional python code snippets and don't need to keep
+		If you just execute occasional Python code snippets and don't need to keep
 		persistent variables, then just use the nameless temporary context provided
 		by [cmd]python.begin[/cmd]("").[br]
 		[br]
 
-		[big]Passing parameters to the python script[/big][br]
-		The easiest way to pass parameters to the python code snippet
+		[big]Passing parameters to the Python script[/big][br]
+		The easiest way to pass parameters to the Python code snippet
 		is to put them as [cmd]python.begin[/cmd] arguments.
 		In fact the complete syntax of [cmd]python.begin[/cmd] is:[br]
 		[b]python.begin(&lt;python context&gt;,&lt;arg0&gt;,&lt;arg1&gt;,...)[/b][br]
 		Where the &lt;arg0&gt;,&lt;arg1&gt;...&lt;argN&gt; parameters
-		are passed to the python context as elements of the aArgs array.[br]
+		are passed to the Python context as elements of the aArgs array.[br]
 		[example]
 		[cmd]python.begin[/cmd]("","Hello world!","Now I CAN",1,2,3)
 		for l in range(0,5):
@@ -218,7 +218,7 @@
 		[br]
 
 		[big]Executing arbitrary KVIrc commands from python[/big][br]
-		You can execute arbitrary KVS commands from python by means of:[br]
+		You can execute arbitrary KVS commands from Python by means of:[br]
 		&nbsp; &nbsp; [b]kvirc.eval(&lt;code&gt;)[/b][br]
 		This function behaves exactly like the ${ &lt;code&gt; } KVS construct -
 		it executes &lt;code&gt; in a child context and returns its evaluation result.[br]
@@ -232,7 +232,7 @@
 		[cmd]python.end[/cmd]
 		[/example]
 		You can "eval" compound command sequences and variable ones.[br]
-		Remember that the python code snippet is evaluated in a child KVS context
+		Remember that the Python code snippet is evaluated in a child KVS context
 		and thus the local variables are NOT visible!
 		The following code snippets may easily fool you:[br]
 		[example]
@@ -254,7 +254,7 @@
 
 		[big]A shortcut for kvirc.eval("/say...")[/big][br]
 		Since kvirc.eval("/say...") is a common calling pattern, say has been added
-		to the KVIrc python namespace. You can now call
+		to the KVIrc Python namespace. You can now call
 		[example]
 		kvirc.say("Hi all!")
 		[/example]
@@ -268,9 +268,9 @@
 		[br]
 
 		[big]Python script return values[/big][br]
-		The [cmd]python.begin[/cmd] command propagates the python code return
+		The [cmd]python.begin[/cmd] command propagates the Python code return
 		value to the KVIrc context (just like a [cmd]setreturn[/cmd]() would do)
-		- this makes it easier to create an alias that executes a python script and
+		- this makes it easier to create an alias that executes a Python script and
 		returns its result.[br]
 		[br]
 		Without this automatic propagation, you would be forced to play with variables:
@@ -282,7 +282,7 @@
 		[/ul]
 		[br]
 
-		[big]Executing python scripts from files[/big][br]
+		[big]Executing Python scripts from files[/big][br]
 		[example]
 		[cmd]alias[/cmd](pythonexec)
 		{
@@ -298,18 +298,18 @@
 		[br]
 
 		[big]Curiosity[/big][br]
-		The python support in KVIrc is implemented as a master-slave module pair.
+		The Python support in KVIrc is implemented as a master-slave module pair.
 		The python.* module is the master while pythoncore is the slave.
-		When python support isn't compiled in, the python.* commands
+		When Python support isn't compiled in, the python.* commands
 		print some warnings and exit gracefully while the pythoncore module
-		refuses to be loaded. When python support is compiled in but
+		refuses to be loaded. When Python support is compiled in but
 		for some reason the libpython.so can't be found or loaded, pythoncore fails
 		the dynamic loading stage, however python.* only fails gracefully with warning
 		messages. This trick allows scripters to check for python
-		support with [fnc]python.isAvailable[/fnc] and to embed python code snippets
+		support with [fnc]python.isAvailable[/fnc] and to embed Python code snippets
 		in KVS even if the support is missing - the snippets will be just skipped.[br]
 		[br]
-		Happy python hacking :)[br]
+		Happy Python hacking :)[br]
 */
 
 /*
@@ -319,9 +319,9 @@
 	@title:
 		python.begin
 	@keyterms:
-		Including python code snippets in KVS
+		Including Python code snippets in KVS
 	@short:
-		Starts a python code snippet
+		Starts a Python code snippet
 	@syntax:
 		python.begin [-n] [-q] [(<python_context>[,<arg0>[,<arg1>[...]]])]
 		<python code>
@@ -330,33 +330,33 @@
 		!sw: -q | --quiet
 		Prevents the command from printing any warnings.
 		!sw: -n | --no-return
-		Prevents the python script return value to be propagated
+		Prevents the Python script return value to be propagated
 		to the current context.
 		!sw: -f | --fail-on-error
-		Treat python errors as KVS errors and abort execution of the
+		Treat Python errors as KVS errors and abort execution of the
 		current script. Incompatible with -q
 	@description:
-		Indicates the beginning of a snippet of python code.
+		Indicates the beginning of a snippet of Python code.
 		The whole code part between python.begin and python.end
-		is executed in a python interpreter.
+		is executed in a Python interpreter.
 		If python.end is omitted then it is implicitly assumed
 		that the code from python.begin to the end of the command
-		buffer is python.[br]
-		Each python code execution is bound to a
+		buffer is Python.[br]
+		Each Python code execution is bound to a
 		python context (that is in fact a particular instance
-		of a python interpreter). If <python_context> is not specified
-		or it is an empty string then temporary python interpreter is created
+		of a Python interpreter). If <python_context> is not specified
+		or it is an empty string then temporary Python interpreter is created
 		and destroyed just after the code snippet has terminated execution.
-		If <python_context> is specified then a python interpreter
+		If <python_context> is specified then a Python interpreter
 		keyed to that context is used: if it was already existing
 		then it is reused otherwise it is created.
-		Any <python_context> is persistent: it mantains the function
-		declarations and python variable states until explicitly
+		Any <python_context> is persistent: it maintains the function
+		declarations and Python variable states until explicitly
 		destroyed with [cmd]python.destroy[/cmd] (or the pythoncore
 		module is forcibly unloaded).[br]
 		The <arg0>,<arg1>,... arguments, if present, are passed
-		to the python code snippet in the aArgs list (accessible as aArgs[0],aArgs[1]...).[br]
-		The return value of the python code is propagated to the current
+		to the Python code snippet in the aArgs list (accessible as aArgs[0],aArgs[1]...).[br]
+		The return value of the Python code is propagated to the current
 		context (just like [cmd]setreturn[/cmd] was called on it) unless
 		the -n switch is used.[br]
 		The -q switch prevents from the command from printing any
@@ -379,13 +379,13 @@
 	@title:
 		python.end
 	@short:
-		Ends a python code snippet
+		Ends a Python code snippet
 	@syntax:
 		python.begin[(<python_context>)]
 		<python code>
 		python.end
 	@description:
-		Ends a python code snippet. See [cmd]python.begin[/cmd].
+		Ends a Python code snippet. See [cmd]python.begin[/cmd].
 	@seealso:
 		[cmd]python.begin[/cmd]
 */
@@ -394,7 +394,7 @@ static bool python_kvs_cmd_begin(KviKvsModuleCommandCall * c)
 {
 	// This command is somewhat special in the fact that has a dedicated
 	// parsing routine in the KVS core parser.
-	// The parser sets the python code as the first parameter of our call,
+	// The parser sets the Python code as the first parameter of our call,
 	// the remaining params are the context name and the arguments
 
 	QString szCode,szContext;
@@ -424,7 +424,7 @@ static bool python_kvs_cmd_begin(KviKvsModuleCommandCall * c)
 	if(!g_pPythonCoreModule->ctrl(KVI_PYTHONCORECTRLCOMMAND_EXECUTE,&ex))
 	{
 		if(!c->switches()->find('q',"quiet"))
-			c->warning(__tr2qs_ctx("The pythoncore module failed to execute the code: something is wrong with the python support","python"));
+			c->warning(__tr2qs_ctx("The pythoncore module failed to execute the code: something is wrong with the Python support","python"));
 		return true;
 	}
 
@@ -467,11 +467,11 @@ static bool python_kvs_cmd_begin(KviKvsModuleCommandCall * c)
 	@title:
 		python.destroy
 	@short:
-		Destroys a python execution context
+		Destroys a Python execution context
 	@syntax:
 		python.destroy [-q] <context_name:string>
 	@description:
-		Destroys the python execution context <context_name>.
+		Destroys the Python execution context <context_name>.
 		If the context does not exist then a warning is printed unless the
 		-q switch is used.[br]
 		The destruction will clear any state associated with the context
@@ -499,7 +499,7 @@ static bool python_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
 	if(!g_pPythonCoreModule->ctrl(KVI_PYTHONCORECTRLCOMMAND_DESTROY,&ex))
 	{
 		if(!c->switches()->find('q',"quiet"))
-			c->warning(__tr2qs_ctx("The pythoncore module failed to execute the code: something is wrong with the python support","python"));
+			c->warning(__tr2qs_ctx("The pythoncore module failed to execute the code: something is wrong with the Python support","python"));
 	}
 #endif //COMPILE_PYTHON_SUPPORT
 
@@ -513,11 +513,11 @@ static bool python_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
 	@title:
 		$python.isAvailable
 	@short:
-		Check if python scripting support is available
+		Check if Python scripting support is available
 	@syntax:
 		$python.isAvailable
 	@description:
-		Returns 1 if the python scripting support is available and 0 otherwise.
+		Returns 1 if the Python scripting support is available and 0 otherwise.
 */
 static bool python_kvs_fnc_isAvailable(KviKvsModuleFunctionCall * c)
 {
diff --git a/src/modules/pythoncore/libkvipythoncore.cpp b/src/modules/pythoncore/libkvipythoncore.cpp
index 4f413b382..1f125b626 100644
--- a/src/modules/pythoncore/libkvipythoncore.cpp
+++ b/src/modules/pythoncore/libkvipythoncore.cpp
@@ -126,7 +126,7 @@ bool KviPythonInterpreter::execute(
 {
 	if(!m_pThreadState)
 	{
-		szError = __tr2qs_ctx("Internal error: python interpreter not initialized","python");
+		szError = __tr2qs_ctx("Internal error: Python interpreter not initialized","python");
 		return false;
 	}
 
diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp
index 02dffde52..18349c2fd 100644
--- a/src/modules/raweditor/RawEditorWindow.cpp
+++ b/src/modules/raweditor/RawEditorWindow.cpp
@@ -85,7 +85,7 @@ RawEditorWidget::RawEditorWidget(QWidget * par)
 
 
 	m_pTreeWidget->setColumnCount(1);
-	m_pTreeWidget->setHeaderLabel(__tr2qs_ctx("Raw Event","editor"));
+	m_pTreeWidget->setHeaderLabel(__tr2qs_ctx("RAW Event","editor"));
 
 //	m_pTreeWidget->setMultiSelection(false);
 	m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -97,12 +97,12 @@ RawEditorWidget::RawEditorWidget(QWidget * par)
 
 	connect(m_pTreeWidget,SIGNAL(customContextMenuRequested(const QPoint &)),this,SLOT(customContextMenuRequested(const QPoint &)));
 
-	QPushButton * pb = new QPushButton(__tr2qs_ctx("&Export All To...","editor"),boxi);
+	QPushButton * pb = new QPushButton(__tr2qs_ctx("&Export All to...","editor"),boxi);
 	connect(pb,SIGNAL(clicked()),this,SLOT(exportAllEvents()));
 
 	KviTalVBox * box = new KviTalVBox(spl);
 	m_pNameEditor = new QLineEdit(box);
-	m_pNameEditor->setToolTip(__tr2qs_ctx("Edit the raw event handler name.","editor"));
+	m_pNameEditor->setToolTip(__tr2qs_ctx("Edit the RAW event handler name.","editor"));
 	m_pEditor = KviScriptEditor::createInstance(box);
 
 	m_bOneTimeSetupDone = false;
@@ -165,7 +165,7 @@ void RawEditorWidget::customContextMenuRequested(const QPoint &pos)
 					this,SLOT(removeCurrentHandler()));
 			m_pContextPopup->addAction(
 					*(g_pIconManager->getSmallIcon(KviIconManager::Floppy)),
-					__tr2qs_ctx("&Export Handler To...","editor"),
+					__tr2qs_ctx("&Export Handler to...","editor"),
 					this,SLOT(exportCurrentHandler()));
 		} else {
 			m_pContextPopup->addAction(
@@ -178,7 +178,7 @@ void RawEditorWidget::customContextMenuRequested(const QPoint &pos)
 	m_pContextPopup->addSeparator();
 	m_pContextPopup->addAction(
 			*(g_pIconManager->getSmallIcon(KviIconManager::RawEvent)),
-			__tr2qs_ctx("&Add Raw Event...","editor"),
+			__tr2qs_ctx("&Add RAW Event...","editor"),
 			this,SLOT(addRaw()));
         m_pContextPopup->popup(mapToGlobal(QPoint(pos.x()+15,pos.y())));
 }
@@ -218,7 +218,7 @@ void RawEditorWidget::addRaw()
 {
 	bool bOk = false;
 
-	int iIdx = QInputDialog::getInt(this,__tr2qs_ctx("New Raw Event","editor"),__tr2qs_ctx("Enter the numeric code of the message (0-999)","editor"),0,0,999,1,&bOk);
+	int iIdx = QInputDialog::getInt(this,__tr2qs_ctx("New RAW Event","editor"),__tr2qs_ctx("Enter the numeric code of the message (0-999)","editor"),0,0,999,1,&bOk);
 
 	if(!bOk)return;
 
@@ -363,7 +363,7 @@ void RawEditorWidget::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
 		m_pNameEditor->setEnabled(false);
 		m_pNameEditor->setText("");
 		m_pEditor->setEnabled(false);
-		QString szTmp = QString(__tr2qs_ctx("\n\nRaw Event:\n%1","editor")).arg(((RawHandlerTreeWidgetItem *)it)->text(0));
+		QString szTmp = QString(__tr2qs_ctx("\n\nRAW Event:\n%1","editor")).arg(((RawHandlerTreeWidgetItem *)it)->text(0));
 		m_pEditor->setText(szTmp);
 	}
 }
@@ -423,7 +423,7 @@ void RawEditorWidget::exportCurrentHandler()
 
 	if(!KviFileUtils::writeFile(szFile,szOut))
 	{
-		QMessageBox::warning(this,__tr2qs_ctx("Write Failed - KVIrc","editor"),__tr2qs_ctx("Unable to write to the raw event file.","editor"),__tr2qs_ctx("&OK","editor"));
+		QMessageBox::warning(this,__tr2qs_ctx("Write Failed - KVIrc","editor"),__tr2qs_ctx("Unable to write to the RAW event file.","editor"),__tr2qs_ctx("&OK","editor"));
 	}
 }
 
@@ -458,7 +458,7 @@ void RawEditorWidget::exportAllEvents()
 
 	if(!KviFileUtils::writeFile(szFile,out))
 	{
-		QMessageBox::warning(this,__tr2qs_ctx("Write Failed - KVIrc","editor"),__tr2qs_ctx("Unable to write to the raw events file.","editor"),__tr2qs_ctx("OK","editor"));
+		QMessageBox::warning(this,__tr2qs_ctx("Write Failed - KVIrc","editor"),__tr2qs_ctx("Unable to write to the RAW events file.","editor"),__tr2qs_ctx("OK","editor"));
 	}
 }
 
diff --git a/src/modules/raweditor/libkviraweditor.cpp b/src/modules/raweditor/libkviraweditor.cpp
index 2f1222b30..06a9060ca 100644
--- a/src/modules/raweditor/libkviraweditor.cpp
+++ b/src/modules/raweditor/libkviraweditor.cpp
@@ -39,11 +39,11 @@ RawEditorWindow * g_pRawEditorWindow = 0;
 	@title:
 		raweditor.open
 	@short:
-		Shows the raw events editor
+		Shows the RAW events editor
 	@syntax:
 		toolbareditor.open
 	@description:
-		Opens the script raw events editor dialog.
+		Opens the script RAW events editor dialog.
 */
 
 static bool raweditor_kvs_cmd_open(KviKvsModuleCommandCall *)
@@ -81,7 +81,7 @@ KVIRC_MODULE(
 	"RawEditor",                                                 // module name
 	"4.0.0",                                                // module version
 	"Copyright (C) 2002 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
-	"Editor for the script raw events",
+	"Editor for the script RAW events",
 	raweditor_module_init,
 	raweditor_module_can_unload,
 	0,
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index e9fb7e7cd..c8545cbc2 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -49,7 +49,7 @@ extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
 	@description:
 		Registers the <channel> with the specified [netmask].
 		[netmask] can be a full network name or a wildcard string
-		tht will be matched against network names.
+		that will be matched against network names.
 		For example, if you want to register #kvirc on IRCNet
 		you can use regchan.add #kvirc IRCNet.
 		If you want to handle #kvirc on all the IRC networks then
diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp
index 097079993..e417aba7d 100644
--- a/src/modules/reguser/RegisteredUserEntryDialog.cpp
+++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp
@@ -405,7 +405,7 @@ RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget *p,KviRegisteredUse
 	}
 	if(!m_pAvatar)m_pAvatar = new KviPixmap();
 
-	m_pAvatarSelector = new KviPixmapSelector(p2,__tr2qs_ctx("Avatar","register"),m_pAvatar,true);
+	m_pAvatarSelector = new KviPixmapSelector(p2,__tr2qs_ctx("Avatar:","register"),m_pAvatar,true);
 	g->addWidget(m_pAvatarSelector,3,0,1,3);
 
 	f = new QFrame(p2);
@@ -615,7 +615,7 @@ void RegisteredUserEntryDialog::okClicked()
 	{
 		// ops... no way
 		// FIXME: spit an error message ?
-		qDebug("Ops.. something wrong with the regusers db");
+		qDebug("Oops! Something wrong with the regusers DB");
 		accept();
 		return;
 	}
diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp
index 23bca582c..8cb85d83f 100644
--- a/src/modules/reguser/RegisteredUsersDialog.cpp
+++ b/src/modules/reguser/RegisteredUsersDialog.cpp
@@ -271,12 +271,12 @@ RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par)
 	QFrame * f = new QFrame(vbox);
 	f->setFrameStyle(QFrame::HLine | QFrame::Sunken);
 
-	m_pSelectAllButton = new QPushButton(__tr2qs_ctx("Select all","register"),vbox);
+	m_pSelectAllButton = new QPushButton(__tr2qs_ctx("Select All","register"),vbox);
 	connect(m_pSelectAllButton,SIGNAL(clicked()),this,SLOT(selectAllClicked()));
 	m_pSelectAllButton->setToolTip(__tr2qs_ctx("Select all the entries","register"));
 	m_pSelectAllButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Plus)));
 
-	m_pExportButton = new QPushButton(__tr2qs_ctx("Export To...","register"),vbox);
+	m_pExportButton = new QPushButton(__tr2qs_ctx("Export to...","register"),vbox);
 	m_pExportButton->setEnabled(false);
 	connect(m_pExportButton,SIGNAL(clicked()),this,SLOT(exportClicked()));
 	m_pExportButton->setToolTip(__tr2qs_ctx("Export the selected entries to a file.<br>All the data associated with the selected registered users will be exported.<br>You (or anyone else) can later import the entries by using the \"Import\" button.","register"));
@@ -480,7 +480,7 @@ void RegisteredUsersDialog::rightButtonPressed ( QTreeWidgetItem * pItem, QPoint
             connect(groups,SIGNAL(triggered(QAction *)),this,SLOT(moveToGroupMenuClicked(QAction *)));
 
             QMenu *mainPopup = new QMenu;
-            mainPopup->addAction(__tr2qs_ctx("Move to group","register"))->setMenu(groups);
+            mainPopup->addAction(__tr2qs_ctx("Move to Group","register"))->setMenu(groups);
 			mainPopup->exec(pnt);
 		}
 	}
@@ -807,7 +807,7 @@ void RegisteredUsersDialog::exportClicked()
 
 
 write_error:
-	KviMessageBox::warning(__tr2qs_ctx("Can't export the registered users database: Write error.","register"));
+	KviMessageBox::warning(__tr2qs_ctx("Can't export the registered users database: write error.","register"));
 	f.close();
 	return;
 
@@ -893,7 +893,7 @@ void RegisteredUsersDialog::importClicked()
 			img=io.read();
 //			if(io.read())goto read_error;
 
-			if(img.isNull())qDebug("Ops.. readed a null image ?");
+			if(img.isNull())qDebug("Oops! Read a null image?");
 
 			QString fName = u->name();
 			KviFileUtils::adjustFilePath(fName);
@@ -920,7 +920,7 @@ void RegisteredUsersDialog::importClicked()
 
 
 read_error:
-	KviMessageBox::warning(__tr2qs_ctx("Can't import the registered users database: Read error.","register"));
+	KviMessageBox::warning(__tr2qs_ctx("Can't import the registered users database: read error.","register"));
 	f.close();
 	return;
 
diff --git a/src/modules/reguser/RegistrationWizard.cpp b/src/modules/reguser/RegistrationWizard.cpp
index bdf4ab34b..6c8fb9553 100644
--- a/src/modules/reguser/RegistrationWizard.cpp
+++ b/src/modules/reguser/RegistrationWizard.cpp
@@ -193,7 +193,7 @@ RegistrationWizard::RegistrationWizard(const QString &startMask,KviRegisteredUse
 	m_pPage3Layout->addWidget(f,1,0);
 
 	m_pAvatar = new KviPixmap();
-	m_pAvatarSelector = new KviPixmapSelector(m_pPage3,__tr2qs_ctx("Store an avatar for this user","register"),m_pAvatar,true);
+	m_pAvatarSelector = new KviPixmapSelector(m_pPage3,__tr2qs_ctx("Store an avatar for this user:","register"),m_pAvatar,true);
 	m_pPage3Layout->addWidget(m_pAvatarSelector,2,0);
 	m_pPage3Layout->setRowStretch(2,1);
 
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 8386423f5..63b8913c5 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -729,7 +729,7 @@ static bool reguser_kvs_cmd_setproperty(KviKvsModuleCommandCall * c)
 		Returns an array of the entries in the registered users database.[br]
 		If <mask> is specified, only entries matching the <mask>
 		and the entries with no registration masks are listed.[br]
-		Please note that <mask> is a wildcard string that will match
+		Please note that the <mask> is a wildcard string that will match
 		wildcard strings... don't get messed with that :D[br]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
@@ -816,15 +816,15 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 		KviPointerList<KviIrcMask> * ml = u->maskList();
 		if(u->matches(mask) || (ml->count() == 0))
 		{
-			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx(" User: %c%Q","register"),KviControlCodes::Bold,&(u->name()));
+			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("User: %c%Q","register"),KviControlCodes::Bold,&(u->name()));
 
 			if(ml->count() == 0)
 			{
-				c->window()->output(KVI_OUT_SYSTEMWARNING,__tr2qs_ctx("    Warning: this user has no registration masks","register"));
+				c->window()->output(KVI_OUT_SYSTEMWARNING,__tr2qs_ctx("Warning: this user has no registration masks","register"));
 			} else {
 				for(KviIrcMask * m = ml->first();m;m = ml->next())
 				{
-					c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("    Mask: %Q!%Q@%Q","register"),&(m->nick()),&(m->user()),&(m->host()));
+					c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Mask: %Q!%Q@%Q","register"),&(m->nick()),&(m->user()),&(m->host()));
 				}
 			}
 
@@ -835,10 +835,10 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 				while(pdit.current())
 				{
 					QString key = pdit.currentKey();
-					c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("    Property: %Q=%Q","register"),&(key),pdit.current());
+					c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Property: %Q=%Q","register"),&(key),pdit.current());
 					++pdit;
 				}
-			} else c->window()->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("    No properties","register"));
+			} else c->window()->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("No properties","register"));
 			count++;
 		}
 		++it;
@@ -1163,7 +1163,7 @@ static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c)
 		reguser.wizard [mask]
 	@description:
 		Allows registering an user with an intuitive and easy to use interface.
-		If [mask] is specified, it is used as inital mask in the dialog.
+		If [mask] is specified, it is used as initial mask in the dialog.
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index 48e158462..da4f19458 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -55,8 +55,8 @@
 		actually out of the possibilities of a common "hacker".[br]
 		My implementation allows the usage of 128, 192 and 256 bit keys
 		on 128 bit data blocks. The encrypted binary data buffer is then converted
-		into an ascii-string by using the base64 conversion or hex-digit-string representation.
-		The six engines are the six possible combinations of the key lengths and ascii-string
+		into an ASCII-string by using the base64 conversion or hex-digit-string representation.
+		The six engines are the six possible combinations of the key lengths and ASCII-string
 		conversions.
 */
 
@@ -113,7 +113,7 @@
 				encKeyLen = decKeyLen;
 			} else {
 				// both keys missing
-				setLastError(__tr2qs("Missing both encrypt and decrypt key: at least one is needed"));
+				setLastError(__tr2qs("Missing both encryption and decryption key: at least one is needed"));
 				return false;
 			}
 		}
@@ -190,13 +190,13 @@
 		switch(errCode)
 		{
 			case RIJNDAEL_SUCCESS: setLastError(__tr2qs("Error 0: success?")); break;
-			case RIJNDAEL_UNSUPPORTED_MODE: setLastError(__tr2qs("Unsupported crypt mode")); break;
+			case RIJNDAEL_UNSUPPORTED_MODE: setLastError(__tr2qs("Unsupported encryption mode")); break;
 			case RIJNDAEL_UNSUPPORTED_DIRECTION: setLastError(__tr2qs("Unsupported direction")); break;
 			case RIJNDAEL_UNSUPPORTED_KEY_LENGTH: setLastError(__tr2qs("Unsupported key length")); break;
 			case RIJNDAEL_BAD_KEY: setLastError(__tr2qs("Bad key data")); break;
 			case RIJNDAEL_NOT_INITIALIZED: setLastError(__tr2qs("Engine not initialized")); break;
 			case RIJNDAEL_BAD_DIRECTION: setLastError(__tr2qs("Invalid direction for this engine")); break;
-			case RIJNDAEL_CORRUPTED_DATA: setLastError(__tr2qs("Corrupted message data or invalid decrypt key")); break;
+			case RIJNDAEL_CORRUPTED_DATA: setLastError(__tr2qs("Corrupted message data or invalid decryption key")); break;
 			default: setLastError(__tr2qs("Unknown error")); break;
 		}
 	}
@@ -205,7 +205,7 @@
 	{
 		if(!m_pEncryptCipher)
 		{
-			setLastError(__tr2qs("Oops... Encryption cipher not initialized"));
+			setLastError(__tr2qs("Oops! Encryption cipher not initialized"));
 			return KviCryptEngine::EncryptError;
 		}
 		int len = (int)kvi_strLen(plainText);
@@ -258,7 +258,7 @@
 	{
 		if(!m_pDecryptCipher)
 		{
-			setLastError(__tr2qs("Oops... Decryption cipher not initialized"));
+			setLastError(__tr2qs("Oops! Decryption cipher not initialized"));
 			return KviCryptEngine::DecryptError;
 		}
 
@@ -432,7 +432,7 @@
 				encKeyLen = decKeyLen;
 			} else {
 				// both keys missing
-				setLastError(__tr2qs("Missing both encrypt and decrypt key: at least one is needed"));
+				setLastError(__tr2qs("Missing both encryption and decryption key: at least one is needed"));
 				return false;
 			}
 		}
diff --git a/src/modules/serverdb/libkviserverdb.cpp b/src/modules/serverdb/libkviserverdb.cpp
index 07d367fa9..17fb6b704 100644
--- a/src/modules/serverdb/libkviserverdb.cpp
+++ b/src/modules/serverdb/libkviserverdb.cpp
@@ -81,8 +81,8 @@ extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase;
 		[fnc]$serverdb.serverDescription[/fnc]: returns the description for a server[br]
 		[fnc]$serverdb.serverEncoding[/fnc]: returns the encoding for a server[br]
 		[fnc]$serverdb.serverTextEncoding[/fnc]: returns the text encoding for a server[br]
-		[fnc]$serverdb.serverId[/fnc]: returns the unique id for a server[br]
-		[fnc]$serverdb.serverIp[/fnc]: returns the ip for a server[br]
+		[fnc]$serverdb.serverId[/fnc]: returns the unique ID for a server[br]
+		[fnc]$serverdb.serverIp[/fnc]: returns the IP for a server[br]
 		[fnc]$serverdb.serverLoginCommand[/fnc]: returns the "on login" script for a server[br]
 		[fnc]$serverdb.serverNickName[/fnc]: returns the specific nickname for a server[br]
 		[fnc]$serverdb.serverPassword[/fnc]: returns the password for a server[br]
@@ -92,7 +92,7 @@ extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase;
 		[fnc]$serverdb.serverJoinChannels[/fnc]: returns the list of autojoin channels for a server[br]
 		[fnc]$serverdb.isAutoConnect[/fnc]: returns the autoconnect status for a server[br]
 		[fnc]$serverdb.isIPv6[/fnc]: returns the ipv6 status for a server[br]
-		[fnc]$serverdb.isSSL[/fnc]: returns the ssl status for a server[br]
+		[fnc]$serverdb.isSSL[/fnc]: returns the SSL status for a server[br]
 		[fnc]$serverdb.networkExists[/fnc]: checks if a network exists[br]
 		[fnc]$serverdb.serverExists[/fnc]: checks if a server exists[br]
 */
@@ -109,7 +109,7 @@ extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase;
 		<bool> $serverdb.networkExists(<network_name:string>)
 	@description:
 		Checks if the network already exists in the DB.[br]
-		It returns 1 if the network exixts, 0 otherwise.
+		It returns 1 if the network exists, 0 otherwise.
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
 */
@@ -151,7 +151,7 @@ static bool serverdb_kvs_fnc_networkExists(KviKvsModuleFunctionCall * c)
 	@description:
 		Checks if the server already exists for a network in the DB.[br]
 		If no network name is provided, the check is made globally.[br]
-		It returns 1 if the server exixts, 0 otherwise
+		It returns 1 if the server exists, 0 otherwise
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
 */
@@ -231,7 +231,7 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c)
 		KviIrcNetwork * pNetwork = g_pServerDataBase->findNetwork(szName); \
 		if(!pNetwork) \
 		{ \
-			c->error(__tr2qs_ctx("The specified network does not exist","serverdb")); \
+			c->error(__tr2qs_ctx("The specified network doesn't exist","serverdb")); \
 			return false; \
 		}
 
@@ -272,14 +272,14 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c)
 		KviIrcNetwork * pRecord = g_pServerDataBase->findNetwork(szNetName); \
 		if(!pRecord) \
 		{ \
-			c->error(__tr2qs_ctx("The specified network does not exist","serverdb")); \
+			c->error(__tr2qs_ctx("The specified network doesn't exist","serverdb")); \
 			return false; \
 		} \
 		\
 		KviIrcServer * pServer = pRecord->findServer(szServName); \
 		if(!pServer) \
 		{ \
-			c->error(__tr2qs_ctx("The specified server does not exist","serverdb")); \
+			c->error(__tr2qs_ctx("The specified server doesn't exist","serverdb")); \
 			return false; \
 		}
 
@@ -748,7 +748,7 @@ SERVERDB_GET_SERVER_PROPERTY(serverdb_kvs_fnc_serverSSL,useSSL,setBoolean)
 	@syntax:
 		<bool> $serverdb.cacheIp(<network:string>,<server:string>)
 	@description:
-		Returns true if KVIrc is set to cache the ip of the server <server> of the network <network>, false otherwise
+		Returns true if KVIrc is set to cache the IP of the server <server> of the network <network>, false otherwise
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
 */
@@ -817,7 +817,7 @@ END_SERVERDB_GET_SERVER_PROPERTY
 		serverdb.addNetwork <string:network name>
 	@description:
 		Adds the specified network <network name> to the DB.[br]
-		If the network already exixts, an error is printed unless the -q switch is used.
+		If the network already exists, an error is printed unless the -q switch is used.
 	@switches:
 		!sw: -a | --autoconnect
 		Autoconnect this network at KVIrc start.
@@ -874,7 +874,7 @@ static bool serverdb_kvs_cmd_addNetwork(KviKvsModuleCommandCall * c)
 		Autoconnect this server at KVIrc start.[br]
 
 		!sw: -c | --cache-ip
-		Caches the server IP at first connect to save bandwitch for future connects.[br]
+		Caches the server IP at first connect to save bandwidth for future connects.[br]
 
 		!sw: -f | --favorite
 		Sets the server as a favorite.[br]
@@ -926,7 +926,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c)
 	if(!pRecord)
 	{
 		// FIXME: default to orphan servers
-		c->error(__tr2qs_ctx("The specified network does not exist","serverdb"));
+		c->error(__tr2qs_ctx("The specified network doesn't exist","serverdb"));
 		return false;
 	}
 
@@ -984,7 +984,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c)
 		if(!pNetwork) \
 		{ \
 			if(c->switches()->find('q',"quiet")) return true; \
-			c->error(__tr2qs_ctx("The specified network does not exist","serverdb")); \
+			c->error(__tr2qs_ctx("The specified network doesn't exist","serverdb")); \
 			return false; \
 		} \
 		\
@@ -1020,7 +1020,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c)
 		if(!pRecord) \
 		{ \
 			if(c->switches()->find('q',"quiet")) return true; \
-			c->error(__tr2qs_ctx("The specified network does not exist","serverdb")); \
+			c->error(__tr2qs_ctx("The specified network doesn't exist","serverdb")); \
 			return false; \
 		} \
 		\
@@ -1028,7 +1028,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c)
 		if(!pServer) \
 		{ \
 			if(c->switches()->find('q',"quiet")) return true; \
-			c->error(__tr2qs_ctx("The specified server does not exist","serverdb")); \
+			c->error(__tr2qs_ctx("The specified server doesn't exist","serverdb")); \
 			return false; \
 		} \
 		\
@@ -1054,8 +1054,8 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c)
 		Do not print errors if the network already exists.
 	@examples:
 		[example]
-		[comment]Quietly sets the nickname HelLViS69 for the Freenode network[/comment][br]
-		serverdb.setNetworkNickName -q Freenode HelLViS69
+		[comment]Quietly sets the nickname HelLViS69 for the freenode network[/comment][br]
+		serverdb.setNetworkNickName -q freenode HelLViS69
 		[/example]
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
@@ -1079,8 +1079,8 @@ SERVERDB_SET_NETWORK_PROPERTY(serverdb_kvs_cmd_setNetworkNickName,setNickName)
 		Do not print errors if the network already exists.
 	@examples:
 		[example]
-		[comment]Quietly sets the username kvirc for the Freenode network[/comment][br]
-		serverdb.setNetworkUserName -q Freenode kvirc
+		[comment]Quietly sets the username kvirc for the freenode network[/comment][br]
+		serverdb.setNetworkUserName -q freenode kvirc
 		[/example]
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
@@ -1104,8 +1104,8 @@ SERVERDB_SET_NETWORK_PROPERTY(serverdb_kvs_cmd_setNetworkUserName,setUserName)
 		Do not print errors if the network already exists.
 	@examples:
 		[example]
-		[comment]Quietly sets the realname KVIrc 4.0 for the Freenode network[/comment][br]
-		serverdb.setNetworkRealName -q Freenode KVIrc 4.0
+		[comment]Quietly sets the realname KVIrc 4.0 for the freenode network[/comment][br]
+		serverdb.setNetworkRealName -q freenode KVIrc 4.0
 		[/example]
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
@@ -1130,8 +1130,8 @@ SERVERDB_SET_NETWORK_PROPERTY(serverdb_kvs_cmd_setNetworkRealName,setRealName)
 		Do not print errors if the network already exists.
 	@examples:
 		[example]
-		[comment]Quietly sets the encoding UTF-8 for the Freenode network[/comment][br]
-		serverdb.setNetworkEncoding -q Freenode UTF-8
+		[comment]Quietly sets the encoding UTF-8 for the freenode network[/comment][br]
+		serverdb.setNetworkEncoding -q freenode UTF-8
 		[/example]
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
@@ -1155,8 +1155,8 @@ SERVERDB_SET_NETWORK_PROPERTY(serverdb_kvs_cmd_setNetworkEncoding,setEncoding)
 		Do not print errors if the network already exists.
 	@examples:
 		[example]
-		[comment]Quietly sets the text encoding UTF-8 for the Freenode network[/comment][br]
-		serverdb.setNetworkTextEncoding -q Freenode UTF-8
+		[comment]Quietly sets the text encoding UTF-8 for the freenode network[/comment][br]
+		serverdb.setNetworkTextEncoding -q freenode UTF-8
 		[/example]
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
@@ -1180,8 +1180,8 @@ SERVERDB_SET_NETWORK_PROPERTY(serverdb_kvs_cmd_setNetworkTextEncoding,setTextEnc
 		Do not print errors if the network already exists.
 	@examples:
 		[example]
-		[comment]Quietly sets the description for the Freenode network[/comment][br]
-		serverdb.setNetworkDescription -q Freenode The FOSS Network
+		[comment]Quietly sets the description for the freenode network[/comment][br]
+		serverdb.setNetworkDescription -q freenode The FOSS Network
 		[/example]
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
@@ -1205,8 +1205,8 @@ SERVERDB_SET_NETWORK_PROPERTY(serverdb_kvs_cmd_setNetworkDescription,setDescript
 		Do not print errors if the network already exists.
 	@examples:
 		[example]
-		[comment]Quietly sets the connect command for the Freenode network[/comment][br]
-		serverdb.setNetworkConnectCommand -q Freenode ns identify HelLViS69 foobar
+		[comment]Quietly sets the connect command for the freenode network[/comment][br]
+		serverdb.setNetworkConnectCommand -q freenode ns identify HelLViS69 foobar
 		[/example]
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
@@ -1230,8 +1230,8 @@ SERVERDB_SET_NETWORK_PROPERTY(serverdb_kvs_cmd_setNetworkConnectCommand,setOnCon
 		Do not print errors if the network already exists.
 	@examples:
 		[example]
-		[comment]Quietly sets the login command for the Freenode network[/comment][br]
-		serverdb.setNetworkLoginCommand -q Freenode join #KVIrc
+		[comment]Quietly sets the login command for the freenode network[/comment][br]
+		serverdb.setNetworkLoginCommand -q freenode join #KVIrc
 		[/example]
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
@@ -1254,7 +1254,7 @@ SERVERDB_SET_NETWORK_PROPERTY(serverdb_kvs_cmd_setNetworkLoginCommand,setOnLogin
 	@examples:
 		[example]
 		[comment]Set two autojoin channels for freenode[/comment][br]
-		serverdb.setNetworkJoinChannels Freenode #kvirc:,#secretchan:password
+		serverdb.setNetworkJoinChannels freenode #kvirc:,#secretchan:password
 		[/example]
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
@@ -1278,7 +1278,7 @@ SERVERDB_SET_NETWORK_PROPERTY(serverdb_kvs_cmd_setNetworkJoinChannels,setAutoJoi
 		Do not print errors if the server already exists.
 	@examples:
 		[example]
-		[comment]Quietly sets the nickname HelLViS69 for the Freenode network[/comment][br]
+		[comment]Quietly sets the nickname HelLViS69 for the freenode network[/comment][br]
 		serverdb.setServerNickName -q irc.freenode.net HelLViS69
 		[/example]
 	@seealso:
@@ -1303,7 +1303,7 @@ SERVERDB_SET_SERVER_PROPERTY(serverdb_kvs_cmd_setServerNickName,setNickName)
 		Do not print errors if the server already exists.
 	@examples:
 		[example]
-		[comment]Quietly sets the username kvirc for the Freenode server[/comment][br]
+		[comment]Quietly sets the username kvirc for the freenode server[/comment][br]
 		serverdb.setServerUserName -q irc.freenode.net kvirc
 		[/example]
 	@seealso:
@@ -1328,7 +1328,7 @@ SERVERDB_SET_SERVER_PROPERTY(serverdb_kvs_cmd_setServerUserName,setUserName)
 		Do not print errors if the server already exists.
 	@examples:
 		[example]
-		[comment]Quietly sets the realname KVIrc 4.0 for the Freenode server[/comment][br]
+		[comment]Quietly sets the realname KVIrc 4.0 for the freenode server[/comment][br]
 		serverdb.setServerRealName -q irc.freenode.net KVIrc 4.0
 		[/example]
 	@seealso:
@@ -1404,7 +1404,7 @@ SERVERDB_SET_SERVER_PROPERTY(serverdb_kvs_cmd_setServerTextEncoding,setTextEncod
 		Do not print errors if the server already exists.
 	@examples:
 		[example]
-		[comment]Quietly sets the description for the Freenode server[/comment][br]
+		[comment]Quietly sets the description for the freenode server[/comment][br]
 		serverdb.setServerDescription -q irc.freenode.net The FOSS Network
 		[/example]
 	@seealso:
@@ -1429,7 +1429,7 @@ SERVERDB_SET_SERVER_PROPERTY(serverdb_kvs_cmd_setServerDescription,setDescriptio
 		Do not print errors if the server already exists.
 	@examples:
 		[example]
-		[comment]Quietly sets the connect command for the Freenode server[/comment][br]
+		[comment]Quietly sets the connect command for the freenode server[/comment][br]
 		serverdb.setServerConnectCommand -q irc.freenode.net ns identify HelLViS69 foobar
 		[/example]
 	@seealso:
@@ -1454,7 +1454,7 @@ SERVERDB_SET_SERVER_PROPERTY(serverdb_kvs_cmd_setServerConnectCommand,setOnConne
 		Do not print errors if the server already exists.
 	@examples:
 		[example]
-		[comment]Quietly sets the login command for the Freenode server[/comment][br]
+		[comment]Quietly sets the login command for the freenode server[/comment][br]
 		serverdb.setServerLoginCommand -q irc.freenode.net join #KVIrc
 		[/example]
 	@seealso:
diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp
index 97fc0e933..44ddde6b0 100644
--- a/src/modules/setup/SetupWizard.cpp
+++ b/src/modules/setup/SetupWizard.cpp
@@ -196,7 +196,7 @@ SetupWizard::SetupWizard()
 	g_pApp->getGlobalKvircDirectory(szLicensePath,KviApplication::License,"COPYING");
 	if(!KviFileUtils::loadFile(szLicensePath,szLicense))
 	{
-		szLicense = __tr("Oops... Can't find the license file.\n" \
+		szLicense = __tr("Oops! Can't find the license file.\n" \
 			"It MUST be included in the distribution...\n" \
 			"Please report to <pragma at kvirc dot net>");
 	}
@@ -415,8 +415,8 @@ SetupWizard::SetupWizard()
 	m_pTheme = new SetupPage(this);
 	m_pTheme->m_pTextLabel->setText(__tr2qs( \
 		"<p>Here you can choose the default appearance of KVIrc.<br><br>" \
-		"The Fancy Theme uses icons, a transparent background and a lot of colors. " \
-		"The Minimalist Theme is designed for low-color displays " \
+		"The Fancy theme uses icons, a transparent background and a lot of colors. " \
+		"The Minimalist theme is designed for low-color displays " \
 		"or for \"console\" extremists; it's more or less white text on a black background.<br><br>" \
 		"If you had a previous version of KVIrc installed, you can choose to not apply any theme " \
 		"in order to preserve your current visual settings.<br><br>" \
@@ -728,8 +728,8 @@ void SetupWizard::chooseOldDataPath()
 		if(
 			QMessageBox::question(
 				this,
-				__tr2qs("Do not overwrite folder? - KVIrc"),
-				__tr2qs("The folder %1 does not seem to be a valid KVIrc settings folder. Do you want to use it anyway?")
+				__tr2qs("Do Not Overwrite Folder? - KVIrc"),
+				__tr2qs("The folder %1 doesn't seem to be a valid KVIrc settings folder. Do you want to use it anyway?")
 					.arg(szBuffer),
 				__tr2qs("&Yes"),
 				__tr2qs("&No"),
diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp
index 5a5fdaea8..6ac2c0dae 100644
--- a/src/modules/sharedfile/libkvisharedfile.cpp
+++ b/src/modules/sharedfile/libkvisharedfile.cpp
@@ -46,7 +46,7 @@ extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 	@title:
 		sharedfile.add
 	@keyterms:
-		trading files by dcc
+		trading files by DCC
 	@short:
 		Adds a file sharedfile
 	@syntax:
@@ -118,7 +118,7 @@ static bool sharedfile_kvs_cmd_add(KviKvsModuleCommandCall * c)
 
 	if(!g_pSharedFilesManager->addSharedFile(szVisibleName,szFileName,szUserMask,timeout))
 	{
-		c->warning(__tr2qs_ctx("Ops..failed to add the sharedfile...","sharedfileswindow"));
+		c->warning(__tr2qs_ctx("Oops! Failed to add the sharedfile...","sharedfileswindow"));
 	}
 
 	return true;
@@ -132,7 +132,7 @@ static bool sharedfile_kvs_cmd_add(KviKvsModuleCommandCall * c)
 	@title:
 		sharedfile.remove
 	@keyterms:
-		trading files by dcc
+		trading files by DCC
 	@short:
 		Removes a shared file
 	@syntax:
@@ -170,7 +170,7 @@ static bool sharedfile_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 	@title:
 		sharedfile.clear
 	@keyterms:
-		trading files by dcc, shared files
+		trading files by DCC, shared files
 	@short:
 		Clears the shared files list
 	@syntax:
@@ -195,7 +195,7 @@ static bool sharedfile_kvs_cmd_clear(KviKvsModuleCommandCall *)
 	@title:
 		sharedfile.list
 	@keyterms:
-		trading files by dcc
+		trading files by DCC
 	@short:
 		Lists the active file sharedfile
 	@syntax:
@@ -218,9 +218,9 @@ static bool sharedfile_kvs_cmd_list(KviKvsModuleCommandCall * c)
 		{
 			c->window()->output(KVI_OUT_NONE,"%c%d. %s",
 				KviControlCodes::Bold,idx + 1,it.currentKey().toUtf8().data());
-			c->window()->output(KVI_OUT_NONE,__tr2qs_ctx("    File: %s (%u bytes)","sharedfileswindow"),
+			c->window()->output(KVI_OUT_NONE,__tr2qs_ctx("File: %s (%u bytes)","sharedfileswindow"),
 				o->absFilePath().toUtf8().data(),o->fileSize());
-			c->window()->output(KVI_OUT_NONE,__tr2qs_ctx("    Mask: %s","sharedfileswindow"),
+			c->window()->output(KVI_OUT_NONE,__tr2qs_ctx("Mask: %s","sharedfileswindow"),
 				o->userMask().toUtf8().data());
 			if(o->expireTime() > 0)
 			{
@@ -229,7 +229,7 @@ static bool sharedfile_kvs_cmd_list(KviKvsModuleCommandCall * c)
 				secs = secs % 3600;
 				int mins = secs / 60;
 				secs = secs % 60;
-				c->window()->output(KVI_OUT_NONE,__tr2qs_ctx("    Expires in %d hours %d minutes %d seconds","sharedfileswindow"),
+				c->window()->output(KVI_OUT_NONE,__tr2qs_ctx("Expires in %d hours %d minutes %d seconds","sharedfileswindow"),
 					hour,mins,secs);
 			}
 			++idx;
diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
index 3ee6cabcf..1b2b53cea 100644
--- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
@@ -133,7 +133,7 @@ void SharedFileEditDialog::browse()
 {
 	QString szBuf;
 	QString szTxt = m_pFilePathEdit->text();
-	if(!KviFileDialog::askForOpenFileName(szBuf,__tr2qs("Choose the file to share"),szTxt,QString(),false,true,this))return;
+	if(!KviFileDialog::askForOpenFileName(szBuf,__tr2qs("Choose the File to Share"),szTxt,QString(),false,true,this))return;
 	m_pFilePathEdit->setText(szBuf);
 }
 
@@ -156,16 +156,16 @@ void SharedFileEditDialog::okClicked()
 	bool bExpires = m_pExpireCheckBox->isChecked();
 	if(bExpires && (dt <= QDateTime::currentDateTime()))
 	{
-		QMessageBox::warning(this,__tr2qs_ctx("Invalid expire time","sharedfileswindow"),
-			__tr2qs_ctx("The expire date/time is in the past: please either remove the \"expires\"" \
-					"check mark or specify a expire date/time in the future","sharedfileswindow"),
+		QMessageBox::warning(this,__tr2qs_ctx("Invalid Expiry Time","sharedfileswindow"),
+			__tr2qs_ctx("The expiry date/time is in the past: please either remove the \"Expires at\"" \
+					"check mark or specify a expiry date/time in the future","sharedfileswindow"),
 					__tr2qs_ctx("OK","sharedfileswindow"));
 		return;
 	}
 
 	if(szName.isEmpty())
 	{
-		QMessageBox::warning(this,__tr2qs_ctx("Invalid share name","sharedfileswindow"),
+		QMessageBox::warning(this,__tr2qs_ctx("Invalid Share Name","sharedfileswindow"),
 			__tr2qs_ctx("The share name can't be empty, please correct it","sharedfileswindow"),
 			__tr2qs_ctx("OK","sharedfileswindow"));
 		return;
diff --git a/src/modules/socketspy/libkvisocketspy.cpp b/src/modules/socketspy/libkvisocketspy.cpp
index bcc417cda..dfd7f7856 100644
--- a/src/modules/socketspy/libkvisocketspy.cpp
+++ b/src/modules/socketspy/libkvisocketspy.cpp
@@ -45,8 +45,8 @@ KviPointerList<SocketSpyWindow> * g_pSocketSpyWindowList = 0;
 		socketspy.open
 	@description:
 		Creates a new socketspy window. A SocketSpy window
-		monitors the incoming and outgoing raw data on the
-		irc socket of the current irc context.
+		monitors the incoming and outgoing RAW data on the
+		IRC socket of the current IRC context.
 */
 
 static bool socketspy_kvs_cmd_open(KviKvsModuleCommandCall * c)
@@ -84,7 +84,7 @@ KVIRC_MODULE(
 	"SocketSpy",                                             // module name
 	"4.0.0",                                                // module version
 	"Copyright (C) 2000 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
-	"SocketSpy irc socket traffic monitor",
+	"SocketSpy IRC socket traffic monitor",
 	socketspy_module_init,
 	socketspy_module_can_unload,
 	0,
diff --git a/src/modules/spellchecker/libkvispellchecker.cpp b/src/modules/spellchecker/libkvispellchecker.cpp
index 9dad1a719..c34c6992e 100644
--- a/src/modules/spellchecker/libkvispellchecker.cpp
+++ b/src/modules/spellchecker/libkvispellchecker.cpp
@@ -110,7 +110,7 @@ static bool spellchecker_kvs_check(KviKvsModuleFunctionCall* c)
 	@description:
 		This function returns the suggestions for the specified word.
 		If the word seems to be spelled correctly or there are no dictionaries
-		selected then the functon returns an empty array.
+		selected then the function returns an empty array.
 */
 static bool spellchecker_kvs_suggestions(KviKvsModuleFunctionCall* c)
 {
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index bdd812895..bfc185366 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -473,8 +473,8 @@ static bool str_kvs_fnc_cmp(KviKvsModuleFunctionCall * c)
 		This function search in the string given as the first parameter for the string
 		given as his second parameter, and will return the index where the nth occurrence
 		given as the third parameter is found or -1 if it's not located. It starts
-		counting at 0. If occurence is not specified then the first occurence
-		is searched. WARNING: The occurence number starts from 1! (Yes, that's a bug, but
+		counting at 0. If occurrence is not specified then the first occurrence
+		is searched. WARNING: The occurrence number starts from 1! (Yes, that's a bug, but
 		for backward compatibility it must remain as it is :( ).[br]
 		FIXME: The semantics of this function are totally broken :(
 */
diff --git a/src/modules/system/Plugin.cpp b/src/modules/system/Plugin.cpp
index 48da58d09..fd5fc2fdc 100644
--- a/src/modules/system/Plugin.cpp
+++ b/src/modules/system/Plugin.cpp
@@ -45,7 +45,8 @@
 		Small plugins which can be called in scripts
 	@body:
 		If you want to know how to call easyplugins please have a look at: $system.call()[br]
-		This part of the documentation handles only the way how to write an easyplugin. An easyplugin is simply a dll/so. You can create one like you normally make such so/dll files. The important thing is that these so/dll-files export some of the following functions.
+		This part of the documentation handles only the way how to write an easyplugin. An easyplugin is simply a dll/so. You can create one like you normally make such so/dll files.[br]
+		The important thing is that these so/dll-files export some of the following functions.
 		[br][br]
 		[b]Exported functions by easyplugin (C/C++-Examples):[/b][br]
 		[br][b]_free function[/b] [i] (needed)[/i][br]
@@ -91,7 +92,8 @@
 
 		[br][b]user function[/b][br]
 		This is the general structure of a user function call.[br]
-		The important thing here is the handling of return values. To return a value to KVIrc you have to allocate memory and write the pointer to it into pBuffer. Have a look at the example for more details.[br]
+		The important thing here is the handling of return values. To return a value to KVIrc you have to allocate memory and write the pointer to it into pBuffer.[br]
+		Have a look at the example for more details.[br]
 		[example]
 		int about(int argc, char * argv[], char ** pBuffer)[br]
 		{[br]
@@ -302,7 +304,7 @@ bool PluginManager::pluginCall(KviKvsModuleFunctionCall *c)
 
 	if(r == -1)
 	{
-		c->error(__tr2qs("This plugin does not export the desired function."));
+		c->error(__tr2qs("This plugin doesn't export the desired function."));
 		return true;
 	}
 	if (r > 0)
@@ -318,7 +320,7 @@ bool PluginManager::pluginCall(KviKvsModuleFunctionCall *c)
 	{
 		if (!plugin->pfree(returnBuffer))
 		{
-			c->warning(__tr2qs("The plugin has no function to free memory. This can result in Memory Leaks!"));
+			c->warning(__tr2qs("The plugin has no function to free memory. This can result in memory leaks!"));
 		}
 	}
 
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 700d112ab..70ed795f5 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -70,7 +70,7 @@ PluginManager * g_pPluginManager;
 	@syntax:
 		<string> $system.ostype()
 	@description:
-		Returns the current type of operating system: unix,macosx or windows.[br]
+		Returns the current type of operating system: UNIX, OS X or Windows.[br]
 */
 
 static bool system_kvs_fnc_ostype(KviKvsModuleFunctionCall * c)
@@ -188,17 +188,17 @@ static bool system_kvs_fnc_osnodename(KviKvsModuleFunctionCall *c)
 /*
 	@doc: system.getenv
 	@keyterms:
-		Enviroinement variables
+		Environment variables
 	@type:
 		function
 	@title:
 		$system.getenv
 	@short:
-		Returns the value of an enviroinement variable
+		Returns the value of an environment variable
 	@syntax:
 		<string> $system.getenv(<variable:string>)
 	@description:
-		Returns the value of the enviroinement <variable>.[br]
+		Returns the value of the environment <variable>.[br]
 */
 
 static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c)
@@ -363,8 +363,8 @@ static bool system_kvs_fnc_selection(KviKvsModuleFunctionCall *c)
 		<boolean> $system.checkModule(<module_name:string>)
 	@description:
 		Attempts to load the specified module and returns
-		$true if succesfull and $false otherwise. This can
-		be effectively used to test if a KVIrc exension module
+		$true if successful and $false otherwise. This can
+		be effectively used to test if a KVIrc extension module
 		is present on the system and can be loaded by the
 		KVIrc engine.
 */
@@ -415,11 +415,11 @@ static bool system_kvs_fnc_hostname(KviKvsModuleFunctionCall *c)
 	@title:
 		$system.dbus
 	@short:
-		Performs a DBus call
+		Performs a D-Bus call
 	@syntax:
 		<variant> $system.dbus(<service:string>,<path:string>,<interface:string>,<method:string>[,<bus_type:string>[,<parameter1:string>[,<parameter2:string>[,...]]]])
 	@description:
-		This function allows performing simple Dbus calls without executing
+		This function allows performing simple D-Bus calls without executing
 		an external process. This feature is available ONLY under unix:
 		this means that this function is absolutely
 		non portable (don't use it in scripts that you're going to distribute).
@@ -500,7 +500,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c)
 			c->returnValue()->setInteger(0);
 			return true;
 		} else {
-			c->warning(__tr2qs("Invalid DBus interface"));
+			c->warning(__tr2qs("Invalid D-Bus interface"));
 			return false;
 		}
 	}
@@ -519,7 +519,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c)
 
 		if(tmp.isEmpty())
 		{
-			c->warning(__tr2qs("Invalid DBus parameter syntax"));
+			c->warning(__tr2qs("Invalid D-Bus parameter syntax"));
 			return false;
 		}
 
@@ -558,7 +558,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c)
 			}
 			ds << uii;
 		} else {
-			c->warning(__tr2qs("Unsupported DBus parameter type %s"),tmp.ptr());
+			c->warning(__tr2qs("Unsupported D-Bus parameter type %s"),tmp.ptr());
 			return false;
 		}
 	}
@@ -568,7 +568,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c)
 	if (reply.type() == QDBusMessage::ErrorMessage)
 	{
 		QDBusError err = reply;
-		c->warning(__tr2qs("The DBus call returned an error \"%s\": %s"),qPrintable(err.name()), qPrintable(err.message()));
+		c->warning(__tr2qs("The D-Bus call returned an error \"%s\": %s"),qPrintable(err.name()), qPrintable(err.message()));
 		return false;
 	}
 
@@ -609,13 +609,13 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c)
 				c->returnValue()->setString("");
 				break;
 			default:
-				c->warning(__tr2qs("Unsupported DBus call return type %s"),v.typeName());
+				c->warning(__tr2qs("Unsupported D-Bus call return type %s"),v.typeName());
 				break;
 		}
 	}
 
 #else
-		c->warning(__tr2qs("DBus calls are available only under UNIX"));
+		c->warning(__tr2qs("D-Bus calls are available only under UNIX"));
 #endif
 	return true;
 }
@@ -628,13 +628,13 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c)
 	@title:
 		system.setenv
 	@keyterms:
-		Enviroinement variables
+		Environment variables
 	@short:
-		Sets an enviroinement variable
+		Sets an environment variable
 	@syntax:
 		system.setenv <variable:string> [<value:string>]
 	@description:
-		Sets the enviroinement <variable> to the <value> string.[br]
+		Sets the environment <variable> to the <value> string.[br]
 		If <value> is not given, the <variable> is unset.[br]
 	@seealso:
 		[fnc]$system.getenv[/fnc]
@@ -819,9 +819,9 @@ static bool system_kvs_cmd_runcmd(KviKvsModuleCommandCall *c)
 	@description:
 		Converts the integer value in network byte order
 		to it's host byte order counterpart.
-		Since the conversion is carried at binary rappresentation
+		Since the conversion is carried at binary representation
 		level you must specify the number of bytes you want
-		the binary rappresentation to have. Valid values are
+		the binary representation to have. Valid values are
 		1 (no conversion), 2 (short), 4 (32 bit int) and 8 (64 bit int).
 		If omitted, bytecount is assumed to be 4.
 */
@@ -875,9 +875,9 @@ static bool system_kvs_fnc_ntohi(KviKvsModuleFunctionCall * c)
 	@description:
 		Converts the integer value in host byte order
 		to it's network byte order counterpart.
-		Since the conversion is carried at binary rappresentation
+		Since the conversion is carried at binary representation
 		level you must specify the number of bytes you want
-		the binary rappresentation to have. Valid values are
+		the binary representation to have. Valid values are
 		1 (no conversion), 2 (short), 4 (32 bit int) and 8 (64 bit int).
 		If omitted, bytecount is assumed to be 4.
 */
diff --git a/src/modules/term/TermWidget.cpp b/src/modules/term/TermWidget.cpp
index 522381235..7687f7647 100644
--- a/src/modules/term/TermWidget.cpp
+++ b/src/modules/term/TermWidget.cpp
@@ -59,7 +59,7 @@
 		if(bIsStandalone)
 		{
 			m_pHBox = new KviTalHBox(this);
-			m_pTitleLabel = new QLabel(__tr2qs("Terminal emulator"),m_pHBox);
+			m_pTitleLabel = new QLabel(__tr2qs("Terminal Emulator"),m_pHBox);
 			m_pTitleLabel->setFrameStyle(QFrame::Raised | QFrame::StyledPanel);
 			m_pCloseButton = new QPushButton("",m_pHBox);
 			m_pCloseButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Close)));
diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp
index b91a08afc..54361b0f3 100644
--- a/src/modules/term/libkviterm.cpp
+++ b/src/modules/term/libkviterm.cpp
@@ -55,7 +55,7 @@ KviModule * g_pTermModule = 0;
 		creates terminal as a docked window
 	@description:
 		Opens a new terminal window (If the service is available).
-		if the -m switch is present, the created terminal as a dockable kvirc window,
+		if the -m switch is present, the created terminal as a dockable KVIrc window,
 		otherwise it is a static window.[br]
 		This command is exported by the "term" module.[br]
 		Note: At the time that this module was written, the
diff --git a/src/modules/texticons/libkvitexticons.cpp b/src/modules/texticons/libkvitexticons.cpp
index d80d44706..c4bae2734 100644
--- a/src/modules/texticons/libkvitexticons.cpp
+++ b/src/modules/texticons/libkvitexticons.cpp
@@ -39,7 +39,7 @@
 		<string>  $texticons.get(<iconName:string>)
 		<integer> $texticons.get(<iconName:string>)
 	@description:
-		if <iconName:string> is setted returns integer icon id or string filename, associated with <iconName:string>[br]
+		if <iconName:string> is setted returns integer icon ID or string filename, associated with <iconName:string>[br]
 		if <iconName:string> isn't set returns hash where keys are the icon names, and values are the icon id's or filenames
 	@seealso:
 		[fnc]$texticons.get[/fnc]
@@ -95,7 +95,7 @@ static bool texticons_kvs_fnc_get(KviKvsModuleFunctionCall * c)
 		texticons.set <iconName:string> <iconId:integer>
 	@description:
 		if command gets only 1 argument it removes <iconName:string> from list of texticons[br]
-		if it gets an integer second parameters, command associates <iconName:string> icon with builin icon, having id <iconId:integer>[br]
+		if it gets an integer second parameters, command associates <iconName:string> icon with builtin icon, having ID <iconId:integer>[br]
 		if it gets a string second parameters, command associates <iconName:string> icon with the filename <iconFile:string>
 	@seealso:
 		[fnc]$texticons.get[/fnc]
@@ -172,7 +172,7 @@ KVIRC_MODULE(
 		of small images without sending the images themselves.[br]
 		The idea is quite simple: the IRC client (and it's user) associates
 		some small images to text strings (called icon tokens) and the strings are sent
-		in place of the images preceeded by a special escape character.[br]
+		in place of the images preceded by a special escape character.[br]
 		The chosen escape character is 29 (hex 0x1d) which corresponds
 		to the ASCII group separator.[br]
 		So for example if a client has the association of the icon token "rose" with a small
@@ -180,7 +180,7 @@ KVIRC_MODULE(
 		"&lt;0x1d&gt;rose" in the message stream to ask the remote parties to
 		display such an icon. If the remote parties don't have this association
 		then they will simply strip the control code and display the string "rose",
-		(eventually showing it in some enchanced way).[br]
+		(eventually showing it in some enhanced way).[br]
 		The icon tokens can't contain spaces
 		so the receiving clients stop the extraction of the icon strings
 		when a space, an icon escape or the message termination is encountered.
diff --git a/src/modules/theme/PackThemeDialog.cpp b/src/modules/theme/PackThemeDialog.cpp
index e12a125e3..c4c16e916 100644
--- a/src/modules/theme/PackThemeDialog.cpp
+++ b/src/modules/theme/PackThemeDialog.cpp
@@ -137,7 +137,7 @@ PackThemeDataWidget::PackThemeDataWidget(PackThemeDialog * pParent)
 {
 	setObjectName("theme_package_data_page");
 	setTitle(__tr2qs_ctx("Theme Data","theme"));
-	setSubTitle(__tr2qs_ctx("This is the information list for the themes you're packaging. If it looks OK press \"Next\" to continue, otherwise press \"Cancel\" and rewiew your themes first.","theme"));
+	setSubTitle(__tr2qs_ctx("This is the information list for the themes you're packaging. If it looks OK press \"Next\" to continue, otherwise press \"Cancel\" and review your themes first.","theme"));
 }
 
 void PackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoList)
diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp
index 1af4319f9..0d0e31a92 100644
--- a/src/modules/theme/ThemeFunctions.cpp
+++ b/src/modules/theme/ThemeFunctions.cpp
@@ -51,7 +51,7 @@ namespace ThemeFunctions
 
 	static bool notAValidThemePackage(QString &szError)
 	{
-		szError = __tr2qs_ctx("The selected file does not seem to be a valid KVIrc theme package","theme");
+		szError = __tr2qs_ctx("The selected file doesn't seem to be a valid KVIrc theme package","theme");
 		return false;
 	}
 
@@ -71,9 +71,9 @@ namespace ThemeFunctions
 
 		if(!r.readHeader(szThemePackageFileName))
 		{
-			qDebug("The selected file does not seem to be a valid KVIrc package");
+			qDebug("The selected file doesn't seem to be a valid KVIrc package");
 			QString szErr = r.lastError();
-			szError = QString(__tr2qs_ctx("The selected file does not seem to be a valid KVIrc package: %1","theme")).arg(szErr);
+			szError = QString(__tr2qs_ctx("The selected file doesn't seem to be a valid KVIrc package: %1","theme")).arg(szErr);
 			return false;
 		}
 
diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp
index 06b85485d..99e0757a3 100644
--- a/src/modules/theme/ThemeManagementDialog.cpp
+++ b/src/modules/theme/ThemeManagementDialog.cpp
@@ -138,7 +138,7 @@ ThemeManagementDialog::ThemeManagementDialog(QWidget * parent)
 	pTool = new QToolButton(pHBox);
 	pTool->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_SAVE)));
 	pTool->setIconSize(QSize(32,32));
-	pTool->setToolTip(__tr2qs_ctx("Save Current Theme...","theme"));
+	pTool->setToolTip(__tr2qs_ctx("Save current theme...","theme"));
 	connect(pTool,SIGNAL(clicked()),this,SLOT(saveCurrentTheme()));
 
 	pSep = new QFrame(pHBox);
@@ -149,13 +149,13 @@ ThemeManagementDialog::ThemeManagementDialog(QWidget * parent)
 	m_pPackThemeButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_PACK)));
 
 	m_pPackThemeButton->setIconSize(QSize(32,32));
-	m_pPackThemeButton->setToolTip(__tr2qs_ctx("Export Selected Themes to a Distributable Package","theme"));
+	m_pPackThemeButton->setToolTip(__tr2qs_ctx("Export selected themes to a distributable package","theme"));
 	connect(m_pPackThemeButton,SIGNAL(clicked()),this,SLOT(packTheme()));
 
 	m_pDeleteThemeButton = new QToolButton(pHBox);
 	m_pDeleteThemeButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_REMOVE)));
 	m_pDeleteThemeButton->setIconSize(QSize(32,32));
-	m_pDeleteThemeButton->setToolTip(__tr2qs_ctx("Delete Selected Themes","theme"));
+	m_pDeleteThemeButton->setToolTip(__tr2qs_ctx("Delete selected themes","theme"));
 	connect(m_pDeleteThemeButton,SIGNAL(clicked()),this,SLOT(deleteTheme()));
 
 	pSep = new QFrame(pHBox);
@@ -165,13 +165,13 @@ ThemeManagementDialog::ThemeManagementDialog(QWidget * parent)
 	pTool = new QToolButton(pHBox);
 	pTool->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN)));
 	pTool->setIconSize(QSize(32,32));
-	pTool->setToolTip(__tr2qs_ctx("Install Theme Package From Disk","theme"));
+	pTool->setToolTip(__tr2qs_ctx("Install theme package from disk","theme"));
 	connect(pTool,SIGNAL(clicked()),this,SLOT(installFromFile()));
 
 	pTool = new QToolButton(pHBox);
 	pTool->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_WWW)));
 	pTool->setIconSize(QSize(32,32));
-	pTool->setToolTip(__tr2qs_ctx("Get More Themes...","theme"));
+	pTool->setToolTip(__tr2qs_ctx("Get more themes...","theme"));
 	connect(pTool,SIGNAL(clicked()),this,SLOT(getMoreThemes()));
 
 	QWidget *w= new QWidget(pHBox);
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index 333c078c6..f4e493a29 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -94,18 +94,18 @@ static bool theme_kvs_cmd_install(KviKvsModuleCommandCall * c)
 		!sw: -e | --external
 		<theme> is an absolute directory containing a theme
 		!sw: -b | --builtin
-		<theme> is the name of a builtin theme (a subdirectory of the kvirc global themes directory)
+		<theme> is the name of a builtin theme (a subdirectory of the KVIrc global themes directory)
 		!sw: -u | --user
-		<theme> is the name of an user theme (a subdirectory of the kvirc local themes directory)
+		<theme> is the name of an user theme (a subdirectory of the KVIrc local themes directory)
 	@description:
 		Attempts to apply the global theme specified by <theme>.
 		If the -b switch is present then <theme> is assumed to be a name of
-		a builtin installed theme (a subdirectory of the kvirc global themes directory).
+		a builtin installed theme (a subdirectory of the KVIrc global themes directory).
 		If the -l switch is present then <theme> is assumed to be a name of
-		an user installed theme (a subdirectory of the kvirc local themes directory).
+		an user installed theme (a subdirectory of the KVIrc local themes directory).
 		If the -e switch is present then <theme> is assumed to be an absolute
 		directory containing the theme data.
-		If no switch is present then kvirc tries to determine automatically the
+		If no switch is present then KVIrc tries to determine automatically the
 		type of theme (user, builtin or external).
 */
 static bool theme_kvs_cmd_apply(KviKvsModuleCommandCall * c)
@@ -161,7 +161,7 @@ static bool theme_kvs_fnc_info(KviKvsModuleFunctionCall * c)
 	KviThemeInfo theme;
 	if(!theme.load(szTheme,KviThemeInfo::Auto))
 	{
-		c->warning(__tr2qs_ctx("The theme package '%Q' does not exist","theme"),&szTheme);
+		c->warning(__tr2qs_ctx("The theme package '%Q' doesn't exist","theme"),&szTheme);
 		return true;
 	}
 
@@ -203,7 +203,7 @@ static bool theme_kvs_cmd_screenshot(KviKvsModuleCommandCall * c)
 
 	bool bResult = KviFileDialog::askForSaveFileName(
 			szTmp,
-			__tr2qs_ctx("Choose a file to save the screenshot to","theme"),
+			__tr2qs_ctx("Choose a Filename to Save the Screenshot to","theme"),
 			szFileName,
 			"*.png",
 			false,
@@ -275,8 +275,8 @@ static bool theme_kvs_cmd_dialog(KviKvsModuleCommandCall *c)
 		<package_name> is the visible name of the package (something like "My Theme Set").[br]
 		<package_version> is the version of the package in the form X.Y.Z.[br]
 		<package_description> is a textual description of the package.
-		<package_author> is the name of the person that is creating the package (NOT necessairly the themes contained within).
-		<package_image> is the path of an image to be used as package rappresentative image. If the package is going
+		<package_author> is the name of the person that is creating the package (NOT necessarily the themes contained within).
+		<package_image> is the path of an image to be used as package representative image. If the package is going
 		to contain a single theme you may specify the theme's screenshot here. Pass an empty string if you
 		don't want an image to be stored in the package.
 		<theme> is a either a single path to a directory containing a theme as it's exported by kvirc,
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index bdf984bd5..e79f451f1 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -236,11 +236,11 @@ void TipWindow::prevTip()
 	@description:
 		Opens the "did you know..." tip window.<br>
 		If <tip_file_name> is specified, that tip is used instead of
-		the default tips provided with kvirc.<br>
+		the default tips provided with KVIrc.<br>
 		<tip_file_name> must be a file name with no path and must refer to a
 		standard KVIrc configuration file found in the global or local
 		KVIrc plugin configuration directory ($KVIrcDir/config/modules).<br>
-		Once the window has been opened, the next tip avaiable in the config file is shown.<br>
+		Once the window has been opened, the next tip available in the config file is shown.<br>
 		This command works even if the tip window is already opened.<br>
 */
 
diff --git a/src/modules/tmphighlight/libkvitmphighlight.cpp b/src/modules/tmphighlight/libkvitmphighlight.cpp
index c995d34d2..3d4117481 100644
--- a/src/modules/tmphighlight/libkvitmphighlight.cpp
+++ b/src/modules/tmphighlight/libkvitmphighlight.cpp
@@ -112,12 +112,12 @@ static bool tmphighlight_kvs_cmd_removenick(KviKvsModuleCommandCall * c)
 	@title:
 		tmphighlight.addChannel
 	@short:
-		Adds a channel to the irc context temporary highlight list
+		Adds a channel to the IRC context temporary highlight list
 	@syntax:
 		tmphighlight.addChannel [window_id:integer]
 	@description:
-		This command adds a channel to the irc context temporary highlight list, so that every user message
-		from that channel will be highlighted until you close that irc context. This is useful when you want
+		This command adds a channel to the IRC context temporary highlight list, so that every user message
+		from that channel will be highlighted until you close that IRC context. This is useful when you want
 		to follow every message in a low traffic channel. If you don't specify a channel, the current one
 		is used.
 	@seealso:
@@ -140,7 +140,7 @@ static bool tmphighlight_kvs_cmd_addchannel(KviKvsModuleCommandCall * c)
 		pWnd = g_pApp->findWindow(szWnd.toUtf8().data());
 		if(!pWnd)
 		{
-			c->warning(__tr2qs("Unable to find a window with the specified window id"));
+			c->warning(__tr2qs("Unable to find a window with the specified window ID"));
 			return false;
 		}
 	}
@@ -166,11 +166,11 @@ static bool tmphighlight_kvs_cmd_addchannel(KviKvsModuleCommandCall * c)
 	@title:
 		tmphighlight.removeChannel
 	@short:
-		Remove a channel from the irc context temporary highlight list
+		Remove a channel from the IRC context temporary highlight list
 	@syntax:
 		tmphighlight.removeChannel [window_id:integer]
 	@description:
-		This command remove a channel from the irc context temporary highlight list.
+		This command remove a channel from the IRC context temporary highlight list.
 		If you don't specify a channel, the current one is used.
 	@seealso:
 		[fnc]$tmphighlight.addChannel[/fnc]
@@ -192,7 +192,7 @@ static bool tmphighlight_kvs_cmd_removechannel(KviKvsModuleCommandCall * c)
 		pWnd = g_pApp->findWindow(szWnd.toUtf8().data());
 		if(!pWnd)
 		{
-			c->warning(__tr2qs("Unable to find a window with the specified window id"));
+			c->warning(__tr2qs("Unable to find a window with the specified window ID"));
 			return false;
 		}
 	}
@@ -254,11 +254,11 @@ static bool tmphighlight_kvs_fnc_isnickhighlighted(KviKvsModuleFunctionCall * c)
 	@title:
 		$tmphighlight.isChannelHighlighted
 	@short:
-		Returns 1 if the channel is highlighted on this irc network, 0 otherwise
+		Returns 1 if the channel is highlighted on this IRC network, 0 otherwise
 	@syntax:
 		<boolean> $tmphighlight.isChannelHighlighted[window_id:integer]
 	@description:
-		This command returns 1 if the channel is highlighted on this irc network, 0 otherwise.
+		This command returns 1 if the channel is highlighted on this IRC network, 0 otherwise.
 	@seealso:
 		[fnc]$tmphighlight.addChannel[/fnc]
 		[fnc]$tmphighlight.removeChannel[/fnc]
@@ -280,7 +280,7 @@ static bool tmphighlight_kvs_fnc_ischannelhighlighted(KviKvsModuleFunctionCall *
 		pWnd = g_pApp->findWindow(szWnd.toUtf8().data());
 		if(!pWnd)
 		{
-			c->warning(__tr2qs("Unable to find a window with the specified window id"));
+			c->warning(__tr2qs("Unable to find a window with the specified window ID"));
 			return false;
 		}
 	}
@@ -324,7 +324,7 @@ KVIRC_MODULE(
 	"4.0.0",                                      // module version
 	"(C) 2002 Juanjo Alvarez (juanjux@yahoo.es)" \
 	"(C) 2009 Fabio Bas (ctrlaltca at libero dot it)", // author & (C)
-	"Temporal Highlightining of channel and nicknames",
+	"Temporary highlighting of channels and nicknames",
 	tmphighlight_module_init,
 	tmphighlight_module_can_unload,
 	0,
diff --git a/src/modules/toolbar/libkvitoolbar.cpp b/src/modules/toolbar/libkvitoolbar.cpp
index 4371ea657..07683170c 100644
--- a/src/modules/toolbar/libkvitoolbar.cpp
+++ b/src/modules/toolbar/libkvitoolbar.cpp
@@ -441,7 +441,7 @@ static bool toolbar_kvs_cmd_removeitem(KviKvsModuleCommandCall * c)
 			if(!d->removeAction(iAction))
 			{
 				if(!c->switches()->find('q',"quiet"))
-					c->warning(__tr2qs("The toolbar does not contain the specified item"));
+					c->warning(__tr2qs("The toolbar doesn't contain the specified item"));
 			}
 		}
 	} else {
@@ -450,7 +450,7 @@ static bool toolbar_kvs_cmd_removeitem(KviKvsModuleCommandCall * c)
 		if(!d->removeAction(szAction))
 		{
 			if(!c->switches()->find('q',"quiet"))
-				c->warning(__tr2qs("The toolbar does not contain the specified item"));
+				c->warning(__tr2qs("The toolbar doesn't contain the specified item"));
 		}
 	}
 
diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
index 0b66564d5..a1fe26078 100644
--- a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
+++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
@@ -134,7 +134,7 @@ CustomToolBarPropertiesDialog::CustomToolBarPropertiesDialog(QWidget * p,const Q
 	m_szOriginalId = szId;
 	m_szLabel = szLabel;
 
-	setWindowTitle(__tr2qs_ctx("ToolBar Properties","editor"));
+	setWindowTitle(__tr2qs_ctx("Toolbar Properties","editor"));
 	setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::ToolBar))));
 	setModal(true);
 
@@ -167,7 +167,7 @@ CustomToolBarPropertiesDialog::CustomToolBarPropertiesDialog(QWidget * p,const Q
 	m_pAdvanced = new QWidget(this);
 	QGridLayout * ag = new QGridLayout(m_pAdvanced);
 
-	l = new QLabel(__tr2qs_ctx("Id","editor") + ":",m_pAdvanced);
+	l = new QLabel(__tr2qs_ctx("ID","editor") + ":",m_pAdvanced);
 	l->setMinimumWidth(100);
 	ag->addWidget(l,0,0);
 
@@ -194,7 +194,7 @@ CustomToolBarPropertiesDialog::CustomToolBarPropertiesDialog(QWidget * p,const Q
 
 	m_pAdvancedButton = new QPushButton(__tr2qs_ctx("Advanced...","editor"),this);
 	connect(m_pAdvancedButton,SIGNAL(clicked()),this,SLOT(advancedClicked()));
-	m_pAdvancedButton->setMinimumWidth(100);
+	m_pAdvancedButton->setMinimumWidth(110);
 	g->addWidget(m_pAdvancedButton,4,0,1,2);
 
 	g->setRowStretch(0,1);
@@ -223,7 +223,7 @@ void CustomToolBarPropertiesDialog::iconSelected(const QString &szIconId)
 
 void CustomToolBarPropertiesDialog::iconButtonClicked()
 {
-	KviImageDialog * dlg = new KviImageDialog(this,__tr2qs_ctx("Please choose the icon for the ToolBar","editor"));
+	KviImageDialog * dlg = new KviImageDialog(this,__tr2qs_ctx("Please Choose the Icon for the Toolbar","editor"));
 	if(dlg->exec() != QDialog::Accepted)
 	{
 		delete dlg;
@@ -247,7 +247,7 @@ void CustomToolBarPropertiesDialog::okClicked()
 {
 	if(m_szLabel.isEmpty())
 	{
-		QMessageBox::information(this,__tr2qs_ctx("Invalid ToolBar Label","editor"),__tr2qs_ctx("The ToolBar Label can't be empty!","editor"),__tr2qs_ctx("OK","editor"));
+		QMessageBox::information(this,__tr2qs_ctx("Invalid Toolbar Label","editor"),__tr2qs_ctx("The toolbar label can't be empty!","editor"),__tr2qs_ctx("OK","editor"));
 		return;
 	}
 
@@ -260,8 +260,8 @@ void CustomToolBarPropertiesDialog::okClicked()
 	{
 		if(m_szId != m_szOriginalId)
 		{
-			if(QMessageBox::information(this,__tr2qs_ctx("Duplicate ToolBar Id","editor"),
-				__tr2qs_ctx("The specified ToolBar Id already exists.<br>" \
+			if(QMessageBox::information(this,__tr2qs_ctx("Duplicate Toolbar ID","editor"),
+				__tr2qs_ctx("The specified toolbar ID already exists.<br>" \
 					"Would you like KVIrc to assign it automatically (so it doesn't "
 					"collide with any other toolbar) or you prefer to do it manually?","editor"),
 				__tr2qs_ctx("Manually","editor"),__tr2qs_ctx("Automatically","editor")) == 0)return;
@@ -301,15 +301,15 @@ CustomizeToolBarsDialog::CustomizeToolBarsDialog(QWidget * p)
 	m_pDrawer = new KviActionDrawer(this);
 	g->addWidget(m_pDrawer,0,0,7,1);
 
-	QPushButton * b = new QPushButton(__tr2qs_ctx("New ToolBar","editor"),this);
+	QPushButton * b = new QPushButton(__tr2qs_ctx("New Toolbar","editor"),this);
 	connect(b,SIGNAL(clicked()),this,SLOT(newToolBar()));
 	g->addWidget(b,0,1);
 
-	m_pDeleteToolBarButton = new QPushButton(__tr2qs_ctx("Delete ToolBar","editor"),this);
+	m_pDeleteToolBarButton = new QPushButton(__tr2qs_ctx("Delete Toolbar","editor"),this);
 	connect(m_pDeleteToolBarButton,SIGNAL(clicked()),this,SLOT(deleteToolBar()));
 	g->addWidget(m_pDeleteToolBarButton,1,1);
 
-	m_pRenameToolBarButton = new QPushButton(__tr2qs_ctx("Edit ToolBar","editor"),this);
+	m_pRenameToolBarButton = new QPushButton(__tr2qs_ctx("Edit Toolbar","editor"),this);
 	connect(m_pRenameToolBarButton,SIGNAL(clicked()),this,SLOT(renameToolBar()));
 	g->addWidget(m_pRenameToolBarButton,2,1);
 
@@ -317,7 +317,7 @@ CustomizeToolBarsDialog::CustomizeToolBarsDialog(QWidget * p)
 	f->setFrameStyle(QFrame::HLine | QFrame::Sunken);
 	g->addWidget(f,3,1);
 
-	m_pExportToolBarButton = new QPushButton(__tr2qs_ctx("Export ToolBar","editor"),this);
+	m_pExportToolBarButton = new QPushButton(__tr2qs_ctx("Export Toolbar","editor"),this);
 	connect(m_pExportToolBarButton,SIGNAL(clicked()),this,SLOT(exportToolBar()));
 	g->addWidget(m_pExportToolBarButton,4,1);
 
@@ -378,7 +378,7 @@ void CustomizeToolBarsDialog::deleteToolBar()
 	KviCustomToolBar * t = KviActionManager::currentToolBar();
 	if(!t)return;
 	if(QMessageBox::question(this,
-			__tr2qs_ctx("Confirm ToolBar Deletion","editor"),
+			__tr2qs_ctx("Confirm Toolbar Deletion","editor"),
 			__tr2qs_ctx("Do you really want to delete toolbar \"%1\"?","editor").arg(t->windowTitle()),
 			QMessageBox::Yes | QMessageBox::No,
 			QMessageBox::No) != QMessageBox::Yes)return;
@@ -402,7 +402,7 @@ void CustomizeToolBarsDialog::exportToolBar()
 	QString szCode;
 
 	int ret = QMessageBox::question(this,
-			__tr2qs_ctx("ToolBar Export","editor"),
+			__tr2qs_ctx("Toolbar Export","editor"),
 			__tr2qs_ctx("Do you want the associated actions to be exported with the toolbar?","editor"),
 			__tr2qs_ctx("Yes","editor"),
 			__tr2qs_ctx("No","editor"),
@@ -496,8 +496,8 @@ void CustomizeToolBarsDialog::newToolBar()
 {
 	CustomToolBarPropertiesDialog * dlg = new CustomToolBarPropertiesDialog(this,
 		__tr2qs_ctx("Please specify the properties for the new toolbar","editor"),
-		KviCustomToolBarManager::instance()->idForNewToolBar(__tr2qs_ctx("My ToolBar","editor")),
-		__tr2qs_ctx("My ToolBar","editor"));
+		KviCustomToolBarManager::instance()->idForNewToolBar(__tr2qs_ctx("My Toolbar","editor")),
+		__tr2qs_ctx("My Toolbar","editor"));
 
 	dlg->show();
 	if(dlg->exec() != QDialog::Accepted)
diff --git a/src/modules/torrent/KTorrentDbusInterface.cpp b/src/modules/torrent/KTorrentDbusInterface.cpp
index dc7160860..87e7a3be8 100644
--- a/src/modules/torrent/KTorrentDbusInterface.cpp
+++ b/src/modules/torrent/KTorrentDbusInterface.cpp
@@ -3,7 +3,7 @@
 //   DBus interface for KTorrent client.
 //
 //   File : KTorrentDbusInterface.h
-//   Creation date : Mod Nov 17 13:46:00 2008 GMT by Fabio Bas
+//   Creation date : Mon Nov 17 13:46:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc IRC client distribution
 //   Copyright (C) 2008 Fabio Bas (ctrlaltca at gmail dot com)
@@ -37,7 +37,7 @@
 		KTorrentDbusInterface,
 		"ktorrentdbus",
 		__tr2qs_ctx(
-			"An interface to KDE's excellent KTorrent client.\n" \
+			"An interface for KDE's excellent KTorrent client.\n" \
 			"Download it from http://www.ktorrent.org\n",
 			"torrent"
 		)
diff --git a/src/modules/torrent/KTorrentDbusInterface.h b/src/modules/torrent/KTorrentDbusInterface.h
index 8ecaa44f0..cf98e2f86 100644
--- a/src/modules/torrent/KTorrentDbusInterface.h
+++ b/src/modules/torrent/KTorrentDbusInterface.h
@@ -6,7 +6,7 @@
 //   DBus interface for KTorrent client.
 //
 //   File : KTorrentDbusInterface.h
-//   Creation date : Mod Nov 17 13:46:00 2008 GMT by Fabio Bas
+//   Creation date : Mon Nov 17 13:46:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc IRC client distribution
 //   Copyright (C) 2008 Fabio Bas (ctrlaltca at gmail dot com)
diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp
index 071a50c99..969c0cdcb 100644
--- a/src/modules/torrent/libkvitorrent.cpp
+++ b/src/modules/torrent/libkvitorrent.cpp
@@ -809,9 +809,9 @@ TC_KVS_STRINGRET_INT_FUNCTION(state, state, "torrent_number")
 	@title:
 		The torrent module
 	@body:
-		The torrent module is an interface to torrent clients. It currently supports KTorrent using dbus.[br]
+		The torrent module is an interface to torrent clients. It currently supports KTorrent using D-Bus.[br]
 		It provides the following set of commands:[br]
-		[cmd]torrent.detect[/cmd]: Performs an autodetection of installed torrent clients[br]
+		[cmd]torrent.detect[/cmd]: Performs an auto-detection of installed torrent clients[br]
 		[cmd]torrent.setClient[/cmd]: Sets the torrent client interface[br]
 		[cmd]torrent.start[/cmd]: Starts downloading of a torrent[br]
 		[cmd]torrent.stop[/cmd]: Stops downloading of a torrent[br]
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index b87d35ac1..8fdcc820f 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -624,7 +624,7 @@ static bool trayicon_kvs_cmd_show(KviKvsModuleCommandCall *)
 	@syntax:
 		trayicon.hide
 	@description:
-		Hides the  tray icon for the current frame window
+		Hides the tray icon for the current frame window
 	@seealso:
 		[cmd]trayicon.show[/cmd]
 */
diff --git a/src/modules/upnp/Manager.cpp b/src/modules/upnp/Manager.cpp
index 7d80ae177..4bb41969b 100644
--- a/src/modules/upnp/Manager.cpp
+++ b/src/modules/upnp/Manager.cpp
@@ -73,7 +73,7 @@ Manager::~Manager()
 // Initialize the manager, detect all devices
 void Manager::initialize()
 {
-	qDebug() << "UPnP::Manager: Initiating a broadcast to detect UPnP devices..." << endl;
+	qDebug() << "UPnP::Manager: initiating a broadcast to detect UPnP devices..." << endl;
 
 
 	// Create the SSDP object to detect devices
@@ -144,7 +144,7 @@ void Manager::slotBroadcastTimeout()
 {
 	if(!m_bBroadcastFoundIt)
 	{
-		qDebug() << "UPnP::Manager: Timeout, no broadcast response received!" << endl;
+		qDebug() << "UPnP::Manager: timeout, no broadcast response received!" << endl;
 
 		m_bBroadcastFailed = true;
 	}
@@ -155,7 +155,7 @@ void Manager::slotBroadcastTimeout()
 // A device was discovered by the SSDP broadcast
 void Manager::slotDeviceFound(const QString &hostname, int port, const QString &rootUrl)
 {
-	qDebug() << "UPnP::Manager: Device found, initializing IgdControlPoint to query it." << endl;
+	qDebug() << "UPnP::Manager: device found, initializing IgdControlPoint to query it." << endl;
 
 	// this blocks the action of our timeout timer
 	m_bBroadcastFoundIt = true;
diff --git a/src/modules/upnp/RootService.cpp b/src/modules/upnp/RootService.cpp
index 08fc3b7cd..abf945da8 100644
--- a/src/modules/upnp/RootService.cpp
+++ b/src/modules/upnp/RootService.cpp
@@ -158,7 +158,7 @@ RootService::~RootService()
 // Recursively add all devices and embedded devices to the deviceServices_ map
 void RootService::addDeviceServices(const QDomNode &device)
 {
-	qDebug() << "UPnP Discovered device " << XmlFunctions::getNodeValue(device, "/UDN") << endl;
+	qDebug() << "UPnP discovered device " << XmlFunctions::getNodeValue(device, "/UDN") << endl;
 
 	if(XmlFunctions::getNodeValue(device, "/deviceType") == InternetGatewayDeviceType)
 	{
@@ -173,7 +173,7 @@ void RootService::addDeviceServices(const QDomNode &device)
 
 		qDebug() << "Model: " << description << endl;
 
-		g_pApp->activeConsole()->output(KVI_OUT_GENERICSTATUS,__tr2qs_ctx("[UPNP]: Found gateway device: %s","upnp"), description.toUtf8().data());
+		g_pApp->activeConsole()->output(KVI_OUT_GENERICSTATUS,__tr2qs_ctx("[UPNP]: found gateway device: %s","upnp"), description.toUtf8().data());
 
 
 	}
diff --git a/src/modules/upnp/Service.cpp b/src/modules/upnp/Service.cpp
index 6d44d3dbf..747250531 100644
--- a/src/modules/upnp/Service.cpp
+++ b/src/modules/upnp/Service.cpp
@@ -58,7 +58,7 @@ Service::Service(const QString &hostname, int port, const QString &informationUr
 , m_iPort(port)
 {
 	m_szInformationUrl = informationUrl;
-	qDebug() << "UPnP::Service: Created information service url='" << m_szInformationUrl << "'." << endl;
+	qDebug() << "UPnP::Service: created information service url='" << m_szInformationUrl << "'." << endl;
 }
 
 
@@ -239,7 +239,7 @@ void Service::slotRequestFinished()
 {
 	QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
 
-	qDebug() << "UPnP::Service: Got HTTP response for request " << endl;
+	qDebug() << "UPnP::Service: received HTTP response for request " << endl;
 
 	if(!reply)
 	{
@@ -289,7 +289,7 @@ void Service::slotRequestFinished()
 			if(cutAt > -1)
 			{
 				baseNamespace.truncate(cutAt);
-				qDebug() << "Device is using " << baseNamespace << " as xml namespace" << endl;
+				qDebug() << "Device is using " << baseNamespace << " as XML namespace" << endl;
 				m_szBaseXmlPrefix = baseNamespace;
 			}
 		}
@@ -297,7 +297,7 @@ void Service::slotRequestFinished()
 		// Determine how to process the data
 		if(xml.namedItem(m_szBaseXmlPrefix + ":Envelope").isNull())
 		{
-			qDebug() << "UPnP::Service: Plain XML detected, calling gotInformationResponse()." << endl;
+			qDebug() << "UPnP::Service: plain XML detected, calling gotInformationResponse()." << endl;
 			// No SOAP envelope found, this is a normal response to callService()
 			gotInformationResponse( xml.lastChild() );
 		} else {
@@ -311,7 +311,7 @@ void Service::slotRequestFinished()
 			{
 				if(resultNode.nodeName().startsWith("m:") || resultNode.nodeName().startsWith("u:"))
 				{
-					qDebug() << "UPnP::Service: SOAP Envelope detected, calling gotActionResponse()." << endl;
+					qDebug() << "UPnP::Service: SOAP envelope detected, calling gotActionResponse()." << endl;
 					// Action success, return SOAP body
 					QMap<QString,QString> resultValues;
 
@@ -329,14 +329,14 @@ void Service::slotRequestFinished()
 					gotActionResponse(resultNode.nodeName().mid(2), resultValues);
 				}
 			} else {
-				qDebug() << "UPnP::Service: SOAP Error detected, calling gotActionResponse()." << endl;
+				qDebug() << "UPnP::Service: SOAP error detected, calling gotActionResponse()." << endl;
 
 				// Action failed
 				gotActionErrorResponse(resultNode);
 			}
 		}
 	} else {
-		qWarning() << "UPnP::Service - XML Parsing failed: " << errorMessage << endl;
+		qWarning() << "UPnP::Service - XML parsing failed: " << errorMessage << endl;
 	}
 
 	// Only emit when bytes>0
diff --git a/src/modules/upnp/SsdpConnection.cpp b/src/modules/upnp/SsdpConnection.cpp
index d4fdaf717..7440d10d1 100644
--- a/src/modules/upnp/SsdpConnection.cpp
+++ b/src/modules/upnp/SsdpConnection.cpp
@@ -118,7 +118,7 @@ void SsdpConnection::slotDataReceived()
 // Send a broadcast to detect all devices
 void SsdpConnection::queryDevices(int bindPort)
 {
-	qDebug() << "UPnP::SsdpConnection: Sending broadcast packet." << endl;
+	qDebug() << "UPnP::SsdpConnection: sending broadcast packet." << endl;
 
 	// Send a packet to a broadcast address
 	QHostAddress address("239.255.255.250");
@@ -134,7 +134,7 @@ void SsdpConnection::queryDevices(int bindPort)
 	bool success = m_pSocket->bind(bindPort);
 	if(! success)
 	{
-		qDebug() << "UPnP::SsdpConnection: Failed to bind to port " << bindPort << "." << endl;
+		qDebug() << "UPnP::SsdpConnection: failed to bind to port " << bindPort << "." << endl;
 	}
 
 	// Send the data
@@ -143,7 +143,7 @@ void SsdpConnection::queryDevices(int bindPort)
 
 	if(bytesWritten == -1)
 	{
-		qDebug() << "UPnP::SsdpConnection: Failed to send the UPnP broadcast packet." << endl;
+		qDebug() << "UPnP::SsdpConnection: failed to send the UPnP broadcast packet." << endl;
 	}
 }
 
diff --git a/src/modules/upnp/WanConnectionService.cpp b/src/modules/upnp/WanConnectionService.cpp
index 9c900f9b6..9073bb89a 100644
--- a/src/modules/upnp/WanConnectionService.cpp
+++ b/src/modules/upnp/WanConnectionService.cpp
@@ -113,7 +113,7 @@ const KviPointerList<PortMapping>& WanConnectionService::getPortMappings() const
 // The control point received a response to callAction()
 void WanConnectionService::gotActionResponse(const QString &responseType, const QMap<QString,QString> &resultValues)
 {
-	qDebug() << "UPnP::WanConnectionService: Parsing action response:"
+	qDebug() << "UPnP::WanConnectionService: parsing action response:"
 		<< " type='" << responseType << "'." << endl;
 
 	// Check the message type
@@ -149,17 +149,17 @@ void WanConnectionService::gotActionResponse(const QString &responseType, const
 		// Register the mapping
 		m_lPortMappings.append(map);
 
-		qDebug() << "UPnP::WanConnectionService - Got mapping: " << map->protocol << " " << map->remoteHost << ":" << map->externalPort
+		qDebug() << "UPnP::WanConnectionService - Received mapping: " << map->protocol << " " << map->remoteHost << ":" << map->externalPort
 			<< " to " << map->internalClient << ":" << map->internalPort
 			<< "    max " << map->leaseDuration << "s '" << map->description << "' " << (map->enabled ? "enabled" : "disabled") << endl;
 	}
 	else if(responseType == "AddPortMappingResponse")
 	{
-		qDebug() << "UPnP::WanConnectionService - Got mapping enabled" << endl;
+		qDebug() << "UPnP::WanConnectionService - Received mapping enabled" << endl;
 	}
 	else if(responseType == "DeletePortMappingResponse")
 	{
-		qDebug() << "UPnP::WanConnectionService - Got mapping disabled" << endl;
+		qDebug() << "UPnP::WanConnectionService - Received mapping disabled" << endl;
 	}
 	else
 	{
diff --git a/src/modules/upnp/XmlFunctions.cpp b/src/modules/upnp/XmlFunctions.cpp
index 1fe7d0a7a..39927fe74 100644
--- a/src/modules/upnp/XmlFunctions.cpp
+++ b/src/modules/upnp/XmlFunctions.cpp
@@ -56,7 +56,7 @@ QDomNode XmlFunctions::getNode( const QDomNode &rootNode, const QString &path )
   }
 
   if( childNode.isNull() ) {
-      qDebug() << "XmlFunctions::getNode() - notice: node '" << pathItems[ i - 1 ] << "'"
+      qDebug() << "XmlFunctions::getNode() - Notice: node '" << pathItems[ i - 1 ] << "'"
                 << " does not exist (root=" << rootNode.nodeName() << " path=" << path << ")." << endl;
   }
 
@@ -106,7 +106,7 @@ QString XmlFunctions::getNodeValue( const QDomNode &rootNode, const QString &pat
   // Added code to avoid more assertion errors, and trace the cause.
   if( rootNode.isNull() )
   {
-    qWarning() << "XmlFunctions::getNodeValue: Attempted to request '" << path << "' on null root node." << endl;
+    qWarning() << "XmlFunctions::getNodeValue: attempted to request '" << path << "' on null root node." << endl;
     return QString();
   }
 
diff --git a/src/modules/upnp/igdcontrolpoint.cpp b/src/modules/upnp/igdcontrolpoint.cpp
index b34ade01f..7ed70ed92 100644
--- a/src/modules/upnp/igdcontrolpoint.cpp
+++ b/src/modules/upnp/igdcontrolpoint.cpp
@@ -52,7 +52,7 @@ IgdControlPoint::IgdControlPoint(const QString &hostname, int port, const QStrin
 , m_pRootService(0)
 , m_pWanConnectionService(0)
 {
-	qDebug() << "CREATED UPnP::IgdControlPoint: Created control point"
+	qDebug() << "CREATED UPnP::IgdControlPoint: created control point"
 		<< " url='" << hostname << ":" << port << "/" << rootUrl << "'." << endl;
 
 	qDebug() << "UPnP::IgdControlPoint: querying services..." << endl;
@@ -123,15 +123,15 @@ void IgdControlPoint::slotDeviceQueried(bool error)
 
 			m_bGatewayAvailable = true;
 
-			qDebug() << "UPnP::IgdControlPoint: wan/ipconnection service found, "
-					<< "querying service '" << params.serviceId << "' for external ip address..." << endl;
+			qDebug() << "UPnP::IgdControlPoint: WAN/IP connection service found, "
+					<< "querying service '" << params.serviceId << "' for external IP address..." << endl;
 
 			// Call the service
 			m_pWanConnectionService = new WanConnectionService(params);
 			connect(m_pWanConnectionService, SIGNAL(queryFinished(bool)), this, SLOT(slotWanQueryFinished(bool)));
 			m_pWanConnectionService->queryExternalIpAddress();
 		} else {
-			qDebug() << "UPnP::IgdControlPoint: no ppp/ipconnection service found :(" << endl;
+			qDebug() << "UPnP::IgdControlPoint: no PPP/IP connection service found :(" << endl;
 		}
 	}
 }
@@ -142,10 +142,10 @@ void IgdControlPoint::slotWanQueryFinished(bool error)
 {
 	if(! error)
 	{
-		qDebug() << "IgdControlPoint: UPnP Gateway Device found." << endl;
+		qDebug() << "IgdControlPoint: UPnP gateway device found." << endl;
 	} else {
 		// Just started, the request for the external IP failed. This should succeed, abort portation
-		qDebug() << "Requesting external IP address failed, leaving UPnP Gateway Device untouched." << endl;
+		qDebug() << "Requesting external IP address failed, leaving UPnP gateway device untouched." << endl;
 	}
 }
 
diff --git a/src/modules/upnp/libkviupnp.cpp b/src/modules/upnp/libkviupnp.cpp
index bf44bac5b..bd04abf84 100644
--- a/src/modules/upnp/libkviupnp.cpp
+++ b/src/modules/upnp/libkviupnp.cpp
@@ -40,13 +40,13 @@ UPnP::Manager* g_pManager = 0;
 	@title:
 		$upnp.getExternalIpAddress
 	@short:
-		Return the external ip address using UPnP
+		Return the external IP address using UPnP
 	@syntax:
 		<string> $upnp.getExternalIpAddress()
 	@description:
-		During the loading of the UPnP module (and during a [cmd]upnp.refresh[/cmd]), KVIrc searches the gateway of your local network. If a gateway is found, KVIrc requests it the external Ip address associated to the router and caches it.[br]
+		During the loading of the UPnP module (and during a [cmd]upnp.refresh[/cmd]), KVIrc searches the gateway of your local network. If a gateway is found, KVIrc requests it the external IP address associated to the router and caches it.[br]
 		Using this function you can get this cached value.[br]
-		Take care that if no gateway have been found or it returned no external Ip address (this can happens if its upstream  (wan) link is not connected), this function returns an empty string.[br]
+		Take care that if no gateway have been found or it returned no external IP address (this can happens if its upstream  (WAN) link is not connected), this function returns an empty string.[br]
 		It's better to check is a gateway has been found using [fnc]$upnp.isGatewayAvailable[/fnc] before using this function.
 	@seealso:
 		[fnc]$upnp.isGatewayAvailable[/fnc]
@@ -73,7 +73,7 @@ static bool upnp_kvs_fnc_getExternalIpAddress(KviKvsModuleFunctionCall * c)
 		<bool> $upnp.isGatewayAvailable()
 	@description:
 		Returns if a UPnP-capable gateway has been found on the local network.[br]
-		If this function returns false (0), no other command or function from the upnp module will work.
+		If this function returns false (0), no other command or function from the UPnP module will work.
 */
 static bool upnp_kvs_fnc_isGatewayAvailable(KviKvsModuleFunctionCall * c)
 {
@@ -101,7 +101,7 @@ static bool upnp_kvs_fnc_isGatewayAvailable(KviKvsModuleFunctionCall * c)
 		interface.[br]
 	@description:
 		Makes a request to the gateway of the local network using UPnP; the request asks the gateway to add an entry in its port mapping table.[br]
-		If the gateway accepts the request, it will forward packets received on <port> on its external (wan) ip address to the host KVIrc is running at, on the same <port>.
+		If the gateway accepts the request, it will forward packets received on <port> on its external (WAN) IP address to the host KVIrc is running at, on the same <port>.
 		Depending on vendors, this is called with different names: Port forwarding, SUA, Virtual Server, PAT, ...
 		It's better to check is a gateway has been found using [fnc]$upnp.isGatewayAvailable[/fnc] before using this function.
 	@seealso:
@@ -170,7 +170,7 @@ static bool upnp_kvs_cmd_delPortMapping(KviKvsModuleCommandCall * c)
 		upnp.refresh
 	@description:
 		Rescan the local network for a gateway using UPnP.[br]
-		This command is automatically executed when KVIrc loads the upnp module.
+		This command is automatically executed when KVIrc loads the UPnP module.
 	@seealso:
 		[fnc]$upnp.isGatewayAvailable[/fnc]
 */
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index c40f4c1d6..b9e205a56 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -514,7 +514,7 @@ void BanFrame::enableClicked()
 void BanFrame::addBan()
 {
 	bool ok = false;
-	QString *pText = new QString(QInputDialog::getText(this, __tr2qs("URL Ban List"),__tr2qs("Add"),QLineEdit::Normal,QString(),&ok));
+	QString *pText = new QString(QInputDialog::getText(this, __tr2qs("URL Ban List"),__tr2qs("Add a URL to ban"),QLineEdit::Normal,QString(),&ok));
 	if (ok && !pText->isEmpty()) {
 		g_pBanList->append(pText);
 		m_pBanList->addItem(*pText);
diff --git a/src/modules/userlist/libkviuserlist.cpp b/src/modules/userlist/libkviuserlist.cpp
index 627d9303c..0ce8d00a0 100644
--- a/src/modules/userlist/libkviuserlist.cpp
+++ b/src/modules/userlist/libkviuserlist.cpp
@@ -42,7 +42,7 @@
 		if(!pWnd) \
 		{ \
 			if(!c->hasSwitch('q',"quiet")) \
-				c->warning(__tr2qs("The window with id '%s' does not exist"),szWnd.toUtf8().data()); \
+				c->warning(__tr2qs("The window with ID '%s' doesn't exist"),szWnd.toUtf8().data()); \
 			return true; \
 		} \
 	} \
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 036c43dbf..97cdc276f 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -74,7 +74,7 @@ KviPointerList<UserWindow> * g_pUserWindowList = 0;
 		if(!pWnd) \
 		{ \
 			if(!c->hasSwitch('q',"quiet")) \
-				c->warning(__tr2qs("The window with id '%s' does not exist"),szWnd.toUtf8().data()); \
+				c->warning(__tr2qs("The window with ID '%s' doesn't exist"),szWnd.toUtf8().data()); \
 			return true; \
 		} \
 	}
@@ -267,7 +267,7 @@ static bool window_kvs_cmd_activate(KviKvsModuleCommandCall * c)
 		system taskbar entry will be flashed.
 		Please note that this command is highly system dependant:
 		on systems that do not have a system taskbar or there
-		is no way to flash an etry this command will do nothing.
+		is no way to flash an entry this command will do nothing.
 		At the time of writing this command works flawlessly on
 		Windows and in KDE compilations.
 	@seealso:
@@ -464,9 +464,9 @@ static bool window_kvs_fnc_hasUserFocus(KviKvsModuleFunctionCall * c)
 		$window.console
 		$window.console(<window_id>)
 	@description:
-		Returns the id of the console window that the window specified by window_id is attached to.
+		Returns the ID of the console window that the window specified by window_id is attached to.
 		The console is the main (and only) console of the IRC context. If window_id is missing then
-		the current window is used. If this window does not belong to an irc context (and thus has
+		the current window is used. If this window does not belong to an IRC context (and thus has
 		no attached console) then 0 is returned.
 	@seealso:
 */
@@ -577,7 +577,7 @@ static bool window_kvs_cmd_highlight(KviKvsModuleCommandCall * c)
 		if(!pWnd)
 		{
 			if(!c->hasSwitch('q',"quiet"))
-				c->warning(__tr2qs("The window with id '%s' does not exist"),szWnd.toUtf8().data());
+				c->warning(__tr2qs("The window with ID '%s' doesn't exist"),szWnd.toUtf8().data());
 			return true;
 		}
 	}
@@ -603,9 +603,9 @@ static bool window_kvs_cmd_highlight(KviKvsModuleCommandCall * c)
 	@description:
 		Every window has a current alert level; it corresponds to an highlight color of that window in the window list.
 		There are 6 defined levels, they start from 0 (normal) to 5 (max alarm level). The classic window list and the tree window list use different colors to represent these levels. Classic task bar uses options:
-		[ul][li]colorWindowListNormalText : normale state[/li][li]colorWindowListHighlight1Text : highlight state 1[/li][li]...[/li][li]colorWindowListHighlight5Text : highlight state 5[/li][/ul]
+		[ul][li]colorWindowListNormalText : normal state[/li][li]colorWindowListHighlight1Text : highlight state 1[/li][li]...[/li][li]colorWindowListHighlight5Text : highlight state 5[/li][/ul]
 		While the tree window list uses options:
-		[ul][li]colorTreeWindowListForeground : normale state[/li][li]colorTreeWindowListHighlight1Foreground : highlight state 1[/li][li]...[/li][li]colorTreeWindowListHighlight5Foreground : highlight state 5[/li][/ul]
+		[ul][li]colorTreeWindowListForeground : normal state[/li][li]colorTreeWindowListHighlight1Foreground : highlight state 1[/li][li]...[/li][li]colorTreeWindowListHighlight5Foreground : highlight state 5[/li][/ul]
 		You can use [fnc]$option[/fnc] to read these options and the [cmd]option[/cmd] command to set them.
 	@seealso:
 		[fnc]$window.activityTemperature[/fnc]
@@ -642,7 +642,7 @@ static bool window_kvs_fnc_highlightLevel(KviKvsModuleFunctionCall * c)
 	@description:
 		Returns the type of the window with <window_id>.[br]
 		The form with no parameters returns the type of the current window.[br]
-		If the window with the specified id does not exist, an empty string is returned.[br]
+		If the window with the specified ID does not exist, an empty string is returned.[br]
 	@seealso:
 */
 
@@ -670,7 +670,7 @@ static bool window_kvs_fnc_type(KviKvsModuleFunctionCall * c)
 	@description:
 		Returns the IRC context of the window with the specified <window_id>.[br]
 		The form with no parameters returns the IRC context of the current window.[br]
-		If the window with the specified id does not exist, an empty string is returned.[br]
+		If the window with the specified ID does not exist, an empty string is returned.[br]
 	@seealso:
 */
 
@@ -698,7 +698,7 @@ static bool window_kvs_fnc_context(KviKvsModuleFunctionCall * c)
 	@description:
 		Returns the caption of the window with <window_id>.[br]
 		The form with no parameters returns the caption of the current window.[br]
-		If the window with the specified id does not exist, an empty string is returned.[br]
+		If the window with the specified ID does not exist, an empty string is returned.[br]
 	@seealso:
 */
 
@@ -752,31 +752,31 @@ static bool window_kvs_cmd_listtypes(KviKvsModuleCommandCall * c)
 		<type> is a window type such as 'query' or 'channel'.[br]
 		See [cmd]window.listtypes[/cmd] for a list of available window types in this KVIrc release.[br]
 		If <type> is the special word 'all', all the window types are listed.[br]
-		<irc_context_id> specifies the irc context in which the windows are searched.[br]
+		<irc_context_id> specifies the IRC context in which the windows are searched.[br]
 		If no <irc_context_id> is specified, the current one is used.[br]
-		If <irc_context_id> is the special word 'all', all the irc context are searched.[br]
+		If <irc_context_id> is the special word 'all', all the IRC context are searched.[br]
 		If <irc_context_id> is the special word 'none' then only windows not belonging to any
 		irc context are listed.[br]
 		The special word 'any' used as <irc_context_id> merges the effects of 'all' and 'none'
-		by searching all the irc contexts AND the windows not belonging to any irc context.[br]
-		The windows that do not belong to any irc context (such as DCC windows), must be searched
+		by searching all the IRC contexts AND the windows not belonging to any IRC context.[br]
+		The windows that do not belong to any IRC context (such as DCC windows), must be searched
 		by using 'none' or 'any' as <irc_context_id>.
 	@examples:
 		[example]
-			[comment]# List all the queries of the current irc context[/comment]
+			[comment]# List all the queries of the current IRC context[/comment]
 			[cmd]echo[/cmd] $window.list(query)
 			[comment]# Equivalent to the above[/comment]
 			[cmd]echo[/cmd] $window.list(query,[fnc]$ic[/fnc])
-			[comment]# List all the channels in all the irc contexts[/comment]
+			[comment]# List all the channels in all the IRC contexts[/comment]
 			[cmd]echo[/cmd] $window.list(channel,all)
-			[comment]# List all the windows in the current irc context[/comment]
+			[comment]# List all the windows in the current IRC context[/comment]
 			[cmd]echo[/cmd] $window.list(all)
-			[comment]# List all the windows in all irc contexts[/comment]
+			[comment]# List all the windows in all IRC contexts[/comment]
 			[cmd]echo[/cmd] $window.list(all,all)
-			[comment]# List all the DCC Send windows: They don't belong to any irc context[/comment]
+			[comment]# List all the DCC Send windows: They don't belong to any IRC context[/comment]
 			[cmd]echo[/cmd] $window.list(dcctransfer,none)
 			[comment]# List all the user windows created with $window.open[/comment]
-			[comment]# They may either belong to an irc context or not[/comment]
+			[comment]# They may either belong to an IRC context or not[/comment]
 			[cmd]echo[/cmd] $window.list(userwnd,any)
 			[comment]# Ok, let's use it[/comment]
 			[comment]# A nice alias that allows iterating commands through all the consoles[/comment]
@@ -905,7 +905,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 			uId = szContext.toUInt(&bOk);
 			if(!bOk)
 			{
-				c->warning(__tr2qs("Invalid IRC context id '%Q'"),&szContext);
+				c->warning(__tr2qs("Invalid IRC context ID '%Q'"),&szContext);
 				return true;
 			}
 		} else {
@@ -966,7 +966,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 		[b]q[/b]: Don't print warning messages during the creation.[br]
 		If <caption> is given then the new window will have it as the initial plain text <caption>.
 		You can change the caption later by calling [cmd]window.setWindowTitle[/cmd].[br]
-		If <irc_context> is given then the new window is bound to the specified irc context
+		If <irc_context> is given then the new window is bound to the specified IRC context
 		and will be destroyed when the attached console closes.
 		If <irc_context> is omitted or is 0 then the window will be context free (not bound
 		to any context) and will exist until it is closed by the GUI, by a [cmd]window.close[/cmd]
@@ -1004,7 +1004,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 	QPixmap *pPix=g_pIconManager->getImage(szIcon);
 	if(!pPix){
 
-	    c->warning(__tr2qs("The specified icon does not exist: switching to 'none'"));
+	    c->warning(__tr2qs("The specified icon doesn't exist: switching to 'none'"));
 	    szIcon.prepend("$icon(");
 	    szIcon.append(")");
 	}
@@ -1068,7 +1068,7 @@ static bool window_kvs_cmd_setWindowTitle(KviKvsModuleCommandCall * c)
 	if(!pWnd)
 	{
 		if(!c->hasSwitch('q',"quiet"))
-			c->warning(__tr2qs("The window with id '%s' does not exist"),szWnd.toUtf8().data());
+			c->warning(__tr2qs("The window with ID '%s' doesn't exist"),szWnd.toUtf8().data());
 		return true;
 	}
 
@@ -1116,7 +1116,7 @@ static bool window_kvs_cmd_setInputText(KviKvsModuleCommandCall * c)
 	if(!pWnd)
 	{
 		if(!c->hasSwitch('q',"quiet"))
-			c->warning(__tr2qs("The window with id '%s' does not exist"),szWnd.toUtf8().data());
+			c->warning(__tr2qs("The window with ID '%s' doesn't exist"),szWnd.toUtf8().data());
 		return true;
 	}
 	if(pWnd->input())
@@ -1161,7 +1161,7 @@ static bool window_kvs_cmd_insertInInputText(KviKvsModuleCommandCall * c)
 	if(!pWnd)
 	{
 		if(!c->hasSwitch('q',"quiet"))
-			c->warning(__tr2qs("The window with id '%s' does not exist"),szWnd.toUtf8().data());
+			c->warning(__tr2qs("The window with ID '%s' doesn't exist"),szWnd.toUtf8().data());
 		return true;
 	}
 	if(pWnd->input())
@@ -1234,7 +1234,7 @@ static bool window_kvs_cmd_setBackground(KviKvsModuleCommandCall * c)
 	if(!pWnd)
 	{
 		if(!c->hasSwitch('q',"quiet"))
-			c->warning(__tr2qs("The window with id '%s' does not exist"),szWnd.toUtf8().data());
+			c->warning(__tr2qs("The window with ID '%s' doesn't exist"),szWnd.toUtf8().data());
 		return true;
 	}
 
@@ -1310,7 +1310,7 @@ static bool initializeCryptEngine(KviCryptEngine * eng,KviCString &szEncryptKey,
 		KviMemory::move(encKey,tmpKey,encKeyLen);
 		KviCString::freeBuffer(tmpKey);
 	} else {
-		szError = __tr2qs("The encrypt key wasn't a valid hexadecimal string");
+		szError = __tr2qs("The encryption key wasn't a valid hexadecimal string");
 		return false;
 	}
 
@@ -1324,7 +1324,7 @@ static bool initializeCryptEngine(KviCryptEngine * eng,KviCString &szEncryptKey,
 		KviMemory::move(decKey,tmpKey,decKeyLen);
 		KviCString::freeBuffer(tmpKey);
 	} else {
-		szError = __tr2qs("The decrypt key wasn't a valid hexadecimal string");
+		szError = __tr2qs("The decryption key wasn't a valid hexadecimal string");
 		return false;
 	}
 	bool bRet = eng->init(encKey,encKeyLen,decKey,decKeyLen);
@@ -1355,7 +1355,7 @@ static bool initializeCryptEngine(KviCryptEngine * eng,KviCString &szEncryptKey,
 		Disables decryption
 	@description:
 		Sets the specified [doc:crypt_engines]cryptographic engine[/doc] for the window. If <enginename> is empty
-		then any current crypting engine is removed (i.e. crypting is disabled).
+		then any current encryption engine is removed (i.e. encrypting is disabled).
 		The must be both expressed in hexadecimal notation and are internally transformed in bytes.
 		If only the encrypt key is specified then it will be used for both encrypting and
 		decrypting. This command works only if crypt support is compiled in.
@@ -1393,7 +1393,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c)
 	if(!pWnd)
 	{
 		if(!c->hasSwitch('q',"quiet"))
-			c->warning(__tr2qs("The window with id '%s' does not exist"),szWnd.toUtf8().data());
+			c->warning(__tr2qs("The window with ID '%s' doesn't exist"),szWnd.toUtf8().data());
 		return true;
 	}
 	if(c->hasSwitch('n',"onlydecrypt") && c->hasSwitch('m',"onlyencrypt"))
@@ -1409,7 +1409,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c)
 		if(szEncryptKey.isEmpty() || szDecryptKey.isEmpty())
 		{
 			if(!c->hasSwitch('q',"quiet"))
-				c->warning(__tr2qs("No encrypt key specified: can't allocate engine"));
+				c->warning(__tr2qs("No encryption key specified: can't allocate engine"));
 			return true;
 		}
 
@@ -1438,7 +1438,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c)
 			}
 		} else {
 			if(!c->hasSwitch('q',"quiet"))
-				c->warning(__tr2qs("The crypt engine \"%Q\" does not exist"),&szEngine);
+				c->warning(__tr2qs("The crypt engine \"%Q\" doesn't exist"),&szEngine);
 		}
 	}
 #else