[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [Konversation] 69577dd: CVS_SILENT i18n style guide fixes
From: Stephan Binner <binner () kde ! org>
Date: 2010-07-01 13:26:45
Message-ID: 20100701132645.140F3BB5412 () projects ! kde ! org
[Download RAW message or body]
commit 69577dd8059fa50462e6440a1fcf97a821bae251
Author: Stephan Binner <binner@kde.org>
Date: Tue Jul 15 11:55:02 2003 +0000
CVS_SILENT i18n style guide fixes
svn path=/trunk/kdeextragear-2/konversation/; revision=237205
diff --git a/konversation/channel.cpp b/konversation/channel.cpp
index 7aaeafb..33eae9d 100644
--- a/konversation/channel.cpp
+++ b/konversation/channel.cpp
@@ -615,7 +615,7 @@ void Channel::modeButtonClicked(int id,bool on)
{
QCString key;
- int result=KPasswordDialog::getPassword(key,i18n("Channel password:"));
+ int result=KPasswordDialog::getPassword(key,i18n("Channel Password"));
if(result==KPasswordDialog::Accepted && !key.isEmpty()) setKey(key);
}
@@ -628,7 +628,7 @@ void Channel::modeButtonClicked(int id,bool on)
{
bool ok=false;
// ask user how many nicks should be the limit
- args=KLineEditDlg::getText(i18n("Nick limit"),
+ args=KLineEditDlg::getText(i18n("Nick Limit"),
i18n("Enter the new nick limit:"),
limit->text(), // will be \
always "" but what the hell ;) &ok,
diff --git a/konversation/channellistpanel.cpp b/konversation/channellistpanel.cpp
index a42f21f..656c069 100644
--- a/konversation/channellistpanel.cpp
+++ b/konversation/channellistpanel.cpp
@@ -53,7 +53,7 @@ ChannelListPanel::ChannelListPanel(QWidget* parent) :
filterTextChanged(QString::null);
- QHGroupBox* filterGroup=new QHGroupBox(i18n("Filter settings"),this);
+ QHGroupBox* filterGroup=new QHGroupBox(i18n("Filter Settings"),this);
QGrid* mainGrid=new QGrid(2,Qt::Vertical,filterGroup);
mainGrid->setSpacing(spacing());
@@ -76,7 +76,7 @@ ChannelListPanel::ChannelListPanel(QWidget* parent) :
channelFilter=new \
QCheckBox(i18n("Channel"),targetBox,"filter_target_channel_check"); topicFilter=new \
QCheckBox(i18n("Topic"),targetBox,"filter_target_topic_check"); regexpCheck=new \
QCheckBox(i18n("Regular expression"),targetBox,"regexp_check");
- QPushButton* applyFilter=new QPushButton(i18n("Apply \
filter"),targetBox,"apply_filter_button"); + QPushButton* applyFilter=new \
QPushButton(i18n("Apply Filter"),targetBox,"apply_filter_button");
channelFilter->setChecked(getChannelTarget());
topicFilter->setChecked(getTopicTarget());
@@ -85,9 +85,9 @@ ChannelListPanel::ChannelListPanel(QWidget* parent) :
targetBox->setStretchFactor(topicFilter,10);
channelListView=new KListView(this,"channel_list_view");
- channelListView->addColumn(i18n("Channel name"));
+ channelListView->addColumn(i18n("Channel Name"));
channelListView->addColumn(i18n("Users"));
- channelListView->addColumn(i18n("Channel topic"));
+ channelListView->addColumn(i18n("Channel Topic"));
channelListView->setFullWidth(true);
channelListView->setAllColumnsShowFocus(true);
@@ -102,9 +102,9 @@ ChannelListPanel::ChannelListPanel(QWidget* parent) :
QHBox* actionBox=new QHBox(this);
actionBox->setSpacing(spacing());
- QPushButton* refreshListButton=new QPushButton(i18n("Refresh \
list"),actionBox,"refresh_list_button");
- QPushButton* saveListButton=new QPushButton(i18n("Save \
list"),actionBox,"save_list_button");
- QPushButton* joinChannelButton=new QPushButton(i18n("Join \
channel"),actionBox,"join_channel_button"); + QPushButton* refreshListButton=new \
QPushButton(i18n("Refresh List"),actionBox,"refresh_list_button"); + QPushButton* \
saveListButton=new QPushButton(i18n("Save List..."),actionBox,"save_list_button"); + \
QPushButton* joinChannelButton=new QPushButton(i18n("Join \
Channel"),actionBox,"join_channel_button");
connect(minUsersSpin,SIGNAL (valueChanged(int)),this,SLOT(setMinUsers(int)) );
connect(maxUsersSpin,SIGNAL (valueChanged(int)),this,SLOT(setMaxUsers(int)) );
@@ -132,7 +132,7 @@ ChannelListPanel::ChannelListPanel(QWidget* parent) :
"of network traffic. If your connection is not \
fast "
"enough, it's possible that your client gets "
"disconnected by the server!"),
- i18n("Channel list warning"),"ChannelListWarning");
+ i18n("Channel List Warning"),"ChannelListWarning");
}
ChannelListPanel::~ChannelListPanel()
@@ -159,7 +159,7 @@ void ChannelListPanel::saveList()
QString::null,
QString::null,
this,
- i18n("Save channel list"));
+ i18n("Save Channel List"));
if(!fileName.isEmpty())
{
diff --git a/konversation/dccpanel.cpp b/konversation/dccpanel.cpp
index f2b1d71..fdfbfd6 100644
--- a/konversation/dccpanel.cpp
+++ b/konversation/dccpanel.cpp
@@ -38,7 +38,7 @@ DccPanel::DccPanel(QWidget* parent) :
dccListView->addColumn(i18n("File"));
dccListView->addColumn(i18n("Size"));
dccListView->addColumn(i18n("Position"));
- dccListView->addColumn(i18n("% done"));
+ dccListView->addColumn(i18n("% Done"));
dccListView->addColumn(i18n("CPS"));
dccListView->addColumn(i18n("IP Address"));
dccListView->addColumn(i18n("Port"));
diff --git a/konversation/dccrecipientdialog.cpp \
b/konversation/dccrecipientdialog.cpp index 7bd29d4..918b580 100644
--- a/konversation/dccrecipientdialog.cpp
+++ b/konversation/dccrecipientdialog.cpp
@@ -25,7 +25,7 @@
QString DccRecipientDialog::selectedNickname; // static
DccRecipientDialog::DccRecipientDialog(QWidget* parent,QStringList list,QSize size) \
:
- KDialogBase(parent,"dcc_recipient_dialog",true,i18n("Select \
recipient"), + \
KDialogBase(parent,"dcc_recipient_dialog",true,i18n("Select \
Recipient"),
KDialogBase::Ok | KDialogBase::Cancel,KDialogBase::Ok,true)
{
kdDebug() << "DccRecipientDialog::DccRecipientDialog()" << endl;
@@ -50,8 +50,8 @@ DccRecipientDialog::DccRecipientDialog(QWidget* parent,QStringList \
list,QSize si connect(nicknameList,SIGNAL (highlighted(QListBoxItem*)),this,SLOT \
(newNicknameSelected(QListBoxItem*)) ); connect(nicknameList,SIGNAL \
(doubleClicked(QListBoxItem*)),this,SLOT (newNicknameSelectedQuit(QListBoxItem*)) ); \
- setButtonOKText(i18n("OK"),i18n("Select nickname and close the window"));
- setButtonCancelText(i18n("Cancel"),i18n("Close the window without changes"));
+ setButtonOKText(i18n("&OK"),i18n("Select nickname and close the window"));
+ setButtonCancelText(i18n("&Cancel"),i18n("Close the window without changes"));
setInitialSize(size);
show();
diff --git a/konversation/dcctransfer.cpp b/konversation/dcctransfer.cpp
index fb23965..91d9537 100644
--- a/konversation/dcctransfer.cpp
+++ b/konversation/dcctransfer.cpp
@@ -52,7 +52,7 @@ DccTransfer::DccTransfer(KListView* parent,DccType type,QString \
folder,QString p buffer=new char[bufferSize];
statusText.append(i18n("Queued"));
- statusText.append(i18n("Negotiating Resume ..."));
+ statusText.append(i18n("Negotiating resume ..."));
statusText.append(i18n("Lookup ..."));
statusText.append(i18n("Connecting ..."));
statusText.append(i18n("Offering ..."));
@@ -117,7 +117,7 @@ void DccTransfer::startGet()
if(!dir.exists())
{
if(!KStandardDirs::makeDir(dir.path()))
- KMessageBox::sorry(static_cast<QWidget*>(0),i18n("Cannot create received files \
directory %1").arg(dir.path()),i18n("DCC error")); + \
KMessageBox::sorry(static_cast<QWidget*>(0),i18n("Cannot create received files \
directory '%1'.").arg(dir.path()),i18n("DCC Error")); }
QString fullName(dccFile);
@@ -140,8 +140,8 @@ void DccTransfer::startGet()
int doResume=KMessageBox::questionYesNoCancel
(
0,
- i18n("<qt>The file \"%1\" already exists. Do you want to resume \
the transfer</qt>").arg(getFile()),
- i18n("Resume transfer"),
+ i18n("<qt>The file \"%1\" already exists. Do you want to resume \
the transfer?</qt>").arg(getFile()), + i18n("Resume Transfer"),
i18n("Resume"),
i18n("Overwrite"),
"ResumeTransfer"
@@ -242,7 +242,7 @@ void DccTransfer::heard()
{
QString errorString=getErrorString(file.status());
- KMessageBox::sorry(0,QString(errorString).arg(file.name()),i18n("DCC Send \
error")); + KMessageBox::sorry(0,QString(errorString).arg(file.name()),i18n("DCC \
Send Error")); setStatus(Failed);
}
}
@@ -300,7 +300,7 @@ void DccTransfer::dccGetConnectionSuccess()
{
QString errorString=getErrorString(file.status());
- KMessageBox::sorry \
(0,"<qt>"+QString(errorString).arg(file.name())+"</qt>",i18n("DCC Get error")); + \
KMessageBox::sorry (0,"<qt>"+QString(errorString).arg(file.name())+"</qt>",i18n("DCC \
Get Error")); setStatus(Failed);
}
}
diff --git a/konversation/editserverdialog.cpp b/konversation/editserverdialog.cpp
index cea3d46..ba196b5 100644
--- a/konversation/editserverdialog.cpp
+++ b/konversation/editserverdialog.cpp
@@ -36,7 +36,7 @@ EditServerDialog::EditServerDialog(QWidget* parent,
QString channelKey,
QString currentIdentity) :
- KDialogBase(parent,"editserver",true,i18n("Edit server"),
+ KDialogBase(parent,"editserver",true,i18n("Edit Server"),
KDialogBase::Ok | KDialogBase::Cancel,
KDialogBase::Ok,true)
@@ -108,8 +108,8 @@ EditServerDialog::EditServerDialog(QWidget* parent,
layout->addMultiCellWidget(spacer,row,row,0,3);
layout->setRowStretch(row,10);
- setButtonOKText(i18n("OK"),i18n("Change server information"));
- setButtonCancelText(i18n("Cancel"),i18n("Discards all changes made"));
+ setButtonOKText(i18n("&OK"),i18n("Change server information"));
+ setButtonCancelText(i18n("&Cancel"),i18n("Discards all changes made"));
}
EditServerDialog::~EditServerDialog()
diff --git a/konversation/inputfilter.cpp b/konversation/inputfilter.cpp
index c8da59d..701bbf6 100644
--- a/konversation/inputfilter.cpp
+++ b/konversation/inputfilter.cpp
@@ -782,7 +782,7 @@ void InputFilter::parseServerCommand(const QString &prefix, const \
QString &comma }
case RPL_MOTDSTART:
{
- server->appendStatusMessage(i18n("MOTD"),i18n("Message Of The Day:"));
+ server->appendStatusMessage(i18n("MOTD"),i18n("Message of the day:"));
break;
}
case RPL_MOTD:
@@ -792,7 +792,7 @@ void InputFilter::parseServerCommand(const QString &prefix, const \
QString &comma }
case RPL_ENDOFMOTD:
{
- server->appendStatusMessage(i18n("MOTD"),i18n("End of Message Of The \
Day")); + server->appendStatusMessage(i18n("MOTD"),i18n("End of message of \
the day")); // Autojoin (for now this must be enough)
if(server->getAutoJoin())
server->queue(server->getAutoJoinCommand());
diff --git a/konversation/ircinput.cpp b/konversation/ircinput.cpp
index 5fe9d89..0a4184d 100644
--- a/konversation/ircinput.cpp
+++ b/konversation/ircinput.cpp
@@ -194,7 +194,7 @@ void IRCInput::paste()
i18n("<qt>You are attempting to paste a large portion of text into \
"
"the chat. This can cause connection resets or flood kills. "
"Do you really want to continue?</qt>"),
- i18n("Large paste warning"),
+ i18n("Large Paste Warning"),
KStdGuiItem::yes(),
KStdGuiItem::no(),
"LargePaste"
diff --git a/konversation/ircview.cpp b/konversation/ircview.cpp
index 0754e4e..f727258 100644
--- a/konversation/ircview.cpp
+++ b/konversation/ircview.cpp
@@ -54,11 +54,11 @@ IRCView::IRCView(QWidget* parent,Server* newServer) : \
KTextBrowser(parent) if(popup)
{
popup->insertItem(i18n("&Copy"),Copy);
- popup->insertItem(i18n("Select all"),SelectAll);
+ popup->insertItem(i18n("Select All"),SelectAll);
popup->insertSeparator();
- popup->insertItem(i18n("Search text"),Search);
+ popup->insertItem(i18n("Search Text..."),Search);
popup->insertSeparator();
- popup->insertItem(i18n("Send file"),SendFile);
+ popup->insertItem(i18n("Send File..."),SendFile);
}
else kdWarning() << "IRCView::IRCView(): Could not create popup!" << endl;
@@ -145,7 +145,7 @@ void IRCView::highlightedSlot(const QString& link)
}
else if(!link.isEmpty() && !copyUrlMenu)
{
- popup->insertItem(i18n("Copy URL to clipboard"),CopyUrl,1);
+ popup->insertItem(i18n("Copy URL to Clipboard"),CopyUrl,1);
copyUrlMenu=true;
urlToCopy=link;
}
diff --git a/konversation/konversation.desktop b/konversation/konversation.desktop
index 1ef7eca..61204aa 100644
--- a/konversation/konversation.desktop
+++ b/konversation/konversation.desktop
@@ -7,7 +7,7 @@ Exec=konversation -caption "%c" %i %m
Icon=konversation
MiniIcon=konversation
DocPath=konversation/index.html
-GenericName=Internet Relay Chat client
+GenericName=Internet Relay Chat Client
GenericName[de]=Internet Relay Chatprogramm
Terminal=0
Name=Konversation
diff --git a/konversation/konversationmainwindow.cpp \
b/konversation/konversationmainwindow.cpp index 3647a54..faccc0a 100644
--- a/konversation/konversationmainwindow.cpp
+++ b/konversation/konversationmainwindow.cpp
@@ -71,28 +71,28 @@ KonversationMainWindow::KonversationMainWindow() : KMainWindow()
KStdAction::keyBindings(this,SLOT(openKeyBindings()),actionCollection()); // \
options_configure_key_binding \
KStdAction::preferences(this,SLOT(openPreferences()),actionCollection()); // \
options_configure
- new KAction(i18n("Server list"), 0, 0, this, SLOT(openServerList()), \
actionCollection(), "open_server_list"); + new KAction(i18n("Server List"), 0, 0, \
this, SLOT(openServerList()), actionCollection(), "open_server_list");
new KAction(i18n("Nicks Online"), 0, 0, this, SLOT(openNicksOnlineWindow()), \
actionCollection(), "open_nicksonline_window");
- new KAction(i18n("Channel list"), 0, 0, this, SLOT(openChannelList()), \
actionCollection(), "open_channel_list");
- new KAction(i18n("Open a Konsole"), 0, 0, this, SLOT(addKonsolePanel()), \
actionCollection(), "open_konsole");
- new KAction(i18n("Open URL catcher"), 0, 0, this, SLOT(addUrlCatcher()), \
actionCollection(), "open_url_catcher"); + new KAction(i18n("Channel List"), 0, 0, \
this, SLOT(openChannelList()), actionCollection(), "open_channel_list"); + new \
KAction(i18n("Open Konsole"), 0, 0, this, SLOT(addKonsolePanel()), \
actionCollection(), "open_konsole"); + new KAction(i18n("Open URL Catcher"), 0, 0, \
this, SLOT(addUrlCatcher()), actionCollection(), "open_url_catcher");
// Actions to navigate through the different pages
new KAction(i18n("Next \
Tab"),0,KShortcut("Alt+Right"),this,SLOT(nextTab()),actionCollection(),"next_tab"); \
new KAction(i18n("Previous \
Tab"),0,KShortcut("Alt+Left"),this,SLOT(previousTab()),actionCollection(),"previous_tab");
- new KAction(i18n("Go to tab number %1").arg( \
1),0,KShortcut("Alt+1"),this,SLOT(goToTab0()),actionCollection(),"go_to_tab_1");
- new KAction(i18n("Go to tab number %1").arg( \
2),0,KShortcut("Alt+2"),this,SLOT(goToTab1()),actionCollection(),"go_to_tab_2");
- new KAction(i18n("Go to tab number %1").arg( \
3),0,KShortcut("Alt+3"),this,SLOT(goToTab2()),actionCollection(),"go_to_tab_3");
- new KAction(i18n("Go to tab number %1").arg( \
4),0,KShortcut("Alt+4"),this,SLOT(goToTab3()),actionCollection(),"go_to_tab_4");
- new KAction(i18n("Go to tab number %1").arg( \
5),0,KShortcut("Alt+5"),this,SLOT(goToTab4()),actionCollection(),"go_to_tab_5");
- new KAction(i18n("Go to tab number %1").arg( \
6),0,KShortcut("Alt+6"),this,SLOT(goToTab5()),actionCollection(),"go_to_tab_6");
- new KAction(i18n("Go to tab number %1").arg( \
7),0,KShortcut("Alt+7"),this,SLOT(goToTab6()),actionCollection(),"go_to_tab_7");
- new KAction(i18n("Go to tab number %1").arg( \
8),0,KShortcut("Alt+8"),this,SLOT(goToTab7()),actionCollection(),"go_to_tab_8");
- new KAction(i18n("Go to tab number %1").arg( \
9),0,KShortcut("Alt+9"),this,SLOT(goToTab8()),actionCollection(),"go_to_tab_9");
- new KAction(i18n("Go to tab number \
%1").arg(10),0,KShortcut("Alt+0"),this,SLOT(goToTab9()),actionCollection(),"go_to_tab_0");
-
- new KAction(i18n("Find \
text"),0,KShortcut("F3"),this,SLOT(findTextShortcut()),actionCollection(),"find_text");
+ new KAction(i18n("Go to Tab Number %1").arg( \
1),0,KShortcut("Alt+1"),this,SLOT(goToTab0()),actionCollection(),"go_to_tab_1"); + \
new KAction(i18n("Go to Tab Number %1").arg( \
2),0,KShortcut("Alt+2"),this,SLOT(goToTab1()),actionCollection(),"go_to_tab_2"); + \
new KAction(i18n("Go to Tab Number %1").arg( \
3),0,KShortcut("Alt+3"),this,SLOT(goToTab2()),actionCollection(),"go_to_tab_3"); + \
new KAction(i18n("Go to Tab Number %1").arg( \
4),0,KShortcut("Alt+4"),this,SLOT(goToTab3()),actionCollection(),"go_to_tab_4"); + \
new KAction(i18n("Go to Tab Number %1").arg( \
5),0,KShortcut("Alt+5"),this,SLOT(goToTab4()),actionCollection(),"go_to_tab_5"); + \
new KAction(i18n("Go to Tab Number %1").arg( \
6),0,KShortcut("Alt+6"),this,SLOT(goToTab5()),actionCollection(),"go_to_tab_6"); + \
new KAction(i18n("Go to Tab Number %1").arg( \
7),0,KShortcut("Alt+7"),this,SLOT(goToTab6()),actionCollection(),"go_to_tab_7"); + \
new KAction(i18n("Go to Tab Number %1").arg( \
8),0,KShortcut("Alt+8"),this,SLOT(goToTab7()),actionCollection(),"go_to_tab_8"); + \
new KAction(i18n("Go to Tab Number %1").arg( \
9),0,KShortcut("Alt+9"),this,SLOT(goToTab8()),actionCollection(),"go_to_tab_9"); + \
new KAction(i18n("Go to Tab Number \
%1").arg(10),0,KShortcut("Alt+0"),this,SLOT(goToTab9()),actionCollection(),"go_to_tab_0");
+
+ new KAction(i18n("Find \
Text"),0,KShortcut("F3"),this,SLOT(findTextShortcut()),actionCollection(),"find_text");
// Initialize KMainWindow->statusBar()
statusBar();
@@ -642,7 +642,7 @@ void KonversationMainWindow::findTextShortcut()
{
KMessageBox::sorry(this,
i18n("You can only search in text fields!"),
- i18n("Find text information"));
+ i18n("Find Text Information"));
}
else
{
diff --git a/konversation/nickchangedialog.cpp b/konversation/nickchangedialog.cpp
index 461ba15..3d6e677 100644
--- a/konversation/nickchangedialog.cpp
+++ b/konversation/nickchangedialog.cpp
@@ -24,7 +24,7 @@
#include "nickchangedialog.h"
NickChangeDialog::NickChangeDialog(QWidget* parent,QString currentNick,const \
QStringList& nickList,QSize size):
- KDialogBase(parent,"nickchangedialog",false,i18n("Change \
nickname"), + \
KDialogBase(parent,"nickchangedialog",false,i18n("Change Nickname"), KDialogBase::Ok \
| KDialogBase::Cancel, KDialogBase::Ok,true)
{
@@ -46,8 +46,8 @@ NickChangeDialog::NickChangeDialog(QWidget* parent,QString \
currentNick,const QSt
connect(nicknameInput,SIGNAL (activated(const QString&)),this,SLOT \
(newNicknameEntered(const QString&)) );
- setButtonOKText(i18n("OK"),i18n("Set new nickname and close the window"));
- setButtonCancelText(i18n("Cancel"),i18n("Close the window without changes"));
+ setButtonOKText(i18n("&OK"),i18n("Set new nickname and close the window"));
+ setButtonCancelText(i18n("&Cancel"),i18n("Close the window without changes"));
setInitialSize(size);
}
diff --git a/konversation/nicklistview.cpp b/konversation/nicklistview.cpp
index a9b08be..43ef3be 100644
--- a/konversation/nicklistview.cpp
+++ b/konversation/nicklistview.cpp
@@ -48,7 +48,7 @@ NickListView::NickListView(QWidget* parent) :
popup->insertItem(i18n("Ping"),Ping);
popup->insertSeparator();
popup->insertItem(i18n("Open Query"),Query);
- popup->insertItem(i18n("Send File"),DccSend);
+ popup->insertItem(i18n("Send File..."),DccSend);
popup->insertSeparator();
if(kickban)
{
diff --git a/konversation/nicksonline.cpp b/konversation/nicksonline.cpp
index 9b9f848..3a1502b 100644
--- a/konversation/nicksonline.cpp
+++ b/konversation/nicksonline.cpp
@@ -30,7 +30,7 @@ NicksOnline::NicksOnline(const QSize& newSize)
{
kdDebug() << "NicksOnline::NicksOnline()" << endl;
- setCaption(i18n("Nicks online - Konversation"));
+ setCaption(i18n("Nicks Online"));
nickListView=new KListView(this);
diff --git a/konversation/outputfilter.cpp b/konversation/outputfilter.cpp
index c5111ce..53a4fd9 100644
--- a/konversation/outputfilter.cpp
+++ b/konversation/outputfilter.cpp
@@ -657,9 +657,9 @@ void OutputFilter::parseOper(const QString& myNick,const QString& \
parameter) nick,
password,
&keep,
- i18n("Enter user name and password for IRC \
operator privileges"), + i18n("Enter user name \
and password for IRC operator privileges:"), false,
- i18n("IRC operator password")
+ i18n("IRC Operator Password")
);
if(result==KIO::PasswordDialog::Accepted) toServer="OPER "+nick+" "+password;
diff --git a/konversation/preferences.cpp b/konversation/preferences.cpp
index 444ab0d..c4381be 100644
--- a/konversation/preferences.cpp
+++ b/konversation/preferences.cpp
@@ -41,7 +41,7 @@ Preferences::Preferences()
// create default identity
Identity* identity=new Identity();
- identity->setName(i18n("Default identity"));
+ identity->setName(i18n("Default Identity"));
addIdentity(identity);
setIdent("konversation");
diff --git a/konversation/prefsdialog.cpp b/konversation/prefsdialog.cpp
index 074b8a4..ceab969 100644
--- a/konversation/prefsdialog.cpp
+++ b/konversation/prefsdialog.cpp
@@ -40,27 +40,27 @@
#include "prefspageignore.h"
PrefsDialog::PrefsDialog(Preferences* preferences,bool noServer) :
- KDialogBase (KDialogBase::TreeList,i18n("Edit preferences"),
+ KDialogBase (KDialogBase::TreeList,i18n("Edit Preferences"),
KDialogBase::Ok | KDialogBase::Apply | \
KDialogBase::Cancel, KDialogBase::Ok,0,"edit_prefs",false,true)
{
kdDebug() << "PrefsDialog::PrefsDialog()" << endl;
setPreferences(preferences);
- serverListPane =addPage(i18n("Server list"));
- QFrame* generalSettingsPane=addPage(i18n("General settings"));
+ serverListPane =addPage(i18n("Server List"));
+ QFrame* generalSettingsPane=addPage(i18n("General Settings"));
QFrame* identityPane =addPage(i18n("Identity"));
QFrame* appearancePane \
=addPage(QStringList::split(',',i18n("Appearance")+","+i18n("General")));
- QFrame* colorsImagesPane \
=addPage(QStringList::split(',',i18n("Appearance")+","+i18n("Colors \
and images")));
- QFrame* buttonsPane \
=addPage(QStringList::split(',',i18n("Appearance")+","+i18n("Quick buttons"))); + \
QFrame* colorsImagesPane \
=addPage(QStringList::split(',',i18n("Appearance")+","+i18n("Colors & Images"))); + \
QFrame* buttonsPane \
=addPage(QStringList::split(',',i18n("Appearance")+","+i18n("Quick Buttons")));
- notifyPane \
=addPage(QStringList::split(',',i18n("Chat")+","+i18n("Notify \
list")));
- QFrame* highlightPane \
=addPage(QStringList::split(',',i18n("Chat")+","+i18n("Highlight \
list")));
- QFrame* ignorePane \
=addPage(QStringList::split(',',i18n("Chat")+","+i18n("Ignore list"))); + \
notifyPane =addPage(QStringList::split(',',i18n("Chat")+","+i18n("Notify \
List"))); + QFrame* highlightPane \
=addPage(QStringList::split(',',i18n("Chat")+","+i18n("Highlight List"))); + QFrame* \
ignorePane =addPage(QStringList::split(',',i18n("Chat")+","+i18n("Ignore \
List")));
- QFrame* logSettingsPane =addPage(i18n("Log settings"));
- QFrame* dccSettingsPane =addPage(i18n("DCC settings"));
+ QFrame* logSettingsPane =addPage(i18n("Log Settings"));
+ QFrame* dccSettingsPane =addPage(i18n("DCC Settings"));
QFrame* dialogsPane =addPage(i18n("Dialogs"));
// TODO: Uncomment this again when it's ready to go
// QFrame* scriptsPane =addPage(i18n("Scripting"));
@@ -86,17 +86,17 @@ PrefsDialog::PrefsDialog(Preferences* preferences,bool noServer) \
: // TODO: Uncomment this again when it's ready to go
// new PrefsPageScripts(scriptsPane, preferences);
- setButtonOKText(i18n("OK"),i18n("Keep changes made to configuration and close the \
window"));
- setButtonApplyText(i18n("Apply"),i18n("Keep changes made to configuration"));
+ setButtonOKText(i18n("&OK"),i18n("Keep changes made to configuration and close the \
window")); + setButtonApplyText(i18n("&Apply"),i18n("Keep changes made to \
configuration"));
if(noServer)
{
enableButtonOK(false);
- setButtonCancelText(i18n("Quit"),i18n("Quits application"));
+ setButtonCancelText(i18n("&Quit"),i18n("Quits application"));
}
else
{
- setButtonCancelText(i18n("Cancel"),i18n("Discards all changes made"));
+ setButtonCancelText(i18n("&Cancel"),i18n("Discards all changes made"));
}
// connect standard signals and slots
diff --git a/konversation/prefspageappearance.cpp \
b/konversation/prefspageappearance.cpp index 0e205e6..95e66c2 100644
--- a/konversation/prefspageappearance.cpp
+++ b/konversation/prefspageappearance.cpp
@@ -165,8 +165,8 @@ PrefsPageAppearance::PrefsPageAppearance(QFrame* \
newParent,Preferences* newPrefe \
closeButtonsCheck->setChecked(preferences->getCloseButtonsOnTabs());
// Sorting
- QVGroupBox* sortOptionsGroup=new QVGroupBox(i18n("Sort \
options"),parentFrame,"sort_options_group");
- sortOrderGroup=new QHGroupBox(i18n("Sorting \
order"),parentFrame,"sort_order_group"); + QVGroupBox* sortOptionsGroup=new \
QVGroupBox(i18n("Sort Options"),parentFrame,"sort_options_group"); + \
sortOrderGroup=new QHGroupBox(i18n("Sorting Order"),parentFrame,"sort_order_group"); \
sortByStatusCheck=new QCheckBox(i18n("Sort by user \
status"),sortOptionsGroup,"sort_by_status_check"); sortCaseInsensitiveCheck=new \
QCheckBox(i18n("Sort case \
insensitive"),sortOptionsGroup,"sort_case_insensitive_check"); @@ -187,7 +187,7 @@ \
PrefsPageAppearance::PrefsPageAppearance(QFrame* newParent,Preferences* newPrefe
for(int index=4;index!=0;index>>=1)
{
- if(preferences->getNoRightsValue()==index) new \
ValueListViewItem(0,sortingOrder,i18n("Normal users")); + \
if(preferences->getNoRightsValue()==index) new \
ValueListViewItem(0,sortingOrder,i18n("Normal Users"));
if(preferences->getVoiceValue()==index) new \
ValueListViewItem(1,sortingOrder,i18n("Voice (+v)"));
if(preferences->getOpValue()==index) new \
ValueListViewItem(2,sortingOrder,i18n("Operators (+o)")); }
diff --git a/konversation/prefspagebuttons.cpp b/konversation/prefspagebuttons.cpp
index 3db8fdd..43128c1 100644
--- a/konversation/prefspagebuttons.cpp
+++ b/konversation/prefspagebuttons.cpp
@@ -33,8 +33,8 @@ PrefsPageButtons::PrefsPageButtons(QFrame* newParent,Preferences* \
newPreferences // Set up the button list
buttonListView=new KListView(parentFrame);
- buttonListView->addColumn(i18n("Button name"));
- buttonListView->addColumn(i18n("Button action"));
+ buttonListView->addColumn(i18n("Button Name"));
+ buttonListView->addColumn(i18n("Button Action"));
buttonListView->setAllColumnsShowFocus(true);
buttonListView->setItemsRenameable(true);
diff --git a/konversation/prefspagecolorsimages.cpp \
b/konversation/prefspagecolorsimages.cpp index 1d50126..a123e03 100644
--- a/konversation/prefspagecolorsimages.cpp
+++ b/konversation/prefspagecolorsimages.cpp
@@ -101,7 +101,7 @@ void PrefsPageColorsImages::selectBackground()
backgroundName->text(),
QString::null,
parentFrame,
- i18n("Select background image")
+ i18n("Select Background Image")
);
if(!fileName.isEmpty()) backgroundName->setText(fileName);
diff --git a/konversation/prefspagedccsettings.cpp \
b/konversation/prefspagedccsettings.cpp index ea9ead1..c902ffb 100644
--- a/konversation/prefspagedccsettings.cpp
+++ b/konversation/prefspagedccsettings.cpp
@@ -40,7 +40,7 @@ PrefsPageDccSettings::PrefsPageDccSettings(QFrame* \
newParent,Preferences* newPre
QLabel* dccFolderLabel=new QLabel(i18n("DCC folder:"),parentFrame);
dccFolderInput=new KLineEdit(preferences->getDccPath(),parentFrame);
- QPushButton* dccFolderButton=new \
QPushButton(i18n("Browse"),parentFrame,"dcc_folder_button"); + QPushButton* \
dccFolderButton=new QPushButton(i18n("Browse..."),parentFrame,"dcc_folder_button");
QHBox* dccSpinBoxes=new QHBox(parentFrame);
dccSpinBoxes->setSpacing(spacingHint());
@@ -100,14 +100,14 @@ void PrefsPageDccSettings::folderButtonClicked()
QString folderName=KFileDialog::getExistingDirectory(
preferences->getDccPath(),
0,
- i18n("Select DCC download \
folder") + i18n("Select DCC \
Download Folder") );
if(!folderName.isEmpty())
{
QFileInfo folderInfo(folderName);
if(folderInfo.isDir()) dccFolderInput->setText(folderName);
- else KMessageBox::sorry(0,i18n("<qt>Error: %1 is not a regular \
folder!</qt>").arg(folderName),i18n("Incorrect path")); + else \
KMessageBox::sorry(0,i18n("<qt>Error: %1 is not a regular \
folder!</qt>").arg(folderName),i18n("Incorrect Path")); }
}
diff --git a/konversation/prefspagegeneralsettings.cpp \
b/konversation/prefspagegeneralsettings.cpp index 0909167..47bd461 100644
--- a/konversation/prefspagegeneralsettings.cpp
+++ b/konversation/prefspagegeneralsettings.cpp
@@ -53,7 +53,7 @@ PrefsPageGeneralSettings::PrefsPageGeneralSettings(QFrame* \
newParent,Preferences
// nick completion special settings
QVBox* suffixBox=new QVBox(parentFrame);
- new QLabel(i18n("Characters to add on nick completion:"),suffixBox);
+ new QLabel(i18n("Characters to add on nick completion"),suffixBox);
QHBox* suffixEditBox=new QHBox(suffixBox);
suffixEditBox->setSpacing(spacingHint());
diff --git a/konversation/prefspagehighlight.cpp \
b/konversation/prefspagehighlight.cpp index c5f9040..392cbf0 100644
--- a/konversation/prefspagehighlight.cpp
+++ b/konversation/prefspagehighlight.cpp
@@ -38,7 +38,7 @@ PrefsPageHighlight::PrefsPageHighlight(QFrame* \
newParent,Preferences* newPrefere {
// Add the layout to the widget
QGridLayout* highlightLayout=new \
QGridLayout(parentFrame,3,2,marginHint(),spacingHint());
- QHGroupBox* highlightListGroup=new QHGroupBox(i18n("Highlight \
list"),parentFrame,"highlight_pattern_group"); + QHGroupBox* highlightListGroup=new \
QHGroupBox(i18n("Highlight List"),parentFrame,"highlight_pattern_group");
QVBox* highlightListBox=new QVBox(highlightListGroup);
highlightListBox->setSpacing(spacingHint());
@@ -69,13 +69,13 @@ PrefsPageHighlight::PrefsPageHighlight(QFrame* \
newParent,Preferences* newPrefere patternInput->setEnabled(false);
patternColor->setEnabled(false);
- currentNickCheck=new QCheckBox(i18n("Always highlight current \
nick"),parentFrame,"highlight_current_nick_check"); + currentNickCheck=new \
QCheckBox(i18n("Always highlight current \
nick:"),parentFrame,"highlight_current_nick_check"); \
currentNickCheck->setChecked(preferences->getHilightNick()); currentNickColor=new \
KColorCombo(parentFrame,"current_nick_color"); \
currentNickColor->setColor(preferences->getHilightNickColor()); \
currentNickChanged(preferences->getHilightNick() ? 2 : 0);
- ownLinesCheck=new QCheckBox(i18n("Always highlight own \
lines"),parentFrame,"highlight_own_lines_check"); + ownLinesCheck=new \
QCheckBox(i18n("Always highlight own \
lines:"),parentFrame,"highlight_own_lines_check"); ownLinesColor=new \
KColorCombo(parentFrame,"own_lines_color"); \
ownLinesCheck->setChecked(preferences->getHilightOwnLines()); \
ownLinesColor->setColor(preferences->getHilightOwnLinesColor()); @@ -83,7 +83,7 @@ \
PrefsPageHighlight::PrefsPageHighlight(QFrame* newParent,Preferences* newPrefere
QVBox* highlightButtonBox=new QVBox(highlightListGroup);
highlightButtonBox->setSpacing(spacingHint());
- QPushButton* newButton=new QPushButton(i18n("New"),highlightButtonBox);
+ QPushButton* newButton=new QPushButton(i18n("New..."),highlightButtonBox);
QPushButton* removeButton=new QPushButton(i18n("Remove"),highlightButtonBox);
// add spacer below the two buttons
new QVBox(highlightButtonBox);
diff --git a/konversation/prefspageidentity.cpp b/konversation/prefspageidentity.cpp
index 6c3ac37..18d0203 100644
--- a/konversation/prefspageidentity.cpp
+++ b/konversation/prefspageidentity.cpp
@@ -41,7 +41,7 @@ PrefsPageIdentity::PrefsPageIdentity(QFrame* newParent,Preferences* \
newPreferenc identityCombo->setEditable(false);
// identityCombo->setInsertionPolicy(QComboBox::NoInsertion);
- QPushButton* renameButton=new \
QPushButton(i18n("Rename"),parentFrame,"rename_identity_button"); + QPushButton* \
renameButton=new QPushButton(i18n("Rename..."),parentFrame,"rename_identity_button"); \
identities=preferences->getIdentityList();
@@ -84,8 +84,8 @@ PrefsPageIdentity::PrefsPageIdentity(QFrame* newParent,Preferences* \
newPreferenc QHBox* buttonBox=new QHBox(parentFrame);
buttonBox->setSpacing(spacingHint());
- QPushButton* addIdentityButton=new QPushButton(i18n("Add new \
identity"),buttonBox,"add_identity_button");
- removeIdentityButton=new QPushButton(i18n("Remove \
identity"),buttonBox,"remove_identity_button"); + QPushButton* addIdentityButton=new \
QPushButton(i18n("Add New Identity"),buttonBox,"add_identity_button"); + \
removeIdentityButton=new QPushButton(i18n("Remove \
Identity"),buttonBox,"remove_identity_button");
QHBox* spacer=new QHBox(parentFrame);
@@ -284,7 +284,7 @@ void PrefsPageIdentity::updateIdentity(int number)
void PrefsPageIdentity::renameIdentity()
{
bool ok;
- QString newName=KLineEditDlg::getText(i18n("Rename identity"),
+ QString newName=KLineEditDlg::getText(i18n("Rename Identity"),
i18n("Please enter a new name for this \
identity:"), identity->getName(),
&ok,
diff --git a/konversation/prefspageignore.cpp b/konversation/prefspageignore.cpp
index dcbf47a..e914760 100644
--- a/konversation/prefspageignore.cpp
+++ b/konversation/prefspageignore.cpp
@@ -39,7 +39,7 @@ PrefsPageIgnore::PrefsPageIgnore(QFrame* newParent,Preferences* \
newPreferences) listBox->setSpacing(spacingHint());
ignoreListView=new KListView(listBox);
- ignoreListView->addColumn(i18n("Ignore pattern"));
+ ignoreListView->addColumn(i18n("Ignore Pattern"));
ignoreListView->addColumn(i18n("Channels"));
ignoreListView->addColumn(i18n("Queries"));
ignoreListView->addColumn(i18n("Notices"));
diff --git a/konversation/prefspagenotify.cpp b/konversation/prefspagenotify.cpp
index c91dad6..997d222 100644
--- a/konversation/prefspagenotify.cpp
+++ b/konversation/prefspagenotify.cpp
@@ -64,7 +64,7 @@ PrefsPageNotify::PrefsPageNotify(QFrame* newParent,Preferences* \
newPreferences) // Set up the buttons to the right of the list
QGrid* buttonBox=new QGrid(3,QGrid::Vertical,listBox);
buttonBox->setSpacing(spacingHint());
- newButton=new QPushButton(i18n("New"),buttonBox);
+ newButton=new QPushButton(i18n("New..."),buttonBox);
removeButton=new QPushButton(i18n("Remove"),buttonBox);
notifyLayout->addWidget(delayBox);
@@ -94,7 +94,7 @@ PrefsPageNotify::~PrefsPageNotify()
void PrefsPageNotify::newNotify()
{
bool ok=false;
- QString newPattern=KLineEditDlg::getText(i18n("Add \
notify"),i18n("New"),&ok,parentFrame); + QString \
newPattern=KLineEditDlg::getText(i18n("Add notify:"),i18n("New"),&ok,parentFrame); \
if(ok) {
KListViewItem* newItem=new KListViewItem(notifyListView,newPattern);
diff --git a/konversation/prefspageserverlist.cpp \
b/konversation/prefspageserverlist.cpp index 717be88..afb7948 100644
--- a/konversation/prefspageserverlist.cpp
+++ b/konversation/prefspageserverlist.cpp
@@ -85,7 +85,7 @@ PrefsPageServerList::PrefsPageServerList(QFrame* \
newParent,Preferences* newPrefe // Add the buttons
connectButton=new QPushButton(i18n("Connect"),buttonBox);
connectButton->setDisabled(true);
- newServerButton=new QPushButton(i18n("New server"),buttonBox);
+ newServerButton=new QPushButton(i18n("New Server..."),buttonBox);
editServerButton=new QPushButton(i18n("Edit"),buttonBox);
editServerButton->setDisabled(true);
removeServerButton=new QPushButton(i18n("Remove"),buttonBox);
diff --git a/konversation/searchdialog.cpp b/konversation/searchdialog.cpp
index 0f77ea1..1125095 100644
--- a/konversation/searchdialog.cpp
+++ b/konversation/searchdialog.cpp
@@ -32,7 +32,7 @@ bool SearchDialog::forward=false;
bool SearchDialog::fromCursor=false;
SearchDialog::SearchDialog(QWidget* parent,QSize size) :
- KDialogBase(parent,"search_dialog",true,i18n("Search text"),
+ KDialogBase(parent,"search_dialog",true,i18n("Search Text"),
KDialogBase::Ok | \
KDialogBase::Cancel,KDialogBase::Ok,true) {
kdDebug() << "SearchDialog::SearchDialog()" << endl;
@@ -47,7 +47,7 @@ SearchDialog::SearchDialog(QWidget* parent,QSize size) :
QHBox* searchBox=new QHBox(page);
- new QLabel(i18n("Search text"),searchBox,"search_label");
+ new QLabel(i18n("Search text:"),searchBox,"search_label");
searchPattern=new KComboBox(searchBox);
searchPattern->setEditable(true);
searchPattern->insertStringList(lastSearchPatterns);
@@ -83,8 +83,8 @@ SearchDialog::SearchDialog(QWidget* parent,QSize size) :
connect(forwardCheck,SIGNAL (stateChanged(int)),this,SLOT (forwardChanged(int)));
connect(fromCursorCheck,SIGNAL (stateChanged(int)),this,SLOT \
(fromCursorChanged(int)));
- setButtonOKText(i18n("OK"),i18n("Search for text"));
- setButtonCancelText(i18n("Cancel"),i18n("Close the window"));
+ setButtonOKText(i18n("&OK"),i18n("Search for text"));
+ setButtonCancelText(i18n("&Cancel"),i18n("Close the window"));
setInitialSize(size);
searchPattern->setFocus();
diff --git a/konversation/server.cpp b/konversation/server.cpp
index d4ad29f..fc2ed00 100644
--- a/konversation/server.cpp
+++ b/konversation/server.cpp
@@ -730,7 +730,7 @@ void Server::requestDccSend(const QString &a_recipient)
lastDccDir,
QString::null,
getMainWindow(),
- i18n("Select file to send to \
%1").arg(recipient) + i18n("Select \
File to Send to %1").arg(recipient) );
if(!fileName.isEmpty())
{
diff --git a/konversation/statuspanel.cpp b/konversation/statuspanel.cpp
index bb060bd..3ef01b9 100644
--- a/konversation/statuspanel.cpp
+++ b/konversation/statuspanel.cpp
@@ -154,8 +154,8 @@ void StatusPanel::closeYourself()
{
int result=KMessageBox::warningYesNo(
this,
- i18n("Do you really want to disconnect from \
%1?").arg(server->getServerName()),
- i18n("Quit server"),
+ i18n("Do you really want to disconnect from \
'%1'?").arg(server->getServerName()), + i18n("Quit Server"),
KStdGuiItem::yes(),
KStdGuiItem::no(),
"QuitServerOnTabClose");
diff --git a/konversation/urlcatcher.cpp b/konversation/urlcatcher.cpp
index b401c86..855734d 100644
--- a/konversation/urlcatcher.cpp
+++ b/konversation/urlcatcher.cpp
@@ -29,7 +29,7 @@
UrlCatcher::UrlCatcher(QWidget* parent) : ChatWindow(parent)
{
- setName(i18n("URL catcher"));
+ setName(i18n("URL Catcher"));
setType(ChatWindow::UrlCatcher);
urlListView=new KListView(this,"url_list_view");
@@ -44,8 +44,8 @@ UrlCatcher::UrlCatcher(QWidget* parent) : ChatWindow(parent)
openUrlButton=new QPushButton(i18n("Open URL"),buttonBox,"open_url_button");
copyUrlButton=new QPushButton(i18n("Copy URL"),buttonBox,"copy_url_button");
deleteUrlButton=new QPushButton(i18n("Delete URL"),buttonBox,"delete_url_button");
- saveListButton=new QPushButton(i18n("Save list"),buttonBox,"save_list_button");
- clearListButton=new QPushButton(i18n("Clear list"),buttonBox,"clear_list_button");
+ saveListButton=new QPushButton(i18n("Save List..."),buttonBox,"save_list_button");
+ clearListButton=new QPushButton(i18n("Clear List"),buttonBox,"clear_list_button");
connect(urlListView,SIGNAL (executed(QListViewItem*)),this,SLOT \
(openUrl(QListViewItem*)) ); connect(urlListView,SIGNAL \
(selectionChanged()),this,SLOT (urlSelected()) ); @@ -150,7 +150,7 @@ void \
UrlCatcher::saveListClicked() QString::null,
QString::null,
this,
- i18n("Save URL list"));
+ i18n("Save URL List"));
if(!fileName.isEmpty())
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic