[ci skip] cpp file typos and capitalization corrections

33 files changed, 169 insertions, 169 deletions

diff --git a/src/kvilib/net/KviDnsResolverNew.cpp b/src/kvilib/net/KviDnsResolverNew.cpp
index 92502f812..94ab413ea 100644
--- a/src/kvilib/net/KviDnsResolverNew.cpp
+++ b/src/kvilib/net/KviDnsResolverNew.cpp
@@ -141,7 +141,7 @@ void KviDnsResolver::slotHostLookupTerminated(const QHostInfo &oHostInfo)
 				m_pPrivateData->pAddressList->append(new QString(oAddress.toString()));
 			break;
 			default:
-				KVI_ASSERT_MSG(false,"Invalid dns query type!");
+				KVI_ASSERT_MSG(false,"Invalid DNS query type!");
 				m_pPrivateData->eState = Failure;
 				m_pPrivateData->eError = KviError::InternalError;
 				m_pPrivateData->szError = __tr2qs("Internal error: unhandled DNS query type");
diff --git a/src/kvirc/kernel/KviActionManager.cpp b/src/kvirc/kernel/KviActionManager.cpp
index a9a08d69c..55ea5665e 100644
--- a/src/kvirc/kernel/KviActionManager.cpp
+++ b/src/kvirc/kernel/KviActionManager.cpp
@@ -59,12 +59,12 @@ KviActionManager::KviActionManager()
 	__var = new KviActionCategory(__name,__vname,__descr); \
 	m_pCategories->replace(__name,__var)
 
-	CATEGORY(m_pCategoryIrc,"irc",__tr2qs("IRC"),__tr2qs("IRC Context related actions"));
+	CATEGORY(m_pCategoryIrc,"irc",__tr2qs("IRC"),__tr2qs("IRC context related actions"));
 	CATEGORY(m_pCategoryGeneric,"generic",__tr2qs("Generic"),__tr2qs("Generic actions"));
 	CATEGORY(m_pCategorySettings,"settings",__tr2qs("Settings"),__tr2qs("Actions related to settings"));
 	CATEGORY(m_pCategoryScripting,"scripting",__tr2qs("Scripting"),__tr2qs("Scripting related actions"));
 	CATEGORY(m_pCategoryGUI,"gui",__tr2qs("GUI"),__tr2qs("Actions related to the Graphic User Interface"));
-	CATEGORY(m_pCategoryChannel,"channel",__tr2qs("Channel"),__tr2qs("IRC Channel related actions"));
+	CATEGORY(m_pCategoryChannel,"channel",__tr2qs("Channel"),__tr2qs("IRC channel related actions"));
 	CATEGORY(m_pCategoryTools,"tools",__tr2qs("Tools"),__tr2qs("Actions that will appear in the \"Tools\" menu"));
 
 	m_bCustomizingToolBars = false;
@@ -282,7 +282,7 @@ KviAction * KviActionManager::getAction(const QString &szName)
 	if((idx == 5) && (!m_bCoreActionsRegistered))
 	{
 		// the core actions are all like kvirc.name
-		// so the dot is at poisition 5 (6th char)
+		// so the dot is at position 5 (6th char)
 		// the first requested core action will trigger this
 		// the nice thing is that we will probably already have a frame when
 		// the core actions are registered thus stuff like windowStack() can be accessed...
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
index d352b2981..5b5455b4e 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
@@ -68,10 +68,10 @@ namespace KviKvsCoreSimpleCommands
 		@short:
 			Sends a CTCP ACTION
 		@description:
-			Sends a CTCP ACTION to the current channel, query or dcc chat.[br]
+			Sends a CTCP ACTION to the current channel, query or DCC chat.[br]
 			If you execute it in any other window type, you will get an error.[br]
 			If you want to use this command in a window that is not a channel
-			query or dcc chat, you may use the [doc:command_rebinding]standard -r switch[/doc].
+			query or DCC chat, you may use the [doc:command_rebinding]standard -r switch[/doc].
 		@examples:
 			[example]
 			me is Hungry!
@@ -115,9 +115,9 @@ namespace KviKvsCoreSimpleCommands
 		@syntax:
 			mode <target> <modeflags> [mode parameters]
 		@short:
-			Sends a MODE irc message
+			Sends a MODE IRC message
 		@description:
-			Sends a MODE irc message to the server of the current IRC context.[br]
+			Sends a MODE IRC message to the server of the current IRC context.[br]
 			The parameters are not modified in any way by KVIrc: so
 			you should use the RFC1459 syntax.[br]
 			This command is [doc:connection_dependant_commands]connection dependant[/doc].
@@ -335,12 +335,12 @@ namespace KviKvsCoreSimpleCommands
 		@syntax:
 			openurl <url:string>
 		@short:
-			Opens an url
+			Opens an URL
 		@description:
 			Opens the specified <url> with an appropriate handler.<br>
-			The handlers for the supported url types are specified in the options dialog.<br>
-			Each handler is a kvirc commandline that the url will be passed to as the first parameter ($0).<br>
-			The supported url types are:<br>
+			The handlers for the supported URL types are specified in the options dialog.<br>
+			Each handler is a kvirc commandline that the URL will be passed to as the first parameter ($0).<br>
+			The supported URL types are:<br>
 			HTTP: http://&lt;url&gt; or sth that begins with "www." <br>
 			HTTPS: https://&lt;url&gt;<br>
 			FILE: file://&lt;url&gt;<br>
@@ -392,7 +392,7 @@ namespace KviKvsCoreSimpleCommands
 		{
 			if(KviIrcUrl::run(szUrl,KviIrcUrl::TryEveryContext | KviIrcUrl::DoNotPartChans,KVSCSC_pContext->console()) & KviIrcUrl::InvalidProtocol)
 			{
-				KVSCSC_pContext->warning(__tr2qs_ctx("Invalid IRC url (%Q)","kvs"),&szUrl);
+				KVSCSC_pContext->warning(__tr2qs_ctx("Invalid IRC URL (%Q)","kvs"),&szUrl);
 			}
 			return true;
 		} else if(KviQString::equalCIN(szUrl,"mailto",6))
@@ -438,7 +438,7 @@ namespace KviKvsCoreSimpleCommands
 					                 DLLs required to run this application was corrupt.
 					  21             Application requires Microsoft Windows 32-bit extensions.
 				*/
-				KVSCSC_pContext->warning(__tr2qs_ctx("The system handler for the url failed to execute: system error is %1","kvs").arg(iRet));
+				KVSCSC_pContext->warning(__tr2qs_ctx("The system handler for the URL failed to execute: system error is %1","kvs").arg(iRet));
 			}
 		} else {
 #endif
@@ -453,9 +453,9 @@ namespace KviKvsCoreSimpleCommands
 				KviKvsScript script(szName,szCommand);
 
 				if(!script.run(KVSCSC_pWindow,&vList,0,KviKvsScript::PreserveParams))
-					KVSCSC_pContext->warning(__tr2qs_ctx("The commandline for this url type seems to be broken (%Q)","kvs"),&szUrl);
+					KVSCSC_pContext->warning(__tr2qs_ctx("The commandline for this URL type seems to be broken (%Q)","kvs"),&szUrl);
 
-			} else KVSCSC_pContext->warning(__tr2qs_ctx("No commandline specified for this type of url (%Q)","kvs"),&szUrl);
+			} else KVSCSC_pContext->warning(__tr2qs_ctx("No commandline specified for this type of URL (%Q)","kvs"),&szUrl);
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		}
 #endif
@@ -514,27 +514,27 @@ namespace KviKvsCoreSimpleCommands
 			[b]MessageType[/b]: <optValue> is a comma separated list of message type properties:
 				<icon>,<foreground>,<background>,<logBoolean>,<level>: <icon> is the index of the internal
 				small icon that has to be shown with the message type, <foreground> is an integer
-				indicating the mirc color to be used for the message type text (0-15),
+				indicating the mIRC color to be used for the message type text (0-15),
 				<background> is similar to foreground and accepts also the value of 100 that means transparent.
-				<logBoolean> is a boolean value (0/1) that indicates wheter this message type has to be logged or not.
+				<logBoolean> is a boolean value (0/1) that indicates whether this message type has to be logged or not.
 				<level> is the message level (actually from 0 to 5).[br]
 			[b]Rectangle[/b]: <optValue> is a comma separated list of integer values that indicate <x>,<y>,<width> and <height>.[br]
 			[b]Pixmap[/b]: <optValue> must be an ABSOLUTE path of the image that you want to load.[br]
 			[b]Int[/b]: <optValue> must be an integer.[br]
 			[b]Uint[/b]: <optValue> must be an UNSIGNED positive integer.[br]
 			Almost all the options available in the option dialog can be set by this command.[br]
