Commit 7fb0de70 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Tr glitches.

parent 432ad0bf
......@@ -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,
......
......@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment