From kde-commits  Thu Jul 01 13:27:07 2010
From: "Lukáš" Tinkl <lukas () kde ! org>
Date: Thu, 01 Jul 2010 13:27:07 +0000
To: kde-commits
Subject: [Konversation] faff3a5: i18n fixes + a small code simplification
Message-Id: <20100701132707.4CFF4BB550E () projects ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=127799880318278

commit faff3a5a26b43ef524d026e8a9418aae5920bad6
Author: Lukáš Tinkl <lukas@kde.org>
Date:   Wed Dec 3 18:20:33 2003 +0000

    i18n fixes + a small code simplification
    
    svn path=/trunk/kdeextragear-2/konversation/; revision=271011

diff --git a/konversation/main.cpp b/konversation/main.cpp
index 73bb8af..1521215 100644
--- a/konversation/main.cpp
+++ b/konversation/main.cpp
@@ -39,7 +39,7 @@ int main(int argc, char* argv[])
                        VERSION,
                        shortDescription,
                        KAboutData::License_GPL,
-                       "(C)2002, 2003 by the Konversation team",
+                       I18N_NOOP("(C)2002, 2003 by the Konversation team"),
                        I18N_NOOP("Konversation is a client for the Internet Relay Chat (IRC) protocol.\n"
                                  "Meet friends on the net, make new acquaintances and lose yourself in\n"
                                  "talk about your favorite subject."),
diff --git a/konversation/prefspageidentity.cpp b/konversation/prefspageidentity.cpp
index 9edc01f..e51ff2b 100644
--- a/konversation/prefspageidentity.cpp
+++ b/konversation/prefspageidentity.cpp
@@ -68,15 +68,8 @@ PrefsPageIdentity::PrefsPageIdentity(QFrame* newParent,Preferences* newPreferenc
   encodings=KGlobal::charsets()->descriptiveEncodingNames();
 
   // from ksirc: remove utf16/ucs2 as it just doesn't work for IRC
-  QStringList::Iterator iterator=encodings.begin();
-  while(iterator!=encodings.end())
-  {
-    if((*iterator).find("utf16")!=-1 ||
-       (*iterator).find("iso-10646")!=-1)
-      iterator=encodings.remove(iterator);
-    else
-      ++iterator;
-  }
+  encodings.remove( "utf16" );
+  encodings.remove( "iso-10646" );
 
   // add encodings to combo box
   codecComboBox->insertStringList(encodings);
@@ -379,7 +372,7 @@ void PrefsPageIdentity::removeIdentity()
 {
   // TODO: are you sure here
   int current=identityCombo->currentItem();
-  
+
   if(current)
   {
     preferences->removeIdentity(identity);
diff --git a/konversation/server.cpp b/konversation/server.cpp
index 56ce723..1c78415 100644
--- a/konversation/server.cpp
+++ b/konversation/server.cpp
@@ -497,7 +497,7 @@ void Server::notifyResponse(const QString& nicksOnline)
       if(notifyLowerCache.find(nickLowerList[index])==notifyLowerCache.end())
       {
         getMainWindow()->appendToFrontmost(i18n("Notify"),i18n("%1 is online (%2).").arg(nickList[index]).arg(getServerName()),statusView);
-        
+
 #ifdef USE_KNOTIFY
         KNotifyClient::event(mainWindow->winId(), "notify",
           i18n("%1 is online (%2).").arg(nickList[index]).arg(getServerName()));
@@ -511,7 +511,7 @@ void Server::notifyResponse(const QString& nicksOnline)
       if(nickLowerList.find(notifyLowerCache[index])==nickLowerList.end())
       {
         getMainWindow()->appendToFrontmost(i18n("Notify"),i18n("%1 went offline. (%2)").arg(notifyCache[index]).arg(getServerName()),statusView);
-      
+
 #ifdef USE_KNOTIFY
         KNotifyClient::event(mainWindow->winId(), "notify",
           i18n("%1 went offline. (%2)").arg(notifyCache[index]).arg(getServerName()));
@@ -1290,7 +1290,8 @@ void Server::nickJoinsChannel(const QString &channelName, const QString &nicknam
     if(KonversationApplication::preferences.getOSDShowChannelEvent())
     {
       KonversationApplication *konvApp=static_cast<KonversationApplication *>(KApplication::kApplication());
-      konvApp->osd->showOSD("(" + channelName + ") " + nickname + " has joined this channel. (" + hostmask + ")");
+      konvApp->osd->showOSD(i18n( "(%1) %2 has joined this channel. (%3)" )
+                            .arg(channelName).arg(nickname).arg(hostmask));
     }
   }
 }
@@ -1321,7 +1322,8 @@ void Server::removeNickFromChannel(const QString &channelName, const QString &ni
     if(KonversationApplication::preferences.getOSDShowChannelEvent())
     {
       KonversationApplication *konvApp=static_cast<KonversationApplication *>(KApplication::kApplication());
-      konvApp->osd->showOSD("(" + channelName + ") " + nickname + " has left this channel. (" + reason + ")");
+      konvApp->osd->showOSD(i18n( "(%1) %2 has left this channel. (%3)" )
+                            .arg(channelName).arg(nickname).arg(reason));
     }
   }
 }
@@ -1414,7 +1416,7 @@ void Server::appendToQuery(const QString& queryName,const QString& message)
     if(KonversationApplication::preferences.getOSDShowQuery())
     {
       KonversationApplication *konvApp=static_cast<KonversationApplication *>(KApplication::kApplication());
-      konvApp->osd->showOSD("(Query) <" + queryName + "> " + message);
+      konvApp->osd->showOSD(i18n( "(Query) <%1> %2" ).arg(queryName).arg(message));
     }
   }
   else kdWarning() << "Server::appendToQuery(" << queryName << "): Query not found!" << endl;