-			Some GUI options might require a KVIrc restart to work properly (altough I've tried to avoid that when possible).
+			Some GUI options might require a KVIrc restart to work properly (although I've tried to avoid that when possible).
 		@examples:
 			[example]
 				[comment]# List available options[/comment]
 				option
-				[comment]# Set the mdi mananger background image[/comment]
+				[comment]# Set the mdi manager background image[/comment]
 				option pixmapMdiBackground /home/pragma/myback1.png
 				[comment]# Set the frame caption text[/comment]
 				option stringFrameCaption KVIrc rulez!
 				[comment]# Enable verbose mode[/comment]
 				option boolBeVerbose 1
-				[comment]# Set the irc view font[/comment]
+				[comment]# Set the IRC view font[/comment]
 				option fontIrcView helvetica,24,5,1,50
 			[/example]
 		@seealso:
@@ -557,7 +557,7 @@ namespace KviKvsCoreSimpleCommands
 			// list available options
 			g_pApp->listAvailableOptions(KVSCSC_pWindow);
 		} else {
-			if(!g_pApp->setOptionValue(szName,szValue))KVSCSC_pContext->warning(__tr2qs_ctx("Option setting error: Unknown option or invalid value for option type","kvs"));
+			if(!g_pApp->setOptionValue(szName,szValue))KVSCSC_pContext->warning(__tr2qs_ctx("Option setting error: unknown option or invalid value for option type","kvs"));
 		}
 
 		return true;
@@ -630,7 +630,7 @@ namespace KviKvsCoreSimpleCommands
 			[/example]
 			[example]
 				[comment]# Here we are assuming that fetchdata.kvs returns a string[/comment]
-				[comment]# We evaluate the return value thru ${} and echo it[/comment]
+				[comment]# We evaluate the return value through ${} and echo it[/comment]
 				echo ${ parse -r /home/pragma/fetchdata.kvs; };
 			[/example]
 	*/
@@ -1000,7 +1000,7 @@ namespace KviKvsCoreSimpleCommands
 		@description:
 			Opens a query window for each user specified in <nickname list>
 			which is a [b]comma separated[/b] list of nicknames.[br]
-			If [text] is speficied, it is sent to the
+			If [text] is specified, it is sent to the
 			query window just as it would have been written in the query itself.
 			If a query with one of the specified targets already exists,
 			it is simply focused and the [text] is sent to the target.[br]
@@ -1084,7 +1084,7 @@ namespace KviKvsCoreSimpleCommands
 			quit [-f] [-u] [quit-message:string]
 		quit -q
 		@short:
-			Terminates the current IRC connection or the entier application
+			Terminates the current IRC connection or the entire application
 		@switches:
 			!sw: -q | --quit
 			Terminates this KVIrc application instance
@@ -1162,7 +1162,7 @@ namespace KviKvsCoreSimpleCommands
 		@short:
 			Raises the KVIrc frame window
 		@description:
-			Raises and activates the KVIrc frame window....assuming that your window manager supports it.[br]
+			Raises and activates the KVIrc frame window, assuming that your window manager supports it.[br]
 	*/
 
 	KVSCSC(raise)
@@ -1204,7 +1204,7 @@ namespace KviKvsCoreSimpleCommands
 			[example]
 			[comment]# Send a private message "by hand"[/comment]
 			raw PRIVMSG Pragma :hello!
-			[comment]# Send a private message thru another connection[/comment]
+			[comment]# Send a private message through another connection[/comment]
 			raw -r=[fnc]$console[/fnc]([fnc]$ic[/fnc](irc.otherserver.com,othernick)) PRIVMSG Pragma :heya on this side!
 			[/example]
 	*/
@@ -1255,7 +1255,7 @@ namespace KviKvsCoreSimpleCommands
 			[comment]# Try this example in a channel or query window[/comment][br]
 			[comment]# Remember the current window id[/comment][br]
 			%winid = $window[br]
-			[comment]# Rebind to the console of the current irc context[/comment][br]
+			[comment]# Rebind to the console of the current IRC context[/comment][br]
 			rebind $console[br]
 			echo "Hello from the console :)"[br]
 			echo "Hello again.. still in the console"[br]
@@ -1297,7 +1297,7 @@ namespace KviKvsCoreSimpleCommands
 			and stops the execution.[br]
 			This is more or less equivalent to calling [cmd]setreturn[/cmd] <string>
 			and then [cmd]halt[/cmd], but has no additional semantics in events.[br]
-			Starting from version 3.0.0 of kvirc you can also return
+			Starting from version 3.0.0 of KVIrc you can also return
 			arrays and hashes just like any other variable types.
 		@examples:
 			return $array(item1,item2,3213,itemX);
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp
index 367aa7366..b16c2b5d6 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp
@@ -68,7 +68,7 @@ namespace KviKvsCoreSimpleCommands
 			then the command is rebound to the window specified by <window_id>.
 			The main difference is that the variables and identifiers in <text>
 			are always parsed (when typing this happen only if the text is a command).[br]
-			The switch -x will make say evaluate and execute arbitary commands, too:
+			The switch -x will make say evaluate and execute arbitrary commands, too:
 			if <text> begins with a slash then it will be treated as a command
 			to be evaluated and executed (after parsing the identifiers etc.).[br]
 			If this happens, the executed command will not be send to the active channel.[br]
@@ -78,7 +78,7 @@ namespace KviKvsCoreSimpleCommands
 			will just print "foo".[br]
 			Please note that using /say -x with a <text> that isn't a constant
 			in the script but comes from some unidentified external source (e.g. the network)
-			is a potential security flaw as it enables anyone to execute arbitary commands:
+			is a potential security flaw as it enables anyone to execute arbitrary commands:
 			don't ever do it.[br]
 			When the -x switch is not used, the text is never interpreted as a command.
 			-q causes the command to run quietly.[br]
@@ -96,7 +96,7 @@ namespace KviKvsCoreSimpleCommands
 		if(KVSCSC_pSwitches->find('x',"allow-exec"))
 		{
 			// allow execution of commands
-			if(!KviUserInput::parse(szText,KVSCSC_pWindow,__tr2qs_ctx("say: injected commandline","kvs")))
+			if(!KviUserInput::parse(szText,KVSCSC_pWindow,__tr2qs_ctx("Say: injected commandline","kvs")))
 			{
 				if(!KVSCSC_pSwitches->find('q',"quiet"))
 					KVSCSC_pContext->warning(__tr2qs_ctx("Say parse error: Broken command","kvs"));
@@ -183,14 +183,14 @@ namespace KviKvsCoreSimpleCommands
 			[br]
 			If <server> is in the form "id:<some_string>" then <some_string>
 			is interpreted as the server's internal id (specified in the options dialog).
-			This is useful when you need to force kvirc to choose between multiple
+			This is useful when you need to force KVIrc to choose between multiple
 			server entries with the same hostname and port stored in the database.[br]
 			Please note that this form causes most of the switches to have no effect
 			since the entry in the database will override them. If no server
 			entry with the specified identifier is found then an error will be generated
 			and the connection attempt will stop.
 			[br]
-			If <server> doesn't seem to be a valid ip address or hostname (i.e. it contains no dots)
+			If <server> doesn't seem to be a valid IP address or hostname (i.e. it contains no dots)
 			and it doesn't look to be in the form "id:<some_string>" then
 			it is assumed to be a network name and if such a network is found
 			in the server list then the best server for that network is contacted.
@@ -847,7 +847,7 @@ namespace KviKvsCoreSimpleCommands
 			[example]
 			# Unban people on the current channel (say #kvirc)
 			unban Maxim,Gizmo!*@*,*!root@*
-			# Do the same but from another window belongin to this IRC context
+			# Do the same but from another window belonging to this IRC context
 			unban -r=[fnc]$channel[/fnc](#kvirc) Maxim,Gizmo!*@*,*!root@*
 			# Do the same from any window
 			unban -r=[fnc]$channel[/fnc](#kvirc,[fnc]$context[/fnc](irc.myirc.net,Pragma)) Maxim,Gizmo!*@*,*!root*@*
@@ -1057,7 +1057,7 @@ namespace KviKvsCoreSimpleCommands
 		@short:
 			Requests user information
 		@description:
-			Requests information about an irc user specified by <nickname>.[br]
+			Requests information about an IRC user specified by <nickname>.[br]
 			If [server] is specified, the request is directed to that one. [server]
 			may be a nickname so that the request is redirected to the server that
 			the user with that nickname is connected to.[br]
diff --git a/src/kvirc/kvs/KviKvsPopupMenu.cpp b/src/kvirc/kvs/KviKvsPopupMenu.cpp
index 80a61e01d..c3fc83263 100644
--- a/src/kvirc/kvs/KviKvsPopupMenu.cpp
+++ b/src/kvirc/kvs/KviKvsPopupMenu.cpp
@@ -820,7 +820,7 @@ void KviKvsPopupMenu::setupMenuContents()
 			if(m_bSetupDone)return;
 			// we have been called by doPopup
 			// the menu contents have been already cleared
-			if(m_pTopLevelData)qDebug("Ops.. something got messed in KviKvsPopupMenu activation system");
+			if(m_pTopLevelData)qDebug("Ooops... Something got messed in KviKvsPopupMenu activation system");
 			// Swap the top level data from temporary to the permanent
 			m_pTopLevelData = m_pTempTopLevelData;
 			m_pTempTopLevelData = 0;
@@ -838,7 +838,7 @@ void KviKvsPopupMenu::setupMenuContents()
 	KviKvsPopupMenuTopLevelData * d = topLevelData();
 	if(!d)
 	{
-		qDebug("Ops...menu contents changed behind my back!");
+		qDebug("Ooops... Menu contents changed behind my back!");
 		return;
 	}
 
@@ -933,9 +933,9 @@ void KviKvsPopupMenu::itemClicked(QAction *pAction)
 				// FIXME: should we print somethng if run() returns false ?
 				lock(KviKvsPopupMenuTopLevelData::Unlocked);
 			}
-		} else qDebug("oops....clicked something that is not an item at position %d",param);
+		} else qDebug("Oops.... Clicked something that is not an item at position %d",param);
 		// FIXME: #warning "Maybe tell that the window has changed"
-	} else qDebug("oops....no menu item at position %d",param);
+	} else qDebug("Oops.... No menu item at position %d",param);
 }
 
 
