Update help handbook and screenshots

Replace missing icons in Settings configuration
Update *.desktop files
KDE => TDE changes

16 files changed, 219 insertions, 374 deletions

diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index a61b5ec..5e159db 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -1,97 +1,60 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kxmleditor "<application>KXML Editor</application>" >
   <!ENTITY kappname "&kxmleditor;">
-  <!ENTITY % English "INCLUDE" >
   <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE"> <!-- change language only here -->
 ]>
 
-<!-- ................................................................ -->
-
-<!-- The language must NOT be changed here. -->
-
 <book lang="&language;">
 
-<!-- This header contains all of the meta-information for the document such
-as Authors, publish date, the abstract, and Keywords -->
-
 <bookinfo>
 <title>The KXML Editor Handbook</title>
 
 <authorgroup>
+
 <author>
 <firstname>Lumir</firstname>
 <othername></othername>
 <surname>Vanek</surname>
-<affiliation>
-<address><email>lvanek@users.sourceforge.net</email></address>
-</affiliation>
 </author>
-</authorgroup>
+<author>&tde-authors;</author>
 
+</authorgroup>
 
 <copyright>
 <year>2004</year>
 <holder>Lumir Vanek</holder>
 </copyright>
-<!-- Translators: put here the copyright notice of the translation -->
-<!-- Put here the FDL notice.  Read the explanation in fdl-notice.docbook
-     and in the FDL itself on how to use it. -->
-<legalnotice>&FDLNotice;</legalnotice>
-
-<!-- Date and version information of the documentation
-Don't forget to include this last date and this last revision number, we
-need them for translation coordination !
-Please respect the format of the date (DD/MM/YYYY) and of the version
-(V.MM.LL), it could be used by automation scripts.
-Do NOT change these in the translation. -->
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
 
-<date>07/08/2004</date>
-<releaseinfo>1.11</releaseinfo>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<!-- Abstract about this handbook -->
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
 
 <abstract>
 <para>
 KXML Editor is an application for browsing and editing XML files.
 </para>
 
-<para>
-This document describes KXML Editor version 1.0.
-</para>
-
 </abstract>
 
-<!-- This is a set of Keywords for indexing by search engines.
-Please at least include KDE, the KDE package it is in, the name
- of your application, and a few relevant keywords. -->
-
 <keywordset>
-<keyword>KDE</keyword>
+<keyword>TDE</keyword>
 <keyword>KXML Editor</keyword>
+<keyword>XML Editor</keyword>
 </keywordset>
 
 </bookinfo>
 
-<!-- The contents of the documentation begin here.  Label
-each chapter so with the id attribute. This is necessary for two reasons: it
-allows you to easily reference the chapter from other chapters of your
-document, and if there is no ID, the name of the generated HTML files will vary
-from time to time making it hard to manage for maintainers and for the CVS
-system. Any chapter labelled (OPTIONAL) may be left out at the author's
-discretion. Other chapters should not be left out in order to maintain a
-consistent documentation style across all KDE apps. -->
-
-<!-- ***************************************************************************** -->
-<!--                                                                               -->
-<!--                             Fundamentals                                      -->
-<!--                                                                               -->
-<!-- ***************************************************************************** -->
-
 <chapter id="some-fundamentals">
 <title>Some Fundamentals</title>
 <para>
-Extensible Markup Language (XML) is wide standart for exchanging and
+Extensible Markup Language (XML) is wide standard for exchanging and
 transferring data in application development. XML stores character data
 in a structured way, using tags placed within the data representing its structure.
 An XML document has a tree structure, where "XML element" tags comprise the nodes.
@@ -118,39 +81,26 @@ You may obtain <ulink url="http://www.zvon.org">more informations</ulink>
 
 </chapter>
 
-<!-- ***************************************************************************** -->
-<!--                                                                               -->
-<!--                             Introduction                                      -->
-<!--                                                                               -->
-<!-- ***************************************************************************** -->
-
 <chapter id="introduction">
 <title>Introduction</title>
 
-<!-- The introduction chapter contains a brief introduction for the
-application that explains what it does and where to report
-problems. Basically a long version of the abstract.  Don't include a
-revision history. (see installation appendix comment) -->
-
 <para>
 KXML Editor is a program that lets you browse and edit XML files. Main window is divided
 to two windows.
 </para>
 
 <para>
-Left side contain tree widget with XML structure. XML document has tree structute, one (and only one)
-element is root. Every element may own one or more childs elements or contents items.
+Left side contain tree widget with XML structure. XML document has tree structure, one (and only one)
+element is root. Every element may own one or more child elements or contents items.
 </para>
 
 <para>
-Right side contain detail for selected item. If XML element is selectected in left side,
-attributes list and raw XML are displayied. If XML contents is selectected in left side, edit widget with full
-context is displayied.
+Right side contain detail for selected item. If XML element is selected in left side,
+attributes list and raw XML are displayed. If XML contents is selected in left side, edit
+widget with full context is displayed.
 </para>
 
 <para>
-<!-- Note that all graphics should be in .png format. Use no gifs because of
-patent issues. -->
 
 <screenshot>
 <screeninfo>Here's a screenshot of &kxmleditor;</screeninfo>
@@ -164,7 +114,7 @@ patent issues. -->
 </para>
 
 <para>
-KXML Editor contain two toolbars with buttons - one with standart commands and second with
+KXML Editor contain two toolbars with buttons - one with standard commands and second with
 commands for edit XML document. Third toolbar contain Konqueror-like path bar, that display
 path of selected XML item.
 </para>
@@ -178,12 +128,6 @@ The black icon at the left hand end of the Pathbar clears the text entry box.
 
 </chapter>
 
-<!-- ***************************************************************************** -->
-<!--                                                                               -->
-<!--                             Edit XML                                          -->
-<!--                                                                               -->
-<!-- ***************************************************************************** -->
-
 <chapter id="edit-xml">
 <title>Edit XML document</title>
 
@@ -217,7 +161,8 @@ hotkey.</para></listitem>
 
 <listitem><para>Then select item, where you can copy XML element.</para></listitem>
 
-<listitem><para><guiicon>Finally, use Paste</guiicon> button or the Menubar <menuchoice><guimenu>Edit</guimenu>
+<listitem><para><guiicon>Finally, use Paste</guiicon> button or the Menubar
+<menuchoice><guimenu>Edit</guimenu>
 <guimenuitem>Paste</guimenuitem></menuchoice> option or the <keycombo
 action="simul"><keycap>Ctrl</keycap><keycap>V</keycap></keycombo> hotkey.
 </para></listitem>
@@ -227,9 +172,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>V</keycap></keycombo> hotkey.
 <para>Moving a XML element or contents item can be done in the same
 way as copying, except that you choose the <guimenuitem>Cut</guimenuitem> option
 or <keycombo action="simul"><keycap>Ctrl</keycap><keycap>X</keycap></keycombo>
-instead of <guimenuitem>Copy</guimenuitem>. <!--The item that you have
-<guimenuitem>Cut</guimenuitem> will be removed from the original position when
-you do the <guimenuitem>Paste</guimenuitem> into the new directory. --> </para>
+instead of <guimenuitem>Copy</guimenuitem>.</para>
 
 <note><para>
 You can also exchange XML between &kxmleditor; and text editor using clipboard. Of course,
@@ -309,26 +252,11 @@ main window.
 </sect1>
 
 </chapter>
-<!-- ***************************************************************************** -->
-
-<!-- ***************************************************************************** -->
-<!--                                                                               -->
-<!--                             Menu Entries                                      -->
-<!--                                                                               -->
-<!-- ***************************************************************************** -->
-
-<!-- (OPTIONAL, BUT RECOMMENDED) This chapter should list all of the
-application windows and their menubar and toolbar commands for easy reference.
-Also include any keys that have a special function but have no equivalent in the
-menus or toolbars. This may not be necessary for small apps or apps with no tool
-or menu bars. -->
-
 
 <chapter id="the-menu-entries">
 <title>The Menu Entries</title>
 
-<!-- ******************************** File menu ********************************* -->
-<sect1 id="file">
+<sect1 id="file-menu">
 <title>The <guimenu>File</guimenu> Menu</title>
 <para><variablelist>
 
@@ -364,15 +292,15 @@ special processing instruction, you may choose XML version and encoding.
 </menuchoice></term>
 <listitem>
 <para>
-This command opens a file.  It does this by means of a dialog box
-which allows the user to navigate the file system.  The dialog operates
+This command opens a file. It does this by means of a dialog box
+which allows the user to navigate the file system. The dialog operates
 like a small file manager. Clicking on directories displayed in the
 central window directs the dialog to enter that directory - displaying its
-contents.  There is an entry/dropdown box which can be used to type in
+contents. There is an entry/dropdown box which can be used to type in
 directly the location and name of the file or by clicking the arrow at the
 side choose from a dropdown list of recently used locations. Below this is
 a filter which similarly may have data entered directly or chosen from a
-dropdown list of recent filter types.  The filter facility lets only files
+dropdown list of recent filter types. The filter facility lets only files
 that meet its specifications be displayed in the central window. If the
 filter contained text such as <literal role="extension">*.xml</literal> then only files
 with the txt extension would be visible in the selection window. Below the filter
@@ -388,7 +316,7 @@ with the two arrows curved in on each other updates the view of the current
 directory. The flag button lets the user set a new bookmark at the current directory
 or go to  one that was previously set. <!-- The button with the wrench (spanner) -->
 <!-- icon even permits the user to change a few basic settings for the dialog -->
-<!-- box.  --> The last button on the toolbar allows you to create a new
+<!-- box. --> The last button on the toolbar allows you to create a new
 directory, and finally  there is dropdown box with a list of some commonly
 frequented directories.
 </para>
@@ -416,9 +344,9 @@ still resides at the same location.
 <guimenuitem><accel>S</accel>ave</guimenuitem>
 </menuchoice></term>
 <listitem><para><action>
-This saves the current document. If there has already been a save of the document then this will overwrite the previously
-saved file without asking for the user's consent. If it is the first save of a new document the save as dialog
-(described below) will be invoked.
+This saves the current document. If there has already been a save of the document then this
+will overwrite the previously saved file without asking for the user's consent. If it is the
+first save of a new document the save as dialog (described below) will be invoked.
 </action></para></listitem>
 </varlistentry>
 
@@ -480,7 +408,7 @@ This allow to remove DTD schema file.
 <guimenuitem>Attach Stylesheet</guimenuitem>
 </menuchoice></term>
 <listitem><para>
-This allow to insert processing instruction for ataching schema (obviously .xsl or .xslt) file.
+This allow to insert processing instruction for attaching schema (obviously .xsl or .xslt) file.
 </para></listitem>
 </varlistentry>
 
