From 13bda38a9f3cb8df26bab8dcacffa700d8d2cef5 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 22 Apr 2010 10:25:09 +0000 Subject: [PATCH] Replaced '&&' with the less geeky word 'and' in the clear-reset and clear-scrollback-reset actions. svn path=/trunk/KDE/kdebase/apps/konsole/; revision=1117484 --- src/SessionController.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SessionController.cpp b/src/SessionController.cpp index 021c1fc33..ecea95f1f 100644 --- a/src/SessionController.cpp +++ b/src/SessionController.cpp @@ -454,9 +454,9 @@ void SessionController::setupActions() _copyToNoneAction->setChecked(true); connect( _copyToNoneAction , SIGNAL(triggered()) , this , SLOT(copyInputToNone()) ); - // Clear+Reset + // Clear and Reset action = collection->addAction("clear-and-reset"); - action->setText( i18n("Clear && Reset") ); + action->setText( i18n("Clear and Reset") ); action->setIcon( KIcon("edit-clear-history") ); connect( action , SIGNAL(triggered()) , this , SLOT(clearAndReset()) ); @@ -529,7 +529,7 @@ void SessionController::setupActions() connect( action , SIGNAL(triggered()) , this , SLOT(showHistoryOptions()) ); action = collection->addAction("clear-history-and-reset"); - action->setText( i18n("Clear Scrollback && Reset") ); + action->setText( i18n("Clear Scrollback and Reset") ); action->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_X) ); connect( action , SIGNAL(triggered()) , this , SLOT(clearHistoryAndReset()) );