Add new help handbooks, delete obsolete handbooks, fix DocPath in *.desktop files, minor handbook housekeeping.

34 files changed, 833 insertions, 419 deletions

diff --git a/applnk/compat/passwords.desktop b/applnk/compat/passwords.desktop
index ab260c718..aaf4d602e 100644
--- a/applnk/compat/passwords.desktop
+++ b/applnk/compat/passwords.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=tdecmshell kcm_useraccount
 Icon=password
-DocPath=kcontrol/passwords/index.html
+DocPath=kcontrol/useraccount/index.html
 NoDisplay=true
 X-TDE-ModuleType=Library
 X-TDE-Library=useraccount
diff --git a/applnk/compat/userinfo.desktop b/applnk/compat/userinfo.desktop
index c20a0c80e..cb1fc2fb3 100644
--- a/applnk/compat/userinfo.desktop
+++ b/applnk/compat/userinfo.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=tdecmshell kcm_useraccount
 Icon=tdmconfig
-DocPath=kcontrol/userinfo/index.html
+DocPath=kcontrol/useraccount/index.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=useraccount
diff --git a/doc/kcontrol/display/index.docbook b/doc/kcontrol/display/index.docbook
index 633ca5379..d51b44dc3 100644
--- a/doc/kcontrol/display/index.docbook
+++ b/doc/kcontrol/display/index.docbook
@@ -56,5 +56,4 @@ Submitting a basic text file is acceptable as the &tde-team; will convert the te
 
 </sect1>
 
-&documentation.index; 
 </article>
diff --git a/doc/kcontrol/displayconfig/index.docbook b/doc/kcontrol/displayconfig/index.docbook
index f702155e0..cc14aba53 100644
--- a/doc/kcontrol/displayconfig/index.docbook
+++ b/doc/kcontrol/displayconfig/index.docbook
@@ -56,5 +56,4 @@ Submitting a basic text file is acceptable as the &tde-team; will convert the te
 
 </sect1>
 
-&documentation.index; 
 </article>
diff --git a/doc/kcontrol/email/CMakeLists.txt b/doc/kcontrol/dnssd/CMakeLists.txt
index 0fc308755..8b04b8f65 100644
--- a/doc/kcontrol/email/CMakeLists.txt
+++ b/doc/kcontrol/dnssd/CMakeLists.txt
@@ -1,12 +1,9 @@
 #################################################
 #
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
 #  Improvements and feedback are welcome
 #
 #  This file is released under GPL >= 2
 #
 #################################################
 
-tde_create_handbook( DESTINATION kcontrol/email )
+tde_create_handbook( DESTINATION kcontrol/dnssd )
diff --git a/doc/kcontrol/dnssd/Makefile.am b/doc/kcontrol/dnssd/Makefile.am
new file mode 100644
index 000000000..416915575
--- /dev/null
+++ b/doc/kcontrol/dnssd/Makefile.am
@@ -0,0 +1,3 @@
+KDE_LANG = en
+KDE_DOCS = AUTO
+
diff --git a/doc/kcontrol/dnssd/index.docbook b/doc/kcontrol/dnssd/index.docbook
new file mode 100644
index 000000000..7b26cc442
--- /dev/null
+++ b/doc/kcontrol/dnssd/index.docbook
@@ -0,0 +1,62 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<!-- Note: When updating this empty handbook, remember that usually most handbooks -->
+<!-- use the book model rather than article. Feel free to use article if the new handbook -->
+<!-- remains really short. -->
+
+<article lang="&language;">
+<title>Zeroconf Service Discovery</title>
+
+<articleinfo>
+
+<authorgroup>
+<corpauthor>&tde-team;</corpauthor>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<abstract>
+<para>
+This handbook describes the Zeroconf Service Discovery module.
+</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>Zeroconf</keyword>
+<keyword>dnssd</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="apologies">
+<title>We Apologize</title>
+<para>No documentation has yet been written for this module.</para>
+
+<para>If you need help, please check <ulink url="http://www.trinitydesktop.org">The &tde;
+web site</ulink>, submit questions to the <ulink url="http://www.trinitydesktop.org/mailinglist.php">
+&tde; mail lists</ulink>, or file a bug report at the <ulink url="http://bugs.trinitydesktop.org/">
+&tde; bug tracker</ulink>.</para>
+
+<para>If you are interested in helping, please consider writing the help file.
+Submitting a basic text file is acceptable as the &tde-team; will convert the text.</para>
+
+<para>Thank you for helping and thank you for your patience.</para>
+
+&underFDL;
+
+</sect1>
+
+&documentation.index; 
+</article>
diff --git a/doc/kcontrol/email/Makefile.am b/doc/kcontrol/email/Makefile.am
deleted file mode 100644
index 137c9a103..000000000
--- a/doc/kcontrol/email/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = en
-KDE_DOCS = kcontrol/email
diff --git a/doc/kcontrol/email/index.docbook b/doc/kcontrol/email/index.docbook
deleted file mode 100644
index 4c65c71b6..000000000
--- a/doc/kcontrol/email/index.docbook
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
-<!ENTITY % addindex "IGNORE">
-<!ENTITY % English "INCLUDE" > <!-- change language only here -->
-]>
-
-<article lang="&language;">
-<articleinfo>
-
-<authorgroup>
-<author>&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
-<author>&Jost.Schenck; &Jost.Schenck.mail;</author>
-<author>&Mike.McBride; &Mike.McBride.mail;</author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-
-<date>2002-09-01</date>
-<releaseinfo>3.1.00</releaseinfo>
-
-<keywordset>
-<keyword>KDE</keyword>
-<keyword>KControl</keyword>
-<keyword>email</keyword>
-<keyword>e-mail</keyword>
-</keywordset>
-
-</articleinfo>
-<sect1 id="e-mail">
-<title>Email</title>
-
-
-<sect2 id="email-intro">
-<title>Introduction</title>
-
-<para>The email module of the &kcontrol; allows you to enter and save some
-basic email information. This information is used when performing functions
-related to email within &tde;, for example, when sending bug reports from the
-&tde; crash handler application.</para>
-
-<para>Programs such as &kmail;, which are used for reading and sending
-email, may offer many more options for customizing the way in which
-email is handled. These options depend upon the specific program being
-used.  &kmail;, for instance, offers its own configuration
-facilities.</para>
-
-<para>Some of the information needed for configuring email should have
-been provided by your internet service provider
-(<acronym>ISP</acronym>). If you are connected to a local network, then
-the system administrator of your network should be able to help
-you.</para>
-
-</sect2>
-
-<sect2 id="email-use">
-<title>Use</title>
-
-<para>&tde; automatically establishes some of the information for this control module 
-using the
-login information on the system. You will need to enter the remaining information.</para>
-<para>Looking at the page from top to
-bottom, the options are:</para>
-
-<variablelist>
-<varlistentry>
-<term><guilabel>Full name</guilabel></term>
-<listitem><para>Type your full name as you would like it to appear in the email
-messages that you send.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Organization</guilabel></term>
-<listitem><para>If you work for a company or
-organization, you can enter its name in this text box.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Email address</guilabel></term>
-<listitem><para>To be able to use email, you must enter your email
-address here.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Reply-to address</guilabel></term>
-<listitem><para>If replies to your email messages should be sent to a different
-address, you can enter that address in this text box.</para></listitem>
-</varlistentry>
-</variablelist>
-</sect2>
-
-</sect1>
-
-</article>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-indent-step:0
-sgml-indent-data:nil
-sgml-parent-document:index.docbook
-End:
--->
-
diff --git a/doc/kcontrol/iccconfig/index.docbook b/doc/kcontrol/iccconfig/index.docbook
index 4f90cc4ba..4b1ff59d0 100644
--- a/doc/kcontrol/iccconfig/index.docbook
+++ b/doc/kcontrol/iccconfig/index.docbook
@@ -56,5 +56,4 @@ Submitting a basic text file is acceptable as the &tde-team; will convert the te
 
 </sect1>
 
-&documentation.index; 
 </article>
diff --git a/doc/kcontrol/passwords/CMakeLists.txt b/doc/kcontrol/khotkeys/CMakeLists.txt
index ffcedb07a..794c8b9ca 100644
--- a/doc/kcontrol/passwords/CMakeLists.txt
+++ b/doc/kcontrol/khotkeys/CMakeLists.txt
@@ -1,12 +1,9 @@
 #################################################
 #
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
 #  Improvements and feedback are welcome
 #
 #  This file is released under GPL >= 2
 #
 #################################################
 