@@ -490,7 +418,7 @@ This allow to insert processing instruction for ataching schema (obviously .xsl
 <guimenuitem>Detach Stylesheet</guimenuitem>
 </menuchoice></term>
 <listitem><para>
-This allow to remove processing instruction for ataching schema.
+This allow to remove processing instruction for attaching schema.
 </para></listitem>
 </varlistentry>
 
@@ -517,8 +445,7 @@ This allow print document.
 
 </sect1>
 
-<!-- ******************************** Edit menu ********************************* -->
-<sect1 id="edit">
+<sect1 id="edit-menu">
 <title>The <guimenu>Edit</guimenu> Menu</title>
 <para><variablelist>
 
@@ -552,12 +479,16 @@ This allow print document.
 </menuchoice></term>
 <listitem>
 <para>
-This will call a display box showing a list of the most recent actions on the left and another list of actions which have been 'undone' on the right.
-There are also three buttons at the right of the box labeled Undo, Redo, and Close.
-Clicking on the Undo button will cause the action at the top of the Undo list to be reversed which will place that particular action at the top of the Redo list.
-Likewise, clicking on the Redo button will reinstate the reversed action and move it back to the top of the Undo list. Clicking on an item below the top item in either
-list will select all the items from the top down to that point. A subsequent click on the corresponding button will cause all the selected actions to be undone or redone accordingly.
-This would be particularly useful when the user knows precisely the point to which she or he would like to proceed - making it unnecessary to go through a series of single undo or redo actions.
+This will call a display box showing a list of the most recent actions on the left and another
+list of actions which have been 'undone' on the right. There are also three buttons at the
+right of the box labeled Undo, Redo, and Close. Clicking on the Undo button will cause the action
+at the top of the Undo list to be reversed which will place that particular action at the top of
+the Redo list. Likewise, clicking on the Redo button will reinstate the reversed action and move
+it back to the top of the Undo list. Clicking on an item below the top item in either list will
+select all the items from the top down to that point. A subsequent click on the corresponding
+button will cause all the selected actions to be undone or redone accordingly. This would be
+particularly useful when the user knows precisely the point to which she or he would like to
+proceed, making it unnecessary to go through a series of single undo or redo actions.
 </para>
 </listitem>
 </varlistentry>
@@ -569,8 +500,8 @@ This would be particularly useful when the user knows precisely the point to whi
 <guimenuitem>C<accel>u</accel>t</guimenuitem>
 </menuchoice></term>
 <listitem>
-<para>This command deletes the current selection and places it on the clipboard.  The
-clipboard is a feature of KDE that works invisibly to provide a way to transfer data between
+<para>This command deletes the current selection and places it on the clipboard. The
+clipboard is a feature of &tde; that works invisibly to provide a way to transfer data between
 applications.</para>
 </listitem>
 </varlistentry>
@@ -582,7 +513,7 @@ applications.</para>
 <guimenuitem><accel>C</accel>opy</guimenuitem></menuchoice></term>
 <listitem>
 <para>This copies the currently selected text to the clipboard so that it may be
-pasted elsewhere.  The clipboard is a feature of KDE that works invisibly to
+pasted elsewhere. The clipboard is a feature of &tde; that works invisibly to
 provide a way to transfer data between applications.</para>
 </listitem>
 </varlistentry>
@@ -595,7 +526,7 @@ provide a way to transfer data between applications.</para>
 </menuchoice></term>
 <listitem>
 <para>This will insert the contents of the clipboard at the cursor position. The
-clipboard is feature of KDE that works invisibly to provide a way to transfer
+clipboard is feature of &tde; that works invisibly to provide a way to transfer
 data between applications.</para>
 </listitem>
 </varlistentry>
@@ -660,18 +591,10 @@ data between applications.</para>
 <listitem>
 <para>This opens the find dialog which is used to specify the <guilabel>Text to
 Find</guilabel> in the document. There is small text box for entering the search
-pattern. <!-- which also doubles as a dropdown box. Clicking on the dropdown arrow at
-the side of the box makes available other recent search patterns.--> Other
-parameters are included to make the search more efficient. Selecting
+pattern. Other parameters are included to make the search more efficient. Selecting
 <guilabel>Case Sensitive</guilabel> will limit finds to entries that match the
 case (upper or lower) of each of the characters in the search
-pattern. <!-- <guilabel>Find Backwards</guilabel> directs the search to proceed in an
-upwardly direction. The <guilabel>Selected Text</guilabel> option keeps the
-search within currently selected text. Checking <guilabel>Whole Words
-Only</guilabel> prevents the search from stopping on words that contain the
-searched for pattern. The <guilabel>Search from Cursor</guilabel> option begins
-the search from the current position of the cursor within the document rather
-than from the beginning. -->
+pattern.
 </para>
 </listitem>
 </varlistentry>
@@ -714,7 +637,7 @@ Display dialog which allows the user to edit selected element as raw XML.
 <screeninfo>Special processing instruction dialog</screeninfo>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="texteditor.png" format="PNG" />
+	    <imagedata fileref="textview.png" format="PNG" />
 	  </imageobject>
 	</mediaobject>
 </screenshot>
@@ -726,12 +649,10 @@ You may press Validate button for checking, if XML is well formed.
 </listitem>
 </varlistentry>
 
-
 </variablelist></para>
 </sect1>
 
-<!-- ******************************** View menu ********************************* -->
-<sect1 id="go">
+<sect1 id="view-menu">
 <title>The <guimenu>View</guimenu> Menu</title>
 <para><variablelist>
 
@@ -739,7 +660,7 @@ You may press Validate button for checking, if XML is well formed.
 <term><menuchoice>
 <shortcut><keycombo><keycap>Alt</keycap><keysym>Up Arrow</keysym></keycombo></shortcut>
 <guimenu><accel>V</accel>iew</guimenu>
-<guimenuitem>To <accel>P</accel> arent node</guimenuitem></menuchoice></term>
+<guimenuitem>To <accel>P</accel>arent node</guimenuitem></menuchoice></term>
 <listitem>
 <para>Go up a level in the tree hierarchy. Select parent node.</para> </listitem>
 </varlistentry>
@@ -755,8 +676,8 @@ You may press Validate button for checking, if XML is well formed.
 Expand selected XML element and show entire child subtree.
 </para>
 <para>
-Tip: You may expand node to choosed level. Press button for this function on toolbar,
-hold mouse pressed for small anmount of time. Program show menu, which allows the user to
+Tip: You may expand node to chosen level. Press button for this function on toolbar,
+hold mouse pressed for small amount of time. Program show menu, which allows the user to
 expand node to selected level.
 </para>
 </listitem>
@@ -773,8 +694,8 @@ expand node to selected level.
 Collapse selected XML element and hide entire child subtree.
 </para>
 <para>
-Tip: You may collapse node from choosed level. Press button for this function on toolbar,
-hold mouse pressed for small anmount of time. Program show menu, which allows the user to
+Tip: You may collapse node from chosen level. Press button for this function on toolbar,
+hold mouse pressed for small amount of time. Program show menu, which allows the user to
 collapse node from selected level.
 </para>
 </listitem>
@@ -783,8 +704,7 @@ collapse node from selected level.
 </variablelist></para>
 </sect1>
 
-<!-- ******************************** Insert menu ***************************** -->
-<sect1 id="xml">
+<sect1 id="insert-menu">
 <title>The <guimenu>Insert</guimenu> Menu</title>
 <para><variablelist>
 
@@ -799,7 +719,7 @@ collapse node from selected level.
 Insert new XML element into tree. Display dialog which allows the user to enter element name.
 If you have void document, new element becomes root. If you have selected any existing element,
 new element becomes child of this element. You may decide, if new element will be placed to
-begin or end of childs items list.
+begin or end of child items list.
 </para>
 </listitem>
 </varlistentry>
@@ -828,8 +748,8 @@ attribute list.
 <listitem>
 <para>
 Insert new XML text item into tree. Display dialog which allows the user to enter contents text.
-New item becomes child of celected XML element. You may decide, if new item will be
-placed to begin or end of childs items list.
+New item becomes child of selected XML element. You may decide, if new item will be
+placed to begin or end of child items list.
 </para>
 </listitem>
 </varlistentry>
@@ -843,8 +763,8 @@ placed to begin or end of childs items list.
 <listitem>
 <para>
 Insert new XML CDATA item into tree. Display dialog which allows the user to enter contents text.
-New item becomes child of celected XML element. You may decide, if new item will be
-placed to begin or end of childs items list.
+New item becomes child of selected XML element. You may decide, if new item will be
+placed to begin or end of child's items list.
 </para>
 </listitem>
 </varlistentry>
@@ -858,8 +778,8 @@ placed to begin or end of childs items list.
 <listitem>
 <para>
 Insert new XML comment item into tree. Display dialog which allows the user to enter contents text.
-New item becomes child of celected XML element. You may decide, if new item will be
-placed to begin or end of childs items list.
+New item becomes child of selected XML element. You may decide, if new item will be
+placed to begin or end of child's items list.
 </para>
 </listitem>
 </varlistentry>
@@ -882,9 +802,7 @@ the user to enter target and data.
 </variablelist></para>
 </sect1>
 
-<!-- ******************************** Bookmarks menu **************************** -->
-
-<sect1 id="bookmarks">
+<sect1 id="bookmarks-menu">
 <title>The <guimenu>Bookmarks</guimenu> Menu</title>
 <para><variablelist>
 
@@ -932,8 +850,45 @@ that are closed is skipped.
 </variablelist></para>
 </sect1>
 
-<!-- ******************************** Settings menu ****************************** -->
-<sect1 id="settings">
+<sect1 id="window-menu">
+<title>The <guimenu>Window</guimenu> Menu</title>
+<para><variablelist>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu><accel>C</accel>lose</guimenu>
+</menuchoice></term>
+<listitem>
+<para>
+Close the current document.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Close <accel>a</accel>ll</guimenu>
+</menuchoice></term>
+<listitem>
+<para>
+Close all documents.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Close all <accel>o</accel>thers</guimenu>
+</menuchoice></term>
+<listitem>
+<para>
+Close all documents except the current document.</para>
+</listitem>
+</varlistentry>
+
+</variablelist></para>
+
+</sect1>
+
+<sect1 id="settings-menu">
 <title>The <guimenu>Settings</guimenu> Menu</title>
 <para><variablelist>
 
@@ -956,32 +911,33 @@ initiate frequently used commands. When unchecked the toolbar is hidden.</para>
 </menuchoice></term>
 <listitem>
 <para>When checked, this displays a small bar at the bottom of the main window
-containing information about the status of the current document.  When unchecked
+containing information about the status of the current document. When unchecked
 the statusbar is hidden.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term><menuchoice>
-<guimenu><accel>S</accel>ettings</guimenu><guimenuitem>Configure S<accel>h</accel>ortcuts</guimenuitem></menuchoice></term>
+<guimenu><accel>S</accel>ettings</guimenu><guimenuitem>Configure
+S<accel>h</accel>ortcuts</guimenuitem></menuchoice></term>
 <listitem>
 <para>This command opens a dialog box whereby the  key bindings may be changed.
 A display window at
 the top of the dialog box shows the list of commands (actions) that can have
-keyboard shortcuts.  Below the display are three radio buttons.  The user may choose
-between No Key, Default Key, and Custom Key.  (Note that a set of radio buttons only
+keyboard shortcuts. Below the display are three radio buttons. The user may choose
+between No Key, Default Key, and Custom Key. (Note that a set of radio buttons only
 allows the selection of one of the offered items - in the way that buttons on a car
-radio only offer the selection of one preset station.  Also, the Default Key
+radio only offer the selection of one preset station. Also, the Default Key
 selection  is only available for those commands that actually have a 'default'
 shortcut.)  Selecting the Custom Key option activates the three check boxes and key
 button at the bottom of the dialog. The user may then select a key
 combination for the command in question by means of the check boxes and key
-button. For example, with the About KDE command selected in the display window,
+button. For example, with the About &tde; command selected in the display window,
 the user could select <keycap>Ctrl</keycap> and <keycap>Alt</keycap>, click on
-the key button, and then press the <keycap>K</keycap> key on the keyboard.  This
+the key button, and then press the <keycap>K</keycap> key on the keyboard. This
 would mean that anytime he or she held down the <keycap>Ctrl</keycap> and
 <keycap>Alt</keycap> buttons and pressed <keycap>K</keycap> (while using
-&kxmleditor;) the About KDE display box would be called. </para>
+&kxmleditor;) the About &tde; display box would be called. </para>
 </listitem>
 </varlistentry>
 
@@ -991,14 +947,14 @@ would mean that anytime he or she held down the <keycap>Ctrl</keycap> and
 <guimenuitem>Configure Tool<accel>b</accel>ars</guimenuitem>
 </menuchoice></term>
 <listitem><para>This will open the dialog whereby the toolbars configuration may
-be changed.   The user can choose which shortcut buttons should appear on the
+be changed.  The user can choose which shortcut buttons should appear on the
 toolbar. A display window on the left lists the commands available to placed
-on the toolbar.  A display on the right lists those commands already on the
-toolbar.  A set of four arrow buttons between the two displays manipulates the
-selections.  The right pointing arrow places any command selected in the left
+on the toolbar. A display on the right lists those commands already on the
+toolbar. A set of four arrow buttons between the two displays manipulates the
+selections. The right pointing arrow places any command selected in the left
 pane onto the right pane, <abbrev>i.e.</abbrev>, it is added to the toolbar.
 The left arrow does just the opposite, removing any action selected in the right
-window from the toolbar.  The up and down pointing arrows change the position of
+window from the toolbar. The up and down pointing arrows change the position of
 an action selected in the right window which changes the position of its button
 in the toolbar.</para> </listitem>
 </varlistentry>
@@ -1017,8 +973,7 @@ linkend="pref-dialog">settings</link> may be adjusted.</para>
 </variablelist></para>
 </sect1>
 
-<!-- ******************************** Help menu ********************************** -->
-<sect1 id="help">
+<sect1 id="help-menu">
 <title>The <guimenuitem>Help</guimenuitem> Menu</title>
 <para><variablelist>
 
@@ -1029,7 +984,7 @@ linkend="pref-dialog">settings</link> may be adjusted.</para>
 <guimenuitem><accel>C</accel>ontents</guimenuitem>
 </menuchoice></term>
 <listitem>
-<para>This invokes the KDE help system starting at the &kxmleditor; help pages (this document).
+<para>This invokes the &tde; help system starting at the &kxmleditor; help pages (this document).
 </para>
 </listitem>
 </varlistentry>
@@ -1057,8 +1012,8 @@ one exists for the particular item) explaining the item's function.
 <listitem>
 <para><action>
 This calls a dialog box to help
-the user help the KDE team to track down and solve any
-problems(bugs) in the program.  The dialog attempts to do this by
+the user help the &tde; team to track down and solve any
+problems(bugs) in the program. The dialog attempts to do this by
 means of email using the information given by the user.
 </action></para>
 </listitem>
@@ -1078,7 +1033,7 @@ means of email using the information given by the user.
 <term><menuchoice>
 <guimenu><accel>H</accel>elp</guimenu><guimenuitem>About <accel>K</accel>DE</guimenuitem></menuchoice></term>
 <listitem>
-<para>This displays the KDE version and other basic information.</para>
+<para>This displays the &tde; version and other basic information.</para>
 </listitem>
 </varlistentry>
 
@@ -1088,35 +1043,27 @@ means of email using the information given by the user.
 
 </chapter>
 
-<!-- ***************************************************************************** -->
-<!--                                                                               -->
-<!--                             Configuration                                     -->
-<!--                                                                               -->
-<!-- ***************************************************************************** -->
-
 <chapter id="pref-dialog">
 <title>Configure &kxmleditor;</title>
 
 <para>Selecting
 <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
 KXML Editor</guimenuitem></menuchoice> from the menu brings up the Configure-KXML Editor
-dialog box. This dialog can be used to alter <!-- a number of different --> application settings. <!-- The
-settings available for change vary according to which category the user chooses from
-a vertical list on the left side of the dialog. --> By means of four buttons
-along the bottom of the box the user can control the process.  She or he may invoke
-the <guilabel>Help</guilabel> system, accept the current settings pressing <guibutton>Apply</guibutton> button,
-accept the current settings and close the dialog by means of the <guibutton>OK</guibutton> button, or
-<guibutton>Cancel</guibutton> the process.
+dialog box. This dialog can be used to alter application settings. By means of four buttons
+along the bottom of the box the user can control the process. She or he may invoke
+the <guilabel>Help</guilabel> system, accept the current settings pressing <guibutton>Apply</guibutton>
+button, accept the current settings and close the dialog by means of the <guibutton>OK</guibutton>
+button, or <guibutton>Cancel</guibutton> the process.
 </para>
 
 <sect1 id="preftreeview">
