commit 125a8e8de11ff816e22cddf9d8cb9c98592c2c55 Author: Stephan Binner Date: Wed Dec 3 21:21:22 2003 +0000 CVS_SILENT i18n style guide fixes svn path=/trunk/kdeextragear-2/konversation/; revision=271032 diff --git a/konversation/ircview.cpp b/konversation/ircview.cpp index 027d946..26cf868 100644 --- a/konversation/ircview.cpp +++ b/konversation/ircview.cpp @@ -172,7 +172,7 @@ void IRCView::highlightedSlot(const QString& link) else if(!link.isEmpty() && !copyUrlMenu) { popup->insertItem(i18n("Copy URL to Clipboard"),CopyUrl,1); - popup->insertItem(i18n("Add to bookmarks"),Bookmark,2); + popup->insertItem(i18n("Add to Bookmarks"),Bookmark,2); copyUrlMenu=true; urlToCopy=link; } diff --git a/konversation/konversationmainwindow.cpp b/konversation/konversationmainwindow.cpp index 9257f21..494b19d 100644 --- a/konversation/konversationmainwindow.cpp +++ b/konversation/konversationmainwindow.cpp @@ -144,7 +144,7 @@ KonversationMainWindow::KonversationMainWindow() : KMainWindow() tray = new TrayIcon(this); connect(this, SIGNAL(startNotification(QWidget*)), tray, SLOT(startNotification(QWidget*))); connect(this, SIGNAL(endNotification(QWidget*)), tray, SLOT(endNotification(QWidget*))); - + // decide whether to show the tray icon or not updateTrayIcon(); @@ -349,7 +349,7 @@ void KonversationMainWindow::addUrlCatcher() if(urlCatcherPanel==0) { urlCatcherPanel=new UrlCatcher(getViewContainer()); - addView(urlCatcherPanel,2,i18n("URL catcher"),true); + addView(urlCatcherPanel,2,i18n("URL Catcher"),true); KonversationApplication *konvApp=static_cast(KApplication::kApplication()); connect(konvApp,SIGNAL (catchUrl(const QString&,const QString&)), @@ -519,7 +519,7 @@ void KonversationMainWindow::newText(QWidget* view,const QString& highlightColor if(view!=getViewContainer()->currentPage()) { getViewContainer()->changeTabState(view,true,highlightColor); - + emit startNotification(view); } else if(!isActiveWindow() && static_cast(view)->getServer()->connected()) { @@ -724,7 +724,7 @@ void KonversationMainWindow::updateTrayIcon() tray->show(); else tray->hide(); - + tray->setNotificationEnabled(KonversationApplication::preferences.getTrayNotify()); } @@ -742,7 +742,7 @@ bool KonversationMainWindow::event(QEvent* e) if(e->type() == QEvent::WindowActivate) { emit endNotification(getViewContainer()->currentPage()); } - + return KMainWindow::event(e); } @@ -751,11 +751,11 @@ void KonversationMainWindow::serverQuit(Server* server) if(server == frontServer) { frontServer = 0; } - + if(frontView->getServer() == server) { frontView = 0; } - + tray->removeServer(server); delete server->getStatusView(); delete server; @@ -764,7 +764,7 @@ void KonversationMainWindow::serverQuit(Server* server) void KonversationMainWindow::openToolbars() { KEditToolbar dlg(actionCollection()); - + if (dlg.exec()) { createGUI(); diff --git a/konversation/prefspagenickcompletion.cpp b/konversation/prefspagenickcompletion.cpp index 14a4a6e..c14f2f0 100644 --- a/konversation/prefspagenickcompletion.cpp +++ b/konversation/prefspagenickcompletion.cpp @@ -34,12 +34,12 @@ PrefsPageNickCompletion::PrefsPageNickCompletion(QFrame* newParent, Preferences* // nick completion mode QLabel* modeLbl = new QLabel(i18n("Completion &mode:"), parentFrame); completionModeCBox = new QComboBox(parentFrame); - completionModeCBox->insertItem(i18n("Cycle nicklist")); - completionModeCBox->insertItem(i18n("Shell like")); - completionModeCBox->insertItem(i18n("Shell like with completionbox")); + completionModeCBox->insertItem(i18n("Cycle Nicklist")); + completionModeCBox->insertItem(i18n("Shell Like")); + completionModeCBox->insertItem(i18n("Shell Like With Completionbox")); completionModeCBox->setCurrentItem(preferences->getNickCompletionMode()); modeLbl->setBuddy(completionModeCBox); - + // nick completion special settings QVBox* suffixBox=new QVBox(parentFrame); new QLabel(i18n("Characters to add on nick completion"),suffixBox);