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

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

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

* freenode is all lowercase instance only.

* tooltips are not Camel Case capitalization style either.

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

* Tree items are Camel Case

* Typos in Unknow channel modes

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

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

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

s spaces

tyyt

20 files changed, 66 insertions, 66 deletions

diff --git a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
index dfcf265b7..8ef5563ed 100644
--- a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
+++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
@@ -74,7 +74,7 @@ OptionsWidget_highlighting::OptionsWidget_highlighting(QWidget * parent)
 	m_pHighlightAllOccurencesRadioButton = new QRadioButton(__tr2qs_ctx("Highlight every occurrence of a word inside text","options"),gbox);
 	g->addWidget(m_pHighlightAllOccurencesRadioButton,0,0,1,2);
 	m_pHighlightAllOccurencesRadioButton->setChecked(KVI_OPTION_BOOL(KviOption_boolUseFullWordHighlighting));
-	KviTalToolTip::add(m_pHighlightAllOccurencesRadioButton,__tr2qs_ctx("<center>This selection will cause KVIrc to search for the highlighted words or nicknames inside the whole text. This will also highlight parts of words (eg. if your nickname is Mark then Markus will be highlighted too).</center>","options"));
+	KviTalToolTip::add(m_pHighlightAllOccurencesRadioButton,__tr2qs_ctx("<center>This selection will cause KVIrc to search for the highlighted words or nicknames inside the whole text. This will also highlight parts of words (e.g. if your nickname is Mark then Markus will be highlighted too).</center>","options"));
 
 	m_pHighlightWholeWordsOnlyRadioButton = new QRadioButton(__tr2qs_ctx("Highlight only whole words splitting on space and on:","options"),gbox);
 	g->addWidget(m_pHighlightWholeWordsOnlyRadioButton,1,0,1,1);
diff --git a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
index b26d8e2df..387e80902 100644
--- a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
+++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
@@ -58,7 +58,7 @@
 		respond to within the interval of time defined in the second field.[br]
 		A strong protection against floods would be replying to 4 requests every 20 seconds.[br]
 		The minimum effective setting is about 3 messages every 6 seconds.[br]
-		Please note that 3 messages every 6 seconds is NOT the same as 10 messages every 20 seconds;
+		Please note that 3 messages every 6 seconds is [b]not[/b] the same as 10 messages every 20 seconds;
 		the first setting would allow 3 requests within one second, but the client would
 		ignore all the requests for the next 5 seconds, the second setting would allow 10 messages within one second
 		and ignore everything for the next 19 seconds. Therefore, 3/6 is a safer setting.[br]
diff --git a/src/modules/options/OptionsWidget_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp
index be6ff706b..aecbd0135 100644
--- a/src/modules/options/OptionsWidget_dcc.cpp
+++ b/src/modules/options/OptionsWidget_dcc.cpp
@@ -131,7 +131,7 @@ OptionsWidget_dccAdvanced::OptionsWidget_dccAdvanced(QWidget * parent)
 					"you have deactivated the anti-flood system: in this case turning off this option " \
 					"might help if you often get attacked by CTCP floods.</center>","options"));
 
-	u = addUIntSelector(0,2,1,2,__tr2qs_ctx("Maximum number of DCC sessions","options"),KviOption_uintMaxDccSlots,0,1000,64);
+	u = addUIntSelector(0,2,1,2,__tr2qs_ctx("Maximum number of DCC sessions:","options"),KviOption_uintMaxDccSlots,0,1000,64);
 	mergeTip(u,__tr2qs_ctx("<center>This is the maximum number of concurrent DCC sessions " \
 					"and it includes all the DCC types (send, chat, recv...). " \
 					"KVIrc will refuse the requests when this limit is reached.</center>","options"));
@@ -243,19 +243,19 @@ OptionsWidget_dccSendAdvanced::OptionsWidget_dccSendAdvanced(QWidget * parent)
 	g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Limits","options"));
 
 	KviTalHBox * hb = new KviTalHBox(g);
-	b = addBoolSelector(hb,__tr2qs_ctx("Limit upload bandwidth to","options"),KviOption_boolLimitDccSendSpeed);
+	b = addBoolSelector(hb,__tr2qs_ctx("Limit upload bandwidth to:","options"),KviOption_boolLimitDccSendSpeed);
 	KviUIntSelector * u = addUIntSelector(hb,"",KviOption_uintMaxDccSendSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccSendSpeed));
 	u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options"));
 	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
 
 	hb = new KviTalHBox(g);
