From 1cad9748cc2e41e26b2b56b87a5a1f6865b70b44 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 30 Jul 2009 16:44:16 +0200
Subject: [PATCH] Fixed tr()-glitches.
---
src/plugins/coreplugin/generalsettings.ui | 2 +-
src/plugins/cvs/settingspage.ui | 2 +-
src/plugins/debugger/breakwindow.cpp | 6 +++---
src/plugins/debugger/debuggermanager.cpp | 9 +++++----
src/plugins/designer/cpp/cppsettingspagewidget.ui | 2 +-
5 files changed, 11 insertions(+), 10 deletions(-)
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 @@
</item>
<item>
<property name="text">
- <string>Reload all unmodified files</string>
+ <string>Reload all modified files</string>
</property>
</item>
<item>
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 @@
<string>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.</string>
</property>
<property name="text">
- <string>Describe by commit id</string>
+ <string>Describe all files matching commit id:</string>
</property>
</widget>
</item>
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 @@
<item>
<widget class="QCheckBox" name="includeQtModuleCheckBox">
<property name="text">
- <string>Include Qt module name</string>
+ <string>Use Qt module name in #include-directive</string>
</property>
</widget>
</item>
--
GitLab