various files: typos/consistency and capitalization see notes below.

https://techbase.kde.org/Projects/Usability/HIG/Capitalization

This was just done last minute over some notes I had made during earlier similar fixes.
* dont capitalize prepositions/conjunctions with less than 5 letters + fix wrong plural.

* freenode is all lowercase instance only.

* tooltips are not Camel Case capitalization style either.

* some centered text on a dialog when all the etxt is left aligned looks off, tootips we can give a pass to.

* Tree items are Camel Case

* Typos in Unknow channel modes

* more tooltips in the Channel Mode/Ban Masks/Invite but flawed design on these
  The tooltips text doubles up as title one isnt capitalized and the other is...
  So now none are in this area only since unlike toolbars thers no test display here and its passable.
  Alternative is to fix these dialogs and toolbars and tbh I cant do it.

* cannot vs can't : these are consistency fixes for strings and debug messages only.

* about dialog group titles "Runtime Info" "Build Info" are Camel Cased as per capitalization guidelines, but label are like all other labels.

s spaces

tyyt

57 files changed, 208 insertions, 208 deletions

diff --git a/src/modules/about/AboutDialog.cpp b/src/modules/about/AboutDialog.cpp
index b401e73f0..fb7eecde7 100644
--- a/src/modules/about/AboutDialog.cpp
+++ b/src/modules/about/AboutDialog.cpp
@@ -121,7 +121,7 @@ AboutDialog::AboutDialog()
 	infoString += "<b>";
 	infoString += __tr2qs_ctx("Runtime Info","about");
 	infoString += ":</b><br>";
-	infoString += __tr2qs_ctx("System Name","about");
+	infoString += __tr2qs_ctx("System name","about");
 	infoString += ": ";
 	infoString += KviOsInfo::name();
 #ifndef COMPILE_ON_MAC
@@ -129,7 +129,7 @@ AboutDialog::AboutDialog()
 	infoString += KviOsInfo::release();
 #endif
 	infoString += "<br>";
-	infoString += __tr2qs_ctx("System Version","about");
+	infoString += __tr2qs_ctx("System version","about");
 	infoString += ": ";
 	infoString += KviOsInfo::version();
 	infoString += "<br>";
@@ -137,51 +137,51 @@ AboutDialog::AboutDialog()
 	infoString += ": ";
 	infoString += KviOsInfo::machine();
 	infoString += "<br>";
-	infoString += __tr2qs_ctx("Qt Version","about");
+	infoString += __tr2qs_ctx("Qt version","about");
 	infoString += ": ";
 	infoString += KviOsInfo::qtVersion();
 	infoString += "<br><br>";
 	infoString += "<b>";
 	infoString += __tr2qs_ctx("Build Info","about");
 	infoString += ":</b><br>";
-	infoString += __tr2qs_ctx("Build Date","about");
+	infoString += __tr2qs_ctx("Build date","about");
 	infoString += ": ";
 	infoString += KviBuildInfo::buildDate();
 	infoString += "<br>";
-	infoString += __tr2qs_ctx("Sources Date","about");
+	infoString += __tr2qs_ctx("Sources date","about");
 	infoString += ": ";
 	infoString += KviBuildInfo::buildSourcesDate();
 	infoString += "<br>";
-	infoString += __tr2qs_ctx("Revision Number","about");
+	infoString += __tr2qs_ctx("Revision number","about");
 	infoString += ": ";
 	infoString += KviBuildInfo::buildRevision();
 	infoString += "<br>";
-	infoString += __tr2qs_ctx("System Name","about");
+	infoString += __tr2qs_ctx("System name","about");
 	infoString += ": ";
 	infoString += KviBuildInfo::buildSystem();
 	infoString += "<br>";
-	infoString += __tr2qs_ctx("CPU Name","about");
+	infoString += __tr2qs_ctx("CPU name","about");
 	infoString += ": ";
 	infoString += KviBuildInfo::buildCPU();
 	infoString += "<br>";
-	infoString += __tr2qs_ctx("Build Command","about");
+	infoString += __tr2qs_ctx("Build command","about");
 	infoString += ": ";
 	infoString += KviBuildInfo::buildCommand();
 	infoString += "<br>";
-	infoString += __tr2qs_ctx("Build Flags","about");
+	infoString += __tr2qs_ctx("Build flags","about");
 	infoString += ": <br>&nbsp;&nbsp;&nbsp;";
 	QString flags = KviBuildInfo::buildFlags();
 	infoString += flags.replace(QRegExp(";"),"<br>&nbsp;&nbsp;&nbsp;");
 	infoString += "<br>";
-	infoString += __tr2qs_ctx("Compiler Name","about");
+	infoString += __tr2qs_ctx("Compiler name","about");
 	infoString += ": ";
 	infoString += KviBuildInfo::buildCompiler();
 	infoString += "<br>";
-	infoString += __tr2qs_ctx("Compiler Flags","about");
+	infoString += __tr2qs_ctx("Compiler flags","about");
 	infoString += ": ";
 	infoString += KviBuildInfo::buildCompilerFlags();
 	infoString += "<br>";
-	infoString += __tr2qs_ctx("Qt Version","about");
+	infoString += __tr2qs_ctx("Qt version","about");
 	infoString += ": ";
 	infoString += KviBuildInfo::qtVersion();
 
diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp
index 659eb77d1..3cbdfe6ec 100644
--- a/src/modules/action/libkviaction.cpp
+++ b/src/modules/action/libkviaction.cpp
@@ -233,7 +233,7 @@ static bool action_kvs_cmd_disable(KviKvsModuleCommandCall * c)
 		Please note that you CAN'T destroy core actions, you can destroy
 		only script actions that have been defined by the user (or other scripts).
 	@seealso:
-		# this will trigger a warning and NOT work
+		[comment]This will trigger a warning and [b]not[/b] work[/comment]
 		action.destroy connect
 */
 
@@ -252,7 +252,7 @@ static bool action_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
 			a->suicide();
 		} else {
 			if(!c->switches()->find('q',"quiet"))
-				c->warning(__tr2qs("The action \"%1\" is a core action and cannot be destroyed").arg(szName));
+				c->warning(__tr2qs("The action \"%1\" is a core action and can't be destroyed").arg(szName));
 		}
 	} else {
 		if(!c->switches()->find('q',"quiet"))
@@ -416,7 +416,7 @@ static bool action_kvs_cmd_create(KviKvsModuleCallbackCommandCall * c)
 		if(old->isKviUserActionNeverOverrideThis())
 			old->suicide();
 		else {
-			c->warning(__tr2qs("The action \"%1\" is already defined as core action and cannot be overridden").arg(szName));
+			c->warning(__tr2qs("The action \"%1\" is already defined as core action and can't be overridden").arg(szName));
 			return false;
 		}
 	}
diff --git a/src/modules/addon/PackAddonDialog.cpp b/src/modules/addon/PackAddonDialog.cpp
index 75f4a458b..357ac6227 100644
--- a/src/modules/addon/PackAddonDialog.cpp
+++ b/src/modules/addon/PackAddonDialog.cpp
@@ -201,7 +201,7 @@ PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent
 	QGridLayout * pLayout = new QGridLayout(this);
 
 	QLabel * pLabel = new QLabel(this);
-	pLabel->setText(__tr2qs_ctx("Package &Author:","addon"));
+	pLabel->setText(__tr2qs_ctx("Package &author:","addon"));
 	pLayout->addWidget(pLabel,0,0);
 
 	m_pPackageAuthorEdit = new QLineEdit(this);
@@ -210,7 +210,7 @@ PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent
 	pLayout->addWidget(m_pPackageAuthorEdit,0,1);
 
 	pLabel = new QLabel(this);
-	pLabel->setText(__tr2qs_ctx("Package &Name:","addon"));
+	pLabel->setText(__tr2qs_ctx("Package &name:","addon"));
 	pLayout->addWidget(pLabel,1,0);
 
 	m_pPackageNameEdit = new QLineEdit(this);
@@ -219,7 +219,7 @@ PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent
 	pLayout->addWidget(m_pPackageNameEdit,1,1);
 
 	pLabel = new QLabel(this);
-	pLabel->setText(__tr2qs_ctx("Package &Version:","addon"));
+	pLabel->setText(__tr2qs_ctx("Package &version:","addon"));
 	pLayout->addWidget(pLabel,2,0);
 
 	m_pPackageVersionEdit = new QLineEdit(this);
@@ -228,7 +228,7 @@ PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent
 	pLayout->addWidget(m_pPackageVersionEdit,2,1);
 
 	pLabel = new QLabel(this);
-	pLabel->setText(__tr2qs_ctx("Package &Description:","addon"));
+	pLabel->setText(__tr2qs_ctx("Package &description:","addon"));
 	pLayout->addWidget(pLabel,3,0);
 
 	m_pPackageDescriptionEdit = new QLineEdit(this);
@@ -237,7 +237,7 @@ PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent
 	pLayout->addWidget(m_pPackageDescriptionEdit,3,1);
 
 	pLabel = new QLabel(this);
-	pLabel->setText(__tr2qs_ctx("Minimum &KVIrc Version:","addon"));
+	pLabel->setText(__tr2qs_ctx("Minimum &KVIrc version:","addon"));
 	pLayout->addWidget(pLabel,4,0);
 
 	m_pPackageMinVersionEdit = new QLineEdit(this);
@@ -360,35 +360,35 @@ void PackAddonSummaryInfoWidget::initializePage()
 
 	QString szText = __tr2qs_ctx("This is what I will check for:","addon");
 	szText += "<br><br><b>";
-	szText += __tr2qs_ctx("Package Author","addon");
+	szText += __tr2qs_ctx("Package author","addon");
 	szText += ":</b> ";
 	szText += szAuthor;
 	szText += "<br><b>";
-	szText += __tr2qs_ctx("Package Name","addon");
+	szText += __tr2qs_ctx("Package name","addon");
 	szText += ":</b> ";
 	szText += szName;
 	szText += "<br><b>";
-	szText += __tr2qs_ctx("Package Version","addon");
+	szText += __tr2qs_ctx("Package version","addon");
 	szText += ":</b> ";
 	szText += szVersion;
 	szText += "<br><b>";
-	szText += __tr2qs_ctx("Package Description","addon");
+	szText += __tr2qs_ctx("Package description","addon");
 	szText += ":</b> ";
 	szText += szDescription;
 	szText += "<br><b>";
-	szText += __tr2qs_ctx("Minimum KVIrc Version","addon");
+	szText += __tr2qs_ctx("Minimum KVIrc version","addon");
 	szText += ":</b> ";
 	szText += szMinVersion;
 	szText += "<br><b>";
-	szText += __tr2qs_ctx("Image File","addon");
+	szText += __tr2qs_ctx("Image file","addon");
 	szText += ":</b> ";
 	szText += szImage;
 	szText += "<br><b>";
-	szText += __tr2qs_ctx("Source Directory","addon");
+	szText += __tr2qs_ctx("Source directory","addon");
 	szText += ":</b> ";
 	szText += szDirPath;
 	szText += "<br><b>";
-	szText += __tr2qs_ctx("Save Path","addon");
+	szText += __tr2qs_ctx("Save path","addon");
 	szText += ":</b> ";
 	szText += szSavePath;
 
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index 8fb7ba377..a33aac16d 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -143,7 +143,7 @@ static bool addon_kvs_cmd_list(KviKvsModuleCommandCall * c)
 	KviPointerHashTableIterator<QString,KviKvsScriptAddon> it(*da);
 	while(KviKvsScriptAddon * a = it.current())
 	{
-		c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("%cAddon id %Q, version %Q%c","addon"),KviControlCodes::Bold,&(a->name()),&(a->version()),KviControlCodes::Bold);
+		c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("%cAddon ID %Q, version %Q%c","addon"),KviControlCodes::Bold,&(a->name()),&(a->version()),KviControlCodes::Bold);
 		c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Name: %Q","addon"),&(a->visibleName()));
 		c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Description: %Q","addon"),&(a->description()));
 
@@ -411,7 +411,7 @@ static bool addon_kvs_cmd_sethelpcallback(KviKvsModuleCallbackCommandCall * c)
 		!sw: -n | --no-uninstall
 			Performs no uninstallation of existing versions of the addon:
 			it simply replaces the registration entry with the new data.