-	b = addBoolSelector(hb,__tr2qs_ctx("Limit download bandwidth to","options"),KviOption_boolLimitDccRecvSpeed);
+	b = addBoolSelector(hb,__tr2qs_ctx("Limit download bandwidth to:","options"),KviOption_boolLimitDccRecvSpeed);
 	u = addUIntSelector(hb,"",KviOption_uintMaxDccRecvSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccRecvSpeed));
 	u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options"));
 	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
 
 
-	u = addUIntSelector(g,__tr2qs_ctx("Maximum number of DCC transfers","options"),KviOption_uintMaxDccSendTransfers,0,1000,10);
+	u = addUIntSelector(g,__tr2qs_ctx("Maximum number of DCC transfers:","options"),KviOption_uintMaxDccSendTransfers,0,1000,10);
 	mergeTip(u,__tr2qs_ctx("<center>This is the maximum number of concurrent DCC transfers. " \
 					"KVIrc will refuse the requests when this limit is reached.</center>","options"));
 
@@ -269,7 +269,7 @@ OptionsWidget_dccSendAdvanced::OptionsWidget_dccSendAdvanced(QWidget * parent)
 
 	hb = new KviTalHBox(g);
 
-	b = addBoolSelector(hb,__tr2qs_ctx("Force idle step","options"),KviOption_boolDccSendForceIdleStep);
+	b = addBoolSelector(hb,__tr2qs_ctx("Force idle step:","options"),KviOption_boolDccSendForceIdleStep);
 	mergeTip(b,
 		__tr2qs_ctx("<center>Enable this option when the DCC file transfers " \
 				"tend to block your computer by consuming too much CPU time. " \
diff --git a/src/modules/options/OptionsWidget_general.h b/src/modules/options/OptionsWidget_general.h
index 444ab6d10..1645e2e95 100644
--- a/src/modules/options/OptionsWidget_general.h
+++ b/src/modules/options/OptionsWidget_general.h
@@ -27,7 +27,7 @@
 #include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_general KviIconManager::Options
-#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_general __tr2qs_no_lookup("General options")
+#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_general __tr2qs_no_lookup("General Options")
 #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_general 40000
 
 class OptionsWidget_general : public KviOptionsWidget
diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index a6c6a9809..be18d41f5 100644
--- a/src/modules/options/OptionsWidget_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -58,33 +58,33 @@ NickAlternativesDialog::NickAlternativesDialog(QWidget * par,const QString &n1,c
 {
 	QGridLayout * g = new QGridLayout(this);
 
-	setWindowTitle(__tr2qs_ctx("Nickname alternatives","options"));
+	setWindowTitle(__tr2qs_ctx("Nickname Alternatives","options"));
 
 	QLabel * l = new QLabel(this);
-	l->setText(__tr2qs_ctx("<center>Here you can choose up to three nicknames " \
+	l->setText(__tr2qs_ctx("Here you can choose up to three nicknames " \
 		"alternative to the primary one. KVIrc will use the alternatives " \
 		"if the primary nick is already used by someone else on a particular " \
-		"IRC network.</center>","options"));
+		"IRC network.","options"));
 	l->setWordWrap(true);
 
 	g->addWidget(l,0,0,1,3);
 
 	l = new QLabel(this);
-	l->setText(__tr2qs_ctx("Alt. Nickname 1:","options"));
+	l->setText(__tr2qs_ctx("Alt. nickname 1:","options"));
 	g->addWidget(l,1,0);
 	m_pNickEdit1 = new QLineEdit(this);
 	g->addWidget(m_pNickEdit1,1,1,1,2);
 	m_pNickEdit1->setText(n1);
 
 	l = new QLabel(this);
-	l->setText(__tr2qs_ctx("Alt. Nickname 2:","options"));
+	l->setText(__tr2qs_ctx("Alt. nickname 2:","options"));
 	g->addWidget(l,2,0);
 	m_pNickEdit2 = new QLineEdit(this);
 	g->addWidget(m_pNickEdit2,2,1,1,2);
 	m_pNickEdit2->setText(n2);
 
 	l = new QLabel(this);
-	l->setText(__tr2qs_ctx("Alt. Nickname 3:","options"));
+	l->setText(__tr2qs_ctx("Alt. nickname 3:","options"));
 	g->addWidget(l,3,0);
 	m_pNickEdit3 = new QLineEdit(this);
 	g->addWidget(m_pNickEdit3,3,1,1,2);
@@ -205,13 +205,13 @@ AvatarSelectionDialog::AvatarSelectionDialog(QWidget * par,const QString &szInit
 
 	QGridLayout * g = new QGridLayout(this);
 
-	QString msg = "<center>";
+	QString msg = "<left>";
 	msg += __tr2qs_ctx("Please select an avatar image. " \
 				"The full path to a local file or an image on the Web can be used.<br>" \
 				"If you wish to use a local image file, click the \"<b>Browse</b>\"" \
 				"button to browse local folders.<br>" \
 				"The full URL for an image (including <b>http://</b>) can be entered manually.","options");
-	msg += "</center><br>";
+	msg += "</left><br>";
 
 	QLabel * l = new QLabel(msg,this);
 	l->setMinimumWidth(250);
@@ -887,16 +887,16 @@ IdentityProfileEditor::IdentityProfileEditor(QWidget * pParent)
 	setObjectName("identity_profile_editor");
 	setWindowTitle(__tr2qs_ctx("Profile Editor - KVIrc","options"));
 
-	m_szName = __tr2qs_ctx("Profile Name","options");
-	m_szNetwork = __tr2qs_ctx("MyNetwork","options");
-	m_szNick = __tr2qs_ctx("MyNick","options");
-	m_szAltNick = __tr2qs_ctx("MyNick2","options");
-	m_szUserName = __tr2qs_ctx("MyUserName","options");
-	m_szRealName = __tr2qs_ctx("MyRealName","options");
+	m_szName = __tr2qs_ctx("Profile name","options");
+	m_szNetwork = __tr2qs_ctx("My network","options");
+	m_szNick = __tr2qs_ctx("My nickname","options");
+	m_szAltNick = __tr2qs_ctx("My nickname 2","options");
+	m_szUserName = __tr2qs_ctx("My username","options");
+	m_szRealName = __tr2qs_ctx("My real name","options");
 
 	QGridLayout * pLayout = new QGridLayout(this);
 
-	QLabel * pLabel = new QLabel(__tr2qs_ctx("Profile Name:","options"),this);
+	QLabel * pLabel = new QLabel(__tr2qs_ctx("Profile name:","options"),this);
 	pLayout->addWidget(pLabel,0,0);
 
 	m_pNameEdit = new QLineEdit(this);
@@ -904,7 +904,7 @@ IdentityProfileEditor::IdentityProfileEditor(QWidget * pParent)
 	pLayout->addWidget(m_pNameEdit,0,1,1,2);
 	connect(m_pNameEdit,SIGNAL(textChanged(const QString &)),this,SLOT(toggleButton(const QString &)));
 
-	pLabel = new QLabel(__tr2qs_ctx("Network Name:","options"),this);
+	pLabel = new QLabel(__tr2qs_ctx("Network name:","options"),this);
 	pLayout->addWidget(pLabel,1,0);
 
 	m_pNetworkEdit = new QLineEdit(this);
@@ -920,7 +920,7 @@ IdentityProfileEditor::IdentityProfileEditor(QWidget * pParent)
 	pLayout->addWidget(m_pNickEdit,2,1,1,2);
 	connect(m_pNickEdit,SIGNAL(textChanged(const QString &)),this,SLOT(toggleButton(const QString &)));
 
-	pLabel = new QLabel(__tr2qs_ctx("Alternative Nickname:","options"),this);
+	pLabel = new QLabel(__tr2qs_ctx("Alternative nickname:","options"),this);
 	pLayout->addWidget(pLabel,3,0);
 
 	m_pAltNickEdit = new QLineEdit(this);
@@ -936,11 +936,11 @@ IdentityProfileEditor::IdentityProfileEditor(QWidget * pParent)
 	pLayout->addWidget(m_pUserNameEdit,4,1,1,2);
 	connect(m_pUserNameEdit,SIGNAL(textChanged(const QString &)),this,SLOT(toggleButton(const QString &)));
 
-	pLabel = new QLabel(__tr2qs_ctx("Realname:","options"),this);
+	pLabel = new QLabel(__tr2qs_ctx("Real name:","options"),this);
 	pLayout->addWidget(pLabel,5,0);
 
 	m_pRealNameEdit = new QLineEdit(this);
-	KviTalToolTip::add(m_pRealNameEdit,__tr2qs_ctx("Put here the realname you want to use","options"));
+	KviTalToolTip::add(m_pRealNameEdit,__tr2qs_ctx("Put here the real name you want to use","options"));
 	pLayout->addWidget(m_pRealNameEdit,5,1,1,2);
 	connect(m_pRealNameEdit,SIGNAL(textChanged(const QString &)),this,SLOT(toggleButton(const QString &)));
 
diff --git a/src/modules/options/OptionsWidget_input.cpp b/src/modules/options/OptionsWidget_input.cpp
index 5d72facdb..ca3185eab 100644
--- a/src/modules/options/OptionsWidget_input.cpp
+++ b/src/modules/options/OptionsWidget_input.cpp
@@ -142,7 +142,7 @@ OptionsWidget_inputFeatures::OptionsWidget_inputFeatures(QWidget * parent)
 
 	addBoolSelector(0,0,0,0,__tr2qs_ctx("Warp cursor at the end of line when browsing history","options"),KviOption_boolInputHistoryCursorAtEnd);
 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Enable the input history logging","options"),KviOption_boolEnableInputHistory); //G&N 2005
-	addBoolSelector(0,2,0,2,__tr2qs_ctx("Hide input toolbuttons by default","options"),KviOption_boolHideInputToolButtons);
+	addBoolSelector(0,2,0,2,__tr2qs_ctx("Hide input tool buttons by default","options"),KviOption_boolHideInputToolButtons);
 	addBoolSelector(0,3,0,3,__tr2qs_ctx("Commandline in user-friendly mode by default","options"),KviOption_boolCommandlineInUserFriendlyModeByDefault);
 	addUIntSelector(0,4,0,4,__tr2qs_ctx("Expand tabulations in input using this amount of spaces:","options"),KviOption_uintSpacesToExpandTabulationInput,1,24,8,true);
 
@@ -153,7 +153,7 @@ OptionsWidget_inputFeatures::OptionsWidget_inputFeatures(QWidget * parent)
 	connect(b,SIGNAL(toggled(bool)),c,SLOT(setDisabled(bool)));
 	connect(c,SIGNAL(toggled(bool)),b,SLOT(setDisabled(bool)));
 
-	addStringSelector(g,__tr2qs_ctx("Nick completion postfix string","options"),KviOption_stringNickCompletionPostfix);
+	addStringSelector(g,__tr2qs_ctx("Nick completion postfix string:","options"),KviOption_stringNickCompletionPostfix);
 	addBoolSelector(g,__tr2qs_ctx("Use the completion postfix string for the first word only","options"),KviOption_boolUseNickCompletionPostfixForFirstWordOnly);
 
 	KviBoolSelector *d = addBoolSelector(0,6,0,6,__tr2qs_ctx("Use a custom cursor width","options"),KviOption_boolEnableCustomCursorWidth);
diff --git a/src/modules/options/OptionsWidget_irc.cpp b/src/modules/options/OptionsWidget_irc.cpp
index 40634db03..0145fd744 100644
--- a/src/modules/options/OptionsWidget_irc.cpp
+++ b/src/modules/options/OptionsWidget_irc.cpp
@@ -73,9 +73,9 @@ OptionsWidget_ircAdvanced::OptionsWidget_ircAdvanced(QWidget * parent)
 		"When this option is disabled, KVIrc will wait for the server " \
 		"to close the connection.<br>" \
 		"Note that if you use this, your QUIT message may be not displayed.</center>","options"));
-	addBoolSelector(0,1,0,1,__tr2qs_ctx("Prepend gender info to realname","options"),KviOption_boolPrependGenderInfoToRealname);
-	addBoolSelector(0,2,0,2,__tr2qs_ctx("Prepend avatar info to realname","options"),KviOption_boolPrependAvatarInfoToRealname);
-	addBoolSelector(0,3,0,3,__tr2qs_ctx("Prepend smart nick color info to realname","options"),KviOption_boolPrependNickColorInfoToRealname);
+	addBoolSelector(0,1,0,1,__tr2qs_ctx("Prepend gender info to real name","options"),KviOption_boolPrependGenderInfoToRealname);
+	addBoolSelector(0,2,0,2,__tr2qs_ctx("Prepend avatar info to real name","options"),KviOption_boolPrependAvatarInfoToRealname);
+	addBoolSelector(0,3,0,3,__tr2qs_ctx("Prepend smart nick color info to real name","options"),KviOption_boolPrependNickColorInfoToRealname);
 	addRowSpacer(0,4,0,4);
 }
 
diff --git a/src/modules/options/OptionsWidget_ircOutput.cpp b/src/modules/options/OptionsWidget_ircOutput.cpp
index 50345464c..fd252a4d9 100644
--- a/src/modules/options/OptionsWidget_ircOutput.cpp
+++ b/src/modules/options/OptionsWidget_ircOutput.cpp
@@ -55,7 +55,7 @@ OptionsWidget_ircOutput::OptionsWidget_ircOutput(QWidget * pParent)
 		KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = KVI_VERBOSITY_LEVEL_NORMAL;
 	m_pVerbosityCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel));
 
