Fixed tr()-glitches.

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>

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>

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);

src/plugins/debugger/debuggermanager.cpp

@@ -1525,10 +1525,11 @@ QString DebuggerManager::qtDumperLibraryName() const
 
 QStringList DebuggerManager::qtDumperLibraryLocations() const
 {
-    if (theDebuggerAction(UseCustomDebuggingHelperLocation)->value().toBool())
+    if (theDebuggerAction(UseCustomDebuggingHelperLocation)->value().toBool()) {
-        return QStringList() <<
+        const QString customLocation = theDebuggerAction(CustomDebuggingHelperLocation)->value().toString();
-                ( theDebuggerAction(CustomDebuggingHelperLocation)->value().toString()
+        const QString location = tr("%1 (explicitly set in the Debugger Options)").arg(customLocation);
-                  + tr(" (explicitly set in the Debugger Options)"));
+        return QStringList(location);
+    }
     return m_dumperLibLocations;
 }
 

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>