diff --git a/src/settings/diffmergesettings.ui b/src/settings/diffmergesettings.ui --- a/src/settings/diffmergesettings.ui +++ b/src/settings/diffmergesettings.ui @@ -181,13 +181,13 @@ </p> or <p align="center"> -<tt>&lt;program&gt; &lt;param&gt; %1 %2</tt> +<tt>&lt;program&gt; &lt;param&gt; %s1 %s2</tt> </p> <br> -If using first or second form, svn itself will generate the diff. %f will replaced with a temporary filename. If %f is not given, -the diff-display should able reading data from stdin. +If one between the first or the second form is used, svn itself generates the diff. %f will be replaced with a temporary filename. If %f is not given, +the diff-display should be able to read data from stdin. <br> -When %1 and %2 is given, kdesvn let this display make the diff. For that it it makes a temporary export or get (if needed) and fill out the parameters with the right value. %1 will filled with the content of start-revision, %2 with the endrevision. On large recoursive diffs this may get real slow! +When %s1 and %s2 are given, kdesvn lets this display make the diff. For that it makes a temporary export or get (if needed) and fills out the parameters with the right values. %s1 will be filled with the content of the initial revision, %s2 with the final revision. On large recoursive diffs this may get really slow. </p> @@ -197,7 +197,7 @@ - see "Whats this" for details + see "What's this" for details Qt::AlignCenter