diff --git a/src/kvirc/kvs/KviKvsReport.cpp b/src/kvirc/kvs/KviKvsReport.cpp
index 453b72dd5..2d9bf1170 100644
--- a/src/kvirc/kvs/KviKvsReport.cpp
+++ b/src/kvirc/kvs/KviKvsReport.cpp
@@ -202,9 +202,9 @@ void KviKvsReport::report(KviKvsReport * r,KviWindow * pOutput)
 	}
 
 	if(r->location().isEmpty())
-		pOutput->output(out,__tr2qs_ctx("[KVS]   in script context \"%Q\"","kvs"),&(r->context()));
+		pOutput->output(out,__tr2qs_ctx("[KVS]   In script context \"%Q\"","kvs"),&(r->context()));
 	else
-		pOutput->output(out,__tr2qs_ctx("[KVS]   in script context \"%Q\", %Q","kvs"),&(r->context()),&(r->location()));
+		pOutput->output(out,__tr2qs_ctx("[KVS]   In script context \"%Q\", %Q","kvs"),&(r->context()),&(r->location()));
 
 	if(pOutput == KviDebugWindow::instance())
 	{
diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
index a8c8b6b45..04ee586d5 100644
--- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
@@ -1111,7 +1111,7 @@ void KviIrcServerParser::parseLiteralNotice(KviIrcMessage *msg)
 			if(KVI_OPTION_BOOL(KviOption_boolVerboseIgnore))
 			{
 				QString szMsg = msg->connection()->decodeText(msg->safeTrailing());
-				console->output(KVI_OUT_IGNORE,msg->serverTime(),__tr2qs("Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),&szNick,&szUser,&szHost,&szMsg);
+				console->output(KVI_OUT_IGNORE,msg->serverTime(),__tr2qs("Ignoring NOTICE from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),&szNick,&szUser,&szHost,&szMsg);
 			}
 			return;
 		}
@@ -1709,7 +1709,7 @@ void KviIrcServerParser::parseLiteralInvite(KviIrcMessage *msg)
 		{
 			KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolInvitesToActiveWindow) ?
 				msg->console()->activeWindow() : (KviWindow *)(msg->console());
-			QString szAction = KVI_OPTION_BOOL(KviOption_boolAutoJoinOnInvite) ? __tr2qs("autojoining") : __tr2qs("double-click the channel name to join");
+			QString szAction = KVI_OPTION_BOOL(KviOption_boolAutoJoinOnInvite) ? __tr2qs("auto joining") : __tr2qs("double-click the channel name to join");
 			pOut->output(KVI_OUT_INVITE,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"),
 				&szNick,&szUser,&szHost,&szChannel,&szAction);
 		}
diff --git a/src/kvirc/ui/KviImageDialog.cpp b/src/kvirc/ui/KviImageDialog.cpp
index 61a51100d..a76eea7df 100644
--- a/src/kvirc/ui/KviImageDialog.cpp
+++ b/src/kvirc/ui/KviImageDialog.cpp
@@ -157,7 +157,7 @@ KviImageDialog::KviImageDialog(QWidget * par,
 	connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked()));
 	g->addWidget(b,3,1);
 
-	b = new QPushButton(__tr2qs("Ok"),this);
+	b = new QPushButton(__tr2qs("OK"),this);
 	connect(b,SIGNAL(clicked()),this,SLOT(okClicked()));
 	g->addWidget(b,3,2);
 
diff --git a/src/kvirc/ui/KviInput.cpp b/src/kvirc/ui/KviInput.cpp
index 6fe5d7514..a806146c7 100644
--- a/src/kvirc/ui/KviInput.cpp
+++ b/src/kvirc/ui/KviInput.cpp
@@ -242,7 +242,7 @@ void KviInput::keyPressEvent(QKeyEvent * e)
 								{
 									int nRet = QMessageBox::question(
 										this,
-										__tr2qs("Confirm Multiline Message"),
+										__tr2qs("Confirm Multi-line Message"),
 										__tr2qs("You're about to send a message with %1 lines of text.<br><br>" \
 											"There is nothing wrong with it, this warning is<br>" \
 											"here to prevent you from accidentally sending<br>" \
diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp
index ae9f568ba..1da6daf10 100644
--- a/src/kvirc/ui/KviInputEditor.cpp
+++ b/src/kvirc/ui/KviInputEditor.cpp
@@ -1105,7 +1105,7 @@ void KviInputEditor::showContextPopup(const QPoint &pos)
 	pAction->setEnabled(hasSelection());
 	pAction = g_pInputPopup->addAction(__tr2qs("&Paste") + ACCEL_KEY(V),this,SLOT(pasteClipboardWithConfirmation()));
 	pAction->setEnabled(!szClip.isEmpty() && !m_bReadOnly);
-	pAction = g_pInputPopup->addAction(__tr2qs("Paste (Slowly)"),this,SLOT(pasteSlow()));
+	pAction = g_pInputPopup->addAction(__tr2qs("Paste Slowly"),this,SLOT(pasteSlow()));
 	if ((iType == KviWindow::Channel) || (iType == KviWindow::Query) || (iType == KviWindow::DccChat))
 	    pAction->setEnabled(!szClip.isEmpty() && !m_bReadOnly);
 	else
@@ -1134,7 +1134,7 @@ void KviInputEditor::showContextPopup(const QPoint &pos)
 	
 
 #ifdef COMPILE_ENCHANT_SUPPORT
-	// check if the cursor is in a spellcheckable block
+	// check if the cursor is in a spell-checkable block
 
 	KviPointerList<KviInputEditorSpellCheckerBlock> lBuffer;
 	splitTextIntoSpellCheckerBlocks(m_szTextBuffer,lBuffer);
diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp
index feea5d73d..da8ddf071 100644
--- a/src/kvirc/ui/KviIrcView.cpp
+++ b/src/kvirc/ui/KviIrcView.cpp
@@ -39,14 +39,14 @@
 // 23 Nov 1999,
 //      Well, not so bad...I seem to still remember how it works
 //      So just for fun, complicated the things a little bit more.
-//      Added precaclucaltion of the text blocks and word wrapping
+//      Added pre-calculation of the text blocks and word wrapping
 //      and a fast scrolling mode (3 lines at once) for consecutive
 //      appendText() calls.
 //      Now the code becomes really not understandable...:)
 
 // 29 Jun 2000 21:02,
 //      Here we go again... I have to adjust this stuff for 3.0.0
-//      Will I make this thingie work ?
+//      Will I make this thingie work?
 // 01 Jul 2000 04:20 (AM!),
 //      Yes....I got it to work just now
 //      and YES, complicated the things yet more.
@@ -197,7 +197,7 @@
 //
 //  <cr>!<escape_command><cr><visible parameters<cr>
 //
-//  <escape_command> ::= u        <--- url link
+//  <escape_command> ::= u        <--- URL link
 //  <escape_command> ::= n        <--- nick link
 //  <escape_command> ::= s        <--- server link
 //  <escape_command> ::= h        <--- host link
@@ -375,7 +375,7 @@ KviIrcView::~KviIrcView()
 	if(m_pToolWidget)
 		delete m_pToolWidget;
 
-	// don't forget the bacgkround pixmap!
+	// don't forget the background pixmap!
 	if(m_pPrivateBackgroundPixmap)
 		delete m_pPrivateBackgroundPixmap;
 
@@ -445,7 +445,7 @@ void KviIrcView::applyOptions()
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
-// The IrcView : DnD   //2005.Resurection by Grifisx & Noldor
+// The IrcView : DnD   //2005.Resurrection by Grifisx & Noldor
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -1119,7 +1119,7 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 	bool bLineMarkPainted = !KVI_OPTION_BOOL(KviOption_boolTrackLastReadTextViewLine);
 	int iLinesPerPage = 0;
 
-	// And loop thru lines until we not run over the upper bound of the view
+	// And loop through lines until we not run over the upper bound of the view
 	while((curBottomCoord >= KVI_IRCVIEW_VERTICAL_BORDER) && pCurTextLine)
 	{
 		//Paint pCurTextLine
@@ -1258,7 +1258,7 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 // A couple of macros that could work well as functions...
 // but since there are really many params to be passed
 // and push & pop calls take clock cycles
-// my paranoic mind decided to go for the macro way.
+// my paranoid mind decided to go for the macro way.
 // This is NOT good programming
 //
 
@@ -1437,7 +1437,7 @@ no_selection_paint:
 						// recover it by displaying the "question mark" icon
 						daIcon = g_pIconManager->getSmallIcon(KviIconManager::Help); // must be there, eventually null pixmap :D
 					}
-					int moredown = 1; //used to center imager vertically (pixels which the image is moved more down)
+					int moredown = 1; //used to center image vertically (pixels which the image is moved more down)
 					moredown += ((m_iFontLineSpacing - daIcon->height()) / 2);
 					pa.drawPixmap(curLeftCoord + m_iIconSideSpacing,imageYPos + moredown,*(daIcon));
 
@@ -1738,7 +1738,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth)
 					curLineWidth+=IRCVIEW_WCHARWIDTH(*p);
 					uLoopedChars++;
 				} while((curLineWidth < maxWidth) && (curBlockLen < maxBlockLen));
-				// Now overrunned, go back 1 char (if we ran over at least 2 chars)
+				// Now overrun, go back 1 char (if we ran over at least 2 chars)
 				if(uLoopedChars>1)
 				{
 					p--;
@@ -1794,7 +1794,7 @@ bool KviIrcView::checkSelectionBlock(KviIrcViewLine * line,int bufIndex)
 	if(!m_pSelectionInitLine || !m_pSelectionEndLine)
 		return false;
 
-	//check if selection is bottom to top or viceversa
+	//check if selection is bottom to top or vice-versa
 	KviIrcViewLine *init, *end;
 	if(m_pSelectionInitLine->uIndex <= m_pSelectionEndLine->uIndex)
 	{
@@ -2155,7 +2155,7 @@ void KviIrcView::chooseBackground()
 	QPixmap p(f);
 	if(p.isNull())
 	{
-		QMessageBox::information(this,__tr2qs("Invalid image"),__tr2qs("Failed to load the selected image"),__tr2qs("Ok"));
+		QMessageBox::information(this,__tr2qs("Invalid image"),__tr2qs("Failed to load the selected image"),__tr2qs("OK"));
 		return;
 	}
 
@@ -2253,7 +2253,7 @@ void KviIrcView::ensureLineVisible(KviIrcViewLine * pLineToShow)
 		maxLineWidth -= KVI_IRCVIEW_PIXMAP_AND_SEPARATOR;
 	//Make sure that we have enough space to paint something...
 	if(maxLineWidth < m_iMinimumPaintWidth)return; // ugh
-	//And loop thru lines until we not run over the upper bound of the view
+	//And loop through lines until we not run over the upper bound of the view
 	KviIrcViewLine * pLine = m_pCurLine;
 	KviIrcViewLine * pCurLine = m_pCurLine;
 	while(pLine)
diff --git a/src/kvirc/ui/KviMaskEditor.cpp b/src/kvirc/ui/KviMaskEditor.cpp
index 1bbb3e78e..042a0d7dc 100644
--- a/src/kvirc/ui/KviMaskEditor.cpp
+++ b/src/kvirc/ui/KviMaskEditor.cpp
@@ -84,7 +84,7 @@ KviMaskInputDialog::KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEdi
 	m_pEdit=new QLineEdit(szMask,this);
 	g->addWidget(m_pEdit,1,0,1,4);
 
-	m_pOkButton= new QPushButton(__tr2qs("Ok"),this);
+	m_pOkButton= new QPushButton(__tr2qs("OK"),this);
 	connect(m_pOkButton,SIGNAL(clicked()), this, SLOT(accept()));
 	g->addWidget(m_pOkButton,2,1);
 	m_pOkButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept)));
diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp
index 73d417560..9c074a34c 100644
--- a/src/kvirc/ui/KviWindow.cpp
+++ b/src/kvirc/ui/KviWindow.cpp
@@ -470,7 +470,7 @@ void KviWindow::cryptControllerFinished()
 void KviWindow::cryptSessionInfoDestroyed()
 {
 #ifdef COMPILE_CRYPT_SUPPORT
-	output(KVI_OUT_SYSTEMERROR,__tr2qs("Ops...I've accidentally lost the crypting engine..."));
+	output(KVI_OUT_SYSTEMERROR,__tr2qs("Ooops... I've accidentally lost the crypting engine."));
 	m_pCryptSessionInfo->m_pEngine = 0;
 	delete m_pCryptSessionInfo;
 	m_pCryptSessionInfo = 0;
diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp
index fba557ce2..d7e9860d8 100644
--- a/src/modules/classeditor/ClassEditorWindow.cpp
+++ b/src/modules/classeditor/ClassEditorWindow.cpp
@@ -540,7 +540,7 @@ void ClassEditorWidget::renameFunction()
 			QMessageBox::information(this,
 			__tr2qs_ctx("Function already exists","editor"),
 			__tr2qs_ctx("This name is already in use. Please choose another one.","editor"),
-			__tr2qs_ctx("Ok, Let me try again...","editor"));
+			__tr2qs_ctx("OK, Let me try again...","editor"));
 			g_pClassEditorModule->unlock();
 			return;
 		}
@@ -602,7 +602,7 @@ void ClassEditorWidget::renameClass(ClassEditorTreeWidgetItem * pClassItem)
 		QMessageBox::information(this,
 			__tr2qs_ctx("Class already exists","editor"),
 			__tr2qs_ctx("This name is already in use. Please choose another one.","editor"),
-			__tr2qs_ctx("Ok, Let me try again...","editor"));
+			__tr2qs_ctx("OK, Let me try again...","editor"));
 		g_pClassEditorModule->unlock();
 		return;
 	}