-tde_create_handbook( DESTINATION kcontrol/passwords )
+tde_create_handbook( DESTINATION kcontrol/khotkeys )
diff --git a/doc/kcontrol/khotkeys/Makefile.am b/doc/kcontrol/khotkeys/Makefile.am
new file mode 100644
index 000000000..416915575
--- /dev/null
+++ b/doc/kcontrol/khotkeys/Makefile.am
@@ -0,0 +1,3 @@
+KDE_LANG = en
+KDE_DOCS = AUTO
+
diff --git a/doc/kcontrol/khotkeys/index.docbook b/doc/kcontrol/khotkeys/index.docbook
new file mode 100644
index 000000000..709fac04b
--- /dev/null
+++ b/doc/kcontrol/khotkeys/index.docbook
@@ -0,0 +1,61 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<!-- Note: When updating this empty handbook, remember that usually most handbooks -->
+<!-- use the book model rather than article. Feel free to use article if the new handbook -->
+<!-- remains really short. -->
+
+<article lang="&language;">
+<title>Input Actions</title>
+
+<articleinfo>
+
+<authorgroup>
+<corpauthor>&tde-team;</corpauthor>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<abstract>
+<para>
+This handbook describes the Input Actions module.
+</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>storage</keyword>
+<keyword>media</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="apologies">
+<title>We Apologize</title>
+<para>No documentation has yet been written for this module.</para>
+
+<para>If you need help, please check <ulink url="http://www.trinitydesktop.org">The &tde;
+web site</ulink>, submit questions to the <ulink url="http://www.trinitydesktop.org/mailinglist.php">
+&tde; mail lists</ulink>, or file a bug report at the <ulink url="http://bugs.trinitydesktop.org/">
+&tde; bug tracker</ulink>.</para>
+
+<para>If you are interested in helping, please consider writing the help file.
+Submitting a basic text file is acceptable as the &tde-team; will convert the text.</para>
+
+<para>Thank you for helping and thank you for your patience.</para>
+
+&underFDL;
+
+</sect1>
+
+</article>
diff --git a/doc/kcontrol/media/CMakeLists.txt b/doc/kcontrol/media/CMakeLists.txt
new file mode 100644
index 000000000..c74597dd6
--- /dev/null
+++ b/doc/kcontrol/media/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/media )
diff --git a/doc/kcontrol/media/Makefile.am b/doc/kcontrol/media/Makefile.am
new file mode 100644
index 000000000..416915575
--- /dev/null
+++ b/doc/kcontrol/media/Makefile.am
@@ -0,0 +1,3 @@
+KDE_LANG = en
+KDE_DOCS = AUTO
+
diff --git a/doc/kcontrol/media/index.docbook b/doc/kcontrol/media/index.docbook
new file mode 100644
index 000000000..67082b508
--- /dev/null
+++ b/doc/kcontrol/media/index.docbook
@@ -0,0 +1,61 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<!-- Note: When updating this empty handbook, remember that usually most handbooks -->
+<!-- use the book model rather than article. Feel free to use article if the new handbook -->
+<!-- remains really short. -->
+
+<article lang="&language;">
+<title>Storage Media</title>
+
+<articleinfo>
+
+<authorgroup>
+<corpauthor>&tde-team;</corpauthor>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<abstract>
+<para>
+This handbook describes the Storage Media module.
+</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>storage</keyword>
+<keyword>media</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="apologies">
+<title>We Apologize</title>
+<para>No documentation has yet been written for this module.</para>
+
+<para>If you need help, please check <ulink url="http://www.trinitydesktop.org">The &tde;
+web site</ulink>, submit questions to the <ulink url="http://www.trinitydesktop.org/mailinglist.php">
+&tde; mail lists</ulink>, or file a bug report at the <ulink url="http://bugs.trinitydesktop.org/">
+&tde; bug tracker</ulink>.</para>
+
+<para>If you are interested in helping, please consider writing the help file.
+Submitting a basic text file is acceptable as the &tde-team; will convert the text.</para>
+
+<para>Thank you for helping and thank you for your patience.</para>
+
+&underFDL;
+
+</sect1>
+
+</article>
diff --git a/doc/kcontrol/passwords/Makefile.am b/doc/kcontrol/passwords/Makefile.am
deleted file mode 100644
index 6c8d0b013..000000000
--- a/doc/kcontrol/passwords/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = en
-KDE_DOCS = kcontrol/passwords
diff --git a/doc/kcontrol/passwords/index.docbook b/doc/kcontrol/passwords/index.docbook
deleted file mode 100644
index b2be11f36..000000000
--- a/doc/kcontrol/passwords/index.docbook
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
-<!ENTITY % addindex "IGNORE">
-<!ENTITY % English "INCLUDE" > <!-- change language only here -->
-]>
-
-<article lang="&language;">
-<articleinfo>
-
-<authorgroup>
-<author>&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-
-<date>2003-10-16</date>
-<releaseinfo>3.2</releaseinfo>
-
-<keywordset>
-<keyword>KDE</keyword>
-<keyword>KControl</keyword>
-<keyword>password</keyword>
-</keywordset>
-
-</articleinfo>
-<sect1 id="passwords">
-
-<title>Passwords</title>
-
-<sect2 id="passwords-intro">
-<title>Introduction</title>
-
-<para>This module of the &kcontrol; gives you options for configuring the way in
-which the &tdesu; program treats passwords. &tdesu; will ask you for a password
-when you try to carry out some privileged actions, such as changing the
-date/time stored in your system clock, or adding new users on your
-computer.</para>
-
-<para>Privileged actions such as those described above can only be
-carried out by <systemitem class="username">root</systemitem> or a
-user with administrator permissions on your system. You will need to
-enter the password for the root account when you want to carry out
-such actions.</para>
-
-<important><para>The options in this module do not affect the behavior of
-passwords in other programs such as &kmail;.</para>
-</important>
-
-</sect2>
-
-<sect2 id="passwords-use">
-<title>Use</title>
-
-<para>There are two configuration options for passwords. The first is
-to control the visual feedback that you receive when you type a
-password. The actual characters in the password are never shown on the
-screen. You can choose to have each character represented by a
-<token>*</token> character. If you want to make it harder for someone
-who might be watching your screen to figure out how many characters
-there are in the password, you can choose to have each character in
-the password be represented by three asterisks rather than just
-one. Still another option is not to have any visual feedback at all,
-so nothing appears on the screen when you type a password.</para>
-
-<para>If you work in a reasonably secure environment, you can check
-the option labeled <guilabel>Remember Passwords</guilabel>, and then
-choose a time period in minutes using the spinner labeled
-<guilabel>Timeout</guilabel>. (You can either type a number between 5
-and 1200 minutes, or use the arrows on the spinner.)</para>
-
-<para>If the <guilabel>Remember passwords</guilabel> option has been selected,
-<application>tdesu</application> will not ask you for a password for the length
-of time specified, after you have given the password once. Keep in mind,
-however, that this makes your workstation less secure.</para>
-
-<important><para>You should avoid selecting the <guilabel>Remember
-passwords</guilabel> option if you are working in an insecure area, such as a
-publicly accessible workstation. Also, note that choosing a shorter timeout may
-be better if you are in a less secure environment.</para></important>
-
-</sect2>
-
-</sect1>
-</article>
\ No newline at end of file
diff --git a/doc/kcontrol/privacy/CMakeLists.txt b/doc/kcontrol/privacy/CMakeLists.txt
new file mode 100644
index 000000000..69d26f8a7
--- /dev/null
+++ b/doc/kcontrol/privacy/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/privacy )
diff --git a/doc/kcontrol/privacy/Makefile.am b/doc/kcontrol/privacy/Makefile.am
new file mode 100644
index 000000000..416915575
--- /dev/null
+++ b/doc/kcontrol/privacy/Makefile.am
@@ -0,0 +1,3 @@
+KDE_LANG = en
+KDE_DOCS = AUTO
+
diff --git a/doc/kcontrol/privacy/index.docbook b/doc/kcontrol/privacy/index.docbook
new file mode 100644
index 000000000..fa3bcd5ce
--- /dev/null
+++ b/doc/kcontrol/privacy/index.docbook
@@ -0,0 +1,57 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<article lang="&language;">
+<title>Privacy</title>
+
+<articleinfo>
+
+<authorgroup>
+<corpauthor>&tde-team;</corpauthor>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<abstract>
+<para>
+This handbook describes the Privacy module.
+</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>privacy</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="privacy-settings">
+<title>Privacy Settings</title>
+
+<para>This module provides a quick way to delete files in your &tde; profile directory to
+protect your privacy.</para>
+
+<para>Various file locations are listed that contain data related to your privacy. Each item
+can be selected individually. All items can be selected using the <guilabel>Select All</guilabel>
+button or none with the <guilabel>Select None</guilabel> button.</para>
+
+<para>After selecting the desired file locations, select the <guilabel>Clean Up</guilabel> button
+To clean or scrub the contents of the affected files.</para>
+
+<para>The selection preferences can be saved by selecting the <guilabel>Apply</guilabel> button.</para>
+
+&underFDL;
+
+</sect1>
+
+</article>
diff --git a/doc/kcontrol/useraccount/CMakeLists.txt b/doc/kcontrol/useraccount/CMakeLists.txt
new file mode 100644
index 000000000..c05285927
--- /dev/null
+++ b/doc/kcontrol/useraccount/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/useraccount )
diff --git a/doc/kcontrol/useraccount/Makefile.am b/doc/kcontrol/useraccount/Makefile.am
new file mode 100644
index 000000000..416915575
--- /dev/null
+++ b/doc/kcontrol/useraccount/Makefile.am
@@ -0,0 +1,3 @@
+KDE_LANG = en
+KDE_DOCS = AUTO
+
diff --git a/doc/kcontrol/useraccount/index.docbook b/doc/kcontrol/useraccount/index.docbook
new file mode 100644
index 000000000..4b8c66d0f
--- /dev/null
+++ b/doc/kcontrol/useraccount/index.docbook
@@ -0,0 +1,180 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<article lang="&language;">
+<title>Password &amp; User Account</title>
+
+<articleinfo>
+<authorgroup>
+<author>
+<firstname>Michael</firstname>
+<surname>Anderson</surname>
+</author>
+<author>
+<firstname>Anne-Marie</firstname>
+<surname>Mahfouf</surname>
+</author>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<copyright>
+<year>2010</year>
+<holder>Michael Anderson</holder>
+<holder>Anne-Marie Mahfouf</holder>
+</copyright>
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<abstract>
+<para>
+This handbook describes the Password &amp; User Account module.
+</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>System Settings</keyword>
+<keyword>kcontrol</keyword>
+<keyword>user</keyword>
+<keyword>account</keyword>
+<keyword>password</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="useraccount">
+<title>User Information</title>
+<sect2 id="intro">
+<title>Introduction</title>
+
+<para>
+<screenshot>
+<screeninfo>Screenshot of the User Account Manager</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="useraccount.png" format="PNG"/>
+    </imageobject>
+     <textobject>
+      <phrase>The User Account Manager</phrase>
+    </textobject>
+  </mediaobject>
+</screenshot>
+</para>
+
+<para>This is a module to enter user information and configure basic user settings such as
+the password and icon. This information and these settings will be used by various &tde;
+applications (mail programs and word processors for example) when they are completed. You can:</para>
+
+<itemizedlist>
+<listitem><para>change your user icon</para></listitem>
+<listitem><para>change your user login password</para></listitem>
+<listitem><para>add personal information</para></listitem>
+<listitem><para>configure the password prompt</para></listitem>
+</itemizedlist>
+
+</sect2>
+
+<sect2 id="icons">
+<title>User Icon and Password</title>
+
+<variablelist>
+<varlistentry><term>User Icon</term>
+<listitem>
+<para>
+This icon is used when the user logs in using a login manager. When your administrator
+has configured the login manager to allow this option, selecting the button allows you
+to change the image, either by using a pre-installed icons or selecting one of your own images.
+Select the <guibutton>Apply</guibutton> to make the changes permanent.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2 id="user-info">
+<title>User Information</title>
+
+<variablelist>
+<varlistentry><term><guilabel>Name:</guilabel></term>
+<listitem>
+<para>
+Enter here the name of the user.
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry><term><guilabel>Organization</guilabel></term>
+<listitem>
+<para>
+Add a business or group name the user would like to be associated with.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry><term><guilabel>Email address:</guilabel></term>
+<listitem>
+<para>
+Enter here an email address that will be associated with this user. 
+</para>
+</listitem>
+</varlistentry>
+<varlistentry><term><guilabel>SMTP server:</guilabel></term>
+<listitem>
+<para>
+Indicate here a local smtp server for sending mail within a network.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry><term><guilabel>User ID</guilabel></term>
+<listitem>
+<para>
+This is an information only, providing you the User ID assigned to you. This number is
+defined in <filename>/etc/passwd</filename> and was defined when your user account was created.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2 id="password">
+<title>At Password Prompt</title>
+
+<para>
+This section allows you to choose how you want to input your password when prompted.
+The default is to have one bullet appear for each letter typed. That can be changed
+to three bullets for each letter, which making guessing the length of the password
+more difficult letters when somebody else is watching. Even more secure is to display
+nothing while typing the password.
+</para>
+
+</sect2>
+
+<sect2 id="change-password">
+<title>Change Password</title>
+
+<variablelist>
+<varlistentry><term><guibutton>Change password...</guibutton></term>
+<listitem>
+<para>
+Selecting this button displays a dialog to change your user password. Your user password
+is the one you log in your system. You will be asked for your current password then twice
+for your new password.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+</sect1>
+</article>
diff --git a/doc/kcontrol/useraccount/useraccount.png b/doc/kcontrol/useraccount/useraccount.png
new file mode 100644
index 000000000..812313f27
--- /dev/null
+++ b/doc/kcontrol/useraccount/useraccount.png
diff --git a/doc/kdcop/index.docbook b/doc/kdcop/index.docbook
index 31c237c0a..9926fe022 100644
--- a/doc/kdcop/index.docbook
+++ b/doc/kdcop/index.docbook
@@ -60,5 +60,4 @@ Submitting a basic text file is acceptable as the &tde-team; will convert the te
 
 </sect1>
 