-			Again, do NOT use this switch if not for debugging purposes
+			Again, do [b]not[/b] use this switch if not for debugging purposes
 			and on your own machine.
 		!sw: -q | --quiet
 			Makes the command run quietly
diff --git a/src/modules/aliaseditor/AliasEditorWindow.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp
index bdd54c845..8ad17a05a 100644
--- a/src/modules/aliaseditor/AliasEditorWindow.cpp
+++ b/src/modules/aliaseditor/AliasEditorWindow.cpp
@@ -585,7 +585,7 @@ void AliasEditorWidget::customContextMenuRequested(const QPoint pnt)
 
 	m_pContextPopup->addAction(
 			*(g_pIconManager->getSmallIcon(KviIconManager::Floppy)),
-			__tr2qs_ctx("Export Selected in singles files...","editor"),
+			__tr2qs_ctx("Export Selected in Single Files...","editor"),
             this,SLOT(exportSelectedSepFiles()))
             ->setEnabled(bHasSelected);
 
diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp
index 174424e5d..ea92889e3 100644
--- a/src/modules/classeditor/ClassEditorWindow.cpp
+++ b/src/modules/classeditor/ClassEditorWindow.cpp
@@ -926,7 +926,7 @@ void ClassEditorWidget::customContextMenuRequested(QPoint pnt)
 
 	m_pContextPopup->addAction(
 		*(g_pIconManager->getSmallIcon(KviIconManager::Floppy)),
-		__tr2qs_ctx("Export Selected in Singles Files...","editor"),
+		__tr2qs_ctx("Export Selected in Single Files...","editor"),
 		this,SLOT(exportSelectedSepFiles()));
 
     pAction->setEnabled(bHasSelected);
@@ -1374,7 +1374,7 @@ bool ClassEditorWidget::removeItem(ClassEditorTreeWidgetItem * pItem, KviPointer
 		{
 			szMsg = QString(__tr2qs_ctx("Do you really want to remove the namespace \"%1\"?","editor")).arg(szName);
 			szMsg += "<br>";
-			szMsg += __tr2qs_ctx("Please note that all the children classes/functions will be deleted too.","editor");
+			szMsg += __tr2qs_ctx("Please note that all the child classes/functions will be deleted too.","editor");
 		} else if(pItem->isMethod())
 		{
 			szMsg = QString(__tr2qs_ctx("Do you really want to remove the function \"%1\"?","editor")).arg(szName);
diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp
index d9f1189fd..bcf8a5813 100644
--- a/src/modules/context/libkvicontext.cpp
+++ b/src/modules/context/libkvicontext.cpp
@@ -146,7 +146,7 @@ STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
 		The returned network name is the one that has been specified
 		in the server database and may not correspond to the real network
 		name. However, this is the network name you want to use if
-		you want to manipulate the serverdb entries related to the current
+		you want to manipulate the serverDB entries related to the current
 		connection.
 	@seealso:
 		[fnc]$context.serverHostName[/fnc]
@@ -180,7 +180,7 @@ STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
 		by the server itself. Some servers report a bogus value for this field.
 		You should take a look at [fnc]$context.serverIpAddress[/fnc] if you want a value that
 		can be used to really reconnect to this server. If you want a value
-		to manipulate the server entry via the serverdb functions then
+		to manipulate the server entry via the serverDB functions then
 		you probably need [fnc]$context.serverdbServerHostName[/fnc].
 	@seealso:
 		[fnc]$context.serverdbServerHostName[/fnc]
@@ -215,7 +215,7 @@ STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
 		The returned server name is the one that has been specified
 		in the server database and may refer to a round-robin DNS entry.
 		However, this is the server name you want to use if you want to manipulate
-		the serverdb entries related to the current connection.
+		the serverDB entries related to the current connection.
 	@seealso:
 		[fnc]$context.serverHostName[/fnc],
 		[fnc]$context.serverPort[/fnc],
@@ -617,11 +617,11 @@ static bool context_kvs_fnc_queueSize(KviKvsModuleFunctionCall * c)
 	@title:
 		$context.getSSLCertInfo
 	@short:
-		Returns the requested information about certificates used in an ssl-enabled IRC session
+		Returns the requested information about certificates used in an SSL enabled IRC session
 	@syntax:
 		$context.getSSLCertInfo(<query:string>[,<type:string='remote'>[,<context_id:integer>[,<param1:string>]]])
 	@description:
-		Returns the requested information about certificates used in an ssl-enabled IRC session.[br]
+		Returns the requested information about certificates used in an SSL enabled IRC session.[br]
 		The second <type> parameter can be "local" or "remote", and refers to the certificate you want
 		to query the information from; if omitted, it defaults to "remote".[br]
 		If <context_id> is omitted then the IRC context associated with the current window is assumed.[br]
@@ -655,15 +655,15 @@ static bool context_kvs_fnc_queueSize(KviKvsModuleFunctionCall * c)
 		[li]fingerprintDigestStr[/li]
 		[li]fingerprintContents * accepts parameter interpreted as "digest name"[/li]
 		[/ul]
-		@examples:
-			[example]
-				[comment]# get a sha256 fingerprint of remote peer's certificate[/comment]
-				$context.getSSLCertInfo(fingerprintContents,remote,$context,sha256)
-			[/example]
-		@seealso:
-			[fnc]$certificate[/fnc]
-			[fnc]$str.evpSign[/fnc]
-			[fnc]$str.evpVerify[/fnc]
+	@examples:
+		[example]
+			[comment]# get a sha256 fingerprint of remote peer's certificate[/comment]
+			$context.getSSLCertInfo(fingerprintContents,remote,$context,sha256)
+		[/example]
+	@seealso:
+		[fnc]$certificate[/fnc]
+		[fnc]$str.evpSign[/fnc]
+		[fnc]$str.evpVerify[/fnc]
 */
 
 static bool context_kvs_fnc_getSSLCertInfo(KviKvsModuleFunctionCall * c)
diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp
index 3c9f28fb6..9a65e9994 100644
--- a/src/modules/dcc/DccChatWindow.cpp
+++ b/src/modules/dcc/DccChatWindow.cpp
@@ -397,7 +397,7 @@ void DccChatWindow::ownAction(const QString &text)
 		m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 		output(KVI_OUT_ACTION,"%Q %Q",&(m_pDescriptor->szLocalNick),&szTmpBuffer);
 	} else {
-		output(KVI_OUT_SYSTEMWARNING,__tr2qs_ctx("Cannot send data: no active connection","dcc"));
+		output(KVI_OUT_SYSTEMWARNING,__tr2qs_ctx("Can't send data: no active connection","dcc"));
 	}
 }
 
diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp
index 536c8d7cd..fbc4751e7 100644
--- a/src/modules/dcc/DccFileTransfer.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -2306,7 +2306,7 @@ DccFileTransferBandwidthDialog::DccFileTransferBandwidthDialog(QWidget * pParent
 	QString szText = __tr2qs_ctx("Configure Bandwidth for DCC Transfer %1","dcc").arg(t->id());
 	setWindowTitle(szText);
 
-	szText = t->isFileUpload() ? __tr2qs_ctx("Limit upload bandwidth to","dcc") : __tr2qs_ctx("Limit download bandwidth to","dcc");
+	szText = t->isFileUpload() ? __tr2qs_ctx("Limit upload bandwidth to:","dcc") : __tr2qs_ctx("Limit download bandwidth to:","dcc");
 
 	m_pEnableLimitCheck = new QCheckBox(szText,this);
 	g->addWidget(m_pEnableLimitCheck,0,0);
diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp
index 8a7440949..546043804 100644
--- a/src/modules/dcc/DccVideoWindow.cpp
+++ b/src/modules/dcc/DccVideoWindow.cpp
@@ -669,7 +669,7 @@ void DccVideoWindow::ownMessage(const QString &text, bool bUserFeedback)
 {
 	if(!m_pSlaveThread)
 	{
-		output(KVI_OUT_SYSTEMWARNING,__tr2qs_ctx("Cannot send data: no active connection","dcc"));
+		output(KVI_OUT_SYSTEMWARNING,__tr2qs_ctx("Can't send data: no active connection","dcc"));
 		return;
 	}
 
@@ -772,7 +772,7 @@ void DccVideoWindow::ownAction(const QString &text)
 		m_tmpTextDataOut.append(buf.ptr(), buf.len());
 		output(KVI_OUT_ACTION,"%Q %Q",&(m_pDescriptor->szLocalNick),&szTmpBuffer);
 	} else {
-		output(KVI_OUT_SYSTEMWARNING,__tr2qs_ctx("Cannot send data: no active connection","dcc"));
+		output(KVI_OUT_SYSTEMWARNING,__tr2qs_ctx("Can't send data: no active connection","dcc"));
 	}
 }
 
diff --git a/src/modules/dcc/DccVoiceWindow.cpp b/src/modules/dcc/DccVoiceWindow.cpp
index 470436703..4356a274a 100644
--- a/src/modules/dcc/DccVoiceWindow.cpp
+++ b/src/modules/dcc/DccVoiceWindow.cpp
@@ -73,7 +73,7 @@ extern DccBroker * g_pDccBroker;
 				//CAN NOT COMPILE :(
 				#define COMPILE_DISABLE_DCC_VOICE
 				#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
-					#warning "Cannot find the soundcard.h header; you will NOT be able to use DCC Voice"
+					#warning "Can't find the soundcard.h header; you will NOT be able to use DCC Voice"
 				#endif
 			#endif
 		#endif
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 251d39203..f28686b4f 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -2718,11 +2718,11 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
 	@title:
 		$dcc.getSSLCertInfo
 	@short:
-		Returns the requested information about certificates used in an ssl-enabled DCC session
+		Returns the requested information about certificates used in an SSL enabled DCC session
 	@syntax:
 		$dcc.getSSLCertInfo(<query:string>[,<type:string='remote'>[,<dcc_id:integer>[,<param1:string>]]])
 	@description:
-		Returns the requested information about certificates used in an ssl-enabled DCC session.[br]
+		Returns the requested information about certificates used in an SSL enabled DCC session.[br]
 		The second <type> parameter can be "local" or "remote", and refers to the certificate you want
 		to query the information from; if omitted, it defaults to "remote".[br]
 		If <dcc_id> is omitted then the DCC Session associated with the current window is assumed.[br]
@@ -2756,16 +2756,16 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
 		[li]fingerprintDigestStr[/li]
 		[li]fingerprintContents * accepts parameter interpreted as "digest name"[/li]
 		[/ul]
-		@examples:
-			[example]
-				# get a sha256 fingerprint of remote peer's certificate
-				$dcc.getSSLCertInfo(fingerprintContents,remote,$dcc.session,sha256)
-			[/example]
-		@seealso:
-			[fnc]$certificate[/fnc]
-			[fnc]$str.evpSign[/fnc]
-			[fnc]$str.evpVerify[/fnc]
-			[module:dcc]dcc module[/module]
+	@examples:
+		[example]
+			[comment]# get a sha256 fingerprint of remote peer's certificate[/comment]
+			$dcc.getSSLCertInfo(fingerprintContents,remote,$dcc.session,sha256)
+		[/example]
+	@seealso:
+		[fnc]$certificate[/fnc]
+		[fnc]$str.evpSign[/fnc]
+		[fnc]$str.evpVerify[/fnc]
+		[module:dcc]dcc module[/module]
 */
 
 static bool dcc_kvs_fnc_getSSLCertInfo(KviKvsModuleFunctionCall * c)
@@ -2979,7 +2979,7 @@ KVIRC_MODULE(
 	"DCC",
 	"4.0.0",
 	"Copyright (C) 2000-2004:\n" \
-	"  Szymon Stefanek (pragma at kvirc dot net)\n",
+	"Szymon Stefanek (pragma at kvirc dot net)\n",
 	"DCC extension for KVIrc\n",
 	dcc_module_init,
 	dcc_module_can_unload,
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index ee0fb6429..4d34a8903 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -988,7 +988,7 @@ static void dccModuleParseDccVoice(KviDccRequest *dcc)
 	if(!dcc->ctcpMsg->msg->haltOutput())
 	{
 		dcc->ctcpMsg->msg->console()->output(KVI_OUT_DCCERROR,
-			__tr2qs_ctx("The above request cannot be accepted: DCC VOICE support not enabled at compilation time ","dcc"));
+			__tr2qs_ctx("The above request can't be accepted: DCC VOICE support not enabled at compilation time ","dcc"));
 		return;
 	}
 #endif