-	pLabel = new QLabel(__tr2qs_ctx("Datetime format","options"),this);
+	pLabel = new QLabel(__tr2qs_ctx("DateTime format:","options"),this);
 	addWidgetToLayout(pLabel,0,1,0,1);
 
 	m_pDatetimeCombo = new QComboBox(this);
diff --git a/src/modules/options/OptionsWidget_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp
index 4c525dfaa..a5a161d8d 100644
--- a/src/modules/options/OptionsWidget_logging.cpp
+++ b/src/modules/options/OptionsWidget_logging.cpp
@@ -53,7 +53,7 @@ OptionsWidget_logging::OptionsWidget_logging(QWidget * parent)
 
 	addBoolSelector(0,3,0,3,__tr2qs_ctx("Strip message type numbers in logs","options"),KviOption_boolStripMsgTypeInLogs);
 	addBoolSelector(0,4,0,4,__tr2qs_ctx("Strip colors in logs","options"),KviOption_boolStripControlCodesInLogs);
-	KviUIntSelector* us = addUIntSelector(0,5,0,5,__tr2qs_ctx("Auto flush logs every","options"),KviOption_uintAutoFlushLogs,0,99999,0);
+	KviUIntSelector* us = addUIntSelector(0,5,0,5,__tr2qs_ctx("Auto flush logs every:","options"),KviOption_uintAutoFlushLogs,0,99999,0);
 	us->setSuffix(__tr2qs_ctx(" min","options"));
 	mergeTip(us,
 		__tr2qs_ctx("<center>Save logs with the current interval<br>" \
diff --git a/src/modules/options/OptionsWidget_mediaTypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp
index 129048e87..274268425 100644
--- a/src/modules/options/OptionsWidget_mediaTypes.cpp
+++ b/src/modules/options/OptionsWidget_mediaTypes.cpp
@@ -123,7 +123,7 @@ OptionsWidget_mediaTypes::OptionsWidget_mediaTypes(QWidget * parent)
 	mergeTip(m_pRemoteExecCommandline,__tr2qs_ctx("<center>This field contains the command to execute when automatically opening a received file.<br>" \
 		"<tt>$0</tt> is used in place of the filename</center>","options"));
 
-	l = new QLabel(__tr2qs_ctx("Icon","options"),this);
+	l = new QLabel(__tr2qs_ctx("Icon:","options"),this);
 	layout()->addWidget(l,8,0);
 	m_pIcon = new QLineEdit(this);
 	layout()->addWidget(m_pIcon,8,1,1,2);
diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp
index 942e00d72..5ed61d9ef 100644
--- a/src/modules/options/OptionsWidget_message.cpp
+++ b/src/modules/options/OptionsWidget_message.cpp
@@ -142,7 +142,7 @@ OptionsWidget_timestamp::OptionsWidget_timestamp(QWidget * pParent)
 	KviTalHBox *hb = new KviTalHBox(this);
 	addWidgetToLayout(hb,0,2,0,2);
 
-	m_pSpecialTimestampColorSelector = addBoolSelector(hb,__tr2qs_ctx("Use special color for timestamps","options"),KviOption_boolUseSpecialColorForTimestamp,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp));
+	m_pSpecialTimestampColorSelector = addBoolSelector(hb,__tr2qs_ctx("Use special color for timestamps:","options"),KviOption_boolUseSpecialColorForTimestamp,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp));
 	connect(m_pSpecialTimestampColorSelector,SIGNAL(toggled(bool)),this,SLOT(enableDisableTimestampSelector(bool)));
 	connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,SLOT(setEnabled(bool)));
 