@@ -612,7 +612,7 @@ void ClassEditorWidget::renameClass(ClassEditorTreeWidgetItem * pClassItem)
 		QMessageBox::information(this,
 			__tr2qs_ctx("Bad Namespace Name","editor"),
 			__tr2qs_ctx("Found an empty namespace in namespace name","editor"),
-			__tr2qs_ctx("Ok, Let me try again...","editor"));
+			__tr2qs_ctx("OK, Let me try again...","editor"));
 		g_pClassEditorModule->unlock();
 		szNewName = "";
 		continue;
@@ -686,12 +686,12 @@ void ClassEditorWidget::renameNamespace(ClassEditorTreeWidgetItem * pOldNamespac
 			QMessageBox::information(this,
 				__tr2qs_ctx("Name already exists as Class name","editor"),
 				__tr2qs_ctx("This name is already in use as Class name. Please choose another one.","editor"),
-				__tr2qs_ctx("Ok, Let me try again...","editor"));
+				__tr2qs_ctx("OK, Let me try again...","editor"));
 		} else {
 			QMessageBox::information(this,
 			__tr2qs_ctx("Namespace already exists","editor"),
 			__tr2qs_ctx("This name is already in use. Please choose another one.","editor"),
-			__tr2qs_ctx("Ok, Let me try again...","editor"));
+			__tr2qs_ctx("OK, Let me try again...","editor"));
 		}
 		g_pClassEditorModule->unlock();
 		return;
@@ -1521,7 +1521,7 @@ bool ClassEditorWidget::askForNamespaceName(const QString & szAction, const QStr
 			QMessageBox::warning(this,
 				__tr2qs_ctx("Missing Namespace Name","editor"),
 				__tr2qs_ctx("You must specify a valid name for the namespace","editor"),
-				__tr2qs_ctx("Ok, Let me try again...","editor"));
+				__tr2qs_ctx("OK, Let me try again...","editor"));
 			g_pClassEditorModule->unlock();
 			continue;
 		}
@@ -1534,7 +1534,7 @@ bool ClassEditorWidget::askForNamespaceName(const QString & szAction, const QStr
 			QMessageBox::information(this,
 				__tr2qs_ctx("Bad Namespace Name","editor"),
 				__tr2qs_ctx("Namespace names can contain only letters, digits, underscores and '::' namespace separators","editor"),
-				__tr2qs_ctx("Ok, Let me try again...","editor"));
+				__tr2qs_ctx("OK, Let me try again...","editor"));
 			g_pClassEditorModule->unlock();
 			szNewName = "";
 			continue;
@@ -1547,8 +1547,8 @@ bool ClassEditorWidget::askForNamespaceName(const QString & szAction, const QStr
 			g_pClassEditorModule->lock();
 			QMessageBox::information(this,
 				__tr2qs_ctx("Bad Namespace Name","editor"),
-				__tr2qs_ctx("Stray ':' character in namespace name: did you mean ...<namespace>::<name> ?","editor"),
-				__tr2qs_ctx("Ok, Let me try again...","editor"));
+				__tr2qs_ctx("Stray ':' character in namespace name: did you mean ...<namespace>::<name>?","editor"),
+				__tr2qs_ctx("OK, Let me try again...","editor"));
 			g_pClassEditorModule->unlock();
 			szNewName = "";
 			continue;
@@ -1559,7 +1559,7 @@ bool ClassEditorWidget::askForNamespaceName(const QString & szAction, const QStr
 			QMessageBox::information(this,
 				__tr2qs_ctx("Bad Namespace Name","editor"),
 				__tr2qs_ctx("Found an empty namespace in namespace name","editor"),
-				__tr2qs_ctx("Ok, Let me try again...","editor"));
+				__tr2qs_ctx("OK, Let me try again...","editor"));
 			g_pClassEditorModule->unlock();
 			szNewName = "";
 			continue;
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 74aded7c5..4b3afa452 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -2437,7 +2437,7 @@ static bool dcc_kvs_fnc_ircContext(KviKvsModuleFunctionCall * c)
 		{
 			c->returnValue()->setInteger(dcc->console()->context()->id());
 		} else {
-			c->error(__tr2qs_ctx("The irc context that originated the dcc doesn't exists anymore.","dcc"));
+			c->error(__tr2qs_ctx("The IRC context that originated the DCC doesn't exists anymore.","dcc"));
 			return false;
 		}
 	}
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index e541b9c71..4351742e0 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -315,15 +315,15 @@ static void dccModuleParseDccChat(KviDccRequest *dcc)
 			{
 				// hum.. not our tag
 
-				// FIXME: As segnaled by PRAEDO, ezbounce seems to send a fourth parameter in response to /quote ezb log
+				// FIXME: As signalled by PRAEDO, ezbounce seems to send a fourth parameter in response to /quote ezb log
 				// Pragma: That's a bug in ezbounce, it sends the filesize of the log as a DCC CHAT parameter...
 				//         The author probably copied and pasted the CTCP line from DCC SEND and forgot to remove the filesize.
-				//         We *could* add an option to ignore the last parameter and treat it as a standard dcc chat
+				//         We *could* add an option to ignore the last parameter and treat it as a standard DCC chat
 				//         request, but since we don't encourage bugs, we don't do it :D
 				//         Mail me at pragma at kvirc dot net if you really think it's necessary.
 				dcc->ctcpMsg->msg->console()->output(KVI_OUT_DCCMSG,
 					__tr2qs_ctx("The above request is broken: it looks like a zero port tag acknowledge but I have either never seen this tag or it was sent more than 120 seconds ago","dcc"));
-				dcc_module_request_error(dcc,__tr2qs_ctx("It seems that I haven't requested this dcc chat","dcc"));
+				dcc_module_request_error(dcc,__tr2qs_ctx("It seems that I haven't requested this DCC chat","dcc"));
 				delete d;
 				return;
 			} else {
@@ -335,7 +335,7 @@ static void dccModuleParseDccChat(KviDccRequest *dcc)
 		}
 	} else {
 		d->bAutoAccept       = KVI_OPTION_BOOL(KviOption_boolAutoAcceptDccChat);
-		d->bActive           = true; // we have to connct (standard active chat)
+		d->bActive           = true; // we have to connect (standard active chat)
 	}
 
 #ifdef COMPILE_SSL_SUPPORT
@@ -419,7 +419,7 @@ static void dccModuleParseDccSend(KviDccRequest *dcc)
 		} else {
 			// this should never happen since we always add
 			// a zero port tag for out outgoing requests
-			// but well... maybe the user did something behing our back...
+			// but well... maybe the user did something behind our back...
 			dcc->szParam4 = "0"; // no resume possible in this case
 		}
 
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index b52ea8e5f..869cb9c89 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -46,7 +46,7 @@
 
 #if defined(COMPILE_SSL_SUPPORT)
 
-	// Apple deprecated openssl since osx 10.7:
+	// Apple deprecated openSSL since OS X 10.7:
 
 	#ifdef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
 		#undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
@@ -79,9 +79,9 @@
 		Makes a copy of the <source> file as <destination>.[br]
 		If the [-o] switch is used, the <destination> file is overwritten, if already exists.[br]
 		With no [-o] switch, this command does not overwrite files.[br]
-		The destination path must be already existing: if you want to ensure this, use [cmd]file.mkdir[/cmd] first.[br]
+		The destination path must already exist: if you want to ensure this, use [cmd]file.mkdir[/cmd] first.[br]
 		The paths (<source> and <destination>) are adjusted according to the system that KVIrc
-		is running on so you don't have to bother about portability: it *should* be automatically
+		is running on so you don't have to bother about portability: it [i]should[i/] be automatically
 		guaranteed. Just use UNIX style paths for them.[br]
 	@seealso:
 		[cmd]file.rename[/cmd], [fnc]$file.exists[/fnc]
@@ -1529,7 +1529,7 @@ static bool file_kvs_fnc_digest(KviKvsModuleFunctionCall * c)
 	{
 		qAlgo = QCryptographicHash::Md5;
 	} else {
-		c->warning(__tr2qs("KVIrc is compiled without Crypto++ or OpenSSL support. $file.digest supports only MD4, MD5 and SHA1."));
+		c->warning(__tr2qs("KVIrc is compiled without Crypto++ or SSL support. $file.digest supports only MD4, MD5 and SHA1."));
 		return true;
 	}
 
diff --git a/src/modules/fish/libkvifish.cpp b/src/modules/fish/libkvifish.cpp
index 67aa026ef..e1f0f5aed 100644
--- a/src/modules/fish/libkvifish.cpp
+++ b/src/modules/fish/libkvifish.cpp
@@ -103,7 +103,7 @@
 
 		return true;
 	#else
-		qDebug("%s",__tr2qs("FiSH has been compiled without ssl support, unable to proceed").toUtf8().data());
+		qDebug("%s",__tr2qs("FiSH has been compiled without SSL support, unable to proceed").toUtf8().data());
 		return false;
 	#endif
 	}
@@ -140,7 +140,7 @@
 		if(!fish_DH1080_gen(&szMyPubKey, pMyPubKeyLen))
 		{
 			#if !defined(COMPILE_SSL_SUPPORT)
-				c->warning(__tr2qs("FiSH has been compiled without ssl support, unable to proceed"));
+				c->warning(__tr2qs("FiSH has been compiled without SSL support, unable to proceed"));
 				return false;
 			#endif
 			return false;
@@ -217,7 +217,7 @@
 		BIGNUM *bn = BN_bin2bn((unsigned char *) szHisPubKey.data(), szHisPubKey.size(),NULL);
 		if(-1 == (secretLen = DH_compute_key(secret, bn, g_fish_dh)))
 		{
-			c->warning(__tr2qs("FiSH: error verificating peer public key (size=%1)").arg(szHisPubKey.size()));
+			c->warning(__tr2qs("FiSH: error verifying peer public key (size=%1)").arg(szHisPubKey.size()));
 			return false;
 		}
 		BN_zero(bn);
@@ -234,7 +234,7 @@
 
 		KviMemory::free(hashedSecret);
 		#else
-			c->warning(__tr2qs("FiSH has been compiled without ssl support, unable to proceed"));
+			c->warning(__tr2qs("FiSH has been compiled without SSL support, unable to proceed"));
 			return false;
 		#endif
 
diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp
index 0ed1f86fd..210547521 100644
--- a/src/modules/help/HelpWindow.cpp
+++ b/src/modules/help/HelpWindow.cpp
@@ -69,7 +69,7 @@ HelpWindow::HelpWindow(const char * name)
 	m_pBottomLayout->setVisible(false);
 
 	m_pIndexTab  = new KviTalVBox(m_pTabWidget);
-	m_pTabWidget->addTab(m_pIndexTab,__tr2qs("HelpIndex"));
+	m_pTabWidget->addTab(m_pIndexTab,__tr2qs("Help Index"));
 
 	KviTalHBox* pSearchBox = new KviTalHBox(m_pIndexTab);
 	m_pIndexSearch = new QLineEdit(pSearchBox);
diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp
index d49914801..4daf8c6a0 100644
--- a/src/modules/links/LinksWindow.cpp
+++ b/src/modules/links/LinksWindow.cpp
@@ -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("Cannot 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 cannot be requested: not connected to a server"));
 	}
 }
 
@@ -296,7 +296,7 @@ void LinksWindow::endOfLinks()
 		output(KVI_OUT_LINKS,__tr2qs("Average hops: ~%d.%d"),avgHops / 100,avgHops % 100);
 	} else {
 		m_szRootServer = __tr2qs("(Unknown)");
-		outputNoFmt(KVI_OUT_LINKS,__tr2qs("Incomplete LINKS result, no stats available"));
+		outputNoFmt(KVI_OUT_LINKS,__tr2qs("Incomplete links result, no stats available"));
 	}
 	outputNoFmt(KVI_OUT_LINKS,"======================");
 
diff --git a/src/modules/links/libkvilinks.cpp b/src/modules/links/libkvilinks.cpp
index fdf5da23a..3c6ab7128 100644
--- a/src/modules/links/libkvilinks.cpp
+++ b/src/modules/links/libkvilinks.cpp
@@ -44,15 +44,15 @@ KviPointerList<LinksWindow> * g_pLinksWindowList = 0;
 	@syntax:
 		links.open
 	@description:
-		Opens a "links" window attacched to the current irc context.[br]
+		Opens a "links" window attached to the current IRC context.[br]
 		The links window handles the RPL_LINKS server replies and shows
-		them in a Tree-View form: this is useful in vizualizing the
+		them in a Tree-View form: this is useful in visualizing the
 		current network connections.[br]
 		Please note that the total number of links received (and the
 		total count of servers displayed when all the links have been received)
-		may actually be less than the real number of irc servers in the network.
+		may actually be less than the real number of IRC servers in the network.
 		Servers that contain a wildcard in their name often act as gateways (hubs)
-		for a "local irc network"; if you're requesting links from a server that is
+		for a "local IRC network"; if you're requesting links from a server that is
 		external to the gateway, the servers internal to the network "behind the gateway"
 		will not be shown; in the extreme case you will see the gateway as leaf node (and it isn't).
 		To see the internal network server tree you might request LINKS from the gateway server.[br]
@@ -69,7 +69,7 @@ static bool links_kvs_cmd_open(KviKvsModuleCommandCall * c)
 		LinksWindow *w = new LinksWindow(c->window()->console());
 		g_pMainWindow->addWindow(w);
 	} else {
-		c->warning(__tr2qs("Links window alread open for this IRC context"));
+		c->warning(__tr2qs("Links window already open for this IRC context"));
 	}
 
 	return true;