-
 <title>Tree View</title>
+
 <para>This category deals with following properties detailed below.</para>
 
 <para>
 <screenshot>
-<screeninfo>TarGz Extensions</screeninfo>
+<screeninfo>Tree View</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="setuptreeview.png" format="PNG" />
@@ -1149,7 +1096,7 @@ Set the default expand level for tree view.
 <listitem>
 <para>
 Enables or disables drag &amp; drop. Disabling it may be useful, when X-Window client
-and server is not on the same machine and respond time is slow, that may cause unnecesary
+and server is not on the same machine and respond time is slow, that may cause unnecessary
 drag &amp; drop operation caused while selecting in tree view.
 </para></listitem>
 </varlistentry>
@@ -1167,20 +1114,67 @@ or Element, attributes names and its value.
 
 </sect1>
 
-<sect1 id="defaults">
+<sect1 id="preftextview">
+<title>Text View</title>
+
+<para>This category allows setting the text editor syntax highlighting.</para>
+
+<para>
+<screenshot>
+<screeninfo>Text View</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="setuptextview.png" format="PNG" />
+    </imageobject>
+  </mediaobject>
+</screenshot>
+</para>
+
+<para>
+<variablelist>
+
+<varlistentry>
+<term><guilabel>Syntax highlighting</guilabel></term>
+<listitem>
+<para>
+You may choose various colors for different XML syntax.
+</para></listitem>
+</varlistentry>
 