@@ -431,9 +431,9 @@ OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent)
 
 	KviTalHBox * h = new KviTalHBox(this);
 	addWidgetToLayout(h,0,1,3,1);
-	QPushButton * b = new QPushButton(__tr2qs_ctx("Load From...","options"),h);
+	QPushButton * b = new QPushButton(__tr2qs_ctx("Load from...","options"),h);
 	connect(b,SIGNAL(clicked()),this,SLOT(load()));
-	b = new QPushButton(__tr2qs_ctx("Save As...","options"),h);
+	b = new QPushButton(__tr2qs_ctx("Save as...","options"),h);
 	connect(b,SIGNAL(clicked()),this,SLOT(save()));
 
 
diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp
index 34af0898c..f6ff26788 100644
--- a/src/modules/options/OptionsWidget_notifier.cpp
+++ b/src/modules/options/OptionsWidget_notifier.cpp
@@ -232,21 +232,21 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent)
 
 	connect(b,
 		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("Default auto hiding time for messages (0 to disable)","options"),
+		addUIntSelector(g,__tr2qs_ctx("Default auto hiding time for messages (0 to disable):","options"),
 				KviOption_uintNotifierAutoHideTime,
 				0,86400,30,KVI_OPTION_BOOL(KviOption_boolEnableNotifier)),
 		SLOT(setEnabled(bool)));
 
 	connect(b2,
 		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("Notifier window opacity while active (mouseover)","options"),
+		addUIntSelector(g,__tr2qs_ctx("Notifier window opacity while active (mouseover):","options"),
 				KviOption_uintNotifierActiveTransparency,
 				0,100,90,KVI_OPTION_BOOL(KviOption_boolNotifierFading)),
 		SLOT(setEnabled(bool)));
 
 	connect(b2,
 		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("Notifier window opacity while inactive","options"),
+		addUIntSelector(g,__tr2qs_ctx("Notifier window opacity while inactive:","options"),
 				KviOption_uintNotifierInactiveTransparency,
 				0,100,40,KVI_OPTION_BOOL(KviOption_boolNotifierFading)),
 		SLOT(setEnabled(bool)));