@@ -101,7 +101,7 @@ static bool links_module_can_unload(KviModule *)
 }
 
 KVIRC_MODULE(
-	"Links",                                             // module name
+	"Links",                                                // module name
 	"4.0.0",                                                // module version
 	"Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"Links window extension",
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index 747c06d55..883bcbb0c 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -141,7 +141,7 @@ void KviMircServersIniImport::die()
 KviRemoteMircServerImportWizard::KviRemoteMircServerImportWizard(KviRemoteMircServersIniImport * f)
 : KviTalWizard(0)
 {
-	QString capt = __tr2qs("Remote mIRC servers.ini Import Wizard");
+	QString capt = __tr2qs("Remote mIRC servers.ini - Import Wizard");
 	setWindowTitle(capt);
 
 	setModal(true);
diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp
index 4f0e5fd5a..1f9d60bf4 100644
--- a/src/modules/my/libkvimy.cpp
+++ b/src/modules/my/libkvimy.cpp
@@ -44,12 +44,12 @@ Idle* g_pIdle;
 	if(!c->parameterList()->count()) \
 	{ \
 		if(c->window()->console()) wnd = c->window()->console(); \
-			else c->warning(__tr2qs("This window has no associated irc context")); \
+			else c->warning(__tr2qs("This window has no associated IRC context")); \
 	} \
 	else \
 	{ \
 		wnd = g_pApp->findConsole(uiWnd); \
-		if(!wnd)c->warning(__tr2qs("No such irc context (%d)"),uiWnd); \
+		if(!wnd)c->warning(__tr2qs("No such IRC context (%d)"),uiWnd); \
 	}
 /*
 	@doc: my.nick
@@ -62,8 +62,8 @@ Idle* g_pIdle;
 	@syntax:
 		<string> $my.nick([irc_context_id:uint])
 	@description:
-		Returns the nickname of the current irc context.[br]
-		If the irc context is not connected then an empty string is returned.[br]
+		Returns the nickname of the current IRC context.[br]
+		If the IRC context is not connected then an empty string is returned.[br]
 		If <irc_context_id> is specified this function returns acts as it was called
 		in that irc_context.[br]
 		Note that this function is different from [fnc]$me[/fnc] that will work also in a DCC CHAT.[br]
diff --git a/src/modules/options/OptionsWidget_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp
index 77e95e6d9..a626e649c 100644
--- a/src/modules/options/OptionsWidget_dcc.cpp
+++ b/src/modules/options/OptionsWidget_dcc.cpp
@@ -320,13 +320,13 @@ OptionsWidget_dccChat::OptionsWidget_dccChat(QWidget * parent)
 	connect(b2,SIGNAL(toggled(bool)),b1,SLOT(setNotEnabled(bool)));
 
 #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_KDE_SUPPORT) || defined(COMPILE_ON_MINGW))
-	b2 = addBoolSelector(0,2,0,2,__tr2qs_ctx("Flash system taskbar on new dcc chat message","options"),KviOption_boolFlashDccChatWindowOnNewMessages);
+	b2 = addBoolSelector(0,2,0,2,__tr2qs_ctx("Flash system taskbar on new DCC chat message","options"),KviOption_boolFlashDccChatWindowOnNewMessages);
 		mergeTip(b2,
-			__tr2qs_ctx("<center>This option causes the system taskbar entry for KVIrc to flash when a new dcc chat message " \
+			__tr2qs_ctx("<center>This option causes the system taskbar entry for KVIrc to flash when a new DCC chat message " \
 				"is received and the KVIrc window is not the active.</center>","options"));
 #endif
 
-	b2 = addBoolSelector(0,3,0,3, __tr2qs_ctx("Popup notifier on new dcc chat message","options"),KviOption_boolPopupNotifierOnNewDccChatMessages);
+	b2 = addBoolSelector(0,3,0,3, __tr2qs_ctx("Popup notifier on new DCC chat message","options"),KviOption_boolPopupNotifierOnNewDccChatMessages);
 	mergeTip(b2,
 		__tr2qs_ctx("<center>This option causes a small notifier window to pop up " \
 			"in the low right corner of the screen when a new message is received " \
diff --git a/src/modules/options/OptionsWidget_ircView.cpp b/src/modules/options/OptionsWidget_ircView.cpp
index e62e6f430..46137ce5f 100644
--- a/src/modules/options/OptionsWidget_ircView.cpp
+++ b/src/modules/options/OptionsWidget_ircView.cpp
@@ -160,7 +160,7 @@ OptionsWidget_ircViewFeatures::OptionsWidget_ircViewFeatures(QWidget * parent)
 	addBoolSelector(0,12,0,12,__tr2qs_ctx("Enable animated smiles","options"),KviOption_boolEnableAnimatedSmiles);
 
 	KviTalGroupBox * pGroup = addGroupBox(0,13,0,13,Qt::Horizontal,__tr2qs_ctx("Enable tooltips for:","options"));
-	addBoolSelector(pGroup,__tr2qs_ctx("Url links","options"),KviOption_boolEnableUrlLinkToolTip);
+	addBoolSelector(pGroup,__tr2qs_ctx("URL links","options"),KviOption_boolEnableUrlLinkToolTip);
 	addBoolSelector(pGroup,__tr2qs_ctx("Host links","options"),KviOption_boolEnableHostLinkToolTip);
 	addBoolSelector(pGroup,__tr2qs_ctx("Server links","options"),KviOption_boolEnableServerLinkToolTip);
 	addBoolSelector(pGroup,__tr2qs_ctx("Mode links","options"),KviOption_boolEnableModeLinkToolTip);
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 211b495a3..983a93c3f 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -800,7 +800,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 
 	iRow++;
 
-	l = new QLabel(__tr2qs_ctx("Proxy server:","options"),tab);
+	l = new QLabel(__tr2qs_ctx("Proxy Server:","options"),tab);
 	gl->addWidget(l,iRow,0);
 	m_pProxyEditor = new QComboBox(tab);
 	gl->addWidget(m_pProxyEditor,iRow,1);
@@ -915,7 +915,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	pCapLayout->addWidget(m_pEnableCAPCheck,0,0);
 
 	KviTalToolTip::add(m_pEnableCAPCheck,__tr2qs_ctx("<center>This check will cause the connection to use the <b>Extended Capability</b> " \
-		"support. Obviously, this server must have support for this, too. Disable this for irc bouncers.</center>","options"));
+		"support. Obviously, this server must have support for this, too. Disable this for IRC bouncers.</center>","options"));
 	m_pEnableCAPCheck->setChecked(s->enabledCAP());
 
 
@@ -926,18 +926,18 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 
 	m_pEnableSASLCheck = new QCheckBox(__tr2qs_ctx("Authenticate via SASL extension","options"),pSASLGroup);
 	pSASLLayout->addWidget(m_pEnableSASLCheck,0,0,1,2);
-	KviTalToolTip::add(m_pEnableSASLCheck,__tr2qs_ctx("<center>This check enables the use of the <b>SASL</b> authentication procotol " \
-		"If you enable the proper global option in the Connection/SSL tab and fill the Sasl Nickname and Sasl Password fields in this page, the SASL protocol will be used for this server if available.</center>","options"));
+	KviTalToolTip::add(m_pEnableSASLCheck,__tr2qs_ctx("<center>This check enables the use of the <b>SASL</b> authentication protocol " \
+		"If you enable the proper global option in the Connection/SSL tab and fill the SASL Nickname and SASL Password fields in this page, the SASL protocol will be used for this server if available.</center>","options"));
 	m_pEnableSASLCheck->setChecked(s->enabledSASL());
 
-	l = new QLabel(__tr2qs_ctx("Sasl Nickname:","options"),pSASLGroup);
+	l = new QLabel(__tr2qs_ctx("SASL Nickname:","options"),pSASLGroup);
 	pSASLLayout->addWidget(l,1,0);
 	m_pSaslNickEditor = new QLineEdit(pSASLGroup);
 	m_pSaslNickEditor->setText(s->saslNick());
 	KviTalToolTip::add(m_pSaslNickEditor,__tr2qs_ctx("<center>If you want to enable SASL authentication, insert your nickname here.</center>","options"));
 	pSASLLayout->addWidget(m_pSaslNickEditor,1,1);
 
-	l = new QLabel(__tr2qs_ctx("Sasl Password:","options"),pSASLGroup);
+	l = new QLabel(__tr2qs_ctx("SASL Password:","options"),pSASLGroup);
 	pSASLLayout->addWidget(l,2,0);
 	m_pSaslPassEditor = new KviPasswordLineEdit(pSASLGroup); // <---- ?????
 	m_pSaslPassEditor->setText(s->saslPass());
@@ -950,7 +950,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	iRow++;
 
 
-	l = new QLabel(__tr2qs_ctx("Link filter:","options"),tab);
+	l = new QLabel(__tr2qs_ctx("Link Filter:","options"),tab);
 	gl->addWidget(l,iRow,0);
 	m_pLinkFilterEditor = new QComboBox(tab);
 	m_pLinkFilterEditor->setEditable(true);
diff --git a/src/modules/options/OptionsWidget_tools.cpp b/src/modules/options/OptionsWidget_tools.cpp
index 44f71d74a..b9b2588fe 100644
--- a/src/modules/options/OptionsWidget_tools.cpp
+++ b/src/modules/options/OptionsWidget_tools.cpp
@@ -36,7 +36,7 @@ OptionsWidget_tools::OptionsWidget_tools(QWidget * parent)
 	setObjectName("tools_options_widget");
 	createLayout();
 
-	addLabel(0,0,0,0,__tr2qs_ctx("This section contains irc tools "\
+	addLabel(0,0,0,0,__tr2qs_ctx("This section contains IRC tools "\
 		"like <b>away, lag and logging system</b>. ","options"));
 
 	addRowSpacer(0,1,0,1);
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index e325c00c2..03998bf12 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -45,7 +45,7 @@
 		The rijndael module
 	@body:
 		The rijndael module exports six [doc:crypt_engines]cryptographic engines[/doc] based
-		on the Advanced Encryptiong Standard algorithm called Rijndael. Rijndael was
+		on the Advanced Encryption Standard algorithm called Rijndael. Rijndael was
 		originally written by Joan Daemen and Vincent Rijmen. The original Rijndael
 		description is available at http://www.esat.kuleuven.ac.be/~rijmen/rijndael/.[br]
 		It is a private key block cipher that has been designed to replace
@@ -189,7 +189,7 @@
 	{
 		switch(errCode)
 		{
-			case RIJNDAEL_SUCCESS: setLastError(__tr2qs("Error 0: Success ?")); break;
+			case RIJNDAEL_SUCCESS: setLastError(__tr2qs("Error 0: success?")); break;
 			case RIJNDAEL_UNSUPPORTED_MODE: setLastError(__tr2qs("Unsupported crypt mode")); break;
 			case RIJNDAEL_UNSUPPORTED_DIRECTION: setLastError(__tr2qs("Unsupported direction")); break;
 			case RIJNDAEL_UNSUPPORTED_KEY_LENGTH: setLastError(__tr2qs("Unsupported key length")); break;
@@ -205,7 +205,7 @@
 	{
 		if(!m_pEncryptCipher)
 		{
-			setLastError(__tr2qs("Ops...encrypt cipher not initialized"));
+			setLastError(__tr2qs("Ooops... Encryption cipher not initialized"));
 			return KviCryptEngine::EncryptError;
 		}
 		int len = (int)kvi_strLen(plainText);
@@ -258,7 +258,7 @@
 	{
 		if(!m_pDecryptCipher)
 		{
-			setLastError(__tr2qs("Ops...decrypt cipher not initialized"));
+			setLastError(__tr2qs("Ooops... Decryption cipher not initialized"));
 			return KviCryptEngine::DecryptError;
 		}
 
@@ -616,7 +616,7 @@
 	{
 		if(*(encoded.ptr()) != '*')
 		{
-			qDebug("WARNING: Specified a CBC key but the incoming message doesn't seem to be a CBC one");
+			qDebug("WARNING: specified a CBC key but the incoming message doesn't seem to be a CBC one");
 			return doDecryptECB(encoded,plain);
 		}
 		encoded.cutLeft(1);
@@ -667,10 +667,10 @@ static bool rijndael_module_init(KviModule * m)
 	g_pEngineList->setAutoDelete(false);
 
 	QString szFormat = __tr2qs("Cryptographic engine based on the Advanced Encryption Standard (AES) algorithm called Rijndael. " \
-		"<br/>The text is first encrypted with rijndael and then converted to %1 notation. " \
+		"<br/>The text is first encrypted with Rijndael and then converted to %1 notation. " \
 		"The keys used are %2 bit long and will be padded with zeros if you provide shorter ones. " \
 		"If only one key is provided, this engine will use it for both encrypting and decrypting. " \
-		"See the rijndael module documentation for more info on the algorithm used. " \
+		"See the Rijndael module documentation for more info on the algorithm used. " \
 		"<br/>This engine works in CBC mode by default: other modes are considered INSECURE and should be avoided. " \
 		"The old pseudo-CBC mode used in KVIrc &lt; 4.2 is still available prefixing your key(s) with \"old:\"; " \
 		"if you want to use ECB mode you must prefix your key(s) with \"ecb:\".");
diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp
index e36e62f12..39025b3a4 100644
--- a/src/modules/setup/SetupWizard.cpp
+++ b/src/modules/setup/SetupWizard.cpp
@@ -196,7 +196,7 @@ SetupWizard::SetupWizard()
 	g_pApp->getGlobalKvircDirectory(szLicensePath,KviApplication::License,"COPYING");
 	if(!KviFileUtils::loadFile(szLicensePath,szLicense))
 	{
-		szLicense = __tr("Oops... can't find the license file.\n" \
+		szLicense = __tr("Ooops... Can't find the license file.\n" \
 			"It MUST be included in the distribution...\n" \
 			"Please report to <pragma at kvirc dot net>");
 	}
@@ -316,7 +316,7 @@ SetupWizard::SetupWizard()
 
 	m_pIdentity = new SetupPage(this);
 
-	m_pIdentity->m_pTextLabel->setText(__tr2qs("Please choose a Nickname.<br><br>" \
+	m_pIdentity->m_pTextLabel->setText(__tr2qs("Please choose a nickname.<br><br>" \
 		"Your nickname is the name that other IRC users will know you by. " \
 		"It can't contain spaces or punctuation. Some IRC networks will shorten your nickname if it is more than 32 characters " \
 		"long.<br><br>"
@@ -494,7 +494,7 @@ SetupWizard::SetupWizard()
 	addPage(m_pDesktopIntegration,__tr2qs("Desktop Integration"));
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	m_pCreateUrlHandlers = new QCheckBox(__tr2qs("Make KVIrc default IRC client"),m_pDesktopIntegration->m_pVBox);
+	m_pCreateUrlHandlers = new QCheckBox(__tr2qs("Make KVIrc the default IRC client"),m_pDesktopIntegration->m_pVBox);
 	m_pCreateUrlHandlers->setChecked(true);
 #endif
 #ifdef COMPILE_KDE_SUPPORT
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index 78b94189a..e9eda0144 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -221,7 +221,7 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
 		)
 		{
 			QString szWinId = c->window()->id();
-			c->warning(__tr2qs("The specified window (%Q) is not a channel/query/dcc"),&szWinId);
+			c->warning(__tr2qs("The specified window (%Q) is not a Channel/Query/DCC"),&szWinId);
 			return false;
 		} else {
 			while( (item = it.current()) != 0)
@@ -283,7 +283,7 @@ static bool spaste_kvs_cmd_list(KviKvsModuleCommandCall * c)
 	@title:
 		spaste.setdelay
 	@short:
-		Sets the delay time in miliseconds for the spaste module command delay
+		Sets the delay time in milliseconds for the spaste module command delay
 	@syntax:
 		spaste.setdelay <time_in_msecs:integer>
 	@description:
@@ -332,8 +332,8 @@ static bool spaste_module_can_unload(KviModule *)
 }
 
 KVIRC_MODULE(
-	"SPaste",                                                 // module name
-	"4.0.0",                                                // module version
+	"SPaste",                                     // module name
+	"4.0.0",                                      // module version
 	"(C) 2002 Juanjo Alvarez (juanjux@yahoo.es)", // author & (C)
 	"Delayed paste commands",
 	spaste_module_init,
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index 52ba57f76..4afa16fe0 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -840,11 +840,11 @@ static bool str_kvs_fnc_stripright(KviKvsModuleFunctionCall * c)
 	@title:
 		$str.stripcolors
 	@short:
-		Returns a mirc color codes stripped string
+		Returns a mIRC color codes stripped string
 	@syntax:
 		<string> $str.stripcolors(<string:string>)
 	@description:
-		Removes all mirc color codes from a string, including also bold, underline, reverse,
+		Removes all mIRC color codes from a string, including also bold, underline, reverse,
 		icon, crypting and ctcp control codes.
 */
 static bool str_kvs_fnc_stripcolors(KviKvsModuleFunctionCall * c)
@@ -1418,7 +1418,7 @@ static bool str_kvs_fnc_digest(KviKvsModuleFunctionCall * c)
 	{
 		qAlgo = QCryptographicHash::Md5;
 	} else {
-		c->warning(__tr2qs("KVIrc is compiled without Crypto++ or OpenSSL support. $str.digest supports only MD4, MD5 and SHA1."));
+		c->warning(__tr2qs("KVIrc is compiled without Crypto++ or SSL support. $str.digest supports only MD4, MD5 and SHA1."));
 		return true;
 	}
 
@@ -2224,7 +2224,7 @@ static bool str_kvs_fnc_evpSign(KviKvsModuleFunctionCall * c)
 
 		if(!pKey)
 		{
-			c->warning(__tr2qs("Can not read private key while trying to use the default private key certificate %s"),KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPath).toUtf8().data());
+			c->warning(__tr2qs("Can't read private key while trying to use the default private key certificate %s"),KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPath).toUtf8().data());
 			c->returnValue()->setString("");
 			return true;
 		}
@@ -2237,7 +2237,7 @@ static bool str_kvs_fnc_evpSign(KviKvsModuleFunctionCall * c)
 
 		if(!pKey)
 		{
-			c->warning(__tr2qs("Can not read private key while trying to use the provided certificate (wrong password?)"));
+			c->warning(__tr2qs("Can't read private key while trying to use the provided certificate (wrong password?)"));
 			c->returnValue()->setString("");
 			return true;
 		}
@@ -2256,7 +2256,7 @@ static bool str_kvs_fnc_evpSign(KviKvsModuleFunctionCall * c)
 		c->returnValue()->setString(szSign.toBase64().data());
 		return true;
 	}
-	c->warning(__tr2qs("An error occured while signing the message."));
+	c->warning(__tr2qs("An error occurred while signing the message."));
 	c->returnValue()->setString("");
 	return true;
 
@@ -2278,7 +2278,7 @@ static bool str_kvs_fnc_evpSign(KviKvsModuleFunctionCall * c)
 	@syntax:
 		<bool> $str.evpVerify(<message:string>,<signature:string>[,<certificate:string>[,<password:string>]])
 	@description:
-		This function verifies the signature for a message against a publick key contained in a certificate.[br]
+		This function verifies the signature for a message against a public key contained in a certificate.[br]
 		The signature has to be base64-encoded, as the one returned by [fnc]$str.evpSign[/fnc].[br]
 		If the <certificate> parameter is omitted, the public key certificate specified in the
 		kvirc options will be used.[br]
@@ -2365,7 +2365,7 @@ static bool str_kvs_fnc_evpVerify(KviKvsModuleFunctionCall * c)
 
 		if(!pKey)
 		{
-			c->warning(__tr2qs("Can not read public key while trying to use the default public key certificate %s"),KVI_OPTION_STRING(KviOption_stringSSLCertificatePath).toUtf8().data());
+			c->warning(__tr2qs("Can't read public key while trying to use the default public key certificate %s"),KVI_OPTION_STRING(KviOption_stringSSLCertificatePath).toUtf8().data());
 			c->returnValue()->setString("");
 			return true;
 		}
