diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index ed9860bbf82aa0ad367891b2f0075dd6a59c58da..9105f328ecd2061f41082032da1ae98288c8de3e 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 801b67bb2a220548526c3dd5f783723dddbf7b4b..808a68244f0c7477981d0ef014b67db1b4448d13 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>