diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-11-25 09:48:25 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-11-25 09:48:25 +0100 |
| commit | e2b0835b58aefdab91edda097c1180dae08058f6 (patch) | |
| tree | 5c26a165c4956d87b3d9cc5568b590276541f5e0 /src/plugins/fakevim | |
| parent | 84aa93c2bbdd4b9e9bb84df78261abd343c07471 (diff) | |
| parent | 7ff81c435af06179fd64147a72f55e884e299cef (diff) | |
| download | qt-creator-e2b0835b58aefdab91edda097c1180dae08058f6.tar.gz | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
src/libs/qmljs/qmljstypedescriptionreader.cpp
src/plugins/analyzerbase/startremotedialog.ui
src/plugins/qmldesigner/designercore/include/rewriterview.h
src/plugins/qt4projectmanager/makestep.cpp
Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
Diffstat (limited to 'src/plugins/fakevim')
| -rw-r--r-- | src/plugins/fakevim/fakevimplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index fc714fe962..9e31c05ee5 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -991,7 +991,7 @@ bool FakeVimPluginPrivate::initialize() for (int i = 1; i < 10; ++i) { QAction *act = new QAction(this); - act->setText(QString("Execute User Action #%1").arg(i)); + act->setText(tr("Execute User Action #%1").arg(i)); act->setData(i); QString id = QString("FakeVim.UserAction%1").arg(i); QString keys = QString("Alt+V,%1").arg(i); |