-&documentation.index; 
 </article>
diff --git a/doc/tdedebugdialog/index.docbook b/doc/tdedebugdialog/index.docbook
index e23d599af..d0682bf23 100644
--- a/doc/tdedebugdialog/index.docbook
+++ b/doc/tdedebugdialog/index.docbook
@@ -120,15 +120,4 @@ ones are restored.</para>
 
 </chapter>
 
-&documentation.index; 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-general-insert-case: lower
-sgml-shorttag: t
-End:
--->
-
-
diff --git a/doc/tdeprintfax/index.docbook b/doc/tdeprintfax/index.docbook
index 438dd4beb..a9134d6fa 100644
--- a/doc/tdeprintfax/index.docbook
+++ b/doc/tdeprintfax/index.docbook
@@ -60,5 +60,4 @@ Submitting a basic text file is acceptable as the &tde-team; will convert the te
 
 </sect1>
 
-&documentation.index; 
 </article>
diff --git a/kcontrol/dnssd/kcm_tdednssd.desktop b/kcontrol/dnssd/kcm_tdednssd.desktop
index 371c8cea3..178b844d2 100644
--- a/kcontrol/dnssd/kcm_tdednssd.desktop
+++ b/kcontrol/dnssd/kcm_tdednssd.desktop
@@ -1,77 +1,23 @@
 [Desktop Entry]
