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

20 files changed, 72 insertions, 72 deletions

diff --git a/src/modules/options/OptionsWidget_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp
index 9674351ee..be6ff706b 100644
--- a/src/modules/options/OptionsWidget_dcc.cpp
+++ b/src/modules/options/OptionsWidget_dcc.cpp
@@ -115,7 +115,7 @@ OptionsWidget_dccAdvanced::OptionsWidget_dccAdvanced(QWidget * parent)
 	mergeTip(b2,__tr2qs_ctx("<center>You can enable this option if you are behind a router that forwards all or a range of ports.<br>" \
 			"KVIrc will try to guess the IP address to use for DCC by looking up the local hostname as seen " \
 			"by the IRC server you're connected to.<br>This method is an exclusive alternative to the \"fixed address\" above.<br>" \
-			"It might guess the correct address automatically if certain conditions are met (e.g. the IRC server does not mask hostnames).</center>","options"));
+			"It might guess the correct address automatically if certain conditions are met (e.g. the IRC server doesn't mask hostnames).</center>","options"));
 
 	b = addBoolSelector(g,__tr2qs_ctx("Use \"broken bouncer hack\" to detect address","options"),KviOption_boolDccBrokenBouncerHack,KVI_OPTION_BOOL(KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable));
 	mergeTip(b,__tr2qs_ctx("<center>When you're behind a dialup router and also tunneling through a psyBNC bouncer, " \
@@ -128,12 +128,12 @@ OptionsWidget_dccAdvanced::OptionsWidget_dccAdvanced(QWidget * parent)
 	mergeTip(b,__tr2qs_ctx("<center>If you enable this option, when a DCC request from a remote " \
 					"user can't be satisfied KVIrc will notify him by a CTCP ERRMSG. This is " \
 					"a nice feature so it is a good idea to leave it on unless for some reason " \
-					"you have deactivated the antiflood system: in this case turning off this option " \
+					"you have deactivated the anti-flood system: in this case turning off this option " \
 					"might help if you often get attacked by CTCP floods.</center>","options"));
 
 	u = addUIntSelector(0,2,1,2,__tr2qs_ctx("Maximum number of DCC sessions","options"),KviOption_uintMaxDccSlots,0,1000,64);
 	mergeTip(u,__tr2qs_ctx("<center>This is the maximum number of concurrent DCC sessions " \
-					"and it includes all the DCC types (send,chat,recv...). " \
+					"and it includes all the DCC types (send, chat, recv...). " \
 					"KVIrc will refuse the requests when this limit is reached.</center>","options"));
 
 	u = addUIntSelector(0,3,1,3,__tr2qs_ctx("DCC socket timeout:","options"),KviOption_uintDccSocketTimeout,10,65536,180);
@@ -271,7 +271,7 @@ OptionsWidget_dccSendAdvanced::OptionsWidget_dccSendAdvanced(QWidget * parent)
 
 	b = addBoolSelector(hb,__tr2qs_ctx("Force idle step","options"),KviOption_boolDccSendForceIdleStep);
 	mergeTip(b,
-		__tr2qs_ctx("<center>Enable this option when the dcc file transfers " \
+		__tr2qs_ctx("<center>Enable this option when the DCC file transfers " \
 				"tend to block your computer by consuming too much CPU time. " \
 				"When this option is enabled the idle interval below will be " \
 				"forcibly inserted between each sent/received data packet.</center>","options"));
diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index 4db01563c..a6c6a9809 100644
--- a/src/modules/options/OptionsWidget_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -389,7 +389,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	sel = addStringSelector(gbox,__tr2qs_ctx("Location:","options"),KviOption_stringCtcpUserInfoLocation);
 	sel->setMinimumLabelWidth(120);
 	mergeTip(sel,szCenterBegin + __tr2qs_ctx("You can describe here your approximate physical location. " \
-				"Something like \"Region, Country\" will be ok. Please note that this information will be viewable " \
+				"Something like \"Region, Country\" will be OK. Please note that this information will be viewable " \
 				"by anyone so putting more data (like the exact address), generally, <b>is not a good idea</b>.","options") + szTrailing);
 
 	sel = addStringSelector(gbox,__tr2qs_ctx("Languages:","options"),KviOption_stringCtcpUserInfoLanguages);
@@ -400,7 +400,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	sel = addStringSelector(gbox,__tr2qs_ctx("Other:","options"),KviOption_stringCtcpUserInfoOther);
 	sel->setMinimumLabelWidth(120);
 	mergeTip(sel,szCenterBegin + __tr2qs_ctx("You can put here some additional personal data. " \
-				"It might be a funny quote or your homepage url... " \
+				"It might be a funny quote or your homepage URL... " \
 				"Please note that this information will be viewable " \
 				"by anyone so <b>don't put any sensible data</b> (passwords, telephone or credit card numbers).","options") + szTrailing);
 
diff --git a/src/modules/options/OptionsWidget_input.cpp b/src/modules/options/OptionsWidget_input.cpp
index 5ababb626..5d72facdb 100644
--- a/src/modules/options/OptionsWidget_input.cpp
+++ b/src/modules/options/OptionsWidget_input.cpp
@@ -35,15 +35,15 @@ OptionsWidget_inputLook::OptionsWidget_inputLook(QWidget * parent)
 	setObjectName("inputlook_options_widget");
 	createLayout();
 
-	addFontSelector(0,0,1,0,__tr2qs_ctx("Font","options"),KviOption_fontInput);
-	addColorSelector(0,1,1,1,__tr2qs_ctx("Background color","options"),KviOption_colorInputBackground);
-	addColorSelector(0,2,1,2,__tr2qs_ctx("Foreground color","options"),KviOption_colorInputForeground);
-	addColorSelector(0,3,1,3,__tr2qs_ctx("Selection background color","options"),KviOption_colorInputSelectionBackground);
-	addColorSelector(0,4,1,4,__tr2qs_ctx("Selection foreground color","options"),KviOption_colorInputSelectionForeground);
-	addColorSelector(0,5,1,5,__tr2qs_ctx("Control char color","options"),KviOption_colorInputControl);
-	addColorSelector(0,6,1,6,__tr2qs_ctx("Cursor color","options"),KviOption_colorInputCursor);
+	addFontSelector(0,0,1,0,__tr2qs_ctx("Font:","options"),KviOption_fontInput);
+	addColorSelector(0,1,1,1,__tr2qs_ctx("Background color:","options"),KviOption_colorInputBackground);
+	addColorSelector(0,2,1,2,__tr2qs_ctx("Foreground color:","options"),KviOption_colorInputForeground);
+	addColorSelector(0,3,1,3,__tr2qs_ctx("Selection background color:","options"),KviOption_colorInputSelectionBackground);
+	addColorSelector(0,4,1,4,__tr2qs_ctx("Selection foreground color:","options"),KviOption_colorInputSelectionForeground);
+	addColorSelector(0,5,1,5,__tr2qs_ctx("Control char color","options:"),KviOption_colorInputControl);
+	addColorSelector(0,6,1,6,__tr2qs_ctx("Cursor color:","options"),KviOption_colorInputCursor);
 
-	addPixmapSelector(0,7,1,7,__tr2qs_ctx("Background image","options"),KviOption_pixmapInputBackground);
+	addPixmapSelector(0,7,1,7,__tr2qs_ctx("Background image:","options"),KviOption_pixmapInputBackground);
 
 	addLabel(0,8,0,8,__tr2qs_ctx("Horizontal align:","options"));
 	m_pHorizontalAlign=new QComboBox(this);
diff --git a/src/modules/options/OptionsWidget_lag.cpp b/src/modules/options/OptionsWidget_lag.cpp
index 673ca5246..f82f7ebf6 100644
--- a/src/modules/options/OptionsWidget_lag.cpp
+++ b/src/modules/options/OptionsWidget_lag.cpp
@@ -46,7 +46,7 @@ OptionsWidget_lag::OptionsWidget_lag(QWidget * parent)
 	mergeTip(pInterval,
 		__tr2qs_ctx("<center>This option allows you to set the lag meter heartbeat interval.<br>" \
 			"The lower the heartbeat interval the higher will be the accuracy of the lag check " \
-			"but also higher cpu usage and data traffic to the server.<br>" \
+			"but also higher CPU usage and data traffic to the server.<br>" \
 			"Please note that this is NOT the interval between pings sent to the server: " \
 			"the pings (if any) will be sent really less often. " \
 			"5000 is a reasonable value.</center>","options"));
diff --git a/src/modules/options/OptionsWidget_mediaTypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp
index 935731d1d..129048e87 100644
--- a/src/modules/options/OptionsWidget_mediaTypes.cpp
+++ b/src/modules/options/OptionsWidget_mediaTypes.cpp
@@ -226,7 +226,7 @@ void OptionsWidget_mediaTypes::currentItemChanged(QTreeWidgetItem *it,QTreeWidge
 void OptionsWidget_mediaTypes::newMediaType()
 {
 	KviMediaType empty;
-	empty.szDescription = __tr2qs_ctx("New Media Type","options");
+	empty.szDescription = __tr2qs_ctx("New media type","options");
 	MediaTypeTreeWidgetItem * it = new MediaTypeTreeWidgetItem(m_pTreeWidget,&empty);
 	m_pTreeWidget->setCurrentItem(it);
 	it->setSelected(true);
diff --git a/src/modules/options/OptionsWidget_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp
index 26e450dc8..2844ee287 100644
--- a/src/modules/options/OptionsWidget_nickserv.cpp
+++ b/src/modules/options/OptionsWidget_nickserv.cpp
@@ -185,7 +185,7 @@ bool NickServRuleEditor::validate()
 
 	if(s.isEmpty())
 	{
-		QMessageBox::warning(this,m,__tr2qs_ctx("The identify command can't be empty!","options"),o);
+		QMessageBox::warning(this,m,__tr2qs_ctx("The IDENTIFY command can't be empty!","options"),o);
 		return false;
 	}
 
diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp
index 9350818ee..34af0898c 100644
--- a/src/modules/options/OptionsWidget_notifier.cpp
+++ b/src/modules/options/OptionsWidget_notifier.cpp
@@ -35,13 +35,13 @@ OptionsWidget_notifierLook::OptionsWidget_notifierLook(QWidget * parent)
 	setObjectName("notifierlook_options_widget");
 	createLayout();
 
-	addFontSelector(0,0,1,0,__tr2qs_ctx("Font","options"),KviOption_fontNotifier);
-	addColorSelector(0,1,1,1,__tr2qs_ctx("Background color","options"),KviOption_colorNotifierBackground);
-	addColorSelector(0,2,1,2,__tr2qs_ctx("Foreground color","options"),KviOption_colorNotifierForeground);
-	addFontSelector(0,3,1,3,__tr2qs_ctx("Title Font","options"),KviOption_fontNotifierTitle);
-	addColorSelector(0,4,1,4,__tr2qs_ctx("Title Foreground color","options"),KviOption_colorNotifierTitleForeground);
+	addFontSelector(0,0,1,0,__tr2qs_ctx("Font:","options"),KviOption_fontNotifier);
+	addColorSelector(0,1,1,1,__tr2qs_ctx("Background color:","options"),KviOption_colorNotifierBackground);
+	addColorSelector(0,2,1,2,__tr2qs_ctx("Foreground color:","options"),KviOption_colorNotifierForeground);
+	addFontSelector(0,3,1,3,__tr2qs_ctx("Title font:","options"),KviOption_fontNotifierTitle);
+	addColorSelector(0,4,1,4,__tr2qs_ctx("Title foreground color:","options"),KviOption_colorNotifierTitleForeground);
 
-	addPixmapSelector(0,5,1,5,__tr2qs_ctx("Background image","options"),KviOption_pixmapNotifierBackground);
+	addPixmapSelector(0,5,1,5,__tr2qs_ctx("Background image:","options"),KviOption_pixmapNotifierBackground);
 
 	addLabel(0,6,0,6,__tr2qs_ctx("Horizontal align:","options"));
 	m_pHorizontalAlign=new QComboBox(this);
diff --git a/src/modules/options/OptionsWidget_protection.cpp b/src/modules/options/OptionsWidget_protection.cpp
index 2590b8f64..2376de59a 100644
--- a/src/modules/options/OptionsWidget_protection.cpp
+++ b/src/modules/options/OptionsWidget_protection.cpp
@@ -1,7 +1,7 @@
 //=============================================================================
 //
 //   File : OptionsWidget_protection.cpp
-//   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
+//   Creation date : Wed Oct 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc IRC client distribution
 //   Copyright (C) 2005-2008 Alessandro Carbone (elfonol at gmail dot com)
diff --git a/src/modules/options/OptionsWidget_protection.h b/src/modules/options/OptionsWidget_protection.h
index 31f8c7008..a67fbcc5c 100644
--- a/src/modules/options/OptionsWidget_protection.h
+++ b/src/modules/options/OptionsWidget_protection.h
@@ -3,7 +3,7 @@
 //=============================================================================
 //
 //   File : OptionsWidget_protection.h
-//   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
+//   Creation date : Wed Oct 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc IRC client distribution
 //   Copyright (C) 2005-2008 Alessandro Carbone (elfonol at gmail dot com)
diff --git a/src/modules/options/OptionsWidget_query.cpp b/src/modules/options/OptionsWidget_query.cpp
index 3a13b3802..6d49078af 100644
--- a/src/modules/options/OptionsWidget_query.cpp
+++ b/src/modules/options/OptionsWidget_query.cpp
@@ -80,12 +80,12 @@ OptionsWidget_query::OptionsWidget_query(QWidget * parent)
 	b = addBoolSelector(0,4,1,4, __tr2qs_ctx("Popup notifier on new query message","options"),KviOption_boolPopupNotifierOnNewQueryMessages);
 	mergeTip(b,
 		__tr2qs_ctx("<center>This option causes a small notifier window to pop up " \
-			"in the low right corner of the screen when a new message is received " \
+			"in the lower right corner of the screen when a new message is received " \
 			"and the KVIrc window is not active.</center>","options"));
 	b = addBoolSelector(0,5,1,5, __tr2qs_ctx("Popup notifier on new notice","options"),KviOption_boolPopupNotifierOnNewNotices);
 	mergeTip(b,
 		__tr2qs_ctx("<center>This option causes a small notifier window to pop up " \
-			"in the low right corner of the screen when a new notice is received " \
+			"in the lower right corner of the screen when a new notice is received " \
 			"and the KVIrc window is not active.</center>","options"));
 	b = addBoolSelector(0,6,1,6, __tr2qs_ctx("Show information about query target at the top of the query","options"),KviOption_boolShowExtendedInfoInQueryLabel);
 	mergeTip(b,
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index d48c4d131..279d449e1 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -203,7 +203,7 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	gl->addWidget(m_pEncodingEditor,1,1);
 	KviTalToolTip::add(m_pEncodingEditor,__tr2qs_ctx("<center>This box allows you to choose the preferred encoding for the servers in this network. " \
 		"This encoding will be used for server specific needs, like referencing nicknames and channel names." \
-		"If you choose \"Use System Encoding\" then the encoding will be set to the systemwide " \
+		"If you choose \"Use System Encoding\" then the encoding will be set to the system-wide " \
 		"value that you choose in the \"Encoding\" page of the options dialog.</center>","options"));
 
 	//text encoding
@@ -215,7 +215,7 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	gl->addWidget(m_pTextEncodingEditor,2,1);
 	KviTalToolTip::add(m_pTextEncodingEditor,__tr2qs_ctx("<center>This box allows you to choose the preferred encoding for the servers in this network. " \
 		"This encoding will be used as the default for text messages." \
-		"If you choose \"Use System Encoding\" then the encoding will be set to the systemwide " \
+		"If you choose \"Use System Encoding\" then the encoding will be set to the system-wide " \
 		"value that you choose in the \"Encoding\" page of the options dialog.</center>","options"));
 
 	//common between server encoding and text encoding
@@ -980,7 +980,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pIdEditor->setText(s->id());
 	gl->addWidget(m_pIdEditor,iRow,1);
 
-	KviTalToolTip::add(m_pIdEditor,__tr2qs_ctx("<center>This field allows you to specify a really unique id for this server. " \
+	KviTalToolTip::add(m_pIdEditor,__tr2qs_ctx("<center>This field allows you to specify a really unique ID for this server. " \
 		"You will then be able to use /server -x &lt;this_id&gt; to make the connection. This is especially " \
 		"useful when you have multiple server entries with the same hostname and port in different networks (bouncers?)</center>","options"));
 
diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp
index e57a6df30..415a8c460 100644
--- a/src/modules/options/OptionsWidget_textEncoding.cpp
+++ b/src/modules/options/OptionsWidget_textEncoding.cpp
@@ -219,7 +219,7 @@ void OptionsWidget_textEncoding::commit()
 		g_szPrevSettedLocale=m_pForcedLocaleCombo->itemText(idx);
 		if(!KviFileUtils::writeFile(szLangFile,m_pForcedLocaleCombo->itemText(idx)))
 		{
-			QMessageBox::critical(this,"KVIrc",__tr2qs_ctx("Unable to write language information to","options")+"\n"+szLangFile,__tr2qs_ctx("Ok","options"));
+			QMessageBox::critical(this,"KVIrc",__tr2qs_ctx("Unable to write language information to","options")+"\n"+szLangFile,__tr2qs_ctx("OK","options"));
 		}
 	}
 /*	if(!KviQString::equalCI(m_pForcedLocaleCombo->text(idx),m_szLanguage))
diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp
index 0a3faf99a..81ea5b281 100644
--- a/src/modules/options/OptionsWidget_textIcons.cpp
+++ b/src/modules/options/OptionsWidget_textIcons.cpp
@@ -191,7 +191,7 @@ void OptionsWidget_textIcons::iconSelected(KviIconManager::SmallIcon eIcon)
 void OptionsWidget_textIcons::chooseFromFile()
 {
 	QString szFile;
-	KviFileDialog::askForOpenFileName(szFile,__tr2qs_ctx("Choose icon filename","options"),QString(),KVI_FILTER_IMAGE,false,true,this);
+	KviFileDialog::askForOpenFileName(szFile,__tr2qs_ctx("Choose Icon Filename","options"),QString(),KVI_FILTER_IMAGE,false,true,this);
 	if(!szFile.isEmpty())
 	{
 		if(g_pIconManager->getPixmap(szFile))
@@ -209,7 +209,7 @@ void OptionsWidget_textIcons::chooseFromFile()
 				KviFileUtils::makeDir(szCurrentThemePath);
 			KviFileUtils::copyFile(szFile,szCurrentThemePath+szFileName);
 			m_pCurrentItem->icon()->setFilename(szFileName);
-			qDebug("set Icon");
+			qDebug("Set icon");
 			QPixmap *p=m_pCurrentItem->icon()->pixmap();
 			m_pCurrentItem->setIcon(QIcon(*p));
 			if(m_pCurrentIconButton)
diff --git a/src/modules/options/OptionsWidget_theme.cpp b/src/modules/options/OptionsWidget_theme.cpp
index c96a11d2b..9655518f7 100644
--- a/src/modules/options/OptionsWidget_theme.cpp
+++ b/src/modules/options/OptionsWidget_theme.cpp
@@ -162,17 +162,17 @@ OptionsWidget_themeToolBarApplets::OptionsWidget_themeToolBarApplets(QWidget * p
 {
 	createLayout();
 
-	addFontSelector(0,0,0,0,__tr2qs_ctx("Font","options"),KviOption_fontIrcToolBarApplet);
+	addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontIrcToolBarApplet);
 
-	addColorSelector(0,1,0,1,__tr2qs_ctx("Background","options"),KviOption_colorIrcToolBarAppletBackground);
-	addColorSelector(0,2,0,2,__tr2qs_ctx("Low-Contrast Foreground","options"),KviOption_colorIrcToolBarAppletForegroundLowContrast);
-	addColorSelector(0,3,0,3,__tr2qs_ctx("Mid-Contrast Foreground","options"),KviOption_colorIrcToolBarAppletForegroundMidContrast);
-	addColorSelector(0,4,0,4,__tr2qs_ctx("Active High-Contrast Foreground (Primary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastActive1);
-	addColorSelector(0,5,0,5,__tr2qs_ctx("Active High-Contrast Foreground (Secondary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastActive2);
-	addColorSelector(0,6,0,6,__tr2qs_ctx("Inactive High-Contrast Foreground (Primary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastInactive1);
-	addColorSelector(0,7,0,7,__tr2qs_ctx("Inactive High-Contrast Foreground (Secondary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastInactive2);
+	addColorSelector(0,1,0,1,__tr2qs_ctx("Background:","options"),KviOption_colorIrcToolBarAppletBackground);
+	addColorSelector(0,2,0,2,__tr2qs_ctx("Low-contrast foreground:","options"),KviOption_colorIrcToolBarAppletForegroundLowContrast);
+	addColorSelector(0,3,0,3,__tr2qs_ctx("Mid-contrast foreground:","options"),KviOption_colorIrcToolBarAppletForegroundMidContrast);
+	addColorSelector(0,4,0,4,__tr2qs_ctx("Active high-contrast foreground (primary):","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastActive1);
+	addColorSelector(0,5,0,5,__tr2qs_ctx("Active high-contrast foreground (secondary):","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastActive2);
+	addColorSelector(0,6,0,6,__tr2qs_ctx("Inactive high-contrast foreground (primary):","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastInactive1);
+	addColorSelector(0,7,0,7,__tr2qs_ctx("Inactive high-contrast foreground (secondary):","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastInactive2);
 
-	addPixmapSelector(0,8,0,8,__tr2qs_ctx("Background Image","options"),KviOption_pixmapIrcToolBarAppletBackground);
+	addPixmapSelector(0,8,0,8,__tr2qs_ctx("Background image:","options"),KviOption_pixmapIrcToolBarAppletBackground);
 
 	layout()->setRowStretch(8,1);
 }
diff --git a/src/modules/options/OptionsWidget_tools.cpp b/src/modules/options/OptionsWidget_tools.cpp
index 37b17faf6..924402655 100644
--- a/src/modules/options/OptionsWidget_tools.cpp
+++ b/src/modules/options/OptionsWidget_tools.cpp
@@ -1,7 +1,7 @@
 //=============================================================================
 //
 //   File : OptionsWidget_tools.cpp
-//   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
+//   Creation date : Wed Oct 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc IRC client distribution
 //   Copyright (C) 2005-2008 Alessandro Carbone (elfonol at gmail dot com)
diff --git a/src/modules/options/OptionsWidget_tools.h b/src/modules/options/OptionsWidget_tools.h
index 2fc59e0b4..95a346b08 100644
--- a/src/modules/options/OptionsWidget_tools.h
+++ b/src/modules/options/OptionsWidget_tools.h
@@ -4,7 +4,7 @@
 //=============================================================================
 //
 //   File : OptionsWidget_tools.h
-//   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
+//   Creation date : Wed Oct 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc IRC client distribution
 //   Copyright (C) 2005-2008 Alessandro Carbone (elfonol at gmail dot com)
diff --git a/src/modules/options/OptionsWidget_topicLabel.cpp b/src/modules/options/OptionsWidget_topicLabel.cpp
index abe9992b0..7385b5094 100644
--- a/src/modules/options/OptionsWidget_topicLabel.cpp
+++ b/src/modules/options/OptionsWidget_topicLabel.cpp
@@ -33,10 +33,10 @@ OptionsWidget_topicLabel::OptionsWidget_topicLabel(QWidget *p):KviOptionsWidget(
 {
 	createLayout();
 
-	addFontSelector(0, 0, 0, 0, __tr2qs_ctx("Font","options"), KviOption_fontLabel);
-	addColorSelector(0, 1, 0, 1, __tr2qs_ctx("Foreground color","options"), KviOption_colorLabelForeground);
-	addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Background color","options"), KviOption_colorLabelBackground);
-	addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image","options"), KviOption_pixmapLabelBackground);
+	addFontSelector(0, 0, 0, 0, __tr2qs_ctx("Font:","options"), KviOption_fontLabel);
+	addColorSelector(0, 1, 0, 1, __tr2qs_ctx("Foreground color:","options"), KviOption_colorLabelForeground);
+	addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Background color:","options"), KviOption_colorLabelBackground);
+	addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image:","options"), KviOption_pixmapLabelBackground);
 
 	layout()->setRowStretch(3, 1);
 }
diff --git a/src/modules/options/OptionsWidget_userList.cpp b/src/modules/options/OptionsWidget_userList.cpp
index ccf252bb1..bc7375dbc 100644
--- a/src/modules/options/OptionsWidget_userList.cpp
+++ b/src/modules/options/OptionsWidget_userList.cpp
@@ -135,11 +135,11 @@ OptionsWidget_userListBackground::OptionsWidget_userListBackground(QWidget * par
 
 	addPixmapSelector(0,1,1,1,__tr2qs_ctx("Background image:","options"),KviOption_pixmapUserListViewBackground);
 
-	addLabel(0,2,0,2,__tr2qs_ctx("Horizontal Alignment:","options"));
+	addLabel(0,2,0,2,__tr2qs_ctx("Horizontal alignment:","options"));
 	m_pHorizontalAlign=new QComboBox(this);
 	addWidgetToLayout(m_pHorizontalAlign,1,2,1,2);
 
-	addLabel(0,3,0,3,__tr2qs_ctx("Vertical Alignment:","options"));
+	addLabel(0,3,0,3,__tr2qs_ctx("Vertical alignment:","options"));
 	m_pVerticalAlign=new QComboBox(this);
 	addWidgetToLayout(m_pVerticalAlign,1,3,1,3);
 
diff --git a/src/modules/options/OptionsWidget_windowList.cpp b/src/modules/options/OptionsWidget_windowList.cpp
index fb625be7a..a1b7b1f55 100644
--- a/src/modules/options/OptionsWidget_windowList.cpp
+++ b/src/modules/options/OptionsWidget_windowList.cpp
@@ -89,11 +89,11 @@ OptionsWidget_windowListTreeForeground::OptionsWidget_windowListTreeForeground(Q
 
 	addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeWindowListForeground);
 	addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeWindowListActiveForeground);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 1:","options"),KviOption_colorTreeWindowListHighlight1Foreground);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 2:","options"),KviOption_colorTreeWindowListHighlight2Foreground);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 3:","options"),KviOption_colorTreeWindowListHighlight3Foreground);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 4:","options"),KviOption_colorTreeWindowListHighlight4Foreground);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 5:","options"),KviOption_colorTreeWindowListHighlight5Foreground);
+	addColorSelector(g,__tr2qs_ctx("Alert level 1:","options"),KviOption_colorTreeWindowListHighlight1Foreground);
+	addColorSelector(g,__tr2qs_ctx("Alert level 2:","options"),KviOption_colorTreeWindowListHighlight2Foreground);
+	addColorSelector(g,__tr2qs_ctx("Alert level 3:","options"),KviOption_colorTreeWindowListHighlight3Foreground);
+	addColorSelector(g,__tr2qs_ctx("Alert level 4:","options"),KviOption_colorTreeWindowListHighlight4Foreground);
+	addColorSelector(g,__tr2qs_ctx("Alert level 5:","options"),KviOption_colorTreeWindowListHighlight5Foreground);
 
 	addColorSelector(0,2,0,2,__tr2qs_ctx("Progress bar color:","options"),KviOption_colorTreeWindowListProgress);
 
@@ -246,11 +246,11 @@ OptionsWidget_windowListClassic::OptionsWidget_windowListClassic(QWidget * paren
 	KviTalGroupBox *g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options"));
 	addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorWindowListNormalText);
 	addColorSelector(g,__tr2qs_ctx("Minimized:","options"), KviOption_colorWindowListMinimizedText);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 1:","options"),KviOption_colorWindowListHighlight1Text);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 2:","options"),KviOption_colorWindowListHighlight2Text);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 3:","options"),KviOption_colorWindowListHighlight3Text);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 4:","options"),KviOption_colorWindowListHighlight4Text);
-	addColorSelector(g,__tr2qs_ctx("Alert Level 5:","options"),KviOption_colorWindowListHighlight5Text);
+	addColorSelector(g,__tr2qs_ctx("Alert level 1:","options"),KviOption_colorWindowListHighlight1Text);
+	addColorSelector(g,__tr2qs_ctx("Alert level 2:","options"),KviOption_colorWindowListHighlight2Text);
+	addColorSelector(g,__tr2qs_ctx("Alert level 3:","options"),KviOption_colorWindowListHighlight3Text);
+	addColorSelector(g,__tr2qs_ctx("Alert level 4:","options"),KviOption_colorWindowListHighlight4Text);
+	addColorSelector(g,__tr2qs_ctx("Alert level 5:","options"),KviOption_colorWindowListHighlight5Text);
 	addColorSelector(0,2,0,2,__tr2qs_ctx("Progress bar color:","options"),KviOption_colorWindowListProgressBar);
 	addUIntSelector(0,3,0,3,__tr2qs_ctx("Minimum width of buttons:","options"),KviOption_uintWindowListButtonMinWidth,24,9999,100);
 	//addUIntSelector(0,4,0,4,__tr2qs_ctx("Maximum number of rows:","options"),KviOption_uintWindowListMaximumRows,1,16,2);
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 8a086bad1..f5bcba8a3 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -58,7 +58,7 @@ extern int g_iOptionWidgetInstances;
 	@description:
 		Saves the options to disk; this includes aliases, popups,
 		events and all user preferences. You shouldn't need to
-		call this as KVIrc *should* save the relevant part of
+		call this as KVIrc [i]should[/i] save the relevant part of
 		configuration when it's changed. However you might want it
 		in a debugging session or when testing an unstable version
 		where crashes are possible.
@@ -79,15 +79,15 @@ static bool options_kvs_cmd_save(KviKvsModuleCommandCall *)
 	@title:
 		options.dialog
 	@short:
-		Shows the "options dialog"
+		Shows the preferences dialog
 	@syntax:
 		options.dialog [-t] [options_group]
 	@description:
-		Shows the KVIrc options dialog for the specified options group.
+		Shows the KVIrc preferences dialog and the specified options group.
 		If the [-t] switch is used, the dialog is opened as toplevel window,
-		otherwise it is opened as part of the current frame window.[br]
-		Valid values for [options_group] are "general" and "theme".
-		If [options_group] is omitted, the option group "general" is assumed.
+		otherwise it is opened as part of the current frame window.[br][br]
+		Valid values for [options_group] are [b]general[/b] and [b]theme[/b].
+		If [options_group] is omitted, the option group [i]general[/i] is assumed.
 		This command is exported by the "options" module.
 	@seealso:
 		[fnc]$options.isDialog[/fnc]
@@ -194,7 +194,7 @@ static bool options_kvs_cmd_pages(KviKvsModuleCommandCall * c)
 	@description:
 		Shows an options page as toplevel dialog.
 		The available option pages can be listed by using [cmd]options.pages[/cmd].
-		If the -n switch is used then dialog will appear as NON modal (will not block input).
+		If the -n switch is used then dialog will appear as [b]non[/b] modal (will not block input).
 	@seealso:
 */
 
@@ -256,9 +256,9 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 		<boolean> $options.isdialog([options_group:string])
 	@description:
 		Returns '1' if the options dialog for the specified options_group is open, '0' otherwise.[br]
-		If [options_group] is omitted then the group "general" is assumed.
-		At the moment of writing the valid [options_group] values are "general" and "theme".
-		This command is exported by the "options" module.
+		If [options_group] is omitted then the group [i]general[/i] is assumed.
+		At the moment of writing the valid [options_group] values are [b]general[/b] and [b]theme[/b].
+		This command is exported by the [i]options[/i] module.
 	@seealso:
 		[cmd]options.dialog[/cmd]
 */
@@ -288,8 +288,8 @@ static bool options_kvs_fnc_isdialog(KviKvsModuleFunctionCall * c)
 	@description:
 		Closes the KVIrc options dialog for the specified options group
 		or containing the specified options page.
-		If [options_group] is omitted, the option group "general" is assumed.
-		This command is exported by the "options" module.
+		If [options_group] is omitted, the option group [i]general[/i] is assumed.
+		This command is exported by the [i]options[/i] module.
 	@seealso:
 		[fnc]$options.isDialog[/fnc]
 */