summaryrefslogtreecommitdiffstats
path: root/src/settings
diff options
context:
space:
mode:
Diffstat (limited to 'src/settings')
-rw-r--r--src/settings/CMakeLists.txt12
-rw-r--r--src/settings/cmdexecsettings.ui4
-rw-r--r--src/settings/diffmergesettings.ui10
-rw-r--r--src/settings/diffmergesettings_impl.cpp2
-rw-r--r--src/settings/displaysettings_impl.cpp2
-rw-r--r--src/settings/kdesvn_part.kcfg4
-rw-r--r--src/settings/kdesvnsettings.kcfgc2
-rw-r--r--src/settings/subversion_settings.ui16
-rw-r--r--src/settings/tdesvnpartrc-use-external.upd2
9 files changed, 27 insertions, 27 deletions
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
index fd7f1ca..7894082 100644
--- a/src/settings/CMakeLists.txt
+++ b/src/settings/CMakeLists.txt
@@ -1,8 +1,8 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
KDE3_ADD_KCFG_FILES(cfgsrc
- kdesvnsettings.kcfgc)
-ADD_LIBRARY(kdesvncfgreader STATIC ${cfgsrc})
+ tdesvnsettings.kcfgc)
+ADD_LIBRARY(tdesvncfgreader STATIC ${cfgsrc})
KDE3_ADD_UI_FILES(
settings_ui_sources
@@ -26,13 +26,13 @@ FILE(GLOB hdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
KDE3_AUTOMOC(${settings_sources})
ADD_LIBRARY(settingsdlgs STATIC ${settings_ui_sources} ${settings_sources} ${hdr})
-ADD_DEPENDENCIES(settingsdlgs kdesvncfgreader)
+ADD_DEPENDENCIES(settingsdlgs tdesvncfgreader)
-SET_TARGET_PROPERTIES(kdesvncfgreader settingsdlgs
+SET_TARGET_PROPERTIES(tdesvncfgreader settingsdlgs
PROPERTIES
COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/kdesvn_part.kcfg DESTINATION ${KCFG_INSTALL_DIR})
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tdesvn_part.kcfg DESTINATION ${KCFG_INSTALL_DIR})
INSTALL(
FILES
@@ -43,7 +43,7 @@ INSTALL(
INSTALL(
FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/kdesvn-use-external-update.sh
+ ${CMAKE_CURRENT_SOURCE_DIR}/tdesvn-use-external-update.sh
DESTINATION
${DATA_INSTALL_DIR}/kconf_update
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
diff --git a/src/settings/cmdexecsettings.ui b/src/settings/cmdexecsettings.ui
index 35de9db..6e73492 100644
--- a/src/settings/cmdexecsettings.ui
+++ b/src/settings/cmdexecsettings.ui
@@ -58,7 +58,7 @@
<comment>no limit</comment>
</property>
<property name="toolTip" stdset="0">
- <string>The minimum a log output must contain before kdesvn shows a single logwindow</string>
+ <string>The minimum a log output must contain before tdesvn shows a single logwindow</string>
</property>
</widget>
</grid>
@@ -71,7 +71,7 @@
<string>Don't display contextmenu in Konqueror</string>
</property>
<property name="toolTip" stdset="0">
- <string>If set, kdesvn will not show a menu inside "Action" menu of konqueror</string>
+ <string>If set, tdesvn will not show a menu inside "Action" menu of konqueror</string>
</property>
</widget>
<widget class="TQCheckBox">
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>
diff --git a/src/settings/diffmergesettings_impl.cpp b/src/settings/diffmergesettings_impl.cpp
index b72c4af..997dffc 100644
--- a/src/settings/diffmergesettings_impl.cpp
+++ b/src/settings/diffmergesettings_impl.cpp
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "diffmergesettings_impl.h"
-#include "src/settings/kdesvnsettings.h"
+#include "src/settings/tdesvnsettings.h"
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
diff --git a/src/settings/displaysettings_impl.cpp b/src/settings/displaysettings_impl.cpp
index da068fd..d2cdc0c 100644
--- a/src/settings/displaysettings_impl.cpp
+++ b/src/settings/displaysettings_impl.cpp
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "displaysettings_impl.h"
-#include "src/settings/kdesvnsettings.h"
+#include "src/settings/tdesvnsettings.h"
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
diff --git a/src/settings/kdesvn_part.kcfg b/src/settings/kdesvn_part.kcfg
index e6471c3..3754d4a 100644
--- a/src/settings/kdesvn_part.kcfg
+++ b/src/settings/kdesvn_part.kcfg
@@ -231,7 +231,7 @@
<group name="cmdline" >
<entry key="no_konqueror_contextmenu" type="Bool" >
<default>false</default>
- <label>Should konqueror not display context menus for kdesvn?</label>
+ <label>Should konqueror not display context menus for tdesvn?</label>
</entry>
<entry key="cmdline_show_logwindow" type="Bool" >
<default>true</default>
@@ -246,7 +246,7 @@
<label>KIO::svn operations uses a standard logmessage</label>
</entry>
<entry key="kio_standard_logmsg" type="String">
- <default>Revision made with kdesvn KIO.</default>
+ <default>Revision made with tdesvn KIO.</default>
<label>The standard logmessage to use with KIO if not asking for it.</label>
</entry>
</group>
diff --git a/src/settings/kdesvnsettings.kcfgc b/src/settings/kdesvnsettings.kcfgc
index db0aa07..4c60cf0 100644
--- a/src/settings/kdesvnsettings.kcfgc
+++ b/src/settings/kdesvnsettings.kcfgc
@@ -1,5 +1,5 @@
# Code generation options for kconfig_compiler
-File=kdesvn_part.kcfg
+File=tdesvn_part.kcfg
ClassName=Kdesvnsettings
Singleton=true
Mutators=true
diff --git a/src/settings/subversion_settings.ui b/src/settings/subversion_settings.ui
index 8e1a4e7..6e40fcf 100644
--- a/src/settings/subversion_settings.ui
+++ b/src/settings/subversion_settings.ui
@@ -30,7 +30,7 @@
<string></string>
</property>
<property name="toolTip" stdset="0">
- <string>Select if kdesvn should check for updates when open a working copy</string>
+ <string>Select if tdesvn should check for updates when open a working copy</string>
</property>
</widget>
<widget class="TQCheckBox">
@@ -52,10 +52,10 @@
<string>Check if items has "svn:needs-lock" property set</string>
</property>
<property name="toolTip" stdset="0">
- <string>When listing on working copies kdesvn may check for this property</string>
+ <string>When listing on working copies tdesvn may check for this property</string>
</property>
<property name="whatsThis" stdset="0">
- <string>When listing on working copies kdesvn may check for &lt;tt&gt;svn:needs-lock&lt;/tt&gt; property.&lt;br&gt;But due this listings/updating on folders containing lot of items may get slow. So you should only switch on if you have repositories containing lot of such entries.</string>
+ <string>When listing on working copies tdesvn may check for &lt;tt&gt;svn:needs-lock&lt;/tt&gt; property.&lt;br&gt;But due this listings/updating on folders containing lot of items may get slow. So you should only switch on if you have repositories containing lot of such entries.</string>
</property>
</widget>
<widget class="TQCheckBox">
@@ -72,7 +72,7 @@
<string>Whether getting details about items when making listing on repositories or not</string>
</property>
<property name="whatsThis" stdset="0">
- <string>&lt;p align="left"&gt;When checked, kdesvn get more detailed info about file items when making a listing to remote repositories. So you may see remote locks in overview.
+ <string>&lt;p align="left"&gt;When checked, tdesvn get more detailed info about file items when making a listing to remote repositories. So you may see remote locks in overview.
&lt;/p&gt;
&lt;p align="left"&gt;&lt;i&gt;Be careful: This may let listings REAL slow!&lt;/i&gt;&lt;/p&gt;</string>
</property>
@@ -99,10 +99,10 @@
<string></string>
</property>
<property name="toolTip" stdset="0">
- <string>Should kdesvn retrieves properties on selected item in repositories</string>
+ <string>Should tdesvn retrieves properties on selected item in repositories</string>
</property>
<property name="whatsThis" stdset="0">
- <string>When browsing kdesvn may try displaying properties below itemlist from a selected item.
+ <string>When browsing tdesvn may try displaying properties below itemlist from a selected item.
On networked repositories (eg., not opened via file:// protocol) this may get real slow. So if you have slow network connections or when browsing hangs often you should deactivate it.</string>
</property>
</widget>
@@ -137,7 +137,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re
<string>When saving passwords, do it into KDE wallet instead of subversions storage?</string>
</property>
<property name="whatsThis" stdset="0">
- <string>&lt;p&gt;Tells if your passwords set in kdesvn should stored into kde wallet instead of simple cleartext storage of subversion.&lt;/p&gt;
+ <string>&lt;p&gt;Tells if your passwords set in tdesvn should stored into kde wallet instead of simple cleartext storage of subversion.&lt;/p&gt;
&lt;p&gt;This would be a little bit more secure 'cause KDE wallet is (mostly) encrypted with a password. On other hand you must re-enter your passwords with other subversion clients not accessing KDE wallet (eg. svn commandline itself, rapidsvn and so on).&lt;/p&gt;
&lt;p&gt;If you're HOME storage eg. subversions configfolder is on a network drive you should hard think about not storing passwords in a plain text file like subversion does but put it into an encrypted storage like kde wallet or don't save passwords.&lt;/p&gt;</string>
</property>
@@ -178,7 +178,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re
<string>Read detailed change lists</string>
</property>
<property name="whatsThis" stdset="0">
- <string>Reading lists of changed files may sometimes a little bit slow down things. But if this feature is switched off, kdesvn may fail generating differences between nodechanges from within the logviewer.</string>
+ <string>Reading lists of changed files may sometimes a little bit slow down things. But if this feature is switched off, tdesvn may fail generating differences between nodechanges from within the logviewer.</string>
</property>
</widget>
<widget class="TQCheckBox">
diff --git a/src/settings/tdesvnpartrc-use-external.upd b/src/settings/tdesvnpartrc-use-external.upd
index 7e5f964..959ca86 100644
--- a/src/settings/tdesvnpartrc-use-external.upd
+++ b/src/settings/tdesvnpartrc-use-external.upd
@@ -3,4 +3,4 @@ Id=0.14.0-1
File=tdesvnpartrc
Group=general_items
Options=overwrite
-Script=kdesvn-use-external-update.sh,sh
+Script=tdesvn-use-external-update.sh,sh