diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui index e2b84b73225..269d1461657 100644 --- a/src/plugins/coreplugin/generalsettings.ui +++ b/src/plugins/coreplugin/generalsettings.ui @@ -183,7 +183,7 @@ - Reload all unmodified files + Reload all modified files diff --git a/src/plugins/cvs/settingspage.ui b/src/plugins/cvs/settingspage.ui index 6798485edb1..efff37aadd8 100644 --- a/src/plugins/cvs/settingspage.ui +++ b/src/plugins/cvs/settingspage.ui @@ -30,7 +30,7 @@ When checked, all files touched by a commit will be displayed when clicking on a revision number in the annotation view (retrieved via commit id). Otherwise, only the respective file will be displayed. - Describe by commit id + Describe all files matching commit id: diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp index 92d342983ac..543a9e3bd67 100644 --- a/src/plugins/debugger/breakwindow.cpp +++ b/src/plugins/debugger/breakwindow.cpp @@ -136,10 +136,10 @@ void BreakWindow::contextMenuEvent(QContextMenuEvent *ev) const int rowCount = itemModel->rowCount(); - QAction *deleteAction = new QAction(tr("Delete breakpoint", 0, si.size()), &menu); + QAction *deleteAction = new QAction(tr("Delete breakpoint"), &menu); deleteAction->setEnabled(si.size() > 0); - QAction *deleteAllAction = new QAction(tr("Delete all breakpoints", 0, si.size()), &menu); + QAction *deleteAllAction = new QAction(tr("Delete all breakpoints"), &menu); deleteAllAction->setEnabled(si.size() > 0); // Delete by file: Find indexes of breakpoints of the same file @@ -168,7 +168,7 @@ void BreakWindow::contextMenuEvent(QContextMenuEvent *ev) alwaysAdjustAction->setCheckable(true); alwaysAdjustAction->setChecked(m_alwaysResizeColumnsToContents); - QAction *editConditionAction = new QAction(tr("Edit condition...", 0, si.size()), &menu); + QAction *editConditionAction = new QAction(tr("Edit condition..."), &menu); editConditionAction->setEnabled(si.size() > 0); QAction *synchronizeAction = new QAction(tr("Synchronize breakpoints"), &menu); diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp index b3ca55f0dc1..a2adb1baa6e 100644 --- a/src/plugins/debugger/debuggermanager.cpp +++ b/src/plugins/debugger/debuggermanager.cpp @@ -1525,10 +1525,11 @@ QString DebuggerManager::qtDumperLibraryName() const QStringList DebuggerManager::qtDumperLibraryLocations() const { - if (theDebuggerAction(UseCustomDebuggingHelperLocation)->value().toBool()) - return QStringList() << - ( theDebuggerAction(CustomDebuggingHelperLocation)->value().toString() - + tr(" (explicitly set in the Debugger Options)")); + if (theDebuggerAction(UseCustomDebuggingHelperLocation)->value().toBool()) { + const QString customLocation = theDebuggerAction(CustomDebuggingHelperLocation)->value().toString(); + const QString location = tr("%1 (explicitly set in the Debugger Options)").arg(customLocation); + return QStringList(location); + } return m_dumperLibLocations; } diff --git a/src/plugins/designer/cpp/cppsettingspagewidget.ui b/src/plugins/designer/cpp/cppsettingspagewidget.ui index 8a34601df91..b06c43da415 100644 --- a/src/plugins/designer/cpp/cppsettingspagewidget.ui +++ b/src/plugins/designer/cpp/cppsettingspagewidget.ui @@ -68,7 +68,7 @@ - Include Qt module name + Use Qt module name in #include-directive