diff --git a/src/modules/options/OptionsWidget_notify.cpp b/src/modules/options/OptionsWidget_notify.cpp
index 051bfbe6c..d1c99aab3 100644
--- a/src/modules/options/OptionsWidget_notify.cpp
+++ b/src/modules/options/OptionsWidget_notify.cpp
@@ -77,19 +77,19 @@ OptionsWidget_notify::OptionsWidget_notify(QWidget * parent)
 		SLOT(setEnabled(bool)));
 	connect(b,
 		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("Check interval (in seconds)","options"),
+		addUIntSelector(g,__tr2qs_ctx("Check interval (in seconds):","options"),
 				KviOption_uintNotifyListCheckTimeInSecs,
 				5,3600,180,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
 		SLOT(setEnabled(bool)));
 	connect(b,
 		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("ISON delay (in seconds)","options"),
+		addUIntSelector(g,__tr2qs_ctx("ISON delay (in seconds):","options"),
 				KviOption_uintNotifyListIsOnDelayTimeInSecs,
 				5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
 		SLOT(setEnabled(bool)));
 	connect(b,
 		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("USERHOST delay (in seconds)","options"),
+		addUIntSelector(g,__tr2qs_ctx("USERHOST delay (in seconds):","options"),
 				KviOption_uintNotifyListUserhostDelayTimeInSecs,
 				5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
 		SLOT(setEnabled(bool)));
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 279d449e1..3e021f680 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -828,7 +828,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	if(s->autoJoinChannelList())
 		m_lstChannels = *(s->autoJoinChannelList());
 	m_pChannelListSelector = new KviChannelListSelector(tab,
-		__tr2qs_ctx("Channels to Join Automatically Upon Connect","options"),&m_lstChannels,true);
+		__tr2qs_ctx("Channels to Join Automatically upon Connect","options"),&m_lstChannels,true);
 	KviTalToolTip::add(m_pChannelListSelector,__tr2qs_ctx("<center>Here you can set a list of channels to be joined automatically " \
 		"after a connection to this server has been established. To add a channel, type its name in the " \
 		"text input below and click \"<b>Add</b>\".</center>","options"));
@@ -973,7 +973,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 
 	iRow++;
 
-	l = new QLabel(__tr2qs_ctx("Id:","options"),tab);
+	l = new QLabel(__tr2qs_ctx("ID:","options"),tab);
 	gl->addWidget(l,iRow,0);
 	m_pIdEditor = new QLineEdit(tab);
 	if(s->id().isEmpty())s->generateUniqueId();
@@ -1308,7 +1308,7 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 	m_pNewNetworkButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::World))));
 	m_pNewNetworkButton->setAutoRaise(true);
 	connect(m_pNewNetworkButton,SIGNAL(clicked()),this,SLOT(newNetwork()));