@@ -998,7 +998,7 @@ static void dccModuleParseDccVoice(KviDccRequest *dcc)
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
 			dcc->ctcpMsg->msg->console()->output(KVI_OUT_DCCERROR,
-				__tr2qs_ctx("The above request cannot be accepted: unsupported codec '%s'","dcc"),dcc->szParam1.ptr());
+				__tr2qs_ctx("The above request can't be accepted: unsupported codec '%s'","dcc"),dcc->szParam1.ptr());
 			return;
 		}
 	}
@@ -1062,7 +1062,7 @@ static void dccModuleParseDccVideo(KviDccRequest *dcc)
 	if(!dcc->ctcpMsg->msg->haltOutput())
 	{
 		dcc->ctcpMsg->msg->console()->output(KVI_OUT_DCCERROR,
-			__tr2qs_ctx("The above request cannot be accepted: DCC VIDEO support not enabled at compilation time ","dcc"));
+			__tr2qs_ctx("The above request can't be accepted: DCC VIDEO support not enabled at compilation time ","dcc"));
 		return;
 	}
 #else
@@ -1072,7 +1072,7 @@ static void dccModuleParseDccVideo(KviDccRequest *dcc)
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
 			dcc->ctcpMsg->msg->console()->output(KVI_OUT_DCCERROR,
-				__tr2qs_ctx("The above request cannot be accepted: unsupported codec '%s'","dcc"),dcc->szParam1.ptr());
+				__tr2qs_ctx("The above request can't be accepted: unsupported codec '%s'","dcc"),dcc->szParam1.ptr());
 			return;
 		}
 	}
diff --git a/src/modules/editor/ScriptEditorImplementation.cpp b/src/modules/editor/ScriptEditorImplementation.cpp
index 0244b1db0..178bfbfd1 100644
--- a/src/modules/editor/ScriptEditorImplementation.cpp
+++ b/src/modules/editor/ScriptEditorImplementation.cpp
@@ -819,7 +819,7 @@ ScriptEditorImplementation::ScriptEditorImplementation(QWidget * par)
 
 	QMenu * pop = new QMenu(b);
 	pop->addAction(__tr2qs_ctx("&Open...","editor"),this,SLOT(loadFromFile()));
-	pop->addAction(__tr2qs_ctx("&Save As...","editor"),this,SLOT(saveToFile()));
+	pop->addAction(__tr2qs_ctx("&Save as...","editor"),this,SLOT(saveToFile()));
 	pop->addSeparator();
 	pop->addAction(__tr2qs_ctx("&Configure Editor...","editor"),this,SLOT(configureColors()));
 	b->setMenu(pop);
@@ -830,7 +830,7 @@ ScriptEditorImplementation::ScriptEditorImplementation(QWidget * par)
 	g->addWidget(m_pFindLineEdit,1,2);
 
 	QLabel * pLab = new QLabel(this);
-	pLab->setText(__tr2qs_ctx("Find","editor"));
+	pLab->setText(__tr2qs_ctx("Find:","editor"));
 	pLab->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 	g->addWidget(pLab,1,1);
 
@@ -1085,7 +1085,7 @@ ScriptEditorReplaceDialog::ScriptEditorReplaceDialog(QWidget * pParent, const QS
 
 	QLabel * m_pFindLabel = new QLabel(this);
 	m_pFindLabel->setObjectName("findlabel");
-	m_pFindLabel->setText(__tr2qs_ctx("Word to find","editor"));
+	m_pFindLabel->setText(__tr2qs_ctx("Word to find:","editor"));
 	pLayout->addWidget(m_pFindLabel,0,0);
 
 	m_pFindLineEdit = new QLineEdit(this);
@@ -1094,7 +1094,7 @@ ScriptEditorReplaceDialog::ScriptEditorReplaceDialog(QWidget * pParent, const QS
 
 	QLabel * m_pReplaceLabel = new QLabel(this);
 	m_pReplaceLabel->setObjectName("replacelabel");
-	m_pReplaceLabel->setText(__tr2qs_ctx("Replace with","editor"));
+	m_pReplaceLabel->setText(__tr2qs_ctx("Replace with:","editor"));
 	pLayout->addWidget(m_pReplaceLabel,1,0);
 
 	m_pReplaceLineEdit = new QLineEdit(this);
diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp
index 1c332ea31..90740c49d 100644
--- a/src/modules/eventeditor/EventEditorWindow.cpp
+++ b/src/modules/eventeditor/EventEditorWindow.cpp
@@ -100,7 +100,7 @@ EventEditor::EventEditor(QWidget * par)
 
 	m_pTreeWidget = new EventEditorTreeWidget(vbox);
 
-	QPushButton * pb = new QPushButton(__tr2qs_ctx("&Export All To...","editor"),vbox);
+	QPushButton * pb = new QPushButton(__tr2qs_ctx("&Export All to...","editor"),vbox);
 	connect(pb,SIGNAL(clicked()),this,SLOT(exportAllEvents()));
 
 	KviTalVBox * box = new KviTalVBox(spl);
diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index cb0d47fe1..7040bc5a0 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -492,7 +492,7 @@ void FileTransferWindow::rightButtonPressed(FileTransferItem *it,const QPoint &p
 
 				m_pLocalFilePopup->addAction(__tr2qs_ctx("&Copy Path to Clipboard","filetransferwindow"),this,SLOT(copyLocalFileToClipboard()));
 
-                pAction = m_pLocalFilePopup->addAction(__tr2qs_ctx("&Delete file","filetransferwindow"),this,SLOT(deleteLocalFile()));
+                pAction = m_pLocalFilePopup->addAction(__tr2qs_ctx("&Delete File","filetransferwindow"),this,SLOT(deleteLocalFile()));
                 pAction->setEnabled(i->transfer()->terminated());
                 pAction = m_pContextPopup->addAction(__tr2qs_ctx("Local &File","filetransferwindow"));
                 pAction->setMenu(m_pLocalFilePopup);
diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp
index df196d13b..84dc98f50 100644
--- a/src/modules/http/libkvihttp.cpp
+++ b/src/modules/http/libkvihttp.cpp
@@ -236,7 +236,7 @@ static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QSt
 		The 'h' flag causes the window to not be created. The transfer will simply run in background.
 		Note that with 'h' the user has no possibility to interact with the transfer.
 		The 'm' flag causes the transfer window to be created as "minimized". 'm' does nothing
-		if the window already exists. The 'n' flag causes the window to be NOT activated (brought to top).
+		if the window already exists. The 'n' flag causes the window to be [b]not[/b] activated (brought to top).
 
 		!sw: -i=<magic identifier> | --identifier=<magic identifier>
 		This identifier is passed as $3 parameter to the [event:OnHTTPGetTerminated]OnHTTPGetTerminated[/event]
diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp
index a6d80bd7b..33a9ad067 100644
--- a/src/modules/links/LinksWindow.cpp
+++ b/src/modules/links/LinksWindow.cpp
@@ -59,9 +59,9 @@ LinksWindow::LinksWindow(KviConsoleWindow * lpConsole)
 	m_pRequestButton = new QToolButton(box);
 	m_pRequestButton->setObjectName("request_button");
 	m_pRequestButton->setIconSize(QSize(16,16));
-	m_pRequestButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Links)));
+	m_pRequestButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Update)));
 	connect(m_pRequestButton,SIGNAL(clicked()),this,SLOT(requestLinks()));
-	m_pRequestButton->setToolTip(__tr2qs("Request Links"));
+	m_pRequestButton->setToolTip(__tr2qs("Request links"));
 
 	QLabel * l = new QLabel(box);
 	box->setStretchFactor(l,1);
@@ -119,7 +119,7 @@ void LinksWindow::requestLinks()
 		outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Sent links request, waiting for reply..."));
 		m_pRequestButton->setEnabled(false);
 	} else {
-		outputNoFmt(KVI_OUT_SYSTEMERROR,__tr2qs("Cannot request links: no active connection"));
+		outputNoFmt(KVI_OUT_SYSTEMERROR,__tr2qs("Can't request links: no active connection"));
 	}
 }
 
@@ -132,7 +132,7 @@ void LinksWindow::connectionStateChange()
 		QString szTmp = QString(__tr2qs("Connected to %1 (%2)")).arg(m_pConsole->connection()->currentServerName(),m_pConsole->currentNetworkName());
 		m_pInfoLabel->setText(szTmp);
 	} else {
-		m_pInfoLabel->setText(__tr2qs("Links cannot be requested: not connected to a server"));
+		m_pInfoLabel->setText(__tr2qs("Links can't be requested: not connected to a server"));
 	}
 }
 
diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp
index 9f02d7664..1558a929b 100644
--- a/src/modules/list/ListWindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -200,21 +200,21 @@ ListWindow::ListWindow(KviConsoleWindow * lpConsole)
 	m_pOpenButton->setObjectName("import_list");
 	m_pOpenButton->setIconSize(QSize(16,16));
 	m_pOpenButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Folder))));
-	KviTalToolTip::add(m_pOpenButton,__tr2qs("Import List"));
+	KviTalToolTip::add(m_pOpenButton,__tr2qs("Import list"));
 	connect(m_pOpenButton,SIGNAL(clicked()),this,SLOT(importList()));
 
 	m_pSaveButton = new QToolButton(pBox);
 	m_pSaveButton->setObjectName("export_list");
 	m_pSaveButton->setIconSize(QSize(16,16));
 	m_pSaveButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Floppy))));
-	KviTalToolTip::add(m_pSaveButton,__tr2qs("Export List"));
+	KviTalToolTip::add(m_pSaveButton,__tr2qs("Export list"));
 	connect(m_pSaveButton,SIGNAL(clicked()),this,SLOT(exportList()));
 
 	m_pRequestButton = new QToolButton(pBox);
 	m_pRequestButton->setObjectName("request_button");
 	m_pRequestButton->setIconSize(QSize(16,16));
 	m_pRequestButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Update))));
-	KviTalToolTip::add(m_pRequestButton,__tr2qs("Request List"));
+	KviTalToolTip::add(m_pRequestButton,__tr2qs("Request list"));
 	connect(m_pRequestButton,SIGNAL(clicked()),this,SLOT(requestList()));
 
 	m_pStopListDownloadButton = new QToolButton(pBox);
@@ -325,7 +325,7 @@ void ListWindow::connectionStateChange()
 			m_pConsole->currentNetworkName());
 		m_pInfoLabel->setText(szTmp);
 	} else {
-		m_pInfoLabel->setText(__tr2qs("List cannot be requested: not connected to a server"));
+		m_pInfoLabel->setText(__tr2qs("List can't be requested: not connected to a server"));
 	}
 }
 
