Rename a number of libraries and executables to avoid conflicts with KDE4

7 files changed, 9 insertions, 9 deletions

diff --git a/doc/en/archives.docbook b/doc/en/archives.docbook
index a94afe1..4cbd645 100644
--- a/doc/en/archives.docbook
+++ b/doc/en/archives.docbook
@@ -10,7 +10,7 @@
     the following archives types: ace, arj, bzip2, deb, gzip, iso,
     lha, rar, rpm, tar, zip and 7-zip and supports the following
     passworded archives: arj, ace, rar and zip. Passwords can be
-    stored in &kwallet;. Please note that the archive
+    stored in &tdewallet;. Please note that the archive
     support first needs to be properly 
     <link linkend="konfig-archives">configured</link> in
     Konfigurator. To open the archive, use &Enter;,
diff --git a/doc/en/features.docbook b/doc/en/features.docbook
index 6170c87..13a9cca 100644
--- a/doc/en/features.docbook
+++ b/doc/en/features.docbook
@@ -56,7 +56,7 @@
           <listitem>
             <para>Powerful internal 
             <link linkend="krviewer">viewer and editor</link> via
-            kparts supporting almost every file format.</para>
+            tdeparts supporting almost every file format.</para>
           </listitem>
           <listitem>
             <para>&advanced-search-module-lnk; :
@@ -289,7 +289,7 @@
           <para>
           <link linkend="archives">Password support</link> for: arj,
           ace, rar and zip. Passwords can be stored in
-          &kwallet;</para>
+          &tdewallet;</para>
         </listitem>
         <listitem>
           <para>
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 283d0f3..071cbde 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -297,7 +297,7 @@ http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcf
 <!ENTITY filelight '<application>Filelight</application>'>
 <!ENTITY tdevelop '<application>Kdevelop</application>'>
 <!ENTITY keditbookmarks '<application>KeditBookmarks</application>'>
-<!ENTITY kwallet "<application>Kwallet</application>">
+<!ENTITY tdewallet "<application>Kwallet</application>">
 
 <!-- (TM) Trademark ENTITIES -->
 <!ENTITY fedora '<trademark>Fedora</trademark>'>
diff --git a/doc/en/remote-connections.docbook b/doc/en/remote-connections.docbook
index 5feb168..692fee8 100644
--- a/doc/en/remote-connections.docbook
+++ b/doc/en/remote-connections.docbook
@@ -182,7 +182,7 @@
 <para>
 Let's start with installing all the packages we need: 
 <screen>
-<prompt>#</prompt> <userinput><command>apt-get install</command> <option>avahi-daemon libnss-mdns kdnssd</option></userinput>
+<prompt>#</prompt> <userinput><command>apt-get install</command> <option>avahi-daemon libnss-mdns tdednssd</option></userinput>
 </screen>
 
 Everything is installed, now let's do some configuration. First, we need our services to be announced on LAN.
diff --git a/doc/ru/features.docbook b/doc/ru/features.docbook
index ed14c93..e63b125 100644
--- a/doc/ru/features.docbook
+++ b/doc/ru/features.docbook
@@ -83,7 +83,7 @@
                <para
 >Мощный встроенный <link linkend="krviewer"
 >просмотрщик и редактор</link
-> через kparts поддерживает все доступные форматы файлов!</para>
+> через tdeparts поддерживает все доступные форматы файлов!</para>
           </listitem>
           <listitem>
                <para
@@ -353,7 +353,7 @@
              <para
 ><link linkend="archives"
 >Поддержка паролей</link
-> для: arj, ace, rar и zip. Пароли будут сохраняться в &kwallet;</para>
+> для: arj, ace, rar и zip. Пароли будут сохраняться в &tdewallet;</para>
           </listitem>
 
           <listitem>
diff --git a/doc/ru/index.docbook b/doc/ru/index.docbook
index 56b03c6..68d88b6 100644
--- a/doc/ru/index.docbook
+++ b/doc/ru/index.docbook
@@ -713,7 +713,7 @@ since the Entity Backspace is not defined in
 <!ENTITY keditbookmarks '<application
 >KeditBookmarks</application
 >'>
-<!ENTITY kwallet "<application
+<!ENTITY tdewallet "<application
 >Kwallet</application
 >">
 
diff --git a/doc/ru/using-krusader.docbook b/doc/ru/using-krusader.docbook
index d336b61..9048a59 100644
--- a/doc/ru/using-krusader.docbook
+++ b/doc/ru/using-krusader.docbook
@@ -446,7 +446,7 @@
 <title
 >Browsing Archives</title>
 <para
->The &vfs_lnk; allows to browse archives as it was a directory. &krusader; supports currently the following archives types: ace, arj, bzip2, deb, gzip, iso, lha, rar, rpm, tar, zip and 7-zip and supports the next passworded archives: arj, ace, rar and zip. Passwords can be stored in &kwallet;. Please note that the archive support first needs to be properly <link linkend="konfig-archives"
+>The &vfs_lnk; allows to browse archives as it was a directory. &krusader; supports currently the following archives types: ace, arj, bzip2, deb, gzip, iso, lha, rar, rpm, tar, zip and 7-zip and supports the next passworded archives: arj, ace, rar and zip. Passwords can be stored in &tdewallet;. Please note that the archive support first needs to be properly <link linkend="konfig-archives"
 >configured</link
 > in Konfigurator. To open the archive use &Enter;, (double-)click or the <keycap
 >Right Arrow</keycap