-Comment=Configure service discovery
-Comment[af]=Stel dienste ontdekker op
-Comment[ar]=إعداد إكتشاف الخدمات
-Comment[be]=Настаўленні пошуку сервісаў
-Comment[bg]=Настройване откриването на услуги
-Comment[bn]=সার্ভিস উদ্ঘাটন কনফিগার করুন
-Comment[bs]=Podesite otkrivanje servisa
-Comment[ca]=Configura el descobriment de serveis
-Comment[cs]=Nastavení hledání služeb
-Comment[csb]=Kòfigùracëjô wëkrëwaniô ùsłëżnotów
-Comment[da]=Indstil opdagelse af tjeneste
-Comment[de]=Diensteerkennung einrichten
-Comment[el]=Ρύθμιση εύρεσης υπηρεσιών
-Comment[eo]=Agordu servo-seĉadon
-Comment[es]=Configura el buscador de servicios
-Comment[et]=Teenuste tuvastamise seadistamine
-Comment[eu]=Konfiguratu igartze zerbitzua
-Comment[fa]=پیکربندی کشف خدمت
-Comment[fi]=Asetuspalvelimen löytäminen
-Comment[fr]=Configuration de la découverte de service
-Comment[fy]=Tsjinst waarnimming ynstellen
-Comment[ga]=Cumraigh fionnachtain seirbhísí
-Comment[gl]=Configurar o descubremento de servizos
-Comment[he]=הגדרת זיהוי השירותים
-Comment[hi]=सेवा डिस्कवरी कॉन्फ़िगर करें
-Comment[hr]=Konfiguriranje usluge discovery
-Comment[hu]=A szolgáltatásdetektálás beállításai
-Comment[is]=Stilla uppgötvun þjónustna
-Comment[it]=Configura scoperta servizi
-Comment[ja]=サービスディスカバリの設定
-Comment[ka]=სერვისის არმოჩენის კონფიგურირება
-Comment[kk]=Қызыметтерді байқауды баптау
-Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ការ​រកឃើញ​សេវា
-Comment[ko]=서비스 발견 설정
-Comment[lt]=Konfigūruoti tarnybų radimą
-Comment[lv]=Konfigurē servisu atrašanu
-Comment[mk]=Конфигурирајте го откривањето сервиси
-Comment[ms]=Konfigur penemuan servis
-Comment[nb]=Sett opp oppdagingstjenesten
-Comment[nds]=Dat Finnen vun Deensten inrichten
-Comment[ne]=पत्ता लगाउने कार्य कन्फिगर गर्नुहोस्
-Comment[nl]=Dienstwaarneming instellen
-Comment[nn]=Set opp oppdagingstenesta
-Comment[pa]=ਸੇਵਾ ਖੋਜ ਸੰਰਚਨਾ
-Comment[pl]=Konfiguracja wykrywania usług
-Comment[pt]=Configurar a descoberta de serviços
-Comment[pt_BR]=Configurar o serviço discovery
-Comment[ro]=Configurează serviciul de descoperire
-Comment[ru]=Настройка обнаружения сервисов
-Comment[rw]=Kuboneza ivumbura serivisi 
-Comment[se]=Heivet bálvalusáicama
-Comment[sk]=Nastavenie služby Discovery
-Comment[sl]=Nastavi odkrivanje storitev
-Comment[sr]=Подешавање откривања сервиса
-Comment[sr@Latn]=Podešavanje otkrivanja servisa
-Comment[sv]=Anpassa tjänstupptäckt
-Comment[ta]=சர்வீஸ் டிஸ்கவரியை வடிவமை
-Comment[tg]=Танзими хизмати ихтироъ
-Comment[th]=ปรับแต่งการค้นพบบริการ
-Comment[tr]=Hizmet araştırmasını yapılandır
-Comment[tt]=Xezmätlär tabu caylawı
-Comment[uk]=Налаштування знаходження служб
-Comment[uz]=Tarmoqdagi xizmatlarni qidirishni moslash
-Comment[uz@cyrillic]=Тармоқдаги хизматларни қидиришни мослаш
-Comment[vi]=Cấu hình dịch vụ khám phá
-Comment[wa]=Apontiaedjes do discovraedje do siervice
-Comment[zh_CN]=配置探索服务
-Comment[zh_TW]=設定服務偵測
 Exec=tdecmshell kcm_tdednssd
-GenericName=
-GenericName[ko]=일반
 Icon=network_local
 MimeType=
+DocPath=kcontrol/dnssd/index.html
+StartupNotify=true
+Terminal=false
+Type=Application
+X-DCOP-ServiceType=
+X-TDE-HasReadOnlyMode=false
+X-TDE-Library=tdednssd
+X-TDE-ModuleType=Library
+X-TDE-ParentApp=kcontrol
+#root parts unused with Avahi
+#X-TDE-SubstituteUID=false 
+#X-TDE-RootOnly=true
+Categories=Qt;TDE;X-TDE-settings-network;
+
+GenericName=
+GenericName[ko]=일반
 Name=Zeroconf Service Discovery
 Name[af]=Dienste ontdekker
 Name[ar]=إكتشاف الخدمات
@@ -140,16 +86,71 @@ Name[vi]=Dịch vụ Khám phá
 Name[wa]=Discovraedje di siervices
 Name[zh_CN]=服务探索
 Name[zh_TW]=服務偵測
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-X-DCOP-ServiceType=
-X-TDE-HasReadOnlyMode=false
-X-TDE-Library=tdednssd
-X-TDE-ModuleType=Library
-X-TDE-ParentApp=kcontrol
-#root parts unused with Avahi
-#X-TDE-SubstituteUID=false 
-#X-TDE-RootOnly=true
-Categories=Qt;TDE;X-TDE-settings-network;
+Comment=Configure service discovery
+Comment[af]=Stel dienste ontdekker op
+Comment[ar]=إعداد إكتشاف الخدمات
+Comment[be]=Настаўленні пошуку сервісаў
+Comment[bg]=Настройване откриването на услуги
+Comment[bn]=সার্ভিস উদ্ঘাটন কনফিগার করুন
+Comment[bs]=Podesite otkrivanje servisa
+Comment[ca]=Configura el descobriment de serveis
+Comment[cs]=Nastavení hledání služeb
+Comment[csb]=Kòfigùracëjô wëkrëwaniô ùsłëżnotów
+Comment[da]=Indstil opdagelse af tjeneste
+Comment[de]=Diensteerkennung einrichten
+Comment[el]=Ρύθμιση εύρεσης υπηρεσιών
+Comment[eo]=Agordu servo-seĉadon
+Comment[es]=Configura el buscador de servicios
+Comment[et]=Teenuste tuvastamise seadistamine
+Comment[eu]=Konfiguratu igartze zerbitzua
+Comment[fa]=پیکربندی کشف خدمت
+Comment[fi]=Asetuspalvelimen löytäminen
+Comment[fr]=Configuration de la découverte de service
+Comment[fy]=Tsjinst waarnimming ynstellen
+Comment[ga]=Cumraigh fionnachtain seirbhísí
+Comment[gl]=Configurar o descubremento de servizos
+Comment[he]=הגדרת זיהוי השירותים
+Comment[hi]=सेवा डिस्कवरी कॉन्फ़िगर करें
+Comment[hr]=Konfiguriranje usluge discovery
+Comment[hu]=A szolgáltatásdetektálás beállításai
+Comment[is]=Stilla uppgötvun þjónustna
+Comment[it]=Configura scoperta servizi
+Comment[ja]=サービスディスカバリの設定
+Comment[ka]=სერვისის არმოჩენის კონფიგურირება
+Comment[kk]=Қызыметтерді байқауды баптау
+Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ការ​រកឃើញ​សេវា
+Comment[ko]=서비스 발견 설정
+Comment[lt]=Konfigūruoti tarnybų radimą
+Comment[lv]=Konfigurē servisu atrašanu
+Comment[mk]=Конфигурирајте го откривањето сервиси
+Comment[ms]=Konfigur penemuan servis
+Comment[nb]=Sett opp oppdagingstjenesten
+Comment[nds]=Dat Finnen vun Deensten inrichten
+Comment[ne]=पत्ता लगाउने कार्य कन्फिगर गर्नुहोस्
+Comment[nl]=Dienstwaarneming instellen
+Comment[nn]=Set opp oppdagingstenesta
+Comment[pa]=ਸੇਵਾ ਖੋਜ ਸੰਰਚਨਾ
+Comment[pl]=Konfiguracja wykrywania usług
+Comment[pt]=Configurar a descoberta de serviços
+Comment[pt_BR]=Configurar o serviço discovery
+Comment[ro]=Configurează serviciul de descoperire
+Comment[ru]=Настройка обнаружения сервисов
+Comment[rw]=Kuboneza ivumbura serivisi 
+Comment[se]=Heivet bálvalusáicama
+Comment[sk]=Nastavenie služby Discovery
+Comment[sl]=Nastavi odkrivanje storitev
+Comment[sr]=Подешавање откривања сервиса
+Comment[sr@Latn]=Podešavanje otkrivanja servisa
+Comment[sv]=Anpassa tjänstupptäckt
+Comment[ta]=சர்வீஸ் டிஸ்கவரியை வடிவமை
+Comment[tg]=Танзими хизмати ихтироъ
+Comment[th]=ปรับแต่งการค้นพบบริการ
+Comment[tr]=Hizmet araştırmasını yapılandır
+Comment[tt]=Xezmätlär tabu caylawı
+Comment[uk]=Налаштування знаходження служб
+Comment[uz]=Tarmoqdagi xizmatlarni qidirishni moslash
+Comment[uz@cyrillic]=Тармоқдаги хизматларни қидиришни мослаш
+Comment[vi]=Cấu hình dịch vụ khám phá
+Comment[wa]=Apontiaedjes do discovraedje do siervice
+Comment[zh_CN]=配置探索服务
+Comment[zh_TW]=設定服務偵測
diff --git a/kcontrol/privacy/privacy.desktop b/kcontrol/privacy/privacy.desktop
index 47a1474ef..9f08bf6c7 100644
--- a/kcontrol/privacy/privacy.desktop
+++ b/kcontrol/privacy/privacy.desktop
@@ -1,5 +1,80 @@
 [Desktop Entry]
