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

25 files changed, 148 insertions, 143 deletions

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();