@@ -360,7 +360,7 @@ void ListWindow::exportList()
 {
 	if(!m_pTreeWidget->topLevelItemCount())
 	{
-		KviMessageBox::warning(__tr2qs("You cannot export an empty list"));
+		KviMessageBox::warning(__tr2qs("You can't export an empty list"));
 		return;
 	}
 
diff --git a/src/modules/log/libkvilog.cpp b/src/modules/log/libkvilog.cpp
index 1789df7ef..6b8448e4b 100644
--- a/src/modules/log/libkvilog.cpp
+++ b/src/modules/log/libkvilog.cpp
@@ -231,7 +231,7 @@ static bool log_kvs_cmd_flush(KviKvsModuleCommandCall * c)
 		$log.file(<window id>)
 	@description:
 		The form with the <window id> parameter returns the log file name
-		of the window that has the specified id. If logging is not enabled
+		of the window that has the specified ID. If logging is not enabled
 		in the specified window, this function returns an empty string.[br]
 		The form without parameters returns the log file name of the current window,
 		thus it is equivalent to calling $log.file([fnc]$window[/fnc])
diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp
index d9f7e0f0d..b0e6bd356 100644
--- a/src/modules/logview/LogViewWindow.cpp
+++ b/src/modules/logview/LogViewWindow.cpp
@@ -140,7 +140,7 @@ LogViewWindow::LogViewWindow()
 	pLayout->addWidget(m_pShowOtherCheck,4,0,1,2);
 
 	QLabel * pLabel;
-	pLabel = new QLabel(__tr2qs_ctx("Contents filter","log"),m_pSearchTab);
+	pLabel = new QLabel(__tr2qs_ctx("Contents Filter","log"),m_pSearchTab);
 	pLayout->addWidget(pLabel,5,0,1,2);
 
 	pLabel = new QLabel(__tr2qs_ctx("Log name mask:","log"),m_pSearchTab);
@@ -155,7 +155,7 @@ LogViewWindow::LogViewWindow()
 	pLayout->addWidget(m_pContentsMask,7,1);
 	connect(m_pContentsMask,SIGNAL(returnPressed()),this,SLOT(applyFilter()));
 
-	m_pEnableFromFilter = new QCheckBox(__tr2qs_ctx("Only older than","log"),m_pSearchTab);
+	m_pEnableFromFilter = new QCheckBox(__tr2qs_ctx("Only older than:","log"),m_pSearchTab);
 	m_pFromDateEdit = new QDateEdit(m_pSearchTab);
 	m_pFromDateEdit->setDate(QDate::currentDate());
 	m_pFromDateEdit->setEnabled(false);
@@ -163,7 +163,7 @@ LogViewWindow::LogViewWindow()
 	pLayout->addWidget(m_pFromDateEdit,8,1);
 	connect(m_pEnableFromFilter,SIGNAL(toggled(bool)),m_pFromDateEdit,SLOT(setEnabled(bool)));
 
-	m_pEnableToFilter = new QCheckBox(__tr2qs_ctx("Only newer than","log"),m_pSearchTab);
+	m_pEnableToFilter = new QCheckBox(__tr2qs_ctx("Only newer than:","log"),m_pSearchTab);
 	m_pToDateEdit = new QDateEdit(m_pSearchTab);
 	m_pToDateEdit->setDate(QDate::currentDate());
 	m_pToDateEdit->setEnabled(false);
@@ -445,7 +445,7 @@ void LogViewWindow::rightButtonClicked(QTreeWidgetItem * pItem, const QPoint &)
 	if(((LogListViewItem *)pItem)->childCount())
 	{
 		//pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::UserList)),__tr2qs_ctx("Export all log files to","log"),m_pExportLogPopup);
-		pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Discard)),__tr2qs_ctx("Remove all log files within this folder","log"),this,SLOT(deleteCurrent()));
+		pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Discard)),__tr2qs_ctx("Remove All Log Files Within This Folder","log"),this,SLOT(deleteCurrent()));
 	} else {
         pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Floppy)),__tr2qs_ctx("Export log file to","log"))->setMenu(m_pExportLogPopup);
 		pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Discard)),__tr2qs_ctx("Remove log file","log"),this,SLOT(deleteCurrent()));
diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp
index 24456c6b2..0ae9a7cfa 100644
--- a/src/modules/my/libkvimy.cpp
+++ b/src/modules/my/libkvimy.cpp
@@ -346,7 +346,7 @@ static bool my_kvs_fnc_serverIsSSL(KviKvsModuleFunctionCall * c)
 		by the server itself. Some servers report a bogus value for this field.
 		You should take a look at [fnc]$context.serverIpAddress[/fnc] if you want a value that
 		can be used to really reconnect to this server. If you want a value
-		to manipulate the server entry via the serverdb functions then
+		to manipulate the server entry via the serverDB functions then
 		you probably need [fnc]$context.serverdbServerHostName[/fnc].
 */
 
