Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts: kmail/kmmainwidget.cpp
12 years ago · 2e1df36c9a
parent 77d545fec0 d69ea1ca74
commit 2e1df36c9a
1 changed files with 1 additions and 1 deletions
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@ -3096,7 +3096,7 @@ void KMMainWidget::setupActions()
    }

    {
-        QAction *action = new QAction(i18n("Message Delayed..."), this);
+        QAction *action = new QAction(i18n("Delayed Messages..."), this);
        actionCollection()->addAction(QLatin1String("message_delayed"), action );
        connect(action, &QAction::triggered, this, &KMMainWidget::slotConfigureSendLater);
    }