Changeset View
Changeset View
Standalone View
Standalone View
src/settings/diffmergesettings.ui
| Show First 20 Lines • Show All 175 Lines • ▼ Show 20 Line(s) | |||||
| 176 | <tt>&lt;program&gt; &lt;param&gt; %f</tt> | 176 | <tt>&lt;program&gt; &lt;param&gt; %f</tt> | ||
| 177 | </p> | 177 | </p> | ||
| 178 | or | 178 | or | ||
| 179 | <p align="center"> | 179 | <p align="center"> | ||
| 180 | <tt>&lt;program&gt; &lt;param&gt;</tt> | 180 | <tt>&lt;program&gt; &lt;param&gt;</tt> | ||
| 181 | </p> | 181 | </p> | ||
| 182 | or | 182 | or | ||
| 183 | <p align="center"> | 183 | <p align="center"> | ||
| 184 | <tt>&lt;program&gt; &lt;param&gt; %1 %2</tt> | 184 | <tt>&lt;program&gt; &lt;param&gt; %s1 %s2</tt> | ||
| 185 | </p> | 185 | </p> | ||
| 186 | <br> | 186 | <br> | ||
| 187 | If using first or second form, svn itself will generate the diff. %f will replaced with a temporary filename. If %f is not given, | 187 | 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, | ||
| 188 | the diff-display should able reading data from stdin. | 188 | the diff-display should be able to read data from stdin. | ||
lueck: Probably the string could be improved:
If using the first or second form, svn itself will… | |||||
| 189 | <br> | 189 | <br> | ||
| 190 | 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! | 190 | 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. | ||
Probably the string could be improved: lueck: Probably the string could be improved:
When %1 and %2 are given, kdesvn lets this display make… | |||||
| 191 | </p></string> | 191 | </p></string> | ||
| 192 | </property> | 192 | </property> | ||
| 193 | </widget> | 193 | </widget> | ||
| 194 | </item> | 194 | </item> | ||
| 195 | </layout> | 195 | </layout> | ||
| 196 | </item> | 196 | </item> | ||
| 197 | <item row="0" column="0"> | 197 | <item row="0" column="0"> | ||
| 198 | <widget class="QLabel" name="m_extern_hint"> | 198 | <widget class="QLabel" name="m_extern_hint"> | ||
| 199 | <property name="text"> | 199 | <property name="text"> | ||
| 200 | <string>see "Whats this" for details</string> | 200 | <string>see "What's this" for details</string> | ||
| 201 | </property> | 201 | </property> | ||
| 202 | <property name="alignment"> | 202 | <property name="alignment"> | ||
| 203 | <set>Qt::AlignCenter</set> | 203 | <set>Qt::AlignCenter</set> | ||
| 204 | </property> | 204 | </property> | ||
| 205 | <property name="wordWrap"> | 205 | <property name="wordWrap"> | ||
| 206 | <bool>true</bool> | 206 | <bool>true</bool> | ||
| 207 | </property> | 207 | </property> | ||
| 208 | </widget> | 208 | </widget> | ||
| ▲ Show 20 Lines • Show All 82 Lines • Show Last 20 Lines | |||||
Probably the string could be improved:
If using the first or second form, svn itself will generate the diff. %f will be replaced with a temporary filename. If %f is not given,
the diff-display should able to read data from stdin.