diff --git a/src/modules/objects/KvsObject_groupBox.cpp b/src/modules/objects/KvsObject_groupBox.cpp
index 2aff37437..04e5f31ef 100644
--- a/src/modules/objects/KvsObject_groupBox.cpp
+++ b/src/modules/objects/KvsObject_groupBox.cpp
@@ -65,7 +65,7 @@ const int align_cod[] = {
 	@description:
 		This widget can be used to display a groupbox.
 		It will be usually a parent for other child controls.
-		You can either use a child layout to manage the children geometries
+		You can either use a child layout to manage the child geometries
 		or use $setColumnLayout to manage the layout automatically.
 	@functions:
 		!fn: $setTitle(<text:String>)
diff --git a/src/modules/objects/KvsObject_listWidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp
index 6e6b62ffd..b3789b41b 100644
--- a/src/modules/objects/KvsObject_listWidget.cpp
+++ b/src/modules/objects/KvsObject_listWidget.cpp
@@ -90,7 +90,7 @@ const char * const itemflags_tbl[] = {
 		"none" : no items can be selected[br]
 		The default mode is "single"
 		!fn: $setFlag(<idx:integer>,<flag1:string>, <flag2:string>, ...)
-		Sets the flags for the item at index idz to the given flags. These determine whether the item can be selected or modified. This is often used to disable an item.[br]
+		Sets the flags for the item at index idx to the given flags. These determine whether the item can be selected or modified. This is often used to disable an item.[br]
 		Supported flags are:
 		[exmaple]
 		[br]- noitemflag : no flag sets;
@@ -143,7 +143,7 @@ const char * const itemflags_tbl[] = {
 		!fn: $currentItemChangedEvent()
 		This function is called by KVIrc when the current item changes.
 		!fn: $itemChangedEvent()
-		This function is called by KVIrc when the current data item changes (i.e. the user check a ckeckable item) .
+		This function is called by KVIrc when the current data item changes (i.e. the user check a checkable item) .
 	@signals:
 		!sg: <string> $currentItemChanged()
 		This signal is emitted by the default implementation of [classfnc]$currentItemChangedEvent[/classfnc]().[br]
diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp
index aa456f0bf..c368e9a02 100644
--- a/src/modules/objects/KvsObject_popupMenu.cpp
+++ b/src/modules/objects/KvsObject_popupMenu.cpp
@@ -65,17 +65,17 @@
 		If called without paramaters show the popup menu at the current pointer position.[br]
 		With the optional parameters show the popup menu at the coordinate x,y widget parameter relative.
 		!fn: $removeItem(<popup_id:Uinteger>)
-		Removes the menu item that has the identifier id.
+		Removes the menu item that has the identifier ID.
 		!fn: $removeItemAt(<index:uinteger>)
 		Removes the menu item at position index.
 		!fn: $insertSeparator(<index:uinteger>)
 		Inserts a separator at position index.[br]
 		If the index is negative the separator becomes the last menu item.
 		!fn: $activatedEvent(<popup_id:uinteger>)
-		This function is called when a menu item and return the the item id.[br]
+		This function is called when a menu item and return the the item ID.[br]
 		The default implementation emits the [classfnc]$activated[/classfnc]() signal.
 		!fn: $highligthtedEvent(<popup_id:uinteger>)
-		This function is called when a menu item is highlighted (hovered) and return the item id.[br]
+		This function is called when a menu item is highlighted (hovered) and return the item ID.[br]
 		The default implementation emits the [classfnc]$highlighted[/classfnc]() signal.
 	@signals:
 		!sg: $activated()
diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp
index b41c77999..70b95d285 100644
--- a/src/modules/objects/KvsObject_socket.cpp
+++ b/src/modules/objects/KvsObject_socket.cpp
@@ -134,7 +134,7 @@ const char * const sockerrors_tbl[] = {
 		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
+		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.
 
diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.cpp b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
index d52c68bff..6cf0ad0d1 100644
--- a/src/modules/objects/KvsObject_treeWidgeteItem.cpp
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
@@ -85,7 +85,7 @@ const char * const itemflags_tbl[] = {
 		Returs the text of the specified column.
 		!fn: $setPixmap(<column:integer>,<pixmap:hobject or imageID>)
 		Sets the pixmap in column column to pm, if pm is non-null and different from the current pixmap, and if column is non-negative.
-		Pixmap can be a KVIrc imageid, an image file or a [class]pixmap[/class] object.
+		Pixmap can be a KVIrc image ID, an image file or a [class]pixmap[/class] object.
 		!fn: $setItemEditable(<bEnabled:boolean>)
 		If bEnabled is true (1), this item can be in-place editable by the user; otherwise it cannot be editable in-place.
 		!fn: $isItemEditable()
@@ -95,14 +95,14 @@ const char * const itemflags_tbl[] = {
 		!fn: $isEnabled()
 		Returns $true if this item is enabled and $false otherwise.
 		!fn: $setOpen(<bOpen:boolean>)
-		Opens or closes the item to show its children items.
+		Opens or closes the item to show its child items.
 		!fn: $isOpen()
 		Returns the open state of this item
 		!fn: $setCheckable(<bCheckable:boolean>)
 		Makes this item checkable or not. This function should be called immediately
 		after the item creation: changing this property later at runtime may have
 		strange results (like the item being moved inside the list, text disappearing,
-		hidden children etc... don't do it :D ).
+		hidden child items etc... don't do it :D ).
 		!fn: $isCheckable()
 		Returns $true if this item is checkable and $false otherwise
 		!fn: $setChecked(<bChecked:boolean>)
@@ -166,7 +166,7 @@ bool KvsObject_treeWidgetItem::init(KviKvsRunTimeContext * pContext,KviKvsVarian
 {
 	if (!parentObject())
 	{
-		pContext->error(__tr2qs_ctx("The listviewitem cannot be parentless","objects"));
+		pContext->error(__tr2qs_ctx("The listviewitem can't be parentless","objects"));
 		return false;
 	}
 	if(parentObject()->inheritsClass("listviewitem"))
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index 9eb2fb00b..bee2b9fa5 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -193,10 +193,10 @@ const char * const widgettypes_tbl[] = {
 		All the other widget-type classes inherit from this one.
 	@functions:
 		!fn: $show()
-		Shows this widget and the children.
+		Shows this widget and the child items.
 		See also [classfnc]$hide[/classfnc]() and [classfnc]$isVisible[/classfnc].
 		!fn: $hide()
-		Hides this widget (and conseguently all the children).
+		Hides this widget (and conseguently all the child items).
 		See also [classfnc]$show[/classfnc]() and [classfnc]$isVisible[/classfnc].
 		!fn: $repaint()
 		Repaints the widget directly by calling [classfnc]$paintEvent[/classfnc]() immediately.
@@ -590,7 +590,7 @@ const char * const widgettypes_tbl[] = {
 // ... now that I think about it, it
 // may happen that widget() will be zero here too:
 // If the Qt "physical" widget gets destroyed
-// by some external factor (for example when children
+// by some external factor (for example when child
 // of a wrapper widget destroyed by KVIrc).
 //
 // as a convention:
diff --git a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
index dfcf265b7..8ef5563ed 100644
--- a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
+++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
@@ -74,7 +74,7 @@ OptionsWidget_highlighting::OptionsWidget_highlighting(QWidget * parent)
 	m_pHighlightAllOccurencesRadioButton = new QRadioButton(__tr2qs_ctx("Highlight every occurrence of a word inside text","options"),gbox);
 	g->addWidget(m_pHighlightAllOccurencesRadioButton,0,0,1,2);
 	m_pHighlightAllOccurencesRadioButton->setChecked(KVI_OPTION_BOOL(KviOption_boolUseFullWordHighlighting));
-	KviTalToolTip::add(m_pHighlightAllOccurencesRadioButton,__tr2qs_ctx("<center>This selection will cause KVIrc to search for the highlighted words or nicknames inside the whole text. This will also highlight parts of words (eg. if your nickname is Mark then Markus will be highlighted too).</center>","options"));
+	KviTalToolTip::add(m_pHighlightAllOccurencesRadioButton,__tr2qs_ctx("<center>This selection will cause KVIrc to search for the highlighted words or nicknames inside the whole text. This will also highlight parts of words (e.g. if your nickname is Mark then Markus will be highlighted too).</center>","options"));
 
 	m_pHighlightWholeWordsOnlyRadioButton = new QRadioButton(__tr2qs_ctx("Highlight only whole words splitting on space and on:","options"),gbox);
 	g->addWidget(m_pHighlightWholeWordsOnlyRadioButton,1,0,1,1);
diff --git a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
index b26d8e2df..387e80902 100644
--- a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
+++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
@@ -58,7 +58,7 @@
 		respond to within the interval of time defined in the second field.[br]
 		A strong protection against floods would be replying to 4 requests every 20 seconds.[br]
 		The minimum effective setting is about 3 messages every 6 seconds.[br]
-		Please note that 3 messages every 6 seconds is NOT the same as 10 messages every 20 seconds;
+		Please note that 3 messages every 6 seconds is [b]not[/b] the same as 10 messages every 20 seconds;
 		the first setting would allow 3 requests within one second, but the client would
 		ignore all the requests for the next 5 seconds, the second setting would allow 10 messages within one second
 		and ignore everything for the next 19 seconds. Therefore, 3/6 is a safer setting.[br]
diff --git a/src/modules/options/OptionsWidget_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp
index be6ff706b..aecbd0135 100644
--- a/src/modules/options/OptionsWidget_dcc.cpp
+++ b/src/modules/options/OptionsWidget_dcc.cpp
@@ -131,7 +131,7 @@ OptionsWidget_dccAdvanced::OptionsWidget_dccAdvanced(QWidget * parent)
 					"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);
+	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...). " \
 					"KVIrc will refuse the requests when this limit is reached.</center>","options"));
@@ -243,19 +243,19 @@ OptionsWidget_dccSendAdvanced::OptionsWidget_dccSendAdvanced(QWidget * parent)
 	g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Limits","options"));
 
 	KviTalHBox * hb = new KviTalHBox(g);
-	b = addBoolSelector(hb,__tr2qs_ctx("Limit upload bandwidth to","options"),KviOption_boolLimitDccSendSpeed);
+	b = addBoolSelector(hb,__tr2qs_ctx("Limit upload bandwidth to:","options"),KviOption_boolLimitDccSendSpeed);
 	KviUIntSelector * u = addUIntSelector(hb,"",KviOption_uintMaxDccSendSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccSendSpeed));
 	u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options"));
 	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
 
 	hb = new KviTalHBox(g);
-	b = addBoolSelector(hb,__tr2qs_ctx("Limit download bandwidth to","options"),KviOption_boolLimitDccRecvSpeed);
+	b = addBoolSelector(hb,__tr2qs_ctx("Limit download bandwidth to:","options"),KviOption_boolLimitDccRecvSpeed);
 	u = addUIntSelector(hb,"",KviOption_uintMaxDccRecvSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccRecvSpeed));
 	u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options"));
 	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
 
 
-	u = addUIntSelector(g,__tr2qs_ctx("Maximum number of DCC transfers","options"),KviOption_uintMaxDccSendTransfers,0,1000,10);
+	u = addUIntSelector(g,__tr2qs_ctx("Maximum number of DCC transfers:","options"),KviOption_uintMaxDccSendTransfers,0,1000,10);
 	mergeTip(u,__tr2qs_ctx("<center>This is the maximum number of concurrent DCC transfers. " \
 					"KVIrc will refuse the requests when this limit is reached.</center>","options"));
 
@@ -269,7 +269,7 @@ OptionsWidget_dccSendAdvanced::OptionsWidget_dccSendAdvanced(QWidget * parent)
 
 	hb = new KviTalHBox(g);
 
-	b = addBoolSelector(hb,__tr2qs_ctx("Force idle step","options"),KviOption_boolDccSendForceIdleStep);
+	b = addBoolSelector(hb,__tr2qs_ctx("Force idle step:","options"),KviOption_boolDccSendForceIdleStep);
 	mergeTip(b,
 		__tr2qs_ctx("<center>Enable this option when the DCC file transfers " \
 				"tend to block your computer by consuming too much CPU time. " \
diff --git a/src/modules/options/OptionsWidget_general.h b/src/modules/options/OptionsWidget_general.h
index 444ab6d10..1645e2e95 100644
--- a/src/modules/options/OptionsWidget_general.h
+++ b/src/modules/options/OptionsWidget_general.h
@@ -27,7 +27,7 @@
 #include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_general KviIconManager::Options
-#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_general __tr2qs_no_lookup("General options")
+#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_general __tr2qs_no_lookup("General Options")
 #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_general 40000
 
 class OptionsWidget_general : public KviOptionsWidget
diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index a6c6a9809..be18d41f5 100644
--- a/src/modules/options/OptionsWidget_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -58,33 +58,33 @@ NickAlternativesDialog::NickAlternativesDialog(QWidget * par,const QString &n1,c
 {
 	QGridLayout * g = new QGridLayout(this);
 
-	setWindowTitle(__tr2qs_ctx("Nickname alternatives","options"));
+	setWindowTitle(__tr2qs_ctx("Nickname Alternatives","options"));
 
 	QLabel * l = new QLabel(this);
-	l->setText(__tr2qs_ctx("<center>Here you can choose up to three nicknames " \
+	l->setText(__tr2qs_ctx("Here you can choose up to three nicknames " \
 		"alternative to the primary one. KVIrc will use the alternatives " \
 		"if the primary nick is already used by someone else on a particular " \
-		"IRC network.</center>","options"));
+		"IRC network.","options"));
 	l->setWordWrap(true);
 
 	g->addWidget(l,0,0,1,3);
 
 	l = new QLabel(this);
-	l->setText(__tr2qs_ctx("Alt. Nickname 1:","options"));
+	l->setText(__tr2qs_ctx("Alt. nickname 1:","options"));
 	g->addWidget(l,1,0);
 	m_pNickEdit1 = new QLineEdit(this);
 	g->addWidget(m_pNickEdit1,1,1,1,2);
 	m_pNickEdit1->setText(n1);
 
 	l = new QLabel(this);
-	l->setText(__tr2qs_ctx("Alt. Nickname 2:","options"));
+	l->setText(__tr2qs_ctx("Alt. nickname 2:","options"));
 	g->addWidget(l,2,0);
 	m_pNickEdit2 = new QLineEdit(this);
 	g->addWidget(m_pNickEdit2,2,1,1,2);
 	m_pNickEdit2->setText(n2);
 
 	l = new QLabel(this);
-	l->setText(__tr2qs_ctx("Alt. Nickname 3:","options"));
+	l->setText(__tr2qs_ctx("Alt. nickname 3:","options"));
 	g->addWidget(l,3,0);
 	m_pNickEdit3 = new QLineEdit(this);
 	g->addWidget(m_pNickEdit3,3,1,1,2);
@@ -205,13 +205,13 @@ AvatarSelectionDialog::AvatarSelectionDialog(QWidget * par,const QString &szInit
 
 	QGridLayout * g = new QGridLayout(this);
 
-	QString msg = "<center>";
+	QString msg = "<left>";
 	msg += __tr2qs_ctx("Please select an avatar image. " \
 				"The full path to a local file or an image on the Web can be used.<br>" \
 				"If you wish to use a local image file, click the \"<b>Browse</b>\"" \
 				"button to browse local folders.<br>" \
 				"The full URL for an image (including <b>http://</b>) can be entered manually.","options");
-	msg += "</center><br>";
+	msg += "</left><br>";
 
 	QLabel * l = new QLabel(msg,this);
 	l->setMinimumWidth(250);
@@ -887,16 +887,16 @@ IdentityProfileEditor::IdentityProfileEditor(QWidget * pParent)
 	setObjectName("identity_profile_editor");
 	setWindowTitle(__tr2qs_ctx("Profile Editor - KVIrc","options"));
 
-	m_szName = __tr2qs_ctx("Profile Name","options");
-	m_szNetwork = __tr2qs_ctx("MyNetwork","options");
-	m_szNick = __tr2qs_ctx("MyNick","options");
-	m_szAltNick = __tr2qs_ctx("MyNick2","options");
-	m_szUserName = __tr2qs_ctx("MyUserName","options");
-	m_szRealName = __tr2qs_ctx("MyRealName","options");
+	m_szName = __tr2qs_ctx("Profile name","options");
+	m_szNetwork = __tr2qs_ctx("My network","options");
+	m_szNick = __tr2qs_ctx("My nickname","options");
+	m_szAltNick = __tr2qs_ctx("My nickname 2","options");
+	m_szUserName = __tr2qs_ctx("My username","options");
+	m_szRealName = __tr2qs_ctx("My real name","options");
 
 	QGridLayout * pLayout = new QGridLayout(this);
 
-	QLabel * pLabel = new QLabel(__tr2qs_ctx("Profile Name:","options"),this);
+	QLabel * pLabel = new QLabel(__tr2qs_ctx("Profile name:","options"),this);
 	pLayout->addWidget(pLabel,0,0);
 
 	m_pNameEdit = new QLineEdit(this);
@@ -904,7 +904,7 @@ IdentityProfileEditor::IdentityProfileEditor(QWidget * pParent)
 	pLayout->addWidget(m_pNameEdit,0,1,1,2);
 	connect(m_pNameEdit,SIGNAL(textChanged(const QString &)),this,SLOT(toggleButton(const QString &)));
 
-	pLabel = new QLabel(__tr2qs_ctx("Network Name:","options"),this);
+	pLabel = new QLabel(__tr2qs_ctx("Network name:","options"),this);
 	pLayout->addWidget(pLabel,1,0);
 
 	m_pNetworkEdit = new QLineEdit(this);
@@ -920,7 +920,7 @@ IdentityProfileEditor::IdentityProfileEditor(QWidget * pParent)
 	pLayout->addWidget(m_pNickEdit,2,1,1,2);
 	connect(m_pNickEdit,SIGNAL(textChanged(const QString &)),this,SLOT(toggleButton(const QString &)));
 
-	pLabel = new QLabel(__tr2qs_ctx("Alternative Nickname:","options"),this);
+	pLabel = new QLabel(__tr2qs_ctx("Alternative nickname:","options"),this);
 	pLayout->addWidget(pLabel,3,0);
 
 	m_pAltNickEdit = new QLineEdit(this);
@@ -936,11 +936,11 @@ IdentityProfileEditor::IdentityProfileEditor(QWidget * pParent)
 	pLayout->addWidget(m_pUserNameEdit,4,1,1,2);
 	connect(m_pUserNameEdit,SIGNAL(textChanged(const QString &)),this,SLOT(toggleButton(const QString &)));
 
-	pLabel = new QLabel(__tr2qs_ctx("Realname:","options"),this);
+	pLabel = new QLabel(__tr2qs_ctx("Real name:","options"),this);
 	pLayout->addWidget(pLabel,5,0);
 
 	m_pRealNameEdit = new QLineEdit(this);
-	KviTalToolTip::add(m_pRealNameEdit,__tr2qs_ctx("Put here the realname you want to use","options"));
+	KviTalToolTip::add(m_pRealNameEdit,__tr2qs_ctx("Put here the real name you want to use","options"));
 	pLayout->addWidget(m_pRealNameEdit,5,1,1,2);
 	connect(m_pRealNameEdit,SIGNAL(textChanged(const QString &)),this,SLOT(toggleButton(const QString &)));
 
diff --git a/src/modules/options/OptionsWidget_input.cpp b/src/modules/options/OptionsWidget_input.cpp
index 5d72facdb..ca3185eab 100644
--- a/src/modules/options/OptionsWidget_input.cpp
+++ b/src/modules/options/OptionsWidget_input.cpp
@@ -142,7 +142,7 @@ OptionsWidget_inputFeatures::OptionsWidget_inputFeatures(QWidget * parent)
 
 	addBoolSelector(0,0,0,0,__tr2qs_ctx("Warp cursor at the end of line when browsing history","options"),KviOption_boolInputHistoryCursorAtEnd);
 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Enable the input history logging","options"),KviOption_boolEnableInputHistory); //G&N 2005
-	addBoolSelector(0,2,0,2,__tr2qs_ctx("Hide input toolbuttons by default","options"),KviOption_boolHideInputToolButtons);
+	addBoolSelector(0,2,0,2,__tr2qs_ctx("Hide input tool buttons by default","options"),KviOption_boolHideInputToolButtons);
 	addBoolSelector(0,3,0,3,__tr2qs_ctx("Commandline in user-friendly mode by default","options"),KviOption_boolCommandlineInUserFriendlyModeByDefault);
 	addUIntSelector(0,4,0,4,__tr2qs_ctx("Expand tabulations in input using this amount of spaces:","options"),KviOption_uintSpacesToExpandTabulationInput,1,24,8,true);
 
@@ -153,7 +153,7 @@ OptionsWidget_inputFeatures::OptionsWidget_inputFeatures(QWidget * parent)
 	connect(b,SIGNAL(toggled(bool)),c,SLOT(setDisabled(bool)));
 	connect(c,SIGNAL(toggled(bool)),b,SLOT(setDisabled(bool)));
 
-	addStringSelector(g,__tr2qs_ctx("Nick completion postfix string","options"),KviOption_stringNickCompletionPostfix);
+	addStringSelector(g,__tr2qs_ctx("Nick completion postfix string:","options"),KviOption_stringNickCompletionPostfix);
 	addBoolSelector(g,__tr2qs_ctx("Use the completion postfix string for the first word only","options"),KviOption_boolUseNickCompletionPostfixForFirstWordOnly);
 
 	KviBoolSelector *d = addBoolSelector(0,6,0,6,__tr2qs_ctx("Use a custom cursor width","options"),KviOption_boolEnableCustomCursorWidth);
diff --git a/src/modules/options/OptionsWidget_irc.cpp b/src/modules/options/OptionsWidget_irc.cpp
index 40634db03..0145fd744 100644
--- a/src/modules/options/OptionsWidget_irc.cpp
+++ b/src/modules/options/OptionsWidget_irc.cpp
@@ -73,9 +73,9 @@ OptionsWidget_ircAdvanced::OptionsWidget_ircAdvanced(QWidget * parent)
 		"When this option is disabled, KVIrc will wait for the server " \
 		"to close the connection.<br>" \
 		"Note that if you use this, your QUIT message may be not displayed.</center>","options"));
-	addBoolSelector(0,1,0,1,__tr2qs_ctx("Prepend gender info to realname","options"),KviOption_boolPrependGenderInfoToRealname);
-	addBoolSelector(0,2,0,2,__tr2qs_ctx("Prepend avatar info to realname","options"),KviOption_boolPrependAvatarInfoToRealname);
-	addBoolSelector(0,3,0,3,__tr2qs_ctx("Prepend smart nick color info to realname","options"),KviOption_boolPrependNickColorInfoToRealname);
+	addBoolSelector(0,1,0,1,__tr2qs_ctx("Prepend gender info to real name","options"),KviOption_boolPrependGenderInfoToRealname);
+	addBoolSelector(0,2,0,2,__tr2qs_ctx("Prepend avatar info to real name","options"),KviOption_boolPrependAvatarInfoToRealname);
+	addBoolSelector(0,3,0,3,__tr2qs_ctx("Prepend smart nick color info to real name","options"),KviOption_boolPrependNickColorInfoToRealname);
 	addRowSpacer(0,4,0,4);
 }
 
diff --git a/src/modules/options/OptionsWidget_ircOutput.cpp b/src/modules/options/OptionsWidget_ircOutput.cpp
index 50345464c..fd252a4d9 100644
--- a/src/modules/options/OptionsWidget_ircOutput.cpp
+++ b/src/modules/options/OptionsWidget_ircOutput.cpp
@@ -55,7 +55,7 @@ OptionsWidget_ircOutput::OptionsWidget_ircOutput(QWidget * pParent)
 		KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = KVI_VERBOSITY_LEVEL_NORMAL;
 	m_pVerbosityCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel));
 
-	pLabel = new QLabel(__tr2qs_ctx("Datetime format","options"),this);
+	pLabel = new QLabel(__tr2qs_ctx("DateTime format:","options"),this);
 	addWidgetToLayout(pLabel,0,1,0,1);
 
 	m_pDatetimeCombo = new QComboBox(this);
diff --git a/src/modules/options/OptionsWidget_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp
index 4c525dfaa..a5a161d8d 100644
--- a/src/modules/options/OptionsWidget_logging.cpp
+++ b/src/modules/options/OptionsWidget_logging.cpp
@@ -53,7 +53,7 @@ OptionsWidget_logging::OptionsWidget_logging(QWidget * parent)
 
 	addBoolSelector(0,3,0,3,__tr2qs_ctx("Strip message type numbers in logs","options"),KviOption_boolStripMsgTypeInLogs);
 	addBoolSelector(0,4,0,4,__tr2qs_ctx("Strip colors in logs","options"),KviOption_boolStripControlCodesInLogs);
-	KviUIntSelector* us = addUIntSelector(0,5,0,5,__tr2qs_ctx("Auto flush logs every","options"),KviOption_uintAutoFlushLogs,0,99999,0);
+	KviUIntSelector* us = addUIntSelector(0,5,0,5,__tr2qs_ctx("Auto flush logs every:","options"),KviOption_uintAutoFlushLogs,0,99999,0);
 	us->setSuffix(__tr2qs_ctx(" min","options"));
 	mergeTip(us,
 		__tr2qs_ctx("<center>Save logs with the current interval<br>" \
diff --git a/src/modules/options/OptionsWidget_mediaTypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp
index 129048e87..274268425 100644
--- a/src/modules/options/OptionsWidget_mediaTypes.cpp
+++ b/src/modules/options/OptionsWidget_mediaTypes.cpp
@@ -123,7 +123,7 @@ OptionsWidget_mediaTypes::OptionsWidget_mediaTypes(QWidget * parent)
 	mergeTip(m_pRemoteExecCommandline,__tr2qs_ctx("<center>This field contains the command to execute when automatically opening a received file.<br>" \
 		"<tt>$0</tt> is used in place of the filename</center>","options"));
 
-	l = new QLabel(__tr2qs_ctx("Icon","options"),this);
+	l = new QLabel(__tr2qs_ctx("Icon:","options"),this);
 	layout()->addWidget(l,8,0);
 	m_pIcon = new QLineEdit(this);
 	layout()->addWidget(m_pIcon,8,1,1,2);
diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp
index 942e00d72..5ed61d9ef 100644
--- a/src/modules/options/OptionsWidget_message.cpp
+++ b/src/modules/options/OptionsWidget_message.cpp
@@ -142,7 +142,7 @@ OptionsWidget_timestamp::OptionsWidget_timestamp(QWidget * pParent)
 	KviTalHBox *hb = new KviTalHBox(this);
 	addWidgetToLayout(hb,0,2,0,2);
 
-	m_pSpecialTimestampColorSelector = addBoolSelector(hb,__tr2qs_ctx("Use special color for timestamps","options"),KviOption_boolUseSpecialColorForTimestamp,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp));
+	m_pSpecialTimestampColorSelector = addBoolSelector(hb,__tr2qs_ctx("Use special color for timestamps:","options"),KviOption_boolUseSpecialColorForTimestamp,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp));
 	connect(m_pSpecialTimestampColorSelector,SIGNAL(toggled(bool)),this,SLOT(enableDisableTimestampSelector(bool)));
 	connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,SLOT(setEnabled(bool)));
 
@@ -431,9 +431,9 @@ OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent)
 
 	KviTalHBox * h = new KviTalHBox(this);
 	addWidgetToLayout(h,0,1,3,1);
-	QPushButton * b = new QPushButton(__tr2qs_ctx("Load From...","options"),h);
+	QPushButton * b = new QPushButton(__tr2qs_ctx("Load from...","options"),h);
 	connect(b,SIGNAL(clicked()),this,SLOT(load()));
-	b = new QPushButton(__tr2qs_ctx("Save As...","options"),h);
+	b = new QPushButton(__tr2qs_ctx("Save as...","options"),h);
 	connect(b,SIGNAL(clicked()),this,SLOT(save()));
 
 
diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp
index 34af0898c..f6ff26788 100644
--- a/src/modules/options/OptionsWidget_notifier.cpp
+++ b/src/modules/options/OptionsWidget_notifier.cpp
@@ -232,21 +232,21 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent)
 
 	connect(b,
 		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("Default auto hiding time for messages (0 to disable)","options"),
+		addUIntSelector(g,__tr2qs_ctx("Default auto hiding time for messages (0 to disable):","options"),
 				KviOption_uintNotifierAutoHideTime,
 				0,86400,30,KVI_OPTION_BOOL(KviOption_boolEnableNotifier)),
 		SLOT(setEnabled(bool)));
 
 	connect(b2,
 		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("Notifier window opacity while active (mouseover)","options"),
+		addUIntSelector(g,__tr2qs_ctx("Notifier window opacity while active (mouseover):","options"),
 				KviOption_uintNotifierActiveTransparency,
 				0,100,90,KVI_OPTION_BOOL(KviOption_boolNotifierFading)),
 		SLOT(setEnabled(bool)));
 
 	connect(b2,
 		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("Notifier window opacity while inactive","options"),
+		addUIntSelector(g,__tr2qs_ctx("Notifier window opacity while inactive:","options"),
 				KviOption_uintNotifierInactiveTransparency,
 				0,100,40,KVI_OPTION_BOOL(KviOption_boolNotifierFading)),
 		SLOT(setEnabled(bool)));
diff --git a/src/modules/options/OptionsWidget_notify.cpp b/src/modules/options/OptionsWidget_notify.cpp
index 051bfbe6c..d1c99aab3 100644
--- a/src/modules/options/OptionsWidget_notify.cpp
+++ b/src/modules/options/OptionsWidget_notify.cpp
@@ -77,19 +77,19 @@ OptionsWidget_notify::OptionsWidget_notify(QWidget * parent)
 		SLOT(setEnabled(bool)));
 	connect(b,
 		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("Check interval (in seconds)","options"),
+		addUIntSelector(g,__tr2qs_ctx("Check interval (in seconds):","options"),
 				KviOption_uintNotifyListCheckTimeInSecs,
 				5,3600,180,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
 		SLOT(setEnabled(bool)));
 	connect(b,
 		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("ISON delay (in seconds)","options"),
+		addUIntSelector(g,__tr2qs_ctx("ISON delay (in seconds):","options"),
 				KviOption_uintNotifyListIsOnDelayTimeInSecs,
 				5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
 		SLOT(setEnabled(bool)));
 	connect(b,
 		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("USERHOST delay (in seconds)","options"),
+		addUIntSelector(g,__tr2qs_ctx("USERHOST delay (in seconds):","options"),
 				KviOption_uintNotifyListUserhostDelayTimeInSecs,
 				5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
 		SLOT(setEnabled(bool)));
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 279d449e1..3e021f680 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -828,7 +828,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	if(s->autoJoinChannelList())
 		m_lstChannels = *(s->autoJoinChannelList());
 	m_pChannelListSelector = new KviChannelListSelector(tab,
-		__tr2qs_ctx("Channels to Join Automatically Upon Connect","options"),&m_lstChannels,true);
+		__tr2qs_ctx("Channels to Join Automatically upon Connect","options"),&m_lstChannels,true);
 	KviTalToolTip::add(m_pChannelListSelector,__tr2qs_ctx("<center>Here you can set a list of channels to be joined automatically " \
 		"after a connection to this server has been established. To add a channel, type its name in the " \
 		"text input below and click \"<b>Add</b>\".</center>","options"));
@@ -973,7 +973,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 
 	iRow++;
 
-	l = new QLabel(__tr2qs_ctx("Id:","options"),tab);
+	l = new QLabel(__tr2qs_ctx("ID:","options"),tab);
 	gl->addWidget(l,iRow,0);
 	m_pIdEditor = new QLineEdit(tab);
 	if(s->id().isEmpty())s->generateUniqueId();
@@ -1308,7 +1308,7 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 	m_pNewNetworkButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::World))));
 	m_pNewNetworkButton->setAutoRaise(true);
 	connect(m_pNewNetworkButton,SIGNAL(clicked()),this,SLOT(newNetwork()));
-	KviTalToolTip::add(m_pNewNetworkButton,__tr2qs_ctx("New Network","options"));
+	KviTalToolTip::add(m_pNewNetworkButton,__tr2qs_ctx("New network","options"));
 
 	QFrame * f = new QFrame(vbox);
 	f->setFrameStyle(QFrame::Sunken | QFrame::HLine);
@@ -1317,34 +1317,34 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 	m_pNewServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Server))));
 	m_pNewServerButton->setAutoRaise(true);
 	connect(m_pNewServerButton,SIGNAL(clicked()),this,SLOT(newServer()));