-<title>Defaults</title>
+<varlistentry>
+<term><guilabel>Element indentation</guilabel></term>
+<listitem>
+<para>
+Choose element indentation for raw XML editing. This indentation is used also for saving document.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Wrap, instead of Horizontal. Scroll bar</guilabel></term>
+<listitem>
+<para>
+Disable horizontal scrollbar and set word wrap ON for raw XML view and editing.
+</para></listitem>
+</varlistentry>
+
+</variablelist></para>
+
+</sect1>
+
+<sect1 id="prefnewfiles">
+
+<title>New Files</title>
 <para>This category allow set default XML version, encoding and program behavior
 while creating new document</para>
 
 <para>
 <screenshot>
-<screeninfo>Defaults</screeninfo>
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="setupdefaults.png" format="PNG" />
-	  </imageobject>
-	</mediaobject>
+<screeninfo>New Files</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="setupnewfiles.png" format="PNG" />
+    </imageobject>
+  </mediaobject>
 </screenshot>
 </para>
 
@@ -1211,22 +1205,21 @@ Behavior when creating new XML documents.
 </para></listitem>
 </varlistentry>
 
-
 </variablelist></para>
 
 </sect1>
 
-<sect1 id="printout">
+<sect1 id="prefprinting">
+<title>Printing</title>
 
-<title>Printout</title>
 <para>This category allow set parameters for printing XML document</para>
 
 <para>
 <screenshot>
-<screeninfo>Printout</screeninfo>
+<screeninfo>Printing</screeninfo>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="setupprintout.png" format="PNG" />
+	    <imagedata fileref="setupprinting.png" format="PNG" />
 	  </imageobject>
 	</mediaobject>
 </screenshot>
@@ -1252,10 +1245,10 @@ Choose font size for printing document.
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>Element intendation</guilabel></term>
+<term><guilabel>Element indentation</guilabel></term>
 <listitem>
 <para>
-Choose element intendation for printing document.
+Choose element indentation for printing document.
 </para></listitem>
 </varlistentry>
 
@@ -1279,20 +1272,19 @@ Choose if you can print footer when printing document.
 
 </sect1>
 
+<sect1 id="prefarchive">
+<title>Archive Extensions</title>
 
-<sect1 id="preftargz">
-
-<title>TarGz Extensions</title>
 <para>This category allow set list of XML files, that is TarGz archives.
 This allow open and save those files transparently. This may be useful
 for browsing KOffice files.</para>
 
 <para>
 <screenshot>
-<screeninfo>TarGz Extensions</screeninfo>
+<screeninfo>Archive Extensions</screeninfo>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="setuptargz.png" format="PNG" />
+	    <imagedata fileref="setuparchive.png" format="PNG" />
 	  </imageobject>
 	</mediaobject>
 </screenshot>
@@ -1305,55 +1297,8 @@ for browsing KOffice files.</para>
 <term><guilabel>Archive files extensions</guilabel></term>
 <listitem>
 <para>
-You may edit list of files extension using <guibutton>New</guibutton> and <guibutton>Delete</guibutton> buttons.
-Actually selected item may be changed using edit line.
-</para></listitem>
-</varlistentry>
-
-</variablelist></para>
-
-</sect1>
-
-<sect1 id="texteditor">
-
-<title>Text Editor</title>
-<para>This category allow set text edior syntax highlighting</para>
-
-<para>
-<screenshot>
-<screeninfo>Text Editor</screeninfo>
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="setuptexteditor.png" format="PNG" />
-	  </imageobject>
-	</mediaobject>
-</screenshot>
-</para>
-
-<para>
-<variablelist>
-
-<varlistentry>
-<term><guilabel>Syntax highlighting</guilabel></term>
-<listitem>
-<para>
-You may choose various colors for different XML syntax.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Element intendation</guilabel></term>
-<listitem>
-<para>
-Choose element intendation for raw XML editing. This intendation is used also for saving document.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Wrap, instead of Hrz. Scroll bar</guilabel></term>
-<listitem>
-<para>
-Disable horizontal srcrollbar and set word wrap ON for raw XML view and editing.
+You may edit list of files extension using <guibutton>New</guibutton> and <guibutton>Delete</guibutton>
+buttons. Actually selected item may be changed using edit line.
 </para></listitem>
 </varlistentry>
 
@@ -1363,23 +1308,8 @@ Disable horizontal srcrollbar and set word wrap ON for raw XML view and editing.
 
 </chapter>
 
-<!-- ***************************************************************************** -->
-<!--                                                                               -->
-<!--                          Credits and licences                                 -->
-<!--                                                                               -->
-<!-- ***************************************************************************** -->
-
-<!-- Include credits for the programmers, documentation writers, and
-contributors here. The license for your software should then be included below
-the credits with a reference to the appropriate license file included in the KDE
-distribution. -->
 <chapter id="credits">
 
-<!-- Include credits for the programmers, documentation writers, and
-contributors here. The license for your software should then be included below
-the credits with a reference to the appropriate license file included in the KDE
-distribution. -->
-
 <title>Credits and License</title>
 
 <para>
@@ -1409,94 +1339,10 @@ distribution. -->
 Documentation copyright 2003 Lumir Vanek <email>lvanek@users.sourceforge.net</email>
 </para>
 
-<!--
-<para>
-Translations done by:
-<itemizedlist>
-<listitem>
-<para>Babel D. Fish <email>babelfish@kde.org</email> (Sanskrit)</para>
-</listitem>
-</itemizedlist>
-</para>
--->
+&underFDL;
 
-&underFDL;               <!-- FDL: do not remove -->
-
-<!-- Determine which license your application is licensed under,
-     and delete all the remaining licenses below:
-
-     (NOTE:  All documentation are licensed under the FDL,
-     regardless of what license the application uses) -->
-
-&underGPL;        	 <!-- GPL License -->
+&underGPL;
 
 </chapter>
 
-<!-- ***************************************************************************** -->
-<!--                                                                               -->
-<!--                             Installation                                      -->
-<!--                                                                               -->
-<!-- ***************************************************************************** -->
-
-<appendix id="installation">
-<title>Installation</title>
-
-<sect1 id="getting-kxmleditor">
-<title>How to obtain KXML Editor</title>
-
-<para>
-You may obtain &kxmleditor; from URL:
-<ulink url="http://sourceforge.net/projects/kxmleditor">http://sourceforge.net/projects/kxmleditor</ulink>.
-</para>
-</sect1>
-
-<sect1 id="requirements">
-<title>Requirements</title>
-
-<!--
-List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in tdesupport,
-tdelibs, or tdebase.
-.Hardware requirements like amount of RAM, disk space, graphics card
-capabilities, screen resolution, special expansion cards, etc.
-.Operating systems the app will run on. If your app is designed only for a
-specific OS, (you wrote a graphical LILO configurator for example) put this
-information here.
--->
-
-<para>
-In order to successfully use &kxmleditor;, you need KDE 3.1.x or higher.
-For instructions on acquiring &kde; please see <ulink url="http://www.kde.org">http://www.kde.org</ulink>.
-</para>
-
-</sect1>
-
-<sect1 id="compilation">
-<title>Compilation and installation</title>
-
-<para>
-In order to compile and install &kxmleditor; on your system, type the following in the base
-directory:
-<screen width="40">
-<prompt>%</prompt> <userinput>./configure</userinput>
-<prompt>%</prompt> <userinput>make</userinput>
-<prompt>%</prompt> <userinput>make install</userinput>
-</screen>
-</para>
-
-<para>Since &kxmleditor; uses autoconf and automake you should have not trouble compiling it.
-Should you run into problems please report them to author.</para>
-
-</sect1>
-
-</appendix>
-
-&documentation.index;
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-End:
--->
diff --git a/doc/en/setuparchive.png b/doc/en/setuparchive.png
new file mode 100644
index 0000000..afccfe5
--- /dev/null
+++ b/doc/en/setuparchive.png
diff --git a/doc/en/setupdefaults.png b/doc/en/setupdefaults.png
deleted file mode 100644
index 59e1917..0000000
--- a/doc/en/setupdefaults.png
+++ /dev/null
diff --git a/doc/en/setupnewfiles.png b/doc/en/setupnewfiles.png
new file mode 100644
index 0000000..ea10d1f
--- /dev/null
+++ b/doc/en/setupnewfiles.png
diff --git a/doc/en/setupprinting.png b/doc/en/setupprinting.png
new file mode 100644
index 0000000..deb04ed
--- /dev/null
+++ b/doc/en/setupprinting.png
diff --git a/doc/en/setupprintout.png b/doc/en/setupprintout.png
deleted file mode 100644
index 0d4b083..0000000
--- a/doc/en/setupprintout.png
+++ /dev/null
diff --git a/doc/en/setuptargz.png b/doc/en/setuptargz.png
deleted file mode 100644
index 623c817..0000000
--- a/doc/en/setuptargz.png
+++ /dev/null
diff --git a/doc/en/setuptexteditor.png b/doc/en/setuptexteditor.png
deleted file mode 100644
index 8e26888..0000000
--- a/doc/en/setuptexteditor.png
+++ /dev/null
diff --git a/doc/en/setuptextview.png b/doc/en/setuptextview.png
new file mode 100644
index 0000000..bd29ea8
--- /dev/null
+++ b/doc/en/setuptextview.png
diff --git a/doc/en/setuptreeview.png b/doc/en/setuptreeview.png
index ce50d83..7756fb1 100644
--- a/doc/en/setuptreeview.png
+++ b/doc/en/setuptreeview.png
diff --git a/kxmleditor.lsm b/kxmleditor.lsm
index bef9475..ab4f514 100644
--- a/kxmleditor.lsm
+++ b/kxmleditor.lsm
@@ -1,14 +1,14 @@
 Begin3
 Title:          KXMLEditor 