-	KviTalToolTip::add(m_pNewNetworkButton,__tr2qs_ctx("New Network","options"));
+	KviTalToolTip::add(m_pNewNetworkButton,__tr2qs_ctx("New network","options"));
 
 	QFrame * f = new QFrame(vbox);
 	f->setFrameStyle(QFrame::Sunken | QFrame::HLine);
@@ -1317,34 +1317,34 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 	m_pNewServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Server))));
 	m_pNewServerButton->setAutoRaise(true);
 	connect(m_pNewServerButton,SIGNAL(clicked()),this,SLOT(newServer()));
-	KviTalToolTip::add(m_pNewServerButton,__tr2qs_ctx("New Server","options"));
+	KviTalToolTip::add(m_pNewServerButton,__tr2qs_ctx("New nerver","options"));
 
 	m_pFavoriteServerButton = new QToolButton(vbox);
 	m_pFavoriteServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::ServerFavorite))));
 	m_pFavoriteServerButton->setAutoRaise(true);
 	connect(m_pFavoriteServerButton,SIGNAL(clicked()),this,SLOT(favoriteServer()));
-	KviTalToolTip::add(m_pFavoriteServerButton,__tr2qs_ctx("Favorite/Unfavorite Server","options"));
+	KviTalToolTip::add(m_pFavoriteServerButton,__tr2qs_ctx("Favorite/Unfavorite server","options"));
 
 	m_pRemoveButton = new QToolButton(vbox);
 	m_pRemoveButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Remove))));
 	m_pRemoveButton->setEnabled(false);
 	m_pRemoveButton->setAutoRaise(true);
 	connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeCurrent()));
