Fix remaining instances of tqStatus embedded in user visible strings

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1250385 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 6 insertions, 6 deletions

diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index 6db38a51..6336185c 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -1105,7 +1105,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const
 	// Build the action message if the currentChatStyle do not have Action template.
 	if( message.type() == Kopete::Message::TypeAction && !d->currentChatStyle->hasActionTemplate() )
 	{
-		kdDebug(14000) << k_funcinfo << "Map Action message to tqStatus template. " << endl;
+		kdDebug(14000) << k_funcinfo << "Map Action message to Status template. " << endl;
 
 		TQString boldNick = TQString::fromUtf8("%1<b>%2</b></a> ").tqarg(nickLink,nick);
 		TQString newBody = boldNick + message.parsedBody();
diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
index cb1f1395..73d62080 100644
--- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
@@ -209,9 +209,9 @@ int ChatWindowStyleManager::installStyle(const TQString &styleBundlePath)
 // 					kdDebug() << k_funcinfo << "Contents/Resources/Footer.html found" << endl;
 					validResult += 1;
 				}
-				if( currentDir->entry(TQString::fromUtf8("Contents/Resources/tqStatus.html")) )
+				if( currentDir->entry(TQString::fromUtf8("Contents/Resources/Status.html")) )
 				{
-// 					kdDebug() << k_funcinfo << "Contents/Resources/tqStatus.html found" << endl;
+// 					kdDebug() << k_funcinfo << "Contents/Resources/Status.html found" << endl;
 					validResult += 1;
 				}
 				if( currentDir->entry(TQString::fromUtf8("Contents/Resources/Header.html")) )
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
index bdf8c362..a85a8aa8 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
@@ -389,7 +389,7 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c )
 			enum ChangeType { noChange, noEvent, signedIn, changedtqStatus, signedOut };
 			ChangeType t = noChange;
 			//kdDebug( 14000 ) << k_funcinfo << m_metaContact->displayName() <<
-			//" - Old MC tqStatus: " << m_oldtqStatus.status() << ", New MC tqStatus: " << newtqStatus.status() << endl;
+			//" - Old MC Status: " << m_oldtqStatus.status() << ", New MC Status: " << newtqStatus.status() << endl;
 			// first, exclude changes due to blocking or subscription changes at the protocol level
 			if ( ( m_oldtqStatus.status() == Kopete::OnlineStatus::Unknown
 						|| newtqStatus.status() == Kopete::OnlineStatus::Unknown ) )
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index ec3e69f3..86fbe897 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -262,7 +262,7 @@ void KopeteWindow::initActions()
 		TQT_SLOT( slotGlobalAvailable() ), actionCollection(),
 		"SetAvailableAll" );
 
-	actionAwayMenu = new KActionMenu( i18n("&Set tqStatus"), "kopeteavailable",
+	actionAwayMenu = new KActionMenu( i18n("&Set Status"), "kopeteavailable",
 							actionCollection(), "Status" );
 	actionAwayMenu->setDelayed( false );
 	actionAwayMenu->insert(actionSetAvailable);
@@ -317,7 +317,7 @@ void KopeteWindow::initActions()
 	editGlobalAction->setAutoSized( true );
 
 	// KActionMenu for selecting the global status message(kopeteonlinestatus_0)
-	KActionMenu * setStatusMenu = new KActionMenu( i18n( "Set tqStatus Message" ), "kopeteeditstatusmessage", actionCollection(), "SetStatusMessage" );
+	KActionMenu * setStatusMenu = new KActionMenu( i18n( "Set Status Message" ), "kopeteeditstatusmessage", actionCollection(), "SetStatusMessage" );
 	setStatusMenu->setDelayed( false );
 	connect( setStatusMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT(slotBuildStatusMessageMenu() ) );
 	connect( setStatusMenu->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_SLOT(slotStatusMessageSelected( int ) ) );