@@ -2386,7 +2386,7 @@ static bool str_kvs_fnc_evpVerify(KviKvsModuleFunctionCall * c)
 
 		if(!pKey)
 		{
-			c->warning(__tr2qs("Can not read public key from the provided certificate."));
+			c->warning(__tr2qs("Can't read public key from the provided certificate."));
 			c->returnValue()->setBoolean(false);
 			return true;
 		}
@@ -2406,7 +2406,7 @@ static bool str_kvs_fnc_evpVerify(KviKvsModuleFunctionCall * c)
 			c->returnValue()->setBoolean(true);
 			return true;
 		default:
-			c->warning(__tr2qs("An error occured during signature verification."));
+			c->warning(__tr2qs("An error occurred during signature verification."));
 			c->returnValue()->setBoolean(false);
 			return true;
 	}
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index 78c184bea..098a26d77 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -167,7 +167,7 @@ static const char * idlemsgs[NIDLEMSGS]=
 	__tr("Nothing is happening..."),
 	__tr("Just idling..."),
 	__tr("Dum de dum de dum..."),
-	__tr("Hey man... do something!"),
+	__tr("Hey man... Do something!"),
 	__tr("Umpf!"),
 	__tr("Silence speaking"),
 	__tr("Are ya here?"),
@@ -175,9 +175,9 @@ static const char * idlemsgs[NIDLEMSGS]=
 	__tr("Everything is all right"),
 	__tr("idle()"),
 	__tr("It's so cold here..."),
-	__tr("Do not disturb... watching TV"),
+	__tr("Do not disturb... Watching TV"),
 	__tr("Just vegetating"),
-	__tr("Hey... are ya sure that your network is up?"),
+	__tr("Hey... Are ya sure that your network is up?"),
 	__tr("Seems like the world has stopped spinning"),
 	__tr("This silence is freaking me out!"),
 	__tr("Mieeeeeowww!"),
@@ -583,16 +583,16 @@ void KviTrayIconWidget::updateIcon()
 	@description:
 		Shows the tray icon (sometimes called dock widget).[br]
 		The tray icon is a small widget that docks in the window manager panel.[br]
-		It shows a small kvirc icon and eventually displays four squares
+		It shows a small KVIrc icon and eventually displays four squares
 		that cover this icon: the bottom left square appears when there is some new
 		text in any console window, the square becomes red if the text is highlighted.[br]
 		The bottom right square appears when there is some new text in any channel window,
 		and it becomes red when the text is highlighted.[br] The upper right square refers to
-		query windows and the upper left one to any other kind of window (dcc, links...).[br]
+		query windows and the upper left one to any other kind of window (DCC, links...).[br]
 		If you move the mouse over the tray icon a tooltip will show you the last lines
 		of the "new" text in all these windows.[br]
 		This is useful when you keep the main KVIrc window minimized and you're working on something else:
-		if the tray icon shows nothing but the kvirc icon, nothing is happening in the main KVIrc window.
+		if the tray icon shows nothing but the KVIrc icon, nothing is happening in the main KVIrc window.
 		If the tray icon shows one or more white (or red) squares, you can move the mouse over
 		and check what's happened exactly and eventually bring up the main KVIrc window by clicking on the icon.[br]
 	@seealso:
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 8039d9669..c6dbf981b 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -127,7 +127,7 @@ void UrlDialogTreeWidget::paintEvent(QPaintEvent * event)
 
 	delete p;
 
-	//call paint on all childrens
+	//call paint on all children
 	QTreeWidget::paintEvent(event);
 }
 
@@ -140,7 +140,7 @@ UrlDialog::UrlDialog(KviPointerList<KviUrl> *)
 
 	m_pUrlList = new UrlDialogTreeWidget(this);
 
-	m_pMenuBar = new KviTalMenuBar(this,"url menu");
+	m_pMenuBar = new KviTalMenuBar(this,"URL menu");
 	//m_pUrlList = new KviListView(this,"list");
 	KviConfigurationFile cfg(szConfigPath,KviConfigurationFile::Read);
 /*
@@ -673,21 +673,21 @@ void loadBanList()
 	@title:
 		url.list
 	@short:
-		Opens url list
+		Opens URL list
 	@syntax:
 		url.list
 	@description:
-		This command opens a window containing the urls' list.
+		This command opens a window containing the URLs' list.
 		In the list there is other information:[br]
-		[U]Window[/U] : window where the url has been shown last[br]
-		[U]Count[/U] : number of urls shown[br]
-		[U]Timestamp[/U] : date/time when the url has been shown first[br]
-		Clicking right on the url column of the list a menu will popup, through it
-		you can remove the selected item, find the url in the window it appeared last, and
-		say it to: [I]@Console, Channels, Querys, DCC Chats[/I] and [I]User windows[/I].[br]
+		[U]Window[/U] : window where the URL has been shown last[br]
+		[U]Count[/U] : number of URLs shown[br]
+		[U]Timestamp[/U] : date/time when the URL has been shown first[br]
+		Clicking right on the URL column of the list a menu will popup, through it
+		you can remove the selected item, find the URL in the window it appeared last, and
+		say it to: [I]@Console, Channels, Queries, DCC Chats[/I] and [I]User windows[/I].[br]
 		The list is saved to file when you click on the menu item or when you unload the plugin
 		on condition that you have checked the relative checkbox in configuration dialog.[br]
-		You can also open the url in your web browser double clicking on it in the url list window.[br][br]
+		You can also open the URL in your web browser double clicking on it in the URL list window.[br][br]
 
   */
 
@@ -734,12 +734,12 @@ UrlDlgList *findFrame()
 	@description:
 		This command opens a configuration window where it is possible
 		to setup plugin's parameters. You can also open this window by
-		using popup menu in the url list window<BR><BR>
+		using popup menu in the URL list window<BR><BR>
 		<H3>Configure dialog options:</H3>
 		There is also a ban list widget, which allows to have a list of words that plugin mustn't catch.<BR><BR>
 		<I>E.g.<BR>
 		<blockquote>if the word "ftp" is inserted in the ban list and if in a window there is an output like "ftp.kvirc.net",
-		the url will not be catched.</blockquote></I>
+		the URL will not be caught.</blockquote></I>
 		<HR>
 */
 
@@ -749,7 +749,7 @@ static bool url_kvs_cmd_config(KviKvsModuleCommandCall *)
 	return true;
 }
 
-int check_url(KviWindow *w,const QString &szUrl) // return 0 if no occurence of the url were found
+int check_url(KviWindow *w,const QString &szUrl) // return 0 if no occurrence of the URL were found
 {
 	int tmp = 0;
 
@@ -833,7 +833,7 @@ bool urllist_module_event_onUrl(KviKvsModuleEventCall * c)
 	@syntax:
 		url.load
 	@description:
-		Loads the URL list module which keeps track of all urls shown in kvirc windows.
+		Loads the URL list module which keeps track of all URLs shown in KVIrc windows.
 */
 
 
@@ -901,23 +901,23 @@ void url_module_config()
 	@type:
 		module
 	@short:
-		The URL list module: keeps track of all urls shown in kvirc windows
+		The URL list module: keeps track of all URLs shown in KVIrc windows
 	@title:
 		The URL list module
 	@body:
-		This plugin keeps track of all urls shown in kvirc windows.
+		This plugin keeps track of all URLs shown in KVIrc windows.
 		<H3>Exported commands:</H3>
-		<B>/url.list</B> : this command opens a window containing the urls' list.
+		<B>/URL.list</B> : this command opens a window containing the URLs' list.
 		In the list there is other information:<BR>
-		<U>Window</U> : window where the url has been shown last<BR>
-		<U>Count</U> : number of urls shown<BR>
-		<U>Timestamp</U> : date/time when the url has been shown first<BR>
-		Clicking right on the url column of the list a menu will popup, through it
-		you can remove the selected item, find the url in the window it appeared last, and
-		say it to: <I>@Console, Channels, Querys, DCC Chats</I> and <I>User windows</I>.<BR>
+		<U>Window</U> : window where the URL has been shown last<BR>
+		<U>Count</U> : number of URLs shown<BR>
+		<U>Timestamp</U> : date/time when the URL has been shown first<BR>
+		Clicking right on the URL column of the list a menu will popup, through it
+		you can remove the selected item, find the URL in the window it appeared last, and
+		say it to: <I>@Console, Channels, Queries, DCC Chats</I> and <I>User windows</I>.<BR>
 		The list is saved to file when you click on the menu item or when you unload the plugin
 		on condition that you have checked the relative checkbox in configuration dialog.<BR>
-		You can also open the url in your web browser double clicking on it in the url list window.<BR><BR>
+		You can also open the URL in your web browser double clicking on it in the URL list window.<BR><BR>
 
 		Mail me if you have any suggestion or you want to notice a bug.<BR>
 		<B>Andrea 'YaP' Parrella</B> &lt;anandrea@iname.com&gt;<BR><BR>
@@ -931,7 +931,7 @@ KVIRC_MODULE(
 	"URL",
 	"4.0.0",
 	"Copyright (C) 2002 Andrea Parrella <yap@yapsoft.it>",
-	"url list module for KVIrc",
+	"URL list module for KVIrc",
 	url_module_init,
 	url_module_can_unload,
 	0,