-Version:        0.7
-Entered-date:   
-Description:    XML files editor for KDE
-Keywords:       KDE, XML
-Author:					Lumir Vanek, Olaf Hartig, Mateusz Korniak
+Version:        1.1.4
+Entered-date:   2004-12-12
+Description:    XML file editor for TDE
+Keywords:       TDE, XML
+Author:         Lumir Vanek, Olaf Hartig, Mateusz Korniak
 Maintained-by:  Lumir Vanek <lvanek@eanet.cz> 
-Primary-site:   http://kxmleditor.sourceforge.net	
+Primary-site:   http://kxmleditor.sourceforge.net
 Home-page:      http://kxmleditor.sourceforge.net
-Original-site:  
+Original-site:
 Platforms:      Linux and other Unices
 Copying-policy: GNU Public License
 End
diff --git a/kxmleditor.spec b/kxmleditor.spec
index b89b00a..fe28578 100644
--- a/kxmleditor.spec
+++ b/kxmleditor.spec
@@ -1,4 +1,4 @@
-Summary:   KXML Editor for KDE 3.x
+Summary:   KXML Editor for TDE
 Name:      kxmleditor
 Version:   1.1.4
 Release:   0.1
@@ -11,7 +11,7 @@ Source:    kxmleditor-1.1.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-buildroot
 
 %description
-XML Editor for KDE.
+XML Editor for TDE.
 
 %prep
 %setup
diff --git a/kxmleditor/kxmleditor.desktop b/kxmleditor/kxmleditor.desktop
index ed28f4d..60c8704 100644
--- a/kxmleditor/kxmleditor.desktop
+++ b/kxmleditor/kxmleditor.desktop
@@ -1,12 +1,13 @@
 [Desktop Entry]
 Type=Application
 Exec=kxmleditor -caption "%c" %i %m  
-Icon=kxmleditor.png
+Icon=kxmleditor
 X-DocPath=kxmleditor/index.html
 Comment=XML editor
 Comment[fi]=XML-editori
 Terminal=false
 Name=KXML Editor
+GenericName=XML Text Editor
 MimeType=text/xml;
 Encoding=UTF-8
-Categories=Application;Development;TextEditor;TDE;
+Categories=Qt;TDE;Development;
diff --git a/part/kxenewfilesettings.cpp b/part/kxenewfilesettings.cpp
index cdf78fa..c23d4b4 100644
--- a/part/kxenewfilesettings.cpp
+++ b/part/kxenewfilesettings.cpp
@@ -76,7 +76,7 @@ TQString KXENewFileSettings::dialogPageHeader() const
 
 TQString KXENewFileSettings::dialogPageIcon() const
 {
-	return "files";
+	return "document-new";
 }
 
 
diff --git a/part/kxeprintsettings.cpp b/part/kxeprintsettings.cpp
index b09f280..f04b965 100644
--- a/part/kxeprintsettings.cpp
+++ b/part/kxeprintsettings.cpp
@@ -85,7 +85,7 @@ TQString KXEPrintSettings::dialogPageHeader() const
 
 TQString KXEPrintSettings::dialogPageIcon() const
 {
-	return "printer2";
+	return "printer";
 }
 
 TQWidget * KXEPrintSettings::dialogPage( TQFrame * pParent )
diff --git a/part/kxmleditorpart.desktop b/part/kxmleditorpart.desktop
index cc2f569..f97f368 100644
--- a/part/kxmleditorpart.desktop
+++ b/part/kxmleditorpart.desktop
@@ -1,4 +1,3 @@
-# KDE Config File
 [Desktop Entry]
 Name=KXMLEditorPart
 Name[de]=KXMLEditor-Objekt
@@ -6,6 +5,5 @@ MimeType=text/xml;
 X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-TDE-Library=libkxmleditorpart
 Type=Service
-Icon=kxmleditor.png
-MiniIcon=kxmleditor.png
-# DocPath=kxmleditor/index.html
+Icon=kxmleditor
+MiniIcon=kxmleditor