feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Tr glitches.

Browse Source
This commit is contained in:
Friedemann Kleint
2009-08-17 15:50:43 +02:00
parent 432ad0bfbc
commit 7fb0de70e5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cvs/cvsplugin.cpp
View File

@@ -1033,8 +1033,8 @@ static inline QString msgExecutionLogEntry(const QString &workingDir, const QStr
//: Executing: <executable> <arguments>
const QString args = arguments.join(QString(QLatin1Char(' ')));
if (workingDir.isEmpty())
return CVSPlugin::tr("Executing: %2 %3\n").arg(executable, args);
return CVSPlugin::tr("Executing in %2: %3 %4\n").arg(workingDir, executable, args);
return CVSPlugin::tr("Executing: %1 %2\n").arg(executable, args);
return CVSPlugin::tr("Executing in %1: %2 %2\n").arg(workingDir, executable, args);
}
// Figure out a working directory for the process,

2
src/plugins/projectexplorer/projectexplorersettingspage.ui
View File

@@ -56,7 +56,7 @@
<item>
<widget class="QLabel" name="jomLabel">
<property name="text">
<string>jom is a drop-in replacement for nmake which distributes the compilation process to multiple CPU cores. For more details, see &lt;a href=&quot;http://qt.gitorious.org/qt-labs/jom/&quot;&gt;the jom Homepage&lt;/a&gt;. Disable this if you expirience problems with your Makefiles.</string>
<string>&lt;i&gt;jom&lt;/i&gt; is a drop-in replacement for &lt;i&gt;nmake&lt;/i&gt; which distributes the compilation process to multiple CPU cores. For more details, see the &lt;a href=&quot;http://qt.gitorious.org/qt-labs/jom/&quot;&gt;jom Homepage&lt;/a&gt;. Disable it if you experience problems with your builds.</string>
</property>
<property name="wordWrap">
<bool>true</bool>