diff --git a/plugins/grepview/grepoutputview.cpp b/plugins/grepview/grepoutputview.cpp
index 5efcb9ad9a..ec0d7216ff 100644
--- a/plugins/grepview/grepoutputview.cpp
+++ b/plugins/grepview/grepoutputview.cpp
@@ -1,229 +1,229 @@
 /**************************************************************************
 *   Copyright 2010 Silvère Lestang <silvere.lestang@gmail.com>            *
 *   Copyright 2010 Julien Desgats <julien.desgats@gmail.com>              *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 
 #include "grepoutputview.h"
 #include "grepoutputmodel.h"
 #include "grepoutputdelegate.h"
 #include "ui_grepoutputview.h"
 #include "grepviewplugin.h"
 #include "grepdialog.h"
 #include "greputil.h"
 
 #include <QtGui/QAction>
 #include <KMessageBox>
 
 #include <interfaces/icore.h>
 #include <interfaces/isession.h>
 
 using namespace KDevelop;
 
 GrepOutputViewFactory::GrepOutputViewFactory()
 {}
 
 QWidget* GrepOutputViewFactory::create(QWidget* parent)
 {
     return new GrepOutputView(parent);
 }
 
 Qt::DockWidgetArea GrepOutputViewFactory::defaultPosition()
 {
     return Qt::BottomDockWidgetArea;
 }
 
 QString GrepOutputViewFactory::id() const
 {
     return "org.kdevelop.GrepOutputView";
 }
 
 GrepOutputView::GrepOutputView(QWidget* parent)
   : QWidget(parent)
 {
     Ui::GrepOutputView::setupUi(this);
 
     setWindowTitle(i18n("Replace output view"));
     setWindowIcon(SmallIcon("edit-find"));
     
     m_prev = new QAction(KIcon("go-previous"), i18n("&Previous item"), this);
     m_prev->setEnabled(false);
     m_next = new QAction(KIcon("go-next"), i18n("&Next item"), this);
     m_next->setEnabled(false);
     m_collapseAll = new QAction(KIcon("arrow-left-double"), i18n("C&ollapse all"), this); // TODO change icon
     m_collapseAll->setEnabled(false);
     m_expandAll = new QAction(KIcon("arrow-right-double"), i18n("&Expand all"), this); // TODO change icon
     m_expandAll->setEnabled(false);
     QAction *separator = new QAction(this);
     separator->setSeparator(true);
     QAction *change_criteria = new QAction(KIcon("configure"), i18n("&Change criteria"), this);
     
     addAction(m_prev);
     addAction(m_next);
     addAction(m_collapseAll);
     addAction(m_expandAll);
     addAction(separator);
     addAction(change_criteria);
     
     renewModel();
     resultsTreeView->setItemDelegate(GrepOutputDelegate::self());
     resultsTreeView->setHeaderHidden(true);
 
     connect(m_prev, SIGNAL(triggered(bool)), this, SLOT(selectPreviousItem()));
     connect(m_next, SIGNAL(triggered(bool)), this, SLOT(selectNextItem()));
     connect(m_collapseAll, SIGNAL(triggered(bool)), this, SLOT(collapseAllItems()));
     connect(m_expandAll, SIGNAL(triggered(bool)), this, SLOT(expandAllItems()));
     connect(applyButton, SIGNAL(clicked()),  this, SLOT(onApply()));
     
     KConfigGroup cg = ICore::self()->activeSession()->config()->group( "GrepDialog" );
     replacementCombo->addItems( cg.readEntry("LastReplacementItems", QStringList()) );
     replacementCombo->setInsertPolicy(QComboBox::InsertAtTop);
     applyButton->setIcon(KIcon("dialog-ok-apply"));
     
     connect(change_criteria, SIGNAL(triggered(bool)), this, SLOT(showDialog()));
 }
 
 GrepOutputView::~GrepOutputView()
 {
     KConfigGroup cg = ICore::self()->activeSession()->config()->group( "GrepDialog" );
     cg.writeEntry("LastReplacementItems", qCombo2StringList(replacementCombo, true));
     emit outputViewIsClosed();
 }
 
 GrepOutputModel* GrepOutputView::renewModel()
 {
     if (model()) {
         model()->deleteLater();
     }
 
     GrepOutputModel* newModel = new GrepOutputModel(resultsTreeView);
     resultsTreeView->setModel(newModel);
     applyButton->setEnabled(false);
     // text may be already present
     newModel->setReplacement(replacementCombo->currentText());
     connect(newModel, SIGNAL(rowsRemoved(QModelIndex, int, int)),
             this, SLOT(rowsRemoved()));
     connect(resultsTreeView, SIGNAL(activated(QModelIndex)), newModel, SLOT(activate(QModelIndex)));
     connect(replacementCombo, SIGNAL(editTextChanged(QString)), newModel, SLOT(setReplacement(QString)));
     connect(newModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(expandRootElement(QModelIndex)));
     connect(newModel, SIGNAL(showErrorMessage(QString,int)), this, SLOT(showErrorMessage(QString)));
     connect(newModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(updateApplyState(QModelIndex,QModelIndex)));
     return newModel;
 }
 
 
 GrepOutputModel* GrepOutputView::model()
 {
     return static_cast<GrepOutputModel*>(resultsTreeView->model());
 }
 
 void GrepOutputView::setPlugin(GrepViewPlugin* plugin)
 {
     m_plugin = plugin;
 }
 
 void GrepOutputView::setMessage(const QString& msg)
 {
     messageLabel->setText(msg);
 }
 
 void GrepOutputView::showErrorMessage( const QString& errorMessage )
 {
     setStyleSheet("QLabel { color : red; }");
     setMessage(errorMessage);
 }
 
 void GrepOutputView::showMessage( KDevelop::IStatus* , const QString& message )
 {
     setStyleSheet("");
     setMessage(message);
 }
 
 void GrepOutputView::onApply()
 {
     Q_ASSERT(model()->rowCount());
     // ask a confirmation before an empty string replacement
     if(replacementCombo->currentText().length() == 0 &&
-       KMessageBox::questionYesNo(this, i18n("Would you want to replace by empty string ?"),
+       KMessageBox::questionYesNo(this, i18n("Would you want to replace by empty string?"),
                                         i18n("Start replacement")) == KMessageBox::ButtonCode::No)
     {
         return;
     }
 
     setEnabled(false);
     model()->doReplacements();
     setEnabled(true);
 }
 
 void GrepOutputView::showDialog()
 {
     m_plugin->showDialog(true);
 }
 
 void GrepOutputView::expandRootElement(const QModelIndex& parent)
 {
     if(!parent.isValid())
     {
         resultsTreeView->setExpanded(model()->index(0,0), true);
     }
 
     m_prev->setEnabled(true);
     m_next->setEnabled(true);
     m_collapseAll->setEnabled(true);
     m_expandAll->setEnabled(true);
     applyButton->setEnabled(true);
 }
 
 void GrepOutputView::selectPreviousItem()
 {
     QModelIndex idx = resultsTreeView->currentIndex();
     if(idx.isValid())
     {
         QModelIndex prev_idx = model()->previousItemIndex(idx);
         resultsTreeView->setCurrentIndex(prev_idx);
         model()->activate(prev_idx);
     }
 }
 
 void GrepOutputView::selectNextItem()
 {
     QModelIndex idx = resultsTreeView->currentIndex();
     if(idx.isValid())
     {
         QModelIndex next_idx = model()->nextItemIndex(idx);
         resultsTreeView->setCurrentIndex(next_idx);
         model()->activate(next_idx);
     }
 }
 
 
 void GrepOutputView::collapseAllItems()
 {
     resultsTreeView->collapseAll();
 }
 
 void GrepOutputView::expandAllItems()
 {
     resultsTreeView->expandAll();
 }
     
 void GrepOutputView::rowsRemoved()
 {
     m_prev->setEnabled(model()->rowCount());
     m_next->setEnabled(model()->rowCount());
 }
 
 void GrepOutputView::updateApplyState(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     Q_UNUSED(bottomRight);
     // we only care about root item
     if(!topLeft.parent().isValid())
     {
         applyButton->setEnabled(topLeft.data(Qt::CheckStateRole) != Qt::Unchecked);
     }
 }
diff --git a/plugins/grepview/grepoutputview.ui b/plugins/grepview/grepoutputview.ui
index 3dcfdc488c..ca059e2683 100644
--- a/plugins/grepview/grepoutputview.ui
+++ b/plugins/grepview/grepoutputview.ui
@@ -1,99 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>GrepOutputView</class>
  <widget class="QWidget" name="GrepOutputView">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>746</width>
     <height>300</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="1" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QWidget" name="statusbar" native="true">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <property name="margin">
          <number>0</number>
         </property>
         <item>
          <widget class="QLabel" name="messageLabel">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>4</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string/>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLabel" name="replacementLabel">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string>Replace with: </string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KComboBox" name="replacementCombo">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>2</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="toolTip">
            <string>Enter the replacement pattern.</string>
           </property>
           <property name="editable">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QPushButton" name="applyButton">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
             <horstretch>1</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="toolTip">
-           <string>Apply replacement on selectd items.</string>
+           <string>Apply replacement on selected items.</string>
           </property>
           <property name="text">
            <string>Apply</string>
           </property>
          </widget>
         </item>
        </layout>
       </widget>
      </item>
      <item>
       <widget class="QTreeView" name="resultsTreeView"/>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>