diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc
index f6399852d..f2d13ecda 100644
--- a/desktop/konsole.notifyrc
+++ b/desktop/konsole.notifyrc
@@ -29,7 +29,7 @@ Comment[uz]=Терминал
 Comment[x-test]=xxKonsolexx
 
 [Event/BellVisible]
-Name=Bell in visible session
+Name=Bell in Visible Session
 Name[af]=Klokkie in die sigbare sessie
 Name[bn]=প্রদর্শিত সেশন-এ ঘণ্টা
 Name[ca]=Timbre en una sessió visible
@@ -144,7 +144,7 @@ Sound=KDE-Sys-App-Message.ogg
 Action=Sound
 
 [Event/BellInvisible]
-Name=Bell in non-visible session
+Name=Bell in Non-visible session
 Name[af]=Klokkie in nie-sigbare sessie
 Name[bn]=আবৃত সেশন-এ ঘণ্টা
 Name[ca]=Timbre en una sessió no visible
@@ -259,7 +259,7 @@ Sound=KDE-Sys-App-Message.ogg
 Action=Popup
 
 [Event/Activity]
-Name=Activity in monitored session
+Name=Activity in Monitored Session
 Name[af]=Aktiveer in gemonitorde sessie
 Name[bn]=মনিটর করা সেশন-এ কিছু ঘটেছে
 Name[ca]=Activitat en una sessió controlada
@@ -373,7 +373,7 @@ Action=Popup
 
 
 [Event/Silence]
-Name=Silence in monitored session
+Name=Silence in Monitored Session
 Name[af]=Stilte in gemonitorde sessie
 Name[bn]=মনিটর করা সেশন-এ কিছু ঘটছে না
 Name[ca]=Silenci en una sessió controlada
@@ -486,7 +486,7 @@ Comment[zh_TW]=監控工作階段中偵測到靜默時的行為
 Action=Popup
 
 [Event/Finished]
-Name=Session finished with non-zero status
+Name=Session Finished With Non-zero Status
 Name[af]=Sessie het geëindig met nie-zero status
 Name[bn]=সেশন নন-জিরো স্ট্যাটাস সমেত সমাপ্ত
 Name[ca]=Sessió finalitzada amb un estat diferent de zero
diff --git a/src/SessionController.cpp b/src/SessionController.cpp
index 315266bad..472382a43 100644
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@@ -91,7 +91,7 @@ SessionController::SessionController(Session* session , TerminalDisplay* view, Q
 
     // handle user interface related to session (menus etc.)
 
-#ifdef KONSOLE_PART	
+#ifdef KONSOLE_PART
     setXMLFile("konsole/partui.rc");
 #else
 	setXMLFile("konsole/sessionui.rc");
@@ -135,7 +135,7 @@ SessionController::SessionController(Session* session , TerminalDisplay* view, Q
 
 	
     // listen for flow control status changes
-    connect( _session , SIGNAL(flowControlEnabledChanged(bool)) , _view , 
+    connect( _session , SIGNAL(flowControlEnabledChanged(bool)) , _view ,
 		SLOT(setFlowControlWarningEnabled(bool)) );
 	_view->setFlowControlWarningEnabled(_session->flowControlEnabled());
 
@@ -455,7 +455,7 @@ void SessionController::setupActions()
 
     connect( pasteAction , SIGNAL(triggered()) , this , SLOT(paste()) );
 
-	action = collection->addAction("paste-selection"); 
+	action = collection->addAction("paste-selection");
 	action->setText( i18n("Paste Selection") );
 	action->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_Insert) );
 	connect( action , SIGNAL(triggered()) , this , SLOT(pasteSelection()) );
@@ -467,8 +467,8 @@ void SessionController::setupActions()
     connect( action , SIGNAL(triggered()) , this , SLOT(renameSession()) );
 
     // Send to All
-    
-    //TODO - Complete the implementation of 'Send Input to All' for 
+
+    //TODO - Complete the implementation of 'Send Input to All' for
     //	     a future KDE 4 release
     //
     //toggleAction = new KToggleAction(i18n("Send Input to All"),this);
@@ -517,7 +517,7 @@ void SessionController::setupActions()
     connect( action , SIGNAL(triggered()) , this , SLOT(decreaseTextSize()) );
 
     // Scrollback
-    _searchToggleAction = new KAction(i18n("Search Output"),this);
+    _searchToggleAction = new KAction(i18n("Search Output..."),this);
     _searchToggleAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_F) );
     _searchToggleAction->setIcon( KIcon("edit-find") );
     _searchToggleAction->setCheckable(true);
@@ -544,7 +544,7 @@ void SessionController::setupActions()
     connect( action , SIGNAL(triggered()) , this , SLOT(saveHistory()) );
 
     action = collection->addAction("history-options");
-    action->setText( i18n("Scrollback Options...") );
+    action->setText( i18n("Scrollback Options") );
     action->setIcon( KIcon("configure") );
     connect( action , SIGNAL(triggered()) , this , SLOT(showHistoryOptions()) );
 
@@ -962,7 +962,7 @@ void SessionController::showDisplayContextMenu(TerminalDisplay* /*display*/ , in
     if ( factory() )
         popup = qobject_cast<QMenu*>(factory()->container("session-popup-menu",this));
 
-    if (popup) 
+    if (popup)
     {
         // prepend content-specific actions such as "Open Link", "Copy Email Address" etc.
         QList<QAction*> contentActions = _view->filterActions(position);
@@ -974,7 +974,7 @@ void SessionController::showDisplayContextMenu(TerminalDisplay* /*display*/ , in
         popup->exec( _view->mapToGlobal(position) );
 
         // remove content-specific actions
-        foreach(QAction* action,contentActions) 
+        foreach(QAction* action,contentActions)
             popup->removeAction(action);
         delete contentSeparator;
     }