-	KviTalToolTip::add(m_pNewServerButton,__tr2qs_ctx("New Server","options"));
+	KviTalToolTip::add(m_pNewServerButton,__tr2qs_ctx("New nerver","options"));
 
 	m_pFavoriteServerButton = new QToolButton(vbox);
 	m_pFavoriteServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::ServerFavorite))));
 	m_pFavoriteServerButton->setAutoRaise(true);
 	connect(m_pFavoriteServerButton,SIGNAL(clicked()),this,SLOT(favoriteServer()));
-	KviTalToolTip::add(m_pFavoriteServerButton,__tr2qs_ctx("Favorite/Unfavorite Server","options"));
+	KviTalToolTip::add(m_pFavoriteServerButton,__tr2qs_ctx("Favorite/Unfavorite server","options"));
 
 	m_pRemoveButton = new QToolButton(vbox);
 	m_pRemoveButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Remove))));
 	m_pRemoveButton->setEnabled(false);
 	m_pRemoveButton->setAutoRaise(true);
 	connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeCurrent()));
-	KviTalToolTip::add(m_pRemoveButton,__tr2qs_ctx("Remove Network/Server","options"));
+	KviTalToolTip::add(m_pRemoveButton,__tr2qs_ctx("Remove network/server","options"));
 
 	m_pCopyServerButton = new QToolButton(vbox);
 	m_pCopyServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Copy))));
 	m_pCopyServerButton->setEnabled(false);
 	m_pCopyServerButton->setAutoRaise(true);
 	connect(m_pCopyServerButton,SIGNAL(clicked()),this,SLOT(copyServer()));