-	KviTalToolTip::add(m_pRemoveButton,__tr2qs_ctx("Remove Network/Server","options"));
+	KviTalToolTip::add(m_pRemoveButton,__tr2qs_ctx("Remove network/server","options"));
 
 	m_pCopyServerButton = new QToolButton(vbox);
 	m_pCopyServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Copy))));
 	m_pCopyServerButton->setEnabled(false);
 	m_pCopyServerButton->setAutoRaise(true);
 	connect(m_pCopyServerButton,SIGNAL(clicked()),this,SLOT(copyServer()));
-	KviTalToolTip::add(m_pCopyServerButton,__tr2qs_ctx("Copy Server","options"));
+	KviTalToolTip::add(m_pCopyServerButton,__tr2qs_ctx("Copy server","options"));
 
 	m_pPasteServerButton = new QToolButton(vbox);
 	m_pPasteServerButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Paste)));
 	m_pPasteServerButton->setEnabled(false);
 	m_pPasteServerButton->setAutoRaise(true);
 	connect(m_pPasteServerButton,SIGNAL(clicked()),this,SLOT(pasteServer()));
-	KviTalToolTip::add(m_pPasteServerButton,__tr2qs_ctx("Paste Server","options"));
+	KviTalToolTip::add(m_pPasteServerButton,__tr2qs_ctx("Paste server","options"));
 
 	f = new QFrame(vbox);
 	f->setFrameStyle(QFrame::Sunken | QFrame::HLine);
@@ -1355,7 +1355,7 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 	m_pImportButton->setMenu(m_pImportPopup);
 	m_pImportButton->setPopupMode(QToolButton::InstantPopup);
 
-	KviTalToolTip::add(m_pImportButton,__tr2qs_ctx("Import Server List","options"));
+	KviTalToolTip::add(m_pImportButton,__tr2qs_ctx("Import server list","options"));
 
 	QFrame * lll = new QFrame(vbox);
 	vbox->setStretchFactor(lll,100);
diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp
index 76d286e67..8a3184745 100644
--- a/src/modules/options/OptionsWidget_sound.cpp
+++ b/src/modules/options/OptionsWidget_sound.cpp
@@ -91,7 +91,7 @@ OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent)
 
 	m_pMediaTestButton->setEnabled(false);
 
-	g = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("ID3 tags encoding","options"),true);
+	g = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("ID3 Tags Encoding","options"),true);
 
 	KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of mp3 tags.","options"));
 
