[kde-doc-english] [kdepim] doc/kmail: Fix doc as reported on kde-i18n ML

[Montel Laurent]

Git commit 30c5009f41fe089c3c3545cc3feac48696123d22 by Montel Laurent.
Committed on 10/06/2014 at 20:50.
Pushed by mlaurent into branch 'master'.

Fix doc as reported on kde-i18n ML

M  +1    -1    doc/kmail/configure.docbook
M  +2    -32   doc/kmail/using-kmail.docbook

http://commits.kde.org/kdepim/30c5009f41fe089c3c3545cc3feac48696123d22

diff --git a/doc/kmail/configure.docbook b/doc/kmail/configure.docbook
index 4de41c6..09c2e2f 100644
--- a/doc/kmail/configure.docbook
+++ b/doc/kmail/configure.docbook
@@ -2236,7 +2236,7 @@ starts.</para>
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>Empty trash on program exit</guilabel></term>
+<term><guilabel>Empty the local trash folder on program exit</guilabel></term>
 <listitem>
 <para>The trash folder is cleared of messages when you quit &kmail; if this
 option is selected.</para>
diff --git a/doc/kmail/using-kmail.docbook b/doc/kmail/using-kmail.docbook
index 4597232..5e2fdba 100644
--- a/doc/kmail/using-kmail.docbook
+++ b/doc/kmail/using-kmail.docbook
@@ -394,7 +394,7 @@ send &HTML; messages to a mailing list unless &HTML; messages are explicitly
 allowed.</para>
 
 <para>In order to be able to create &HTML; messages you first have to enable
-the markup tools. To do this enable <guimenuitem>Formatting (&HTML;)</guimenuitem> in the <menuchoice><guimenu>Options</guimenu></menuchoice> menu.
+the markup tools. To do this enable <guimenuitem>Rich text editing</guimenuitem> in the <menuchoice><guimenu>Options</guimenu></menuchoice> menu.
 A toolbar with several tools to
 format the message will appear. Via the drop down box you can select between
 standard text and six different types of lists (three bulleted lists with 
@@ -510,7 +510,7 @@ snippetDelimiter=$
     <menuchoice><guimenu>View</guimenu><guimenuitem>Translator</guimenuitem></menuchoice> from the
       menubar. A new panel will appear at the bottom of the composer.</para>
       <para> To translate a section of text, first select the text you would like translated to the
-	box with the <guilabel>Drag text...</guilabel>. Select the language it currently is, in the <guilabel>From:</guilabel> drop down box.
+	box with the <guilabel>Drag text that you want to translate.</guilabel>. Select the language it currently is, in the <guilabel>From:</guilabel> drop down box.
           Select the language you would like to translate to in the <guilabel>To:</guilabel> drop down box, and click the <guibutton>Translate</guibutton> button.
           Your translated text will appear in the next box. If you need to translate
             in the other direction you can just click the <guibutton>Invert</guibutton> button.
@@ -1925,27 +1925,6 @@ version.)</para>
 </listitem>
 </varlistentry>
 -->
-<varlistentry>
-<term><guilabel>Automatically sign messages</guilabel></term>
-<listitem><para>This lets you toggle whether to automatically sign your messages
-by default; of course, it is still possible to send unsigned messages by deselecting
-the icon in the composer window.</para> 
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Keep passphrase in memory</guilabel></term>
-<listitem>
-<para>When this option is off, &kmail; will ask for your passphrase each
-time you sign a message (before sending) or select an encrypted message;
-if you turn this option on, &kmail; will remember your passphrase from
-after your first successful input until you finish your &kmail; session. The
-passphrase is stored in memory and not written to the hard disk.
-If you use one of the Crypto-Plugins or if you use <application>GnuPG</application>
-with the gpg-agent then an external program will ask for your passphrase and
-optionally remember it for some time.</para>
-</listitem>
-</varlistentry>
 
 <varlistentry>
 <term><guilabel>When encrypting emails, always also encrypt to the certificate of my own identity</guilabel></term>
@@ -1958,15 +1937,6 @@ you too.</para>
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>Show signed/encrypted text after composing</guilabel></term>
-<listitem>
-<para>This will show you the result of encrypting and signing before the message
-gets sent; this way, you can still cancel sending if encrypting failed. It is
-strongly recommended to use this option.</para> 
-</listitem>
-</varlistentry>
-
-<varlistentry>
 <term><guilabel>Store sent messages encrypted</guilabel></term>
 <listitem>
 <para>When this box is checked, sent messages are stored encrypted like they were