-	KviTalToolTip::add(m_pCopyServerButton,__tr2qs_ctx("Copy Server","options"));
+	KviTalToolTip::add(m_pCopyServerButton,__tr2qs_ctx("Copy server","options"));
 
 	m_pPasteServerButton = new QToolButton(vbox);
 	m_pPasteServerButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Paste)));
 	m_pPasteServerButton->setEnabled(false);
 	m_pPasteServerButton->setAutoRaise(true);
 	connect(m_pPasteServerButton,SIGNAL(clicked()),this,SLOT(pasteServer()));
-	KviTalToolTip::add(m_pPasteServerButton,__tr2qs_ctx("Paste Server","options"));
+	KviTalToolTip::add(m_pPasteServerButton,__tr2qs_ctx("Paste server","options"));
 
 	f = new QFrame(vbox);
 	f->setFrameStyle(QFrame::Sunken | QFrame::HLine);
@@ -1355,7 +1355,7 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 	m_pImportButton->setMenu(m_pImportPopup);
 	m_pImportButton->setPopupMode(QToolButton::InstantPopup);
 
-	KviTalToolTip::add(m_pImportButton,__tr2qs_ctx("Import Server List","options"));
+	KviTalToolTip::add(m_pImportButton,__tr2qs_ctx("Import server list","options"));
 
 	QFrame * lll = new QFrame(vbox);
 	vbox->setStretchFactor(lll,100);
diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp
index 76d286e67..8a3184745 100644
--- a/src/modules/options/OptionsWidget_sound.cpp
+++ b/src/modules/options/OptionsWidget_sound.cpp
@@ -91,7 +91,7 @@ OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent)
 
 	m_pMediaTestButton->setEnabled(false);
 
-	g = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("ID3 tags encoding","options"),true);
+	g = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("ID3 Tags Encoding","options"),true);
 
 	KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of mp3 tags.","options"));
 
@@ -333,16 +333,16 @@ OptionsWidget_sounds::OptionsWidget_sounds(QWidget * parent)
 {
 	setObjectName("sound_options_widget");
 	createLayout();
-	addLabel(0,0,0,0,__tr2qs_ctx("New query opened","options"));
+	addLabel(0,0,0,0,__tr2qs_ctx("New query opened:","options"));
 	addSoundSelector(1,0,1,0,"",KviOption_stringOnNewQueryOpenedSound);
 
-	addLabel(0,1,0,1,__tr2qs_ctx("New message in inactive query","options"));
+	addLabel(0,1,0,1,__tr2qs_ctx("New message in inactive query:","options"));
 	addSoundSelector(1,1,1,1,"",KviOption_stringOnQueryMessageSound);
 
-	addLabel(0,2,0,2,__tr2qs_ctx("Highlighted message in inactive window","options"));
+	addLabel(0,2,0,2,__tr2qs_ctx("Highlighted message in inactive window:","options"));
 	addSoundSelector(1,2,1,2,"",KviOption_stringOnHighlightedMessageSound);
 
-	addLabel(0,3,0,3,__tr2qs_ctx("On me was kicked","options"));
+	addLabel(0,3,0,3,__tr2qs_ctx("On me was kicked:","options"));
 	addSoundSelector(1,3,1,3,"",KviOption_stringOnMeKickedSound);
 
 	addRowSpacer(0,4,1,4);
diff --git a/src/modules/options/OptionsWidget_textIcons.h b/src/modules/options/OptionsWidget_textIcons.h
index 25bf97299..23885a3af 100644
--- a/src/modules/options/OptionsWidget_textIcons.h
+++ b/src/modules/options/OptionsWidget_textIcons.h
@@ -34,7 +34,7 @@
 class TextIconTableItem;
 
 #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textIcons KviIconManager::BigGrin
-#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textIcons __tr2qs_no_lookup("Text icons")
+#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textIcons __tr2qs_no_lookup("Text Icons")
 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_textIcons OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textIcons __tr2qs_no_lookup("smileys,emoticons")
 
diff --git a/src/modules/options/OptionsWidget_tray.cpp b/src/modules/options/OptionsWidget_tray.cpp
index 5c75c84f2..0a64eb351 100644
--- a/src/modules/options/OptionsWidget_tray.cpp
+++ b/src/modules/options/OptionsWidget_tray.cpp
@@ -59,11 +59,11 @@ OptionsWidget_tray::OptionsWidget_tray(QWidget * parent)
 
 	m_pLevelsGroup = addGroupBox(0,5,0,5,Qt::Horizontal,__tr2qs_ctx("Select Message Levels to Notify","options"));
 
-	addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for low-priority messages","options"),
+	addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for low-priority messages:","options"),
 				KviOption_uintMinTrayLowLevelMessage,
 				1,5,1,true);
 
-	addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for high-priority message","options"),
+	addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for high-priority message:","options"),
 				KviOption_uintMinTrayHighLevelMessage,
 				1,5,4,true);
 
diff --git a/src/modules/options/OptionsWidget_tray.h b/src/modules/options/OptionsWidget_tray.h
index 0785f21c9..46111b7ff 100644
--- a/src/modules/options/OptionsWidget_tray.h
+++ b/src/modules/options/OptionsWidget_tray.h
@@ -29,7 +29,7 @@
 #include <QComboBox>
 
 #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tray KviIconManager::TrayIcon
-#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tray __tr2qs_no_lookup("Tray icon")
+#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tray __tr2qs_no_lookup("Tray Icon")
 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_tray OptionsWidget_interfaceFeatures
 #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_tray __tr2qs_no_lookup("tray,TRAYICON")
 
diff --git a/src/modules/options/OptionsWidget_urlHandlers.cpp b/src/modules/options/OptionsWidget_urlHandlers.cpp
index 5574b797e..56f421fdf 100644
--- a/src/modules/options/OptionsWidget_urlHandlers.cpp
+++ b/src/modules/options/OptionsWidget_urlHandlers.cpp
@@ -48,10 +48,10 @@ OptionsWidget_urlHandlers::OptionsWidget_urlHandlers(QWidget * parent)
 
 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Mouse Handler","options"));
 
-	addLabel(gbox,__tr2qs_ctx("How many click to open links?","options"));
+	addLabel(gbox,__tr2qs_ctx("How many clicks to open links?","options"));
 
-	m_pClickRadio = new QRadioButton(__tr2qs_ctx("Single click","options"),gbox);
-	m_pDoubleClickRadio = new QRadioButton(__tr2qs_ctx("Double click","options"),gbox);
+	m_pClickRadio = new QRadioButton(__tr2qs_ctx("Single-click","options"),gbox);
+	m_pDoubleClickRadio = new QRadioButton(__tr2qs_ctx("Double-click","options"),gbox);
 
 	switch(KVI_OPTION_UINT(KviOption_uintUrlMouseClickNum))
 	{
diff --git a/src/modules/options/OptionsWidget_urlHandlers.h b/src/modules/options/OptionsWidget_urlHandlers.h
index 6768cddc9..c797c6f8e 100644
--- a/src/modules/options/OptionsWidget_urlHandlers.h
+++ b/src/modules/options/OptionsWidget_urlHandlers.h
@@ -29,7 +29,7 @@
 class QRadioButton;
 
 #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_urlHandlers KviIconManager::Url
-#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_urlHandlers __tr2qs_no_lookup("URL handlers")
+#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_urlHandlers __tr2qs_no_lookup("URL Handlers")
 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_urlHandlers OptionsWidget_general
 #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_urlHandlers 70000
 #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_urlHandlers __tr2qs_no_lookup("URL,programs")
diff --git a/src/modules/popup/libkvipopup.cpp b/src/modules/popup/libkvipopup.cpp
index b2800b5e7..4b66c6fca 100644
--- a/src/modules/popup/libkvipopup.cpp
+++ b/src/modules/popup/libkvipopup.cpp
@@ -828,7 +828,7 @@ static bool popup_kvs_cmd_show(KviKvsModuleCommandCall * c)
 	{
 		delete pPopupParams;
 		pPopupParams = 0;
-		c->error(__tr2qs_ctx("A popup menu cannot be popped up twice","kvs"));
+		c->error(__tr2qs_ctx("A popup menu can't be popped up twice","kvs"));
 		return false;
 	}
 
diff --git a/src/modules/proxydb/libkviproxydb.cpp b/src/modules/proxydb/libkviproxydb.cpp
index ac925082a..e4a9c79ae 100644
--- a/src/modules/proxydb/libkviproxydb.cpp
+++ b/src/modules/proxydb/libkviproxydb.cpp
@@ -731,7 +731,7 @@ KVIRC_MODULE(
 	"ProxyDB",                                              // module name
 	"4.0.0",                                                // module version
 	"Copyright (C) 2008 Elvio Basello (hellvis69 at netsons dot org)", // author & (C)
-	"IRC proxy server DB related functions",
+	"IRC proxy serverDB related functions",
 	proxydb_module_init,
 	proxydb_module_can_unload,
 	0,
diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp
index 18349c2fd..bc3357bb5 100644
--- a/src/modules/raweditor/RawEditorWindow.cpp
+++ b/src/modules/raweditor/RawEditorWindow.cpp
@@ -521,7 +521,7 @@ QPixmap * RawEditorWindow::myIconPtr()
 
 void RawEditorWindow::fillCaptionBuffers()
 {
-	m_szPlainTextCaption = __tr2qs_ctx("Raw Editor","editor");
+	m_szPlainTextCaption = __tr2qs_ctx("RAW Editor","editor");
 }
 
 void RawEditorWindow::getConfigGroupName(QString &szName)
diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp
index 8cb85d83f..2f2d34577 100644
--- a/src/modules/reguser/RegisteredUsersDialog.cpp
+++ b/src/modules/reguser/RegisteredUsersDialog.cpp
@@ -283,7 +283,7 @@ RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par)
 	m_pExportButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Floppy)));
 
 
-	m_pImportButton = new QPushButton(__tr2qs_ctx("Import From...","register"),vbox);
+	m_pImportButton = new QPushButton(__tr2qs_ctx("Import from...","register"),vbox);
 	connect(m_pImportButton,SIGNAL(clicked()),this,SLOT(importClicked()));
 	m_pImportButton->setToolTip(__tr2qs_ctx("Import entries from a file exported earlier by the \"export\" function of this dialog.","register"));
 	m_pImportButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Folder)));