+Exec=tdecmshell privacy
+Terminal=false
+Type=Application
+X-TDE-FactoryName=privacy
+X-TDE-Library=privacy
+Categories=Qt;TDE;X-TDE-settings-security;
 Icon=trashcan_empty
+DocPath=kcontrol/privacy/index.html
+
+Name=Privacy
+Name[af]=Privaatheid
+Name[ar]=الخصوصية
+Name[az]=Gizlilik
+Name[be]=Прыватнасць
+Name[bg]=Анонимност
+Name[bn]=প্রাইভেসি
+Name[br]=Buhez prevez
+Name[bs]=Privatnost
+Name[ca]=Privacitat
+Name[cs]=Soukromí
+Name[csb]=Priwatnosc
+Name[cy]=Preifatrwydd
+Name[de]=Privatsphäre
+Name[el]=Προσωπικό απόρρητο
+Name[eo]=Privataj aferoj
+Name[es]=Privacidad
+Name[et]=Privaatsus
+Name[eu]=Pribatutasuna
+Name[fa]=محرمانگی
+Name[fi]=Yksityisyys
+Name[fr]=Confidentialité
+Name[ga]=Príobháideachas
+Name[gl]=Intimidade
+Name[he]=פרטיות
+Name[hi]=गोपनीयता
+Name[hr]=Privatnost
+Name[hu]=Magánjellegű adatok törlése
+Name[is]=Einkamál
+Name[ja]=プライバシー
+Name[ka]=კონფიდენციალურობა
+Name[kk]=Қарақшылыққа қарсылық
+Name[km]=ភាព​ឯកជន
+Name[lt]=Privatumas
+Name[lv]=Privātums
+Name[mk]=Приватност
+Name[ms]=Privasi
+Name[mt]=Privatezza
+Name[nb]=Personvern
+Name[nds]=Privaatrebeet
+Name[ne]=गोप्यता
+Name[nn]=Personvern
+Name[pa]=ਰਹੱਸ
+Name[pl]=Prywatność
+Name[pt]=Privacidade
+Name[pt_BR]=Privacidade
+Name[ro]=Intimitate
+Name[ru]=Конфиденциальность
+Name[rw]=Umwihariko
+Name[se]=Iežassuodjaleapmi
+Name[sk]=Súkromie
+Name[sl]=Zasebnost
+Name[sr]=Приватност
+Name[sr@Latn]=Privatnost
+Name[sv]=Integritet
+Name[ta]=தனிமை
+Name[te]=ప్రైవసి
+Name[th]=ความเป็นส่วนตัว
+Name[tr]=Gizlilik
+Name[tt]=Xosusílıq
+Name[uk]=Конфіденційність
+Name[uz]=Shaxsiy maʼlumot
+Name[uz@cyrillic]=Шахсий маълумот
+Name[vi]=Riêng tư
+Name[wa]=Vikereye da vosse
+Name[zh_CN]=隐私
+Name[zh_TW]=隱私權
 Comment=Privacy - a kcontrol module to clean unwanted traces the user leaves on the system
 Comment[af]=Privaatheid - 'n Beheer module wat voetspore wat deur gebruikers op die stelsel gelaat word skoon maak
 Comment[ar]=الخصوصية - وحدة kcontrol لتنظيف الآثار غير المرغوب بها التي يتركها المستخدم على النظام
@@ -66,7 +141,6 @@ Comment[vi]=Riêng tư - trình điều khiển giúp xoá các dấu vết mà
 Comment[wa]=Vikereye da vosse - on module di kcontrol po rnetyî les passêyes nén volowes ki l' uzeu leye sol sistinme
 Comment[zh_CN]=隐私 - 清除用户留在系统中痕迹的 kcontrol 模块
 Comment[zh_TW]=隱私權 - 一個控制模組用來清除使用者不希望留在系統中的痕跡
-Exec=tdecmshell privacy
 Keywords=Privacy,privacy
 Keywords[ar]=خصوصية، الخصوصية
 Keywords[az]=Gizlilik,gizlilik
@@ -130,75 +204,3 @@ Keywords[vi]=Riêng tư,riêng tư
 Keywords[wa]=privé,privêye vikereye,vikerêye da vosse
 Keywords[zh_CN]=Privacy,privacy,隐私
 Keywords[zh_TW]=Privacy,privacy,隱私權
-Name=Privacy
-Name[af]=Privaatheid
-Name[ar]=الخصوصية
-Name[az]=Gizlilik
-Name[be]=Прыватнасць
-Name[bg]=Анонимност
-Name[bn]=প্রাইভেসি
-Name[br]=Buhez prevez
-Name[bs]=Privatnost
-Name[ca]=Privacitat
-Name[cs]=Soukromí
-Name[csb]=Priwatnosc
-Name[cy]=Preifatrwydd
-Name[de]=Privatsphäre
-Name[el]=Προσωπικό απόρρητο
-Name[eo]=Privataj aferoj
-Name[es]=Privacidad
-Name[et]=Privaatsus
-Name[eu]=Pribatutasuna
-Name[fa]=محرمانگی
-Name[fi]=Yksityisyys
-Name[fr]=Confidentialité
-Name[ga]=Príobháideachas
-Name[gl]=Intimidade
-Name[he]=פרטיות
-Name[hi]=गोपनीयता
-Name[hr]=Privatnost
-Name[hu]=Magánjellegű adatok törlése
-Name[is]=Einkamál
-Name[ja]=プライバシー
-Name[ka]=კონფიდენციალურობა
-Name[kk]=Қарақшылыққа қарсылық
-Name[km]=ភាព​ឯកជន
-Name[lt]=Privatumas
-Name[lv]=Privātums
-Name[mk]=Приватност
-Name[ms]=Privasi
-Name[mt]=Privatezza
-Name[nb]=Personvern
-Name[nds]=Privaatrebeet
-Name[ne]=गोप्यता
-Name[nn]=Personvern
-Name[pa]=ਰਹੱਸ
-Name[pl]=Prywatność
-Name[pt]=Privacidade
-Name[pt_BR]=Privacidade
-Name[ro]=Intimitate
-Name[ru]=Конфиденциальность
-Name[rw]=Umwihariko
-Name[se]=Iežassuodjaleapmi
-Name[sk]=Súkromie
-Name[sl]=Zasebnost
-Name[sr]=Приватност
-Name[sr@Latn]=Privatnost
-Name[sv]=Integritet
-Name[ta]=தனிமை
-Name[te]=ప్రైవసి
-Name[th]=ความเป็นส่วนตัว
-Name[tr]=Gizlilik
-Name[tt]=Xosusílıq
-Name[uk]=Конфіденційність
-Name[uz]=Shaxsiy maʼlumot
-Name[uz@cyrillic]=Шахсий маълумот
-Name[vi]=Riêng tư
-Name[wa]=Vikereye da vosse
-Name[zh_CN]=隐私
-Name[zh_TW]=隱私權
-Terminal=false
-Type=Application
-X-TDE-FactoryName=privacy
-X-TDE-Library=privacy
-Categories=Qt;TDE;X-TDE-settings-security;
diff --git a/khotkeys/app/khotkeys.desktop b/khotkeys/app/khotkeys.desktop
index d5d61af74..fcdc503ee 100644
--- a/khotkeys/app/khotkeys.desktop
+++ b/khotkeys/app/khotkeys.desktop
@@ -1,43 +1,206 @@
 [Desktop Entry]
 Exec=khotkeys
