diff options
Diffstat (limited to 'kopete/protocols/oscar/oscaraccount.cpp')
| -rw-r--r-- | kopete/protocols/oscar/oscaraccount.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp index da6d534b..719e9122 100644 --- a/kopete/protocols/oscar/oscaraccount.cpp +++ b/kopete/protocols/oscar/oscaraccount.cpp @@ -727,7 +727,7 @@ void OscarAccount::userStoppedTyping( const TQString & contact ) void OscarAccount::slotSocketError( int errCode, const TQString& errString ) { Q_UNUSED( errCode ); - KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).tqarg( accountId() ), + KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).arg( accountId() ), errString, myself()->onlineStatus().protocolIcon(), Kopete::UI::Global::mainWidget() ); @@ -744,7 +744,7 @@ void OscarAccount::slotTaskError( const Oscar::SNAC& s, int code, bool fatal ) if ( s.family == 0 && s.subtype == 0 ) { message = getFLAPErrorMessage( code ); - KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).tqarg( accountId() ), + KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).arg( accountId() ), message, myself()->onlineStatus().protocolIcon(), Kopete::UI::Global::mainWidget() ); switch ( code ) @@ -819,44 +819,44 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) { reason = i18n( "You have logged in more than once with the same %1," \ " account %2 is now disconnected.") - .tqarg( acctDescription ).tqarg( accountId() ); + .arg( acctDescription ).arg( accountId() ); } else // error while logging in { reason = i18n( "Sign on failed because either your %1 or " \ "password are invalid. Please check your settings for account %2.") - .tqarg( acctDescription ).tqarg( accountId() ); + .arg( acctDescription ).arg( accountId() ); } break; case 0x0002: // Service temporarily unavailable case 0x0014: // Reservation map error reason = i18n("The %1 service is temporarily unavailable. Please try again later.") - .tqarg( acctType ); + .arg( acctType ); break; case 0x0004: // Incorrect nick or password, re-enter case 0x0005: // Mismatch nick or password, re-enter reason = i18n("Could not sign on to %1 with account %2 because the " \ - "password was incorrect.").tqarg( acctType ).tqarg( accountId() ); + "password was incorrect.").arg( acctType ).arg( accountId() ); break; case 0x0007: // non-existant ICQ# case 0x0008: // non-existant ICQ# reason = i18n("Could not sign on to %1 with nonexistent account %2.") - .tqarg( acctType ).tqarg( accountId() ); + .arg( acctType ).arg( accountId() ); break; case 0x0009: // Expired account reason = i18n("Sign on to %1 failed because your account %2 expired.") - .tqarg( acctType ).tqarg( accountId() ); + .arg( acctType ).arg( accountId() ); break; case 0x0011: // Suspended account reason = i18n("Sign on to %1 failed because your account %2 is " \ - "currently suspended.").tqarg( acctType ).tqarg( accountId() ); + "currently suspended.").arg( acctType ).arg( accountId() ); break; case 0x0015: // too many clients from same IP case 0x0016: // too many clients from same IP case 0x0017: // too many clients from same IP (reservation) reason = i18n("Could not sign on to %1 as there are too many clients" \ - " from the same computer.").tqarg( acctType ); + " from the same computer.").arg( acctType ); break; case 0x0018: // rate exceeded (turboing) if ( isConnected() ) @@ -866,7 +866,7 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) " Wait ten minutes and try again." \ " If you continue to try, you will" \ " need to wait even longer.") - .tqarg( accountId() ).tqarg( acctType ); + .arg( accountId() ).arg( acctType ); } else { @@ -875,7 +875,7 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) " Wait ten minutes and try again." \ " If you continue to try, you will" \ " need to wait even longer.") - .tqarg( accountId() ).tqarg( acctType) ; + .arg( accountId() ).arg( acctType) ; } break; case 0x001C: @@ -883,7 +883,7 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) if ( !d->versionAlreadyUpdated ) { reason = i18n("Sign on to %1 with your account %2 failed.") - .tqarg( acctType ).tqarg( accountId() ); + .arg( acctType ).arg( accountId() ); d->versionAlreadyUpdated = true; } @@ -891,19 +891,19 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) { reason = i18n("The %1 server thinks the client you are using is " \ "too old. Please report this as a bug at http://bugs.kde.org") - .tqarg( acctType ); + .arg( acctType ); } break; case 0x0022: // Account suspended because of your age (age < 13) reason = i18n("Account %1 was disabled on the %2 server because " \ "of your age (less than 13).") - .tqarg( accountId() ).tqarg( acctType ); + .arg( accountId() ).arg( acctType ); break; default: if ( !isConnected() ) { reason = i18n("Sign on to %1 with your account %2 failed.") - .tqarg( acctType ).tqarg( accountId() ); + .arg( acctType ).arg( accountId() ); } break; } |