1 files changed, 5 insertions, 5 deletions
diff --git a/src/settings/diffmergesettings.ui b/src/settings/diffmergesettings.ui
index 5594d40..106fb72 100644
--- a/src/settings/diffmergesettings.ui
+++ b/src/settings/diffmergesettings.ui
@@ -59,7 +59,7 @@
                 <string>Use external diff display</string>
             </property>
             <property name="toolTip" stdset="0">
-                <string>If kdesvn should use an external diff display and/or generator. If not checked use internal display.</string>
+                <string>If tdesvn should use an external diff display and/or generator. If not checked use internal display.</string>
             </property>
         </widget>
         <widget class="TQCheckBox">
@@ -131,7 +131,7 @@
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>&lt;p&gt;
-Enter how kdesvn should call the conflict resolver program. The form is
+Enter how tdesvn should call the conflict resolver program. The form is
 &lt;p align="center"&gt;
 &lt;b&gt;&lt;tt&gt;&amp;lt;program&amp;gt; &amp;lt;programoptions&amp;gt;&lt;/tt&gt;&lt;/b&gt;
 &lt;/p&gt;
@@ -142,7 +142,7 @@ The substitutions means:&lt;br&gt;
 &lt;b&gt;&lt;tt&gt;%o&lt;/tt&gt;&lt;/b&gt; Old version&lt;br&gt;
 &lt;b&gt;&lt;tt&gt;%m&lt;/tt&gt;&lt;/b&gt; Mine or local edit version&lt;br&gt;
 &lt;b&gt;&lt;tt&gt;%n&lt;/tt&gt;&lt;/b&gt; Newest version&lt;br&gt;
-&lt;b&gt;&lt;tt&gt;%t&lt;/tt&gt;&lt;/b&gt; The target to save as, kdesvn will use the orignal file name for it.
+&lt;b&gt;&lt;tt&gt;%t&lt;/tt&gt;&lt;/b&gt; The target to save as, tdesvn will use the orignal file name for it.
 &lt;/p&gt;
 &lt;p&gt;
 Default: &lt;tt&gt;kdiff3 %o %m %n -o %t&lt;/tt&gt;
@@ -169,7 +169,7 @@ Default: &lt;tt&gt;kdiff3 %o %m %n -o %t&lt;/tt&gt;
                             </property>
                             <property name="whatsThis" stdset="0">
                                 <string>&lt;p&gt;
-Enter how kdesvn should call the external merge program. The form is
+Enter how tdesvn should call the external merge program. The form is
 &lt;p align="center"&gt;
 &lt;b&gt;&lt;tt&gt;&amp;lt;program&amp;gt; &amp;lt;programoptions&amp;gt; %s1 %s2 %t&lt;/tt&gt;&lt;/b&gt;
 &lt;/p&gt;
@@ -202,7 +202,7 @@ or
 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.
 &lt;br&gt;
-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 %1 and %2 is given, tdesvn 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!
 &lt;/p&gt;</string>
                             </property>
                         </widget>