-Name=KHotKeys
-Name[af]=TDE Kortpad Sleutels
-Name[be]=Клавішныя скароты TDE
-Name[bg]=Горещи клавиши
-Name[cs]=Horké klávesy TDE
-Name[csb]=Skrodzënë ë gestë
-Name[cy]=BysellauBrysTDE
-Name[eo]=Klavkombinoj
-Name[es]=Teclas rápidas de TDE
-Name[et]=TDE kiirklahvid
-Name[fi]=Pikanäppäimet
-Name[hi]=के-हॉट-कीज़
-Name[hu]=Parancsbeállító (KHotKeys)
-Name[is]=Flýtilyklar TDE
-Name[lt]=TDE klavišų kombinacijos
-Name[lv]=TDE Karstie Taustiņi
-Name[mk]=TDE брзи копчиња
-Name[mn]=КДЭ-халуун тушаал
-Name[nb]=TDE-hurtigtaster
-Name[ne]=केडीई हट कुञ्जी
-Name[nn]=TDE-snøggtastar
-Name[pa]=ਕੇ-ਹਾਟਕੀ
-Name[pl]=Skróty i gesty
-Name[pt_BR]=Teclas de atalho
-Name[ro]=Taste rapide
-Name[ru]=Клавиши быстрого доступа
-Name[se]=TDE jođánisboalut
-Name[sv]=Khotkeys
-Name[ta]=Kஹாட்கீஸ்
-Name[te]=కెహాట్ కీలు
-Name[tg]=Калидҳои тез
-Name[th]=ปุ่มพิมพ์ลัดของ TDE
-Name[uk]=Швидкі клавіші TDE
-Name[vi]=Phím nóng TDE
-Name[zh_TW]=TDE 熱鍵
 Type=Service
 ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=khotkeys
 X-TDE-FactoryName=khotkeys
 X-TDE-Kded-autoload=false
