summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-01-08 11:32:53 +0100
committercon <qtc-committer@nokia.com>2010-01-08 14:19:45 +0100
commit81b2fbab93990651401a1483f5692f11ddd9a0a0 (patch)
tree4d6eb23ccb7f9fec7701a8a266a19e0818bd0ae1
parent8ca903b412affae076ccd8680682065e8f8ba149 (diff)
downloadqt-creator-81b2fbab93990651401a1483f5692f11ddd9a0a0.tar.gz
Translations: Fix debugger messages
Reviewed-by: hjk (cherry picked from commit 945315173faf07e2bafa7dfcd31f08328f56df85)
-rw-r--r--src/plugins/debugger/gdb/gdbengine.cpp8
-rw-r--r--src/plugins/debugger/gdb/gdboptionspage.ui14
2 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index ed9860bbf8..9105f328ec 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -836,11 +836,11 @@ void GdbEngine::commandTimeout()
debugMessage(_("TIMED OUT WAITING FOR GDB REPLY. COMMANDS STILL IN PROGRESS:"));
int timeOut = m_commandTimer->interval();
//m_commandTimer->stop();
- QString msg = tr("The gdb process has not produced any response "
- "to a command within %1 seconds. This may been it is stuck "
+ const QString msg = tr("The gdb process has not responded "
+ "to a command within %n seconds. This could mean it is stuck "
"in an endless loop or taking longer than expected to perform "
- "the operation it was reqested.\nYou have a choice of waiting "
- "longer or abort debugging.").arg(timeOut);
+ "the operation.\nYou can choose between waiting "
+ "longer or abort debugging.", 0, timeOut);
QMessageBox *mb = showMessageBox(QMessageBox::Critical,
tr("Gdb not responding"), msg,
QMessageBox::Ok | QMessageBox::Cancel);
diff --git a/src/plugins/debugger/gdb/gdboptionspage.ui b/src/plugins/debugger/gdb/gdboptionspage.ui
index 801b67bb2a..808a68244f 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.ui
+++ b/src/plugins/debugger/gdb/gdboptionspage.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>397</width>
- <height>322</height>
+ <width>480</width>
+ <height>371</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -37,7 +37,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="Utils::PathChooser" name="gdbLocationChooser" native="true"/>
+ <widget class="Utils::PathChooser" name="gdbLocationChooser"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelEnvironment">
@@ -60,7 +60,7 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="Utils::PathChooser" name="scriptFileChooser" native="true"/>
+ <widget class="Utils::PathChooser" name="scriptFileChooser"/>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="checkBoxUsePreciseBreakpoints">
@@ -85,11 +85,11 @@ name in different directories.</string>
<item row="4" column="1">
<widget class="QSpinBox" name="spinBoxGdbWatchdogTimeout">
<property name="toolTip">
- <string>This is the number of second Qt Creator will wait before
-it terminates non-reacting gdb process. The default value of 20 seconds
+ <string>This is the number of seconds Qt Creator will wait before
+it terminates non-responsive gdb process. The default value of 20 seconds
should be sufficient for most applications, but there are situations when
loading big libraries or listing source files takes much longer than that
-on slow machines. In this case the value should be increased.</string>
+on slow machines. In this case, the value should be increased.</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>