@@ -333,16 +333,16 @@ OptionsWidget_sounds::OptionsWidget_sounds(QWidget * parent)
 {
 	setObjectName("sound_options_widget");
 	createLayout();
-	addLabel(0,0,0,0,__tr2qs_ctx("New query opened","options"));
+	addLabel(0,0,0,0,__tr2qs_ctx("New query opened:","options"));
 	addSoundSelector(1,0,1,0,"",KviOption_stringOnNewQueryOpenedSound);
 
-	addLabel(0,1,0,1,__tr2qs_ctx("New message in inactive query","options"));
+	addLabel(0,1,0,1,__tr2qs_ctx("New message in inactive query:","options"));
 	addSoundSelector(1,1,1,1,"",KviOption_stringOnQueryMessageSound);
 
-	addLabel(0,2,0,2,__tr2qs_ctx("Highlighted message in inactive window","options"));
+	addLabel(0,2,0,2,__tr2qs_ctx("Highlighted message in inactive window:","options"));
 	addSoundSelector(1,2,1,2,"",KviOption_stringOnHighlightedMessageSound);
 
-	addLabel(0,3,0,3,__tr2qs_ctx("On me was kicked","options"));
+	addLabel(0,3,0,3,__tr2qs_ctx("On me was kicked:","options"));
 	addSoundSelector(1,3,1,3,"",KviOption_stringOnMeKickedSound);
 
 	addRowSpacer(0,4,1,4);
diff --git a/src/modules/options/OptionsWidget_textIcons.h b/src/modules/options/OptionsWidget_textIcons.h
index 25bf97299..23885a3af 100644
--- a/src/modules/options/OptionsWidget_textIcons.h
+++ b/src/modules/options/OptionsWidget_textIcons.h
@@ -34,7 +34,7 @@
 class TextIconTableItem;
 
 #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textIcons KviIconManager::BigGrin
-#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textIcons __tr2qs_no_lookup("Text icons")
+#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textIcons __tr2qs_no_lookup("Text Icons")
 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_textIcons OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textIcons __tr2qs_no_lookup("smileys,emoticons")
 
diff --git a/src/modules/options/OptionsWidget_tray.cpp b/src/modules/options/OptionsWidget_tray.cpp
index 5c75c84f2..0a64eb351 100644
--- a/src/modules/options/OptionsWidget_tray.cpp
+++ b/src/modules/options/OptionsWidget_tray.cpp
@@ -59,11 +59,11 @@ OptionsWidget_tray::OptionsWidget_tray(QWidget * parent)
 
 	m_pLevelsGroup = addGroupBox(0,5,0,5,Qt::Horizontal,__tr2qs_ctx("Select Message Levels to Notify","options"));
 
-	addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for low-priority messages","options"),
+	addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for low-priority messages:","options"),
 				KviOption_uintMinTrayLowLevelMessage,
 				1,5,1,true);
 
-	addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for high-priority message","options"),
+	addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for high-priority message:","options"),
 				KviOption_uintMinTrayHighLevelMessage,
 				1,5,4,true);
 
diff --git a/src/modules/options/OptionsWidget_tray.h b/src/modules/options/OptionsWidget_tray.h
index 0785f21c9..46111b7ff 100644
--- a/src/modules/options/OptionsWidget_tray.h
+++ b/src/modules/options/OptionsWidget_tray.h
@@ -29,7 +29,7 @@
 #include <QComboBox>
 
 #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tray KviIconManager::TrayIcon
-#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tray __tr2qs_no_lookup("Tray icon")
+#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tray __tr2qs_no_lookup("Tray Icon")
 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_tray OptionsWidget_interfaceFeatures
 #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_tray __tr2qs_no_lookup("tray,TRAYICON")
 
diff --git a/src/modules/options/OptionsWidget_urlHandlers.cpp b/src/modules/options/OptionsWidget_urlHandlers.cpp
index 5574b797e..56f421fdf 100644
--- a/src/modules/options/OptionsWidget_urlHandlers.cpp
+++ b/src/modules/options/OptionsWidget_urlHandlers.cpp
@@ -48,10 +48,10 @@ OptionsWidget_urlHandlers::OptionsWidget_urlHandlers(QWidget * parent)
 
 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Mouse Handler","options"));
 
-	addLabel(gbox,__tr2qs_ctx("How many click to open links?","options"));
+	addLabel(gbox,__tr2qs_ctx("How many clicks to open links?","options"));
 
-	m_pClickRadio = new QRadioButton(__tr2qs_ctx("Single click","options"),gbox);
-	m_pDoubleClickRadio = new QRadioButton(__tr2qs_ctx("Double click","options"),gbox);
+	m_pClickRadio = new QRadioButton(__tr2qs_ctx("Single-click","options"),gbox);
+	m_pDoubleClickRadio = new QRadioButton(__tr2qs_ctx("Double-click","options"),gbox);
 
 	switch(KVI_OPTION_UINT(KviOption_uintUrlMouseClickNum))
 	{
diff --git a/src/modules/options/OptionsWidget_urlHandlers.h b/src/modules/options/OptionsWidget_urlHandlers.h
index 6768cddc9..c797c6f8e 100644
--- a/src/modules/options/OptionsWidget_urlHandlers.h
+++ b/src/modules/options/OptionsWidget_urlHandlers.h
@@ -29,7 +29,7 @@
 class QRadioButton;
 
 #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_urlHandlers KviIconManager::Url
-#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_urlHandlers __tr2qs_no_lookup("URL handlers")
+#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_urlHandlers __tr2qs_no_lookup("URL Handlers")
 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_urlHandlers OptionsWidget_general
 #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_urlHandlers 70000
 #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_urlHandlers __tr2qs_no_lookup("URL,programs")