+DocPath=kcontrol/khotkeys/index.html
+
+Name=Input Actions
+Name[af]=Inset Aksies
+Name[ar]=نشاطات الإدخال
+Name[be]=Дзеянні
+Name[bg]=Действия
+Name[br]=Oberoù enkas
+Name[bs]=Akcije unosa
+Name[ca]=Accions d'entrada
+Name[cs]=Vstupní činnosti
+Name[csb]=Klawiszowé dzéjania
+Name[da]=Indgiv handlinger
+Name[de]=Tastenkombinationen
+Name[el]=Ενέργειες εισόδου
+Name[eo]=Enir-agadoj
+Name[es]=Introducir acciones
+Name[et]=Sisestustoimingud
+Name[eu]=Sarrerako ekintzak
+Name[fa]=کنشهای ورودی
+Name[fi]=Syöttötoiminnot
+Name[fr]=Actions d'entrées
+Name[fy]=Ynfieraksjes
+Name[ga]=Gníomhartha Ionchurtha
+Name[gl]=Accións de Entrada
+Name[he]=פעולות קלט
+Name[hr]=Aktivnosti unosa
+Name[hu]=Beviteli műveletek
+Name[is]=Inntaksaðgerðir
+Name[it]=Azioni di immissione
+Name[ja]=入力アクション
+Name[ka]=შეტანის ქმედებები
+Name[kk]=Енгізу әрекеттері
+Name[km]=អំពើបញ្ចូល
+Name[ko]=입력 동작
+Name[lt]=Įvesties veiksmai
+Name[mk]=Влезни дејства
+Name[ms]=Tindakan Input
+Name[nb]=Input-handlinger
+Name[nds]=Ingaavakschonen
+Name[ne]=आगत कार्य
+Name[nl]=Invoeracties
+Name[nn]=Innhandlingar
+Name[pa]=ਇੰਪੁੱਟ ਕਾਰਵਾਈਆਂ
+Name[pl]=Akcje klawiszowe
+Name[pt]=Acções de Entrada
+Name[pt_BR]=Ações de Entrada
+Name[ro]=Acțiuni de intrare
+Name[ru]=Действия
+Name[rw]=Kwinjiza Ibikorwa
+Name[sk]=Vstupné akcie
+Name[sl]=Vhodna dejanja
+Name[sr]=Акције улаза
+Name[sr@Latn]=Akcije ulaza
+Name[sv]=Inmatningsåtgärder
+Name[ta]=உள்ளீட்டு செயல்கள்
+Name[te]=ములాంశ చర్యలు
+Name[tg]=Амалҳо
+Name[th]=การกระทำเพื่อใส่ข้อมูล
+Name[tr]=Girdi Eylemleri
+Name[tt]=Kertü Ğämälläre
+Name[uk]=Ввід
+Name[uz]=Kiritish amallari
+Name[uz@cyrillic]=Киритиш амаллари
+Name[vi]=Gõ Phím nóng
+Name[wa]=Accions en intrêye
+Name[zh_CN]=输入动作
+Name[zh_TW]=輸入動作
+
+Comment=Configure Hotkey settings
+Comment[af]=Stel kortpad sleutels op
+Comment[be]=Настаўленні клавішных скаротаў
+Comment[bg]=Настройване на жестове с мишката
+Comment[bn]=হট-কী সেটিংস কনফিগার করুন
+Comment[br]=Kefluniañ dibarzhoù Hotkey
+Comment[bs]=Podesite opcije kratica tastature
+Comment[ca]=Configura l'arranjament de les tecles ràpides
+Comment[cs]=Nastavení horkých kláves
+Comment[csb]=Kònfigùracëjô klawiszowëch skrodzënów
+Comment[cy]=Ffurfweddu gosodiadau BysyllBrys
+Comment[da]=Opsætning af genvejstast
+Comment[de]=Tastenkombinationen festlegen
+Comment[el]=Ρυθμίσεις HotKeys
+Comment[eo]=Agordo de klavkomando
+Comment[es]=Configuración de las preferencias de Hotkey
+Comment[et]=Kiirklahvide seadistused
+Comment[eu]=Konfiguratu Hotkey-ren ezarpenak
+Comment[fa]=پیکربندی تنظیمات کلید میان‌بر
+Comment[fi]=Muokkaa pikanäppäinten asetuksia
+Comment[fr]=Configurer les réglages des raccourcis clavier
+Comment[fy]=Fluchtoetsen ynstelle
+Comment[gl]=Configurar opcións de HotKeys
+Comment[he]=שינוי הגדרות מקשי הקיצור
+Comment[hi]=हॉट-की विन्यास कॉन्फ़िगर करें
+Comment[hr]=Konfiguriranje postavki prečaca
+Comment[hu]=A használható parancsok beállítása
+Comment[is]=Stillingar flýtilykla
+Comment[it]=Configura impostazioni di Hotkey
+Comment[ja]=ホットキーの設定
+Comment[ka]=კლავიშთა კომბინაციის კონფიგურირება
+Comment[kk]=Пернелер тіркесімдерді баптау
+Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ការ​កំណត់​គ្រាប់ចុច​បន្ទាន់
+Comment[ko]=단축키 설정
+Comment[lt]=Konfigūruoti klavišų kombinacijų nustatymus
+Comment[lv]=Konfigurē karsto taustiņu parametrus
+Comment[mk]=Конфигурирајте ги поставувањата за брзите копчиња
+Comment[ms]=Konfigur seting Kekunci Panas
+Comment[mt]=Konfigurazzjoni tal-hotkeys
+Comment[nb]=Sett opp hurtigtaster
+Comment[nds]=Akschonen för besünner Ingaven instellen
+Comment[ne]=हटकुञ्जी सेटिङ कन्फिगर गर्नुहोस्
+Comment[nl]=Sneltoetsen instellen
+Comment[nn]=Set opp snøggtastar
+Comment[pa]=ਹਾਟਕੀ ਸੈਟਿੰਗ ਸੰਰਚਨਾ
+Comment[pl]=Konfiguracja skrótów klawiszowych
+Comment[pt]=Configurar as opções de teclas
+Comment[pt_BR]=Configura definições de teclas de atalho
+Comment[ro]=Configurează setările Hotkey
+Comment[ru]=Настройка действий по комбинациям клавиш и росчеркам мышью
+Comment[rw]=Kuboneza amagenamiterere Butozihuta
+Comment[se]=Heivet jođánisboaluid
+Comment[sk]=Nastavenia klávesových skratiek
+Comment[sl]=Nastavitve vročih tipk
+Comment[sr]=Подешавање поставки пречица
+Comment[sr@Latn]=Podešavanje postavki prečica
+Comment[sv]=Anpassa Hotkey-inställningar
+Comment[ta]=ÍÕìÌÅ¢¨º «¨ÁôÒ¸¨Ç ¯ûǨÁ
+Comment[th]=ตั้งค่าปุ่มลัด
+Comment[tr]=Kısayol ayarlarını yapılandır
+Comment[tt]=Qaynar töymälärne caylaw
+Comment[uk]=Налаштування швидких клавіш
+Comment[vi]=Cấu hình các thiết lập về phím nóng
+Comment[wa]=Apontiaedjes des tchuzes Hotkeys
+Comment[zh_CN]=配置热键设置
+Comment[zh_TW]=設定熱鍵設定值
+
+Keywords=Keys,Global key bindings,Key bindings,Gestures,Mouse gestures
+Keywords[af]=Keys,Globale sleutel bindings,sleutel scheme,sleutel bindings,kortpaaie,application kortpaaie
+Keywords[ar]=مفايتح، مفاتيح الاختصارات العامّة، خريطة المفاتيح، مفاتيح الاختصارات،  اختصارات، اختصارات تطبيقات ، حركات الفأرة
+Keywords[be]=Клавішы,Глабальныя скароты,Скароты,Рухі,Рухі мышы,Keys,Global key bindings,Key bindings,Gestures,Mouse gestures
+Keywords[bg]=бърз, клавиш, бързи, достъп, клавишна, комбинация, жестове, мишка, жест, операция, Keys, Global key bindings, Key bindings, Gestures, Mouse gestures
+Keywords[bs]=Keys,Global key bindings,Key bindings,Gestures,Mouse gestures,tipke,kratice tastature,globalne kratice tastature,geste,geste miša
+Keywords[ca]=Tecles,lligams de tecles globals,Lligams de tecles,gestos,gestos de ratolí
+Keywords[cs]=Klávesy,Globální klávesové zkratky,Schéma kláves,Klávesové zkratky,Zkratky,Gesta
+Keywords[csb]=klawisze,globalné klawiszowé skrodzënë,schemë skrodzënów,gestë,mësz
+Keywords[cy]=Bysyll,Bysellau,Rhwymiadau bysell eang,Ystumiau,Ystumiau llygoden
+Keywords[da]=Taster,Globale tastebindinger,Tastebindinger,Gester,Muse-gester
+Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturlayout,Gesten,Mausgesten
+Keywords[el]=Πλήκτρα,Καθολικοί συνδυασμοί πλήκτρων,Συνδυασμοί πλήκτρων,Gestures,Mouse gestures
+Keywords[eo]=klavoj,malloka,signifoj,asocioj,kombinoj,klavkombinoj,muzo
+Keywords[es]=Teclas,Asociaciones de teclas globales,Asociaciones de teclas,Gestos,Gestos del ratón
+Keywords[et]=Klahvid,Globaalsed kiirklahvid,Klahviskeem,Kiirklahvid,Klahvide seosed,Žestid,Hiirežestid
+Keywords[eu]=Teklak,Tekla elkarketa orokorrak,Tekla elkarketak,Keinuak,Saguaren keinuak
+Keywords[fa]=کلیدها، مقیدسازیهای کلید سراسری، مقیدسازیهای کلید، حرکات، حرکات موشی
+Keywords[fi]=Näppäimet,Yleiset näppäinsidokset,Näppäinteema,Näppäinsidokset,pikavalinnat,sovellusten pikavalinnat,hiirieleet
+Keywords[fr]=touches,raccourcis clavier globaux,raccourcis clavier,gestes,gestes de la souris
+Keywords[fy]=keys,toetsen,toetsenbindingen,key bindings,toetsbiningen,sneltoetsen,fluchtoetsen,globale toetsenbindingen,algemiene toetsbiningen,mouse gestures,muisgebaren,mûsstjoeringen,stjoeringen,gestures,gebaren
+Keywords[ga]=Eochracha,Ceangail chomhchoiteanna eochracha,Ceangail chomhchoiteanna,Gothaí,Gothaí luiche
+Keywords[gl]=Teclas,Atallos de teclado globais,Atallos de teclado,Xestos,Xestos co rato
+Keywords[he]=מקשים,תפקידי מקשים גלובליים,תצורת מקשים,תפקידי מקשים,קיצורים,קיצורים של יישומים, Keys,Global key bindings,Key bindings,Gestures,Mouse gestures
+Keywords[hi]=कुंजियाँ,ग्लोबल की-बाइंडिंग्स,की-बाइंडिंग्स,गेस्चर्स,माउस गेस्चर्स
+Keywords[hr]=Keys,Global key bindings,Key bindings,Gestures,Mouse gestures,Tipke,Opći prečaci tipkovnice,Prečaci tipkovnice,Gestikulacije,Gestikulacije mišem
+Keywords[hu]=billentyűk,globális billentyűparancs,billentyűparancs,műveletek,mozdulatsorok
+Keywords[is]=Lyklar,Hnappar,Flýtihnappar,Flýtilyklar,Lyklabindingar
+Keywords[it]=tasti,associazioni globali di tasti,schema di tasti,associazioni di tasti,scorciatoie,gesti,gesti mouse,mouse gesti
+Keywords[ja]=キー,グローバルキー,キーバインド,ジェスチャー,マウスジェスチャー
+Keywords[km]=គ្រាប់ចុច,ការ​ចង​គ្រាប់ចុច​សកល,ការ​ចង​គ្រាប់ចុច,កាយវិការ,កាយវិការ​កណ្ដុរ
+Keywords[lt]=Keys,Global key bindings,Key bindings,Gestures,Mouse gestures,klavišai,klavišų sietis,klavišų schema,klavišų išdėstymas,spartieji klavišai,programų spartieji klavišai,pelės veiksmai
+Keywords[lv]=Taustiņi,Globālās taustiņu sasaistes,Taustiņu shēma,Taustiņu sasaistes,mouse gestures
+Keywords[mk]=Keys,Global key bindings,Key bindings,Gestures,Mouse gestures, Копчиња,Глобални врски на копчиња,врски на копчиња,гестови,гестови со глушец
+Keywords[nb]=Taster,generelle hurtigtaster,hurtigtaster,bevegelser,musebevegelser
+Keywords[nds]=Tasten,Globale Tastkombinatschonen,Tastschema,Tastkombinatschonen,Ingaavtekens,Muusteken
+Keywords[ne]=कुञ्जीहरू, विश्वव्यापी कुञ्जी बाइन्डिङ, कुञ्जी बाइन्डिङ, सङ्केत, माउस सङ्केत
+Keywords[nl]=keys,toetsen,toetsenbindingen,key bindings,sneltoetsen,globale toetsenbindingen,mouse gestures,muisgebaren,gestures,gebaren
+Keywords[nn]=tastar,globale snøggtastar,tasteoppsett,snøggtastar,snarvegar,programsnarvegar,rørsler,muserørsler
+Keywords[pa]=Keys,Global key bindings,Key bindings,Gestures,ਮਾਊਸ gestures, ਸਵਿੱਚਾਂ
+Keywords[pl]=klawisze,globalne skróty klawiszowe,schematy skrótów,gesty,mysz
+Keywords[pt]=teclas,teclas globais,esquema de teclas,atribuições de teclas,gestos,gestos com rato
+Keywords[pt_BR]=Teclas,Teclas de atalho globais,esquema de teclado,gestos, gestos do mouse
+Keywords[ro]=taste,asocieri globale de taste,schemă taste,asocieri taste,acceleratori,acceleratori aplicații,scurtături,gesturi
+Keywords[ru]=Keys,Global key bindings,Key bindings,Gestures,Mouse gestures,мышь,росчерк,клавиши,комбинации клавиш,действия
+Keywords[rw]=Buto,Ibyafataranyijwe urufunguzo rusange,Ibyafatanyijwe by'urufunguzo,Ibimenyetso,Ibimenyetso by'imbeba
+Keywords[se]=boalut,oppalaš jođánisboalut,boalločoahkádusat,boalločatnasat,njuolgobálgát,prográmmanjuolgabálgát,lihkádusat,sáhpánlihkádusat
+Keywords[sk]=Klávesy,Globálne klávesové skratky,schéma kláves,klávesové skratky,gestá,gestá myšou
+Keywords[sl]=tipke,globalne vezi tipk,vezi tipk,tipkovne vezi,gibi,miškini gibi
+Keywords[sr]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts,тастери,глобални тастери,пречица,шема тастера,пречице,програмске пречице
+Keywords[sr@Latn]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts,tasteri,globalni tasteri,prečica,šema tastera,prečice,programske prečice
+Keywords[sv]=tangenter,globala tangentbindningar,tangentbindningar,gester,musgester
+Keywords[ta]=விசைகள்,உலகலாவிய விசை பிணைப்புகள்,விசை திட்டம்,விசை பிணைப்புகள்,குறுக்குவழிகள்,பயன்பாட்டுக் குறுக்குவழிகள்
+Keywords[th]=ปุ่มพิมพ์,ปุ่มพิมพ์ส่วนกลาง,ชุดปุ่มพิมพ์,การจับคู่ปุ่มพิมพ์,ปุ่มพิมพ์ลัด,แป้นพิมพ์ลัด,ปุ่มพิมพ์ลัดแอพพลิเคชัน,การลากเมาส์
+Keywords[tr]=Tuşlar,Küresel tuş bağlantıları,Tuş bağlantıları,Kısayollar,Uygulama kısayolları,Fare hareketleri
+Keywords[uk]=клавіші,глобальні прив'язки клавіш,схема клавіш,прив'язка клавіш, жести, жести мишки
+Keywords[uz]=Gestures,Mouse gestures,Tugmalar,Umumiy tugmalar birikmasi,Tugmalar birikmasi
+Keywords[uz@cyrillic]=Gestures,Mouse gestures,Тугмалар,Умумий тугмалар бирикмаси,Тугмалар бирикмаси
+Keywords[vi]=Phím,tổ hợp phím toàn cục,tổ hợp phím,gõ phím,di chuyển chuột
+Keywords[wa]=Tapes,globås rascourtis,rascourtis,djesses,manire di bodjî,manire di bodjî li sori
+Keywords[zh_CN]=Keys,Global key bindings,Key bindings,Gestures,Mouse gestures,键,全局键绑定,手势,鼠标手势
+Keywords[zh_TW]=Keys,Global key bindings,Key bindings,Gestures,Mouse gestures,按鍵,全域按建連結,按鍵連結,手勢,滑鼠手勢
diff --git a/khotkeys/kcontrol/khotkeys.desktop b/khotkeys/kcontrol/khotkeys.desktop
index 0608bce34..7dbd41899 100644
--- a/khotkeys/kcontrol/khotkeys.desktop
+++ b/khotkeys/kcontrol/khotkeys.desktop
@@ -2,11 +2,12 @@
 Exec=tdecmshell khotkeys
 Icon=khotkeys
 Type=Application
