1 files changed, 10 insertions, 10 deletions

diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index 2896ccc8..d6d89a25 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -364,7 +364,7 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password )
 void GroupWiseAccount::slotMessageSendingFailed()
 {
 	KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry,
-				i18n("Message Sending Failed", "Kopete was not able to send the last message sent on account '%1'.\nIf possible, please send the console output from Kopete to <wstephenson@novell.com> for analysis." ).tqarg( accountId() ) , i18n ("Unable to Send Message on Account '%1'").tqarg( accountId() ) );
+				i18n("Message Sending Failed", "Kopete was not able to send the last message sent on account '%1'.\nIf possible, please send the console output from Kopete to <wstephenson@novell.com> for analysis." ).arg( accountId() ) , i18n ("Unable to Send Message on Account '%1'").arg( accountId() ) );
 }
 
 void GroupWiseAccount::setOnlineStatus( const Kopete::OnlineStatus& status, const TQString &reason )
@@ -566,7 +566,7 @@ void GroupWiseAccount::reconcileOfflineChanges()
 						break;
 					}
 					else
-						kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "metacontact " << c->metaContact()->displayName( ) << "has multiple tqchildren and group membership, and contact " << c->dn() << " was removed from one group on the server." << endl;
+						kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "metacontact " << c->metaContact()->displayName( ) << "has multiple children and group membership, and contact " << c->dn() << " was removed from one group on the server." << endl;
 						conflicts = true;
 				}
 			} // 
@@ -647,7 +647,7 @@ void GroupWiseAccount::slotConnError()
 {
 	kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl;
 	KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry,
-				i18n( "Error shown when connecting failed", "Kopete was not able to connect to the GroupWise Messenger server for account '%1'.\nPlease check your server and port settings and try again." ).tqarg( accountId() ) , i18n ("Unable to Connect '%1'").tqarg( accountId() ) );
+				i18n( "Error shown when connecting failed", "Kopete was not able to connect to the GroupWise Messenger server for account '%1'.\nPlease check your server and port settings and try again." ).arg( accountId() ) , i18n ("Unable to Connect '%1'").arg( accountId() ) );
 
 	disconnect();
 }
@@ -823,19 +823,19 @@ void GroupWiseAccount::handleIncomingMessage( const ConferenceEvent & message )
 	{
 		TQString prefix = i18n("Prefix used for automatically generated auto-reply"
 			" messages when the contact is Away, contains contact's name",
-			"Auto reply from %1: " ).tqarg( sender->metaContact()->displayName() );
+			"Auto reply from %1: " ).arg( sender->metaContact()->displayName() );
 		messageMunged = prefix + message.message;
 	}
 	if ( message.type == GroupWise::ReceivedBroadcast )
 	{
 		TQString prefix = i18n("Prefix used for broadcast messages",
-			"Broadcast message from %1: " ).tqarg( sender->metaContact()->displayName() );
+			"Broadcast message from %1: " ).arg( sender->metaContact()->displayName() );
 		messageMunged = prefix + message.message;
 	}
 	if ( message.type == GroupWise::ReceivedSystemBroadcast )
 	{
 		TQString prefix = i18n("Prefix used for system broadcast messages",
-			"System Broadcast message from %1: " ).tqarg( sender->metaContact()->displayName() );
+			"System Broadcast message from %1: " ).arg( sender->metaContact()->displayName() );
 		messageMunged = prefix + message.message;
 	}
 
@@ -1210,7 +1210,7 @@ void GroupWiseAccount::receiveContactCreated()
 
 		KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget (), KMessageBox::Error,
 							i18n ("The contact %1 could not be added to the contact list, with error message: %2").
-							tqarg(cct->userId() ).tqarg( cct->statusString() ),
+							arg(cct->userId() ).arg( cct->statusString() ),
 							i18n ("Error Adding Contact") );
 	}
 }
@@ -1255,8 +1255,8 @@ void GroupWiseAccount::receiveContactDeleted( const ContactItem & instance )
 
 void GroupWiseAccount::slotConnectedElsewhere()
 {
-	KPassivePopup::message( i18n ("Signed in as %1 Elsewhere").tqarg( accountId() ),
-				i18n( "The parameter is the user's own account id for this protocol", "You have been disconnected from GroupWise Messenger because you signed in as %1 elsewhere" ).tqarg( accountId() ) , Kopete::UI::Global::mainWidget() );
+	KPassivePopup::message( i18n ("Signed in as %1 Elsewhere").arg( accountId() ),
+				i18n( "The parameter is the user's own account id for this protocol", "You have been disconnected from GroupWise Messenger because you signed in as %1 elsewhere" ).arg( accountId() ) , Kopete::UI::Global::mainWidget() );
 	disconnect();
 }
 
@@ -1364,7 +1364,7 @@ void GroupWiseAccount::receiveInviteNotify( const ConferenceEvent & event )
 			c = createTemporaryContact( event.user );
 
 		sess->addInvitee( c );
-		Kopete::Message declined = Kopete::Message( myself(), sess->members(), i18n("%1 has been invited to join this conversation.").tqarg( c->metaContact()->displayName() ), Kopete::Message::Internal, Kopete::Message::PlainText );
+		Kopete::Message declined = Kopete::Message( myself(), sess->members(), i18n("%1 has been invited to join this conversation.").arg( c->metaContact()->displayName() ), Kopete::Message::Internal, Kopete::Message::PlainText );
 		sess->appendMessage( declined );
 	}
 	else