diff --git a/src/modules/serverdb/libkviserverdb.cpp b/src/modules/serverdb/libkviserverdb.cpp
index 17fb6b704..3977bd03d 100644
--- a/src/modules/serverdb/libkviserverdb.cpp
+++ b/src/modules/serverdb/libkviserverdb.cpp
@@ -39,9 +39,9 @@ extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase;
 	@short:
 		Interface to the servers database
 	@title:
-		The serverdb module
+		The serverDB module
 	@body:
-		The serverdb module is the scripting interface to the servers and networks database.[br]
+		The serverDB module is the scripting interface to the servers and networks database.[br]
 		It provides the following set of commands:[br]
 		[cmd]serverdb.addNetwork[/cmd]: adds a network entry to the database[br]
 		[cmd]serverdb.addServer[/cmd]: adds a server entry to the database[br]
@@ -335,11 +335,11 @@ SERVERDB_GET_NETWORK_PROPERTY(serverdb_kvs_fnc_networkUserName,userName)
 	@title:
 		$serverdb.networkRealName
 	@short:
-		Returns the realname
+		Returns the real name
 	@syntax:
 		<string> $serverdb.networkRealName(<network:string>)
 	@description:
-		Returns the realname set for the network <network> if set
+		Returns the real name set for the network <network> if set
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
 */
@@ -523,11 +523,11 @@ SERVERDB_GET_SERVER_PROPERTY(serverdb_kvs_fnc_serverUserName,userName,setString)
 	@title:
 		$serverdb.serverRealName
 	@short:
-		Returns the realname
+		Returns the real name
 	@syntax:
 		<string> $serverdb.serverRealName(<network:string>,<server:string>)
 	@description:
-		Returns the realname set for the server <server> of the network <network> if set
+		Returns the real name set for the server <server> of the network <network> if set
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
 */
@@ -823,7 +823,7 @@ END_SERVERDB_GET_SERVER_PROPERTY
 		Autoconnect this network at KVIrc start.
 	@examples:
 		[example]
-		if(![fnc]$serverdb.networkExists[/fnc](Freenode)) serverdb.addNetwork -q Freenode
+		if(![fnc]$serverdb.networkExists[/fnc](freenode)) serverdb.addNetwork -q freenode
 		[/example]
 	@seealso:
 		[module:serverdb]ServerDB module documentation[/module]
@@ -1094,17 +1094,17 @@ SERVERDB_SET_NETWORK_PROPERTY(serverdb_kvs_cmd_setNetworkUserName,setUserName)
 	@title:
 		serverdb.setNetworkRealName
 	@short:
-		Sets the realname
+		Sets the realn ame
 	@syntax:
 		serverdb.setNetworkRealName [switches] <name:string> <realname:string>
 	@description:
-		Sets the realname <realname> for the specified network <name>.
+		Sets the real name <realname> for the specified network <name>.
 	@switches:
 		!sw: -q | --quiet
 		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]
+		[comment]Quietly sets the real name KVIrc 4.0 for the freenode network[/comment][br]
 		serverdb.setNetworkRealName -q freenode KVIrc 4.0
 		[/example]
 	@seealso:
@@ -1318,17 +1318,17 @@ SERVERDB_SET_SERVER_PROPERTY(serverdb_kvs_cmd_setServerUserName,setUserName)
 	@title:
 		serverdb.setServerRealName
 	@short:
-		Sets the realname
+		Sets the real name
 	@syntax:
 		serverdb.setServerRealName [switches] <network:string> <server:string> <realname:string>
 	@description:
-		Sets the realname <realname> for the specified server <server> in the network <network>.
+		Sets the real name <realname> for the specified server <server> in the network <network>.
 	@switches:
 		!sw: -q | --quiet
 		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 real name KVIrc 4.0 for the freenode server[/comment][br]
 		serverdb.setServerRealName -q irc.freenode.net KVIrc 4.0
 		[/example]
 	@seealso:
@@ -1560,7 +1560,7 @@ KVIRC_MODULE(
 	"ServerDB",                                              // module name
 	"4.0.0",                                                // module version
 	"Copyright (C) 2008 Elvio Basello (hellvis69 at netsons dot org)", // author & (C)
-	"IRC server DB related functions",
+	"IRC serverDB related functions",
 	serverdb_module_init,
 	serverdb_module_can_unload,
 	0,
diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp
index 44ddde6b0..5394afea3 100644
--- a/src/modules/setup/SetupWizard.cpp
+++ b/src/modules/setup/SetupWizard.cpp
@@ -935,7 +935,7 @@ void SetupWizard::setUrlHandlers()
 void SetupWizard::reject()
 {
 	if(QMessageBox::warning(this,__tr2qs("Abort Setup - KVIrc Setup"),
-		__tr2qs("You have chosen to abort the setup.<br>KVIrc cannot run until you complete this procedure.<br><br>Do you really wish to abort?"),
+		__tr2qs("You have chosen to abort the setup.<br>KVIrc can't run until you complete this procedure.<br><br>Do you really wish to abort?"),
 		QMessageBox::Yes,QMessageBox::No|QMessageBox::Default|QMessageBox::Escape) != QMessageBox::Yes)return;
 
 	KviTalWizard::reject();
@@ -966,7 +966,7 @@ void SetupWizard::accept()
 		{
 			if(!KviFileUtils::makeDir(szDir))
 			{
-				KviMessageBox::warning(__tr("Cannot create directory %s.\n" \
+				KviMessageBox::warning(__tr("Can't create directory %s.\n" \
 					"You may not have write permission " \
 					"for that path. Please go back and choose another directory."));
 				setCurrentPage(m_pDirectory);
@@ -997,7 +997,7 @@ void SetupWizard::accept()
 		{
 			if(!KviFileUtils::makeDir(szDir))
 			{
-				KviMessageBox::warning(__tr("Cannot create directory %s.\n" \
+				KviMessageBox::warning(__tr("Can't create directory %s.\n" \
 					"You may not have write permission " \
 					"for that path. Please go back and choose another directory."));
 				setCurrentPage(m_pDirectory);
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 70ed795f5..09541a148 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -237,7 +237,7 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c)
 	@description:
 		Returns the current value of the system clipboard.
 		Please note that there are systems that have the concept
-		of "selection" (most notably X11) which is NOT the same as the clipboard.
+		of "selection" (most notably X11) which is [b]not[/b] the same as the clipboard.
 		See [fnc]$system.selection[/fnc]().
 	@seealso:
 		[fnc]$system.selection[/fnc],
@@ -267,7 +267,7 @@ static bool system_kvs_fnc_clipboard(KviKvsModuleFunctionCall *c)
 	@description:
 		Sets the system clipboard contents to the string <data>.
 		Please note that there are systems that have the concept
-		of "selection" (most notably X11) which is NOT the same as the clipboard.
+		of "selection" (most notably X11) which is [b]not[/b] the same as the clipboard.
 		See [fnc]$system.selection[/fnc]().
 	@seealso:
 		[fnc]$system.selection[/fnc],
@@ -301,7 +301,7 @@ static bool system_kvs_cmd_setClipboard(KviKvsModuleCommandCall * c)
 	@description:
 		Sets the system selection contents to the string <data>.
 		Please note that this command will work only on systems that have the concept
-		of "selection" (most notably X11) which is NOT the same as the clipboard.
+		of "selection" (most notably X11) which is [b]not[/b] the same as the clipboard.
 	@seealso:
 		[fnc]$system.selection[/fnc],
 		[fnc]$system.clipboard[/fnc],
@@ -333,7 +333,7 @@ static bool system_kvs_cmd_setSelection(KviKvsModuleCommandCall * c)
 	@description:
 		Returns the current value of the system selection.
 		This function will work only on systems that have the concept
-		of "selection" (most notably X11) which is NOT the same as clipboard.
+		of "selection" (most notably X11) which is [b]not[/b] the same as clipboard.
 		On other systems this function will always return an empty string.
 		See [fnc]$system.clipboard[/fnc]().
 	@seealso:
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index e79f451f1..0a7b61366 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -95,7 +95,7 @@ TipWindow::TipWindow()
 
 	setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Idea)));
 
-	setWindowTitle(__tr2qs("Did you know..."));
+	setWindowTitle(__tr2qs("Did You Know..."));
 
 	QGridLayout *layout = new QGridLayout(this);
 	layout->addWidget(m_pTipFrame,0,0,1,5);
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 97cdc276f..6879b4287 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -232,7 +232,7 @@ static bool window_kvs_cmd_undock(KviKvsModuleCommandCall * c)
 		the current window is activated. If the specified window
 		does not exist a warning is printed unless the -q switch is used.
 		Please note that if the window is currently docked to a frame then this
-		command will NOT raise the frame window. If you're interested in
+		command will [b]not[/b] raise the frame window. If you're interested in
 		the user's attention then you might be interested in [cmd]window.demandAttention[/cmd].
 	@seealso:
 		[cmd]window.demandAttention[/cmd]
@@ -747,7 +747,7 @@ static bool window_kvs_cmd_listtypes(KviKvsModuleCommandCall * c)
 	@syntax:
 		$window.list(<type>[,<irc_context_id>])
 	@description:
-		Returns an array of window identifiers with a speficied type and eventually belonging to a specified
+		Returns an array of window identifiers with a specified type and eventually belonging to a specified
 		irc context.[br]
 		<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]
@@ -972,9 +972,9 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 		to any context) and will exist until it is closed by the GUI, by a [cmd]window.close[/cmd]
 		call or until KVIrc terminates. When <irc_context> is given but is not valid
 		then a warning is printed (unless the q flag is used) and the created window is context free.[br]
-		You will generally use the [fnc]$context[/fnc] function to retrieve the current IRC context id.[br]
+		You will generally use the [fnc]$context[/fnc] function to retrieve the current IRC context ID.[br]
 		[br]
-		<icon> is intepreted as the index of the internal icon to be used
+		<icon> is interpreted as the index of the internal icon to be used
 		for the window. If <icon> is omitted then a default icon is used.[br]
 	@examples:
 		[example]
@@ -1282,7 +1282,7 @@ static bool window_kvs_cmd_setBackground(KviKvsModuleCommandCall * c)
 		window.savePropertiesAsDefault [window_id]
 	@description:
 		Saves the window properties of the specified window as default for every window
-		of the same type (eg: all queries, all channels, ..).
+		of the same type (e.g. all queries, all channels, ..).
 		If window_id is missing then the current window properties are used.
 */
 
@@ -1358,7 +1358,7 @@ static bool initializeCryptEngine(KviCryptEngine * eng,KviCString &szEncryptKey,
 		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.
+		decrypting. This command works only if cryptography support is compiled in.
 	@examples:
 		[example]
 		[comment]# This is a really lame example :D[/comment]
@@ -1434,11 +1434,11 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c)
 				if(szError.isEmpty())szError = __tr2qs("Unknown engine error");
 				g_pCryptEngineManager->deallocateEngine(e);
 				if(!c->hasSwitch('q',"quiet"))
-					c->warning(__tr2qs("Failed to initialize the specified crypt engine: %Q"),&szError);
+					c->warning(__tr2qs("Failed to initialize the specified encryption engine: %Q"),&szError);
 			}
 		} else {
 			if(!c->hasSwitch('q',"quiet"))
-				c->warning(__tr2qs("The crypt engine \"%Q\" doesn't exist"),&szEngine);
+				c->warning(__tr2qs("The encryption engine \"%Q\" doesn't exist"),&szEngine);
 		}
 	}
 #else
@@ -1455,11 +1455,11 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c)
 	@title:
 		$window.cryptEngine
 	@short:
-		Returns the name of the crypt engine currently set in a window
+		Returns the name of the encryption engine currently set in a window
 	@syntax:
 		$window.cryptEngine(<window_id:integer>)
 	@description:
-		Returns the name of the crypt engine set in the current window.
+		Returns the name of the encryption engine set in the current window.
 		If no current engine is set then empty string is returned.
 	@seealso:
 		[cmd]window.setCryptEngine[/cmd]