-
+DocPath=kcontrol/khotkeys/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=khotkeys
 X-TDE-Init-Library=khotkeys_init
 X-TDE-Init=khotkeys
+Categories=Qt;TDE;X-TDE-settings-accessibility;
 
 Name=Input Actions
 Name[af]=Inset Aksies
@@ -99,7 +100,7 @@ Comment[fr]=Configurer les réglages des raccourcis clavier
 Comment[fy]=Fluchtoetsen ynstelle
 Comment[gl]=Configurar opcións de HotKeys
 Comment[he]=שינוי הגדרות מקשי הקיצור
-Comment[hi]=हॉट-की विन्यास कॉन्फ़िगर करें 
+Comment[hi]=हॉट-की विन्यास कॉन्फ़िगर करें
 Comment[hr]=Konfiguriranje postavki prečaca
 Comment[hu]=A használható parancsok beállítása
 Comment[is]=Stillingar flýtilykla
@@ -187,7 +188,7 @@ Keywords[pt]=teclas,teclas globais,esquema de teclas,atribuições de teclas,ges
 Keywords[pt_BR]=Teclas,Teclas de atalho globais,esquema de teclado,gestos, gestos do mouse
 Keywords[ro]=taste,asocieri globale de taste,schemă taste,asocieri taste,acceleratori,acceleratori aplicații,scurtături,gesturi
 Keywords[ru]=Keys,Global key bindings,Key bindings,Gestures,Mouse gestures,мышь,росчерк,клавиши,комбинации клавиш,действия
-Keywords[rw]=Buto,Ibyafataranyijwe urufunguzo rusange,Ibyafatanyijwe by'urufunguzo,Ibimenyetso,Ibimenyetso by'imbeba 
+Keywords[rw]=Buto,Ibyafataranyijwe urufunguzo rusange,Ibyafatanyijwe by'urufunguzo,Ibimenyetso,Ibimenyetso by'imbeba
 Keywords[se]=boalut,oppalaš jođánisboalut,boalločoahkádusat,boalločatnasat,njuolgobálgát,prográmmanjuolgabálgát,lihkádusat,sáhpánlihkádusat
 Keywords[sk]=Klávesy,Globálne klávesové skratky,schéma kláves,klávesové skratky,gestá,gestá myšou
 Keywords[sl]=tipke,globalne vezi tipk,vezi tipk,tipkovne vezi,gibi,miškini gibi
@@ -204,5 +205,3 @@ Keywords[vi]=Phím,tổ hợp phím toàn cục,tổ hợp phím,gõ phím,di ch
 Keywords[wa]=Tapes,globås rascourtis,rascourtis,djesses,manire di bodjî,manire di bodjî li sori
 Keywords[zh_CN]=Keys,Global key bindings,Key bindings,Gestures,Mouse gestures,键,全局键绑定,手势,鼠标手势
 Keywords[zh_TW]=Keys,Global key bindings,Key bindings,Gestures,Mouse gestures,按鍵,全域按建連結,按鍵連結,手勢,滑鼠手勢
-
-Categories=Qt;TDE;X-TDE-settings-accessibility;
diff --git a/tdeioslave/media/tdecmodule/media.desktop b/tdeioslave/media/tdecmodule/media.desktop
index d93f876f4..5acd58d96 100644
--- a/tdeioslave/media/tdecmodule/media.desktop
+++ b/tdeioslave/media/tdecmodule/media.desktop
@@ -1,13 +1,12 @@
 [Desktop Entry]
 Type=Application
-#DocPath=
+DocPath=kcontrol/media/index.html
 Icon=system
 Exec=tdecmshell media
-
-
 X-TDE-Library=media
 X-TDE-FactoryName=media
 X-TDE-ParentApp=kcontrol
+Categories=Qt;TDE;X-TDE-settings-peripherals;
 
 Name=Storage Media
 Name[af]=Stoor Media
@@ -150,7 +149,7 @@ Keywords[csb]=pòdôwczi,trzëmanié pòdôwków,zôpisowné media,usb,cdrom,ùr
 Keywords[da]=opbevaring,medie,usb,cdrom,enhed
 Keywords[de]=Speicher,Medien,Medium,USB,CD-Rom,cdrom,Gerät
 Keywords[el]=αποθήκευση,μέσο,usb,cdrom,συσκευή
-Keywords[eo]=memorigilo,medio,usb,lumdisko,aparato   
+Keywords[eo]=memorigilo,medio,usb,lumdisko,aparato
 Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo
 Keywords[et]=salvestamine,andmekandja,usb,cd,seade
 Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua
@@ -193,5 +192,3 @@ Keywords[vi]=lưu trữ,ổ,usb,cdrom,thiết bị
 Keywords[wa]=wårdaedje,media,usb,cdrom,device,éndjin
 Keywords[zh_CN]=storage,media,usb,cdrom,device,存储,介质,设备
 Keywords[zh_TW]=storage,media,usb,cdrom,device,儲存,媒體,光碟機,裝置
-
-Categories=Qt;TDE;X-TDE-settings-peripherals;
diff --git a/tdepasswd/kcm/kcm_useraccount.desktop b/tdepasswd/kcm/kcm_useraccount.desktop
index 51c168bd5..d4e31243f 100644
--- a/tdepasswd/kcm/kcm_useraccount.desktop
+++ b/tdepasswd/kcm/kcm_useraccount.desktop
@@ -5,6 +5,8 @@ X-TDE-ParentApp=kcontrol
 X-TDE-Library=useraccount
 Type=Application
 Exec=tdecmshell kcm_useraccount
+DocPath=kcontrol/useraccount/index.html
+
 Name=Password & User Account
 Name[af]=Gebruiker rekening en Wagwoord
 Name[ar]=كلمة المرور و حساب المستخدم