[kde-doc-english] [kdepim] doc/kmail: Documentation: Last 3 sections of menus. Moved details to using-kmail and provided links.
Scarlett Clark
scarlett at scarlettgatelyclark.com
Sun Aug 25 14:31:11 UTC 2013
Git commit 47d93ddf6a8df82fa1c79a88654d6f0308dd4f8b by Scarlett Clark.
Committed on 25/08/2013 at 14:22.
Pushed by scarlettclark into branch 'master'.
Documentation: Last 3 sections of menus. Moved details to using-kmail and provided links.
REVIEW:112219
M +304 -362 doc/kmail/menus.docbook
http://commits.kde.org/kdepim/47d93ddf6a8df82fa1c79a88654d6f0308dd4f8b
diff --git a/doc/kmail/menus.docbook b/doc/kmail/menus.docbook
index b796e6c..e22d546 100644
--- a/doc/kmail/menus.docbook
+++ b/doc/kmail/menus.docbook
@@ -61,7 +61,7 @@ performs a menu item function, the default shortcut is listed with the menu item
</menuchoice></term>
<listitem><para>Here you can create several new items as follows:</para></listitem>
</varlistentry>
-<varlistentry id="file-new-newmessage">
+<varlistentry id="reader-file-new-newmessage">
<term><menuchoice>
<guimenu>File</guimenu>
<guisubmenu>New</guisubmenu>
@@ -69,7 +69,7 @@ performs a menu item function, the default shortcut is listed with the menu item
</menuchoice></term>
<listitem><para><action>Compose a new message.</action></para></listitem>
</varlistentry>
-<varlistentry id="file-new-message-from-template">
+<varlistentry id="reader-file-new-message-from-template">
<term><menuchoice>
<guimenu>File</guimenu>
<guisubmenu>New</guisubmenu>
@@ -78,7 +78,7 @@ performs a menu item function, the default shortcut is listed with the menu item
<listitem><para><action>Creates a new message from a selected template.</action> Please see <link linkend="new-compose-from-templates">Compose From Templates</link> for additional information on creating templates.</para>
<para>If you do not have any templates saved, you will see <menuchoice><guimenu>Message</guimenu><guisubmenu>Message from Template</guisubmenu><guimenuitem>(no templates)</guimenuitem></menuchoice></para></listitem>
</varlistentry>
-<varlistentry id="add-folder">
+<varlistentry id="reader-add-folder">
<term><menuchoice>
<guimenu>File</guimenu>
<guisubmenu>New</guisubmenu>
@@ -86,7 +86,7 @@ performs a menu item function, the default shortcut is listed with the menu item
</menuchoice></term>
<listitem><para><action>Create a new folder</action></para></listitem>
</varlistentry>
-<varlistentry id="new-addressbook-contact">
+<varlistentry id="reader-new-addressbook-contact">
<term><menuchoice>
<guimenu>File</guimenu>
<guisubmenu>New</guisubmenu>
@@ -94,7 +94,7 @@ performs a menu item function, the default shortcut is listed with the menu item
</menuchoice></term>
<listitem><para><action>Brings up the new contact dialog</action></para></listitem>
</varlistentry>
-<varlistentry id="file-open">
+<varlistentry id="reader-file-open">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo>
@@ -104,14 +104,14 @@ performs a menu item function, the default shortcut is listed with the menu item
</menuchoice></term>
<listitem><para><action>Open email messages or mailboxes.</action></para></listitem>
</varlistentry>
-<varlistentry id="open-recent">
+<varlistentry id="reader-open-recent">
<term><menuchoice>
<guimenu>File</guimenu>
<guimenuitem>Open Recent</guimenuitem>
</menuchoice></term>
<listitem><para><action>Opens recently used messages.</action> Only messages that have been saved and then opened will show up on this list.</para></listitem>
</varlistentry>
-<varlistentry id="file-save-as">
+<varlistentry id="reader-file-save-as">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>
@@ -122,14 +122,14 @@ performs a menu item function, the default shortcut is listed with the menu item
<listitem><para><action>Saves the currently displayed message to a <filename role="extension">.mbox</filename>.</action> This includes all the headers and attachments.</para>
<para>If you would like to save it to a different format ⪚ <filename role="extension">.txt</filename>, deselect <guilabel>Automatically select filename extension (.mbox)</guilabel>, and be sure to change the file extension while naming the file.</para></listitem>
</varlistentry>
-<varlistentry id="file-import-messages">
+<varlistentry id="reader-file-import-messages">
<term><menuchoice>
<guimenu>File</guimenu>
<guimenuitem>Import Messages...</guimenuitem>
</menuchoice></term>
<listitem><para><action>Starts up <application>KMailCVT</application></action>. This application lets you import messages from several email clients into &kmail;.</para></listitem>
</varlistentry>
-<varlistentry id="file-print-preview">
+<varlistentry id="reader-file-print-preview">
<term><menuchoice>
<guimenu>File</guimenu>
<guimenuitem>Print Preview...</guimenuitem></menuchoice></term>
@@ -137,8 +137,12 @@ performs a menu item function, the default shortcut is listed with the menu item
<para><action>Display a dialog which shows how your email will be printed.</action></para>
<note><para>This will only be enabled if a printer is available.</para></note></listitem>
</varlistentry>
+<<<<<<< Updated upstream
<!--FIXME what means available? Printer Driver installed? Printer connected?-->
<varlistentry id="file-print">
+=======
+<varlistentry id="reader-file-print">
+>>>>>>> Stashed changes
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo>
@@ -148,7 +152,7 @@ performs a menu item function, the default shortcut is listed with the menu item
</menuchoice></term>
<listitem><para><action>Display a dialog that lets you print the currently displayed message.</action></para></listitem>
</varlistentry>
-<varlistentry id="file-expire-all-folders">
+<varlistentry id="reader-file-expire-all-folders">
<term><menuchoice>
<guimenu>File</guimenu>
<guimenuitem>Expire All Folders</guimenuitem>
@@ -157,14 +161,14 @@ performs a menu item function, the default shortcut is listed with the menu item
<link linkend="folders-properties-window">Properties dialog</link> (the default is not to delete old messages at all).</para>
</listitem>
</varlistentry>
-<varlistentry id="empty-all-trash-folders">
+<varlistentry id="reader-empty-all-trash-folders">
<term><menuchoice>
<guimenu>File</guimenu>
<guimenuitem>Empty All Trash Folders</guimenuitem>
</menuchoice></term>
<listitem><para><action>Use this to empty all trash folders,</action> &ie; the local trash folder and all trash folders that you might have on &imap; servers.</para></listitem>
</varlistentry>
-<varlistentry id="work-offline">
+<varlistentry id="reader-work-offline">
<term><menuchoice>
<guimenu>File</guimenu>
<guimenuitem>Work Offline</guimenuitem>
@@ -174,7 +178,7 @@ This turns off all network jobs. This is useful when working with messages witho
This selection will become <menuchoice><guimenu>File</guimenu><guimenuitem>Work Online</guimenuitem></menuchoice>,
which needs to be selected to go back online (required to send and receive).</para></listitem>
</varlistentry>
-<varlistentry id="check-mail">
+<varlistentry id="reader-check-mail">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo>
@@ -184,14 +188,14 @@ which needs to be selected to go back online (required to send and receive).</pa
</menuchoice></term>
<listitem><para><action>Checks for new messages in all your accounts.</action></para></listitem>
</varlistentry>
-<varlistentry id="file-check-mail-in">
+<varlistentry id="reader-file-check-mail-in">
<term><menuchoice>
<guimenu>File</guimenu>
<guisubmenu>Check Mail In</guisubmenu>
</menuchoice></term>
<listitem><para><action>Check for new messages from a particular account,</action> these accounts will be listed in the submenu.</para></listitem>
</varlistentry>
-<varlistentry id="update-folder">
+<varlistentry id="reader-update-folder">
<term><menuchoice>
<shortcut>
<keycap>F5</keycap>
@@ -202,7 +206,7 @@ which needs to be selected to go back online (required to send and receive).</pa
<listitem><para><action>Checks whether new mail arrived in the currently selected folder.</action></para>
<note><para> This is only available for &imap; folders.</para></note></listitem>
</varlistentry>
-<varlistentry id="update-this-folder-and-all-subfolders">
+<varlistentry id="reader-update-this-folder-and-all-subfolders">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>F5</keycap></keycombo>
@@ -214,7 +218,7 @@ which needs to be selected to go back online (required to send and receive).</pa
<para>You can also select multiple folders and the menu item will turn into <menuchoice><guimenu>File</guimenu><guimenuitem>Update These Folders and All Their Subfolders</guimenuitem></menuchoice></para>
<note><para> This is only available for &imap; folders.</para></note></listitem>
</varlistentry>
-<varlistentry id="send-queued-messages">
+<varlistentry id="reader-send-queued-messages">
<term><menuchoice>
<guimenu>File</guimenu>
<guimenuitem>Send Queued Messages</guimenuitem>
@@ -222,7 +226,7 @@ which needs to be selected to go back online (required to send and receive).</pa
<listitem><para><action>Sends the messages that are in your outbox.</action> Messages can end up in your outbox by selecting <guibutton>Queue</guibutton> in the composer menu,
composing a message in offline mode, and sending while you have no Internet connection.</para></listitem>
</varlistentry>
-<varlistentry id="send-queued-messages-via">
+<varlistentry id="reader-send-queued-messages-via">
<term><menuchoice>
<guimenu>File</guimenu>
<guimenuitem>Send Queued Messages Via</guimenuitem>
@@ -237,7 +241,7 @@ This allows you to choose which server to send your queued messages from. They m
<para>The shortcut will open up the New Message compose window. The submenu contains menu entries and shortcuts for various &kontact; tasks.</para>
</listitem>
</varlistentry>-->
-<varlistentry id="file-quit">
+<varlistentry id="reader-file-quit">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
@@ -257,7 +261,7 @@ This allows you to choose which server to send your queued messages from. They m
<para>If the menu item you are looking for is missing, please see <ulink url="help:/fundamentals/ui.html#menus-edit">Edit Menu</ulink> of the &kde; Fundamentals.
The items listed here are &kmail; specific.</para>
<variablelist>
-<varlistentry id="move-to-trash">
+<varlistentry id="reader-edit-move-to-trash">
<term><menuchoice>
<shortcut>
<keycap>Del</keycap>
@@ -268,7 +272,7 @@ This allows you to choose which server to send your queued messages from. They m
<listitem><para><action>Moves the selected messages to the trash folder.</action>
If the selected messages are already in the trash folder, they will be permanently deleted.</para></listitem>
</varlistentry>
-<varlistentry id="move-thread-to-trash">
+<varlistentry id="reader-edit-move-thread-to-trash">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>Del</keycap></keycombo>
@@ -278,7 +282,7 @@ If the selected messages are already in the trash folder, they will be permanent
</menuchoice></term>
<listitem><para><action>Moves the selected thread to the trash folder,</action> ⪚ a conversation in a mailing list.</para></listitem>
</varlistentry>
-<varlistentry id="edit-find-messages">
+<varlistentry id="reader-edit-find-messages">
<term><menuchoice>
<shortcut>
<keycap>S</keycap></shortcut>
@@ -289,7 +293,7 @@ If the selected messages are already in the trash folder, they will be permanent
⪚ a certain subject. Please see <link linkend="filter-criteria">Filter Criteria</link> for details on search options.</para>
<para>Your search results will display in the text area, at which point you can open the <guibutton>Open Search Folder</guibutton> or highlight the desired message and select <guibutton>Open Message</guibutton>.</para></listitem>
</varlistentry>
-<varlistentry id="edit-find-in-message">
+<varlistentry id="reader-edit-find-in-message">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo>
@@ -299,7 +303,7 @@ If the selected messages are already in the trash folder, they will be permanent
</menuchoice></term>
<listitem><para><action>Searches the current message text for a string entered into the <guilabel>Find:</guilabel> textbox.</action></para></listitem>
</varlistentry>
-<varlistentry id="edit-select-all-messages">
+<varlistentry id="reader-edit-select-all-messages">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo>
@@ -309,7 +313,7 @@ If the selected messages are already in the trash folder, they will be permanent
</menuchoice></term>
<listitem><para><action>Selects all messages in the current folder.</action></para></listitem>
</varlistentry>
-<varlistentry id="edit-select-all-text">
+<varlistentry id="reader-edit-select-all-text">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo>
@@ -327,14 +331,14 @@ If the selected messages are already in the trash folder, they will be permanent
<title>View Menu</title>
<variablelist>
-<varlistentry id="view-message-list">
+<varlistentry id="reader-view-message-list">
<term><menuchoice>
<guimenu>View</guimenu>
<guisubmenu>Message List</guisubmenu>
</menuchoice></term>
<listitem><para>This menu has the following options to change the view of your message list.</para>
<variablelist>
-<varlistentry id="messagelist-sorting">
+<varlistentry id="reader-view-messagelist-sorting">
<term><menuchoice>
<guisubmenu>Sorting</guisubmenu>
</menuchoice></term>
@@ -344,27 +348,27 @@ If the selected messages are already in the trash folder, they will be permanent
The following options may not be immediately obvious, therefore deserve an explanation.</para>
<itemizedlist>
<listitem><para><guilabel>Smart Sender/Receiver</guilabel> will display the sender when you are reading in your outbox folder/template folder, and display the receiver when you are in your inbox/inbox subfolders.</para></listitem>
- <listitem><para><guilabel>By Action Item Status</guilabel> and <guilabel>By Important Status</guilabel> need to be set before they can be sorted. Please see <link linkend="mark-messages">Mark Messages</link> for more information on marking your messages.</para></listitem>
+ <listitem><para><guilabel>By Action Item Status</guilabel> and <guilabel>By Important Status</guilabel> need to be set before they can be sorted. Please see <link linkend="reader-mark-messages">Mark Messages</link> for more information on marking your messages.</para></listitem>
</itemizedlist></listitem>
<listitem><para><guilabel>Message Sort Direction</guilabel> and <guilabel>Group Sort Direction</guilabel> allow you to change the direction of your message/group sort respectively.</para></listitem>
<listitem><para><guilabel>Folder always Uses this Sort Order</guilabel> allows you to keep your sort settings per folder.</para></listitem>
</itemizedlist></listitem>
</varlistentry>
-<varlistentry id="messagelist-aggregation">
+<varlistentry id="reader-view-messagelist-aggregation">
<term><menuchoice>
<guisubmenu>Aggregation</guisubmenu>
</menuchoice></term>
<listitem><para>Allows you to set your aggregation view.</para>
<para><guilabel>Configure...</guilabel> Allows you to configure aggregation, please see <link linkend="configure-appearance-message-list">Configure Appearance Message List</link> for more information on aggregation.</para></listitem>
</varlistentry>
-<varlistentry id="messagelist-theme">
+<varlistentry id="reader-view-messagelist-theme">
<term><menuchoice>
<guisubmenu>Theme</guisubmenu>
</menuchoice></term>
<listitem><para>Allows you to select a theme.</para>
<para><guilabel>Configure...</guilabel> Allows you to configure themes, please see <link linkend="configure-appearance-message-list">Configure Appearance Message List</link> for more information on themes.</para></listitem>
</varlistentry>
-<varlistentry id="messagelist-create-new-tab">
+<varlistentry id="reader-view-messagelist-create-new-tab">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;&Shift;<keycap>T</keycap></keycombo>
@@ -373,7 +377,7 @@ The following options may not be immediately obvious, therefore deserve an expla
</menuchoice></term>
<listitem><para><action>Creates a new tab,</action> then select the folder you would like to display in the tab.</para></listitem>
</varlistentry>
-<varlistentry id="messagelist-close-tab">
+<varlistentry id="reader-view-messagelist-close-tab">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;&Shift;<keycap>W</keycap></keycombo>
@@ -384,43 +388,22 @@ The following options may not be immediately obvious, therefore deserve an expla
</varlistentry>
</variablelist></listitem>
</varlistentry>
-<varlistentry id="view-headers">
+<varlistentry id="reader-view-headers">
<term><menuchoice>
<guimenu>View</guimenu>
<guisubmenu>Headers</guisubmenu>
</menuchoice></term>
-<listitem><para><action>Select your headers view.</action> Your choices are as follows:</para>
-<itemizedlist>
- <listitem><para><guilabel>Enterprise Headers</guilabel> A minimal header with title, From, and To, with a graphical design.</para></listitem>
- <listitem><para><guilabel>Fancy Headers</guilabel> Minimal header with a spam status notification.</para></listitem>
- <listitem><para><guilabel>Brief Headers</guilabel> Title, and in parentheses you will find From and the date.</para></listitem>
- <listitem><para><guilabel>Standard Headers</guilabel> Title, From, and To.</para></listitem>
- <listitem><para><guilabel>Long Headers</guilabel> Title, Date, From, and To.</para></listitem>
- <listitem><para><guilabel>All Headers</guilabel> List everything you ever wanted to know about the email, including every server it went through, virus/spam scanners it went through &etc;</para></listitem>
- <listitem><para><guilabel>Custom Headers</guilabel> See <link linkend="configure-appearance-message-window">Message Window configuration</link> <guilabel>Headers:</guilabel> to set up custom headers that can be selected here.</para></listitem>
- <listitem><para><guilabel>Example</guilabel> An example header from the <guilabel>Download New Themes</guilabel></para></listitem>
- <listitem><para><guilabel>Example Fancy</guilabel> An example fancy header from the <guilabel>Download New Themes</guilabel></para></listitem>
- <listitem><para><guilabel>Download New Themes</guilabel> Allows you to download custom themes created by other &kmail; users.</para></listitem>
-</itemizedlist></listitem>
+<listitem><para><action>Select your headers view.</action> Please see <link linkend="using-header-options">Header Options</link> for details on headers.</para></listitem>
</varlistentry>
-<varlistentry id="view-attachments">
+<varlistentry id="reader-view-attachments">
<term><menuchoice>
<guimenu>View</guimenu>
<guimenuitem>Attachments</guimenuitem>
</menuchoice></term>
<listitem><para><action>Changes the way attachments appear in the <guilabel>Message Preview Pane</guilabel></action>
-(independent of the &MIME; Tree) as follows:</para>
-<itemizedlist>
- <listitem><para><guimenuitem>As Icons</guimenuitem>, all attachments appear as icons at the bottom of the message.</para></listitem>
- <listitem><para><guimenuitem>Smart</guimenuitem> will show attachments as icons, unless the message suggests that they should be displayed inline.
- You can suggest that certain attachments should be shown inline in your own messages when you select <guilabel>Suggest automatic display</guilabel>
- in the attachment's properties dialog.</para></listitem>
- <listitem><para><guimenuitem>Inline</guimenuitem> shows the contents of the attachments at the bottom of the message.
-Attachments that cannot be displayed, ⪚ compressed files, will still be shown as an icon.</para></listitem>
- <listitem><para><guimenuitem>Hide</guimenuitem> will not show attachments.</para></listitem>
-</itemizedlist></listitem>
+(independent of the &MIME; Tree) Please see <link linkend="using-attachment-view-options">Attachment Options</link> for details on attachments.</para></listitem>
</varlistentry>
-<varlistentry id="expand-thread-or-group">
+<varlistentry id="reader-view-expand-thread-or-group">
<term><menuchoice>
<shortcut>
<keycap>.</keycap></shortcut>
@@ -429,7 +412,7 @@ Attachments that cannot be displayed, ⪚ compressed files, will still be shown
</menuchoice></term>
<listitem><para><action>This will display the thread of the current message,</action> &ie; all messages that are replies to the current message.</para></listitem>
</varlistentry>
-<varlistentry id="view-collapse-thread-or-group">
+<varlistentry id="reader-view-collapse-thread-or-group">
<term><menuchoice>
<shortcut>
<keycap>,</keycap>
@@ -439,7 +422,7 @@ Attachments that cannot be displayed, ⪚ compressed files, will still be shown
</menuchoice></term>
<listitem><para><action>This will hide the thread of the current message,</action> &ie; it will hide all messages that are replies to the current message.</para></listitem>
</varlistentry>
-<varlistentry id="view-expand-all-threads">
+<varlistentry id="reader-view-expand-all-threads">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>.</keycap></keycombo>
@@ -449,7 +432,7 @@ Attachments that cannot be displayed, ⪚ compressed files, will still be shown
</menuchoice></term>
<listitem><para><action>Expands all threads in the current folder.</action></para></listitem>
</varlistentry>
-<varlistentry id="view-collapse-all-threads">
+<varlistentry id="reader-view-collapse-all-threads">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>,</keycap></keycombo>
@@ -459,7 +442,7 @@ Attachments that cannot be displayed, ⪚ compressed files, will still be shown
</menuchoice></term>
<listitem><para><action>Collapses all threads in the current folder.</action></para></listitem>
</varlistentry>
-<varlistentry id="view-viewsource">
+<varlistentry id="reader-view-viewsource">
<term><menuchoice>
<shortcut>
<keycap>V</keycap>
@@ -472,14 +455,14 @@ This can be useful to find out the origin of a mail. </para>
<note><para>You should know that it is easy to fake the <literal>From:</literal> header of a mail, but one can still find out which mail
servers have been used to send the message by looking at the <literal>Received:</literal> lines in the header.</para></note></listitem>
</varlistentry>
-<varlistentry id="view-show-message-structure">
+<varlistentry id="reader-view-show-message-structure">
<term><menuchoice>
<guimenu>View</guimenu>
<guimenuitem>Show Message Structure</guimenuitem>
</menuchoice></term>
<listitem><para><action>Display the structure viewer,</action> which is a part of the main window that lets you access all parts of a message.</para></listitem>
</varlistentry>
-<varlistentry id="view-use-fixed-font">
+<varlistentry id="reader-view-use-fixed-font">
<term><menuchoice>
<shortcut>
<keycap>X</keycap>
@@ -490,7 +473,7 @@ servers have been used to send the message by looking at the <literal>Received:<
<listitem><para><action>Uses a fixed width (Monospace) font to display the messages in the current folder.</action>
The font to be used can be configured in the <link linkend="configure-appearance-fonts">Configure Appearance Fonts</link> tab of the configuration dialog.</para></listitem>
</varlistentry>
-<varlistentry id="view-set-encoding">
+<varlistentry id="reader-view-set-encoding">
<term><menuchoice>
<guimenu>View</guimenu>
<guisubmenu>Set Encoding</guisubmenu>
@@ -498,7 +481,7 @@ servers have been used to send the message by looking at the <literal>Received:<
<listitem><para><action>Lets you choose the character encoding to be used in the Message Pane.</action>
The default, <guilabel>Auto</guilabel>, should work in almost all cases.</para></listitem>
</varlistentry>
-<varlistentry id="view-zoom">
+<varlistentry id="reader-view-zoom">
<term><menuchoice>
<guimenu>View</guimenu>
<guisubmenu>Zoom</guisubmenu>
@@ -514,7 +497,7 @@ servers have been used to send the message by looking at the <literal>Received:<
<title>Go Menu</title>
<variablelist>
-<varlistentry id="go-jump-to-folder">
+<varlistentry id="reader-go-jump-to-folder">
<term><menuchoice>
<shortcut>
<keycap>J</keycap>
@@ -525,7 +508,7 @@ servers have been used to send the message by looking at the <literal>Received:<
<listitem><para><action>Show a dialog box with a list of all your folders.</action>
Click on the folder you wish to view and it will display it in the message view pane.</para></listitem>
</varlistentry>
-<varlistentry id="go-next-message">
+<varlistentry id="reader-go-next-message">
<term><menuchoice>
<shortcut>
<keycap>N</keycap>
@@ -536,7 +519,7 @@ servers have been used to send the message by looking at the <literal>Received:<
<listitem><para><action>Selects the next message in the message list.</action>
The keyboard shortcut <keycap>Right Arrow</keycap> also performs this action.</para></listitem>
</varlistentry>
-<varlistentry id="go-next-unread-message">
+<varlistentry id="reader-go-next-unread-message">
<term><menuchoice>
<shortcut>
<keycap>+</keycap>
@@ -547,7 +530,7 @@ servers have been used to send the message by looking at the <literal>Received:<
<listitem><para><action>Selects the next unread message in the message list.</action>
If there are not any unread messages below the currently selected message, then the behavior depends on the value of the <xref linkend="configure-misc-folders-go-unread"/> option.</para></listitem>
</varlistentry>
-<varlistentry id="go-previous-message">
+<varlistentry id="reader-go-previous-message">
<term><menuchoice>
<shortcut>
<keycap>P</keycap>
@@ -557,7 +540,7 @@ servers have been used to send the message by looking at the <literal>Received:<
</menuchoice></term>
<listitem><para><action>Selects the previous message in the message list.</action></para></listitem>
</varlistentry>
-<varlistentry id="go-previous-unread">
+<varlistentry id="reader-go-previous-unread">
<term><menuchoice>
<shortcut>
<keycap>-</keycap>
@@ -569,7 +552,7 @@ servers have been used to send the message by looking at the <literal>Received:<
If there is not an unread message above the currently selected message, then the behavior depends on the value of the
<xref linkend="configure-misc-folders-go-unread"/> option.</para></listitem>
</varlistentry>
-<varlistentry id="go-next-unread-folder">
+<varlistentry id="reader-go-next-unread-folder">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Alt;<keycap>+</keycap></keycombo>
@@ -579,7 +562,7 @@ servers have been used to send the message by looking at the <literal>Received:<
</menuchoice></term>
<listitem><para><action>Jumps to the next folder with unread messages.</action></para></listitem>
</varlistentry>
-<varlistentry id="go-previous-unread-folder">
+<varlistentry id="reader-go-previous-unread-folder">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Alt;<keycap>-</keycap></keycombo>
@@ -589,7 +572,7 @@ servers have been used to send the message by looking at the <literal>Received:<
</menuchoice></term>
<listitem><para><action>Jumps to the previous folder with unread messages.</action></para></listitem>
</varlistentry>
-<varlistentry id="go-next-unread-text">
+<varlistentry id="reader-go-next-unread-text">
<term><menuchoice>
<shortcut>
<keycap>Space</keycap>
@@ -606,21 +589,21 @@ servers have been used to send the message by looking at the <literal>Received:<
<sect2 id="reader-folder-menu">
<title>Folder Menu</title>
<variablelist>
-<varlistentry id="folder-add-folder">
+<varlistentry id="reader-folder-add-folder">
<term><menuchoice>
<guimenu>Folder</guimenu>
<guimenuitem>Add Folder...</guimenuitem>
</menuchoice></term>
<listitem><para><action>Opens the <link linkend="folders-properties-window">Folder Properties</link> dialog</action> that lets you create a new folder.</para></listitem>
</varlistentry>
-<varlistentry id="folder-mark-all-messages-as-read">
+<varlistentry id="reader-folder-mark-all-messages-as-read">
<term><menuchoice>
<guimenu>Folder</guimenu>
<guimenuitem>Mark All Messages as Read</guimenuitem>
</menuchoice></term>
<listitem><para><action>Sets the status of all new and unread messages in the current folder to read.</action></para></listitem>
</varlistentry>
-<varlistentry id="folder-update-folder">
+<varlistentry id="reader-folder-update-folder">
<term><menuchoice>
<shortcut>
<keycap>F5</keycap>
@@ -631,7 +614,7 @@ servers have been used to send the message by looking at the <literal>Received:<
<listitem><para><action>Checks whether new mail arrived in the currently selected folder.</action></para>
<note><para>This is only available for &imap; folders.</para></note></listitem>
</varlistentry>
-<varlistentry id="folder-update-folder-and-all-its-subfolders">
+<varlistentry id="reader-folder-update-folder-and-all-its-subfolders">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>F5</keycap></keycombo>
@@ -642,7 +625,7 @@ servers have been used to send the message by looking at the <literal>Received:<
<listitem><para><action>Checks whether new mail arrived in the currently selected folder and all of its subfolders.</action></para>
<note><para>This is only available for &imap; folders.</para></note></listitem>
</varlistentry>
-<varlistentry id="folder-move-all-messages-to-trash">
+<varlistentry id="reader-folder-move-all-messages-to-trash">
<term><menuchoice>
<guimenu>Folder</guimenu>
<guimenuitem>Move All to Trash</guimenuitem>
@@ -651,7 +634,7 @@ servers have been used to send the message by looking at the <literal>Received:<
<note><para>This is only available if the currently selected folder is not a trash folder. If the currently selected folder is a trash folder, you will see <guilabel>Empty Trash</guilabel>.
Please see next section for details.</para></note></listitem>
</varlistentry>
-<varlistentry id="folder-empty-trash">
+<varlistentry id="reader-folder-empty-trash">
<term><menuchoice>
<guimenu>Folder</guimenu>
<guimenuitem>Empty Trash</guimenuitem>
@@ -659,7 +642,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Permanently deletes all messages.</action></para>
<note><para>This is only available if the currently selected folder is a trash folder.</para></note></listitem>
</varlistentry>
-<varlistentry id="folder-archive-folder">
+<varlistentry id="reader-folder-archive-folder">
<term><menuchoice>
<guimenu>Folder</guimenu>
<guimenuitem>Archive Folder...</guimenuitem>
@@ -670,7 +653,7 @@ Please see next section for details.</para></note></listitem>
Check the <guilabel>Delete folder and subfolders after completion</guilabel> if you would like everything you archived deleted.
By default all subfolders will be archived, uncheck <guilabel>Archive all subfolders</guilabel> if you only want to archive the parent folder.</para></listitem>
</varlistentry>
-<varlistentry id="folder-delete-folder">
+<varlistentry id="reader-folder-delete-folder">
<term><menuchoice>
<guimenu>Folder</guimenu>
<guimenuitem>Delete Folder</guimenuitem>
@@ -678,7 +661,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Removes the selected folder and all its contents, including subfolders.</action></para>
<warning><para>Please note that there is no way to access the contents of a folder after it has been removed.</para></warning></listitem>
</varlistentry>
-<varlistentry id="folder-remove-duplicate-messages">
+<varlistentry id="reader-folder-remove-duplicate-messages">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>*</keycap></keycombo>
@@ -688,7 +671,7 @@ Please see next section for details.</para></note></listitem>
</menuchoice></term>
<listitem><para><action>Searches the folder for duplicate messages and deletes them.</action></para></listitem>
</varlistentry>
-<varlistentry id="folder-apply-all-filters-on-folder">
+<varlistentry id="reader-folder-apply-all-filters-on-folder">
<term><menuchoice>
<guimenu>Folder</guimenu>
<guimenuitem>Apply All Filters On Folder</guimenuitem>
@@ -696,7 +679,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Applies all configured filters on the currently selected folder.</action>
Please see <link linkend="filter-dialog-id">Filter dialog</link> for more information on filters.</para></listitem>
</varlistentry>
-<varlistentry id="folder-prefer-html-to-plain-text">
+<varlistentry id="reader-folder-prefer-html-to-plain-text">
<term><menuchoice>
<guimenu>Folder</guimenu>
<guimenuitem>Prefer HTML to Plain Text</guimenuitem>
@@ -704,7 +687,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>If enabled then &html; messages in this folder will be shown using &html; rendering.</action></para>
<warning><para>For security reasons, we recommend to only activate this for folders which only contain trusted messages.</para></warning></listitem>
</varlistentry>
-<varlistentry id="folder-load-external-references">
+<varlistentry id="reader-folder-load-external-references">
<term><menuchoice>
<guimenu>Folder</guimenu>
<guimenuitem>Load External References</guimenuitem>
@@ -712,7 +695,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para>If you have &html; messages enabled (see above), then you have the option to enable this to have <action>images and resources linked from the web will load automatically.</action></para>
<warning><para>For security reasons, we recommend to only activate this for folders which only contain trusted messages.</para></warning></listitem>
</varlistentry>
-<varlistentry id="folder-mailing-list-management">
+<varlistentry id="reader-folder-mailing-list-management">
<term><menuchoice>
<guimenu>Folder</guimenu>
<guimenuitem>Mailing List Management...</guimenuitem>
@@ -720,7 +703,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>This opens up the mailing list management dialog.</action>
Please see <link linkend="folders-properties-mailinglist">Mailing List dialog</link> for more information on mailing lists.</para></listitem>
</varlistentry>
-<varlistentry id="folder-assign-shortcut">
+<varlistentry id="reader-folder-assign-shortcut">
<term><menuchoice>
<guimenu>Folder</guimenu>
<guimenuitem>Assign Shortcut...</guimenuitem>
@@ -735,7 +718,7 @@ Please see next section for details.</para></note></listitem>
<title>Message Menu</title>
<variablelist>
-<varlistentry id="message-new-message">
+<varlistentry id="reader-message-new-message">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>
@@ -746,7 +729,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Opens the <link linkend="the-composer-window">composer window</link></action>
so you can write a new message.</para></listitem>
</varlistentry>
-<varlistentry id="message-new-message-to-mailing-list">
+<varlistentry id="reader-message-new-message-to-mailing-list">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;&Shift;<keycap>N</keycap></keycombo>
@@ -758,7 +741,7 @@ Please see next section for details.</para></note></listitem>
If the current folder holds a mailing list and has a posting address defined,
this address will be the default <guilabel>To:</guilabel> address.</para></listitem>
</varlistentry>
-<varlistentry id="message-reply">
+<varlistentry id="reader-message-reply">
<term><menuchoice>
<shortcut>
<keycap>R</keycap></shortcut>
@@ -767,10 +750,10 @@ Please see next section for details.</para></note></listitem>
</menuchoice></term>
<listitem><para><action>Opens up the composer window, inserts the quoted text of the currently selected message and presets the
<guilabel>To:</guilabel> field either with the mailing-list address (if you reply to a mailing-list message) or with the preferred reply address of the sender.</action>
- If you want to control which address the <guilabel>To:</guilabel> field is preset with then you should use <link linkend="message-reply-special">Reply Special</link>.
+ If you want to control which address the <guilabel>To:</guilabel> field is preset with then you should use <link linkend="reader-message-reply-special">Reply Special</link>.
Your identity will automatically be set to the identity this message was originally sent to.</para></listitem>
</varlistentry>
-<varlistentry id="message-reply-all">
+<varlistentry id="reader-message-reply-all">
<term><menuchoice>
<shortcut>
<keycap>A</keycap>
@@ -786,7 +769,7 @@ Please see next section for details.</para></note></listitem>
selected message excluding your own address.</action>
Your identity will automatically be set to the identity this message was originally sent to.</para></listitem>
</varlistentry>
-<varlistentry id="message-reply-special">
+<varlistentry id="reader-message-reply-special">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Shift;<keycap>A</keycap></keycombo>
@@ -798,7 +781,7 @@ Please see next section for details.</para></note></listitem>
selected message and presets the <guilabel>To:</guilabel> field with the
preferred reply address of the sender.</action> Your identity will automatically be set to the identity this message was originally sent to.</para></listitem>
</varlistentry>
-<varlistentry id="message-reply-special-reply-to-mailinglist">
+<varlistentry id="reader-message-reply-special-reply-to-mailinglist">
<term><menuchoice>
<shortcut>
<keycap>L</keycap>
@@ -812,7 +795,7 @@ Please see next section for details.</para></note></listitem>
If you did not specify a mailing-list address for the currently selected folder and &kmail; cannot determine the posting address
from the currently selected message then the <guilabel>To:</guilabel> field will be empty. Your identity will automatically be set to the identity this message was originally sent to.</para></listitem>
</varlistentry>
-<varlistentry id="message-reply-special-reply-without-quote">
+<varlistentry id="reader-message-reply-special-reply-without-quote">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Shift;<keycap>R</keycap></keycombo>
@@ -823,7 +806,7 @@ Please see next section for details.</para></note></listitem>
</menuchoice></term>
<listitem><para>Works just like <guimenuitem>Reply...</guimenuitem> except that the text of the currently selected message is not quoted.</para></listitem>
</varlistentry>
-<varlistentry id="message-reply-special-reply-with-custom-template">
+<varlistentry id="reader-message-reply-special-reply-with-custom-template">
<term><menuchoice>
<guimenu>Message</guimenu>
<guisubmenu>Reply Special</guisubmenu>
@@ -831,7 +814,7 @@ Please see next section for details.</para></note></listitem>
</menuchoice></term>
<listitem><para>Works just like <guimenuitem>Reply...</guimenuitem> with the option to select a custom template that has been configured in <link linkend="configure-composer-custom-templates">Custom Templates</link>.</para></listitem>
</varlistentry>
-<varlistentry id="message-reply-special-reply-to-all-with-custom-template">
+<varlistentry id="reader-message-reply-special-reply-to-all-with-custom-template">
<term><menuchoice>
<guimenu>Message</guimenu>
<guisubmenu>Reply Special</guisubmenu>
@@ -840,7 +823,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para>Works just like <guimenuitem>Reply to All...</guimenuitem> with the option to select a custom template that has
been configured in <link linkend="configure-composer-custom-templates">Custom Templates</link>.</para></listitem>
</varlistentry>
-<varlistentry id="message-forward-as-attachment">
+<varlistentry id="reader-message-forward-as-attachment">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Shift;<keycap>F</keycap></keycombo>
@@ -852,7 +835,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Forwards the message to a new recipient.</action> The message and its attachments will become an attachment of the new message.
The original message headers will be included in the forwarded message as well.</para></listitem>
</varlistentry>
-<varlistentry id="message-forward-inline">
+<varlistentry id="reader-message-forward-inline">
<term><menuchoice>
<shortcut>
<keycap>F</keycap></shortcut>
@@ -863,7 +846,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>The message's text and some important header fields will be copied to the body of the new message with text marking the forwarded part.</action>
Attachments will be forwarded as attachments of the new message.</para></listitem>
</varlistentry>
-<varlistentry id="message-forward-redirect">
+<varlistentry id="reader-message-forward-redirect">
<term><menuchoice>
<shortcut>
<keycap>E</keycap>
@@ -875,7 +858,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para>This works like forward, except that the message stays the same (even the <guilabel>From:</guilabel> field).
The user who redirected the message is added in special header fields (<literal>Redirect-From</literal>, <literal>Redirect-Date</literal>, <literal>Redirect-To</literal>, &etc;).</para></listitem>
</varlistentry>
-<varlistentry id="message-forward-with-custom-template">
+<varlistentry id="reader-message-forward-with-custom-template">
<term><menuchoice>
<guimenu>Message</guimenu>
<guisubmenu>Forward</guisubmenu>
@@ -883,7 +866,7 @@ Please see next section for details.</para></note></listitem>
</menuchoice></term>
<listitem><para>Works just like forward with the option to select a custom template that has been configured in the composer custom templates tab in <link linkend="configure-composer-custom-templates">Custom Templates</link>.</para></listitem>
</varlistentry>
-<varlistentry id="message-send-again">
+<varlistentry id="reader-message-send-again">
<term><menuchoice>
<guimenu>Message</guimenu>
<guimenuitem>Send Again...</guimenuitem>
@@ -891,7 +874,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Opens a composer window with the currently selected message so it can be sent again.</action></para>
<note><para>This is only available for messages which you have sent or, more precisely, for messages which have the <guilabel>sent</guilabel> status.</para></note></listitem>
</varlistentry>
-<varlistentry id="message-edit-message">
+<varlistentry id="reader-message-edit-message">
<term><menuchoice>
<shortcut>
<keycap>T</keycap>
@@ -902,7 +885,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Edits the selected message if it is editable.</action></para>
<note><para>Only messages in the <guilabel>outbox</guilabel> and <guilabel>drafts</guilabel> folder can be edited.</para></note></listitem>
</varlistentry>
-<varlistentry id="message-mailing-list">
+<varlistentry id="reader-message-mailing-list">
<term><menuchoice>
<guimenu>Message</guimenu>
<guimenuitem>Mailing List</guimenuitem>
@@ -919,21 +902,21 @@ Please see next section for details.</para></note></listitem>
<listitem><para><guimenuitem>Unsubscribe to List(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with the mailing list subscription address and unsubscribe in the <guilabel>Subject:</guilabel> field.</para></listitem>
</itemizedlist></listitem>
</varlistentry>
-<varlistentry id="message-copy-message-to">
+<varlistentry id="reader-message-copy-message-to">
<term><menuchoice>
<guimenu>Message</guimenu>
<guisubmenu>Copy Message To</guisubmenu>
</menuchoice></term>
<listitem><para><action>Copies the selected messages to a specified folder,</action> you can choose from recent folders, local folders, or a specific account folder.</para></listitem>
</varlistentry>
-<varlistentry id="message-move-message-to">
+<varlistentry id="reader-message-move-message-to">
<term><menuchoice>
<guimenu>Message</guimenu>
<guisubmenu>Move Message To</guisubmenu>
</menuchoice></term>
<listitem><para>The same as copy message to, except you <action>permanently move the selected messages to a specified folder.</action>.</para></listitem>
</varlistentry>
-<varlistentry id="mark-messages">
+<varlistentry id="reader-mark-messages">
<term><menuchoice>
<guimenu>Message</guimenu>
<guisubmenu>Mark Message</guisubmenu>
@@ -997,7 +980,7 @@ Please see next section for details.</para></note></listitem>
</tbody>
</tgroup></informaltable></listitem>
</varlistentry>
-<varlistentry id="mark-thread">
+<varlistentry id="reader-mark-thread">
<term><menuchoice>
<guimenu>Message</guimenu>
<guisubmenu>Mark Thread</guisubmenu>
@@ -1078,7 +1061,7 @@ Please see next section for details.</para></note></listitem>
<member>Filter on Mailing-List...(currently selected mail must be a mailing list for this to be available)</member>
</simplelist></listitem>
</varlistentry>
-<varlistentry id="message-apply-filter">
+<varlistentry id="reader-message-apply-filter">
<term><menuchoice>
<guimenu>Message</guimenu>
<guimenuitem>Apply Filter</guimenuitem>
@@ -1086,14 +1069,14 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Allows you to <guimenuitem>Apply all Filters</guimenuitem>.</action> If you have spam filtering set up through
<link linkend="the-anti-spam-wizard">Anti-Spam Wizard</link> the options <guimenuitem>Filter Classify as Spam</guimenuitem> and <guimenuitem>Filter Classify as NOT Spam</guimenuitem> will be available for spam filtering.</para></listitem>
</varlistentry>
-<varlistentry id="message-create-to-do-reminder">
+<varlistentry id="reader-message-create-to-do-reminder">
<term><menuchoice>
<guimenu>Message</guimenu>
<guimenuitem>Create To-do/Reminder</guimenuitem>
</menuchoice></term>
<listitem><para><action>Brings up the &kontact; To-do/Reminder dialog</action> with options to add the selected email as a link, inline, or inline without attachments.</para></listitem>
</varlistentry>
-<varlistentry id="message-add-note">
+<varlistentry id="reader-message-add-note">
<term><menuchoice>
<guimenu>Message</guimenu>
<guimenuitem>Add Note...</guimenuitem>
@@ -1108,7 +1091,7 @@ Please see next section for details.</para></note></listitem>
<sect2 id="reader-tools-menu">
<title>Tools Menu</title>
<variablelist>
-<varlistentry id="tools-find-messages">
+<varlistentry id="reader-tools-find-messages">
<term><menuchoice>
<shortcut>
<keycap>S</keycap>
@@ -1135,7 +1118,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Starts <ulink url="help:kwatchgnupg"><application>KWatchGnuPG</application></ulink>,</action> a tool to present the debug output of the <application>GnuPG</application> application.
If signing, encryption, or verification mysteriously stop working, you might find out why by looking at this log.</para></listitem>
</varlistentry>
-<varlistentry id="tools-edit-out-of-office-replies">
+<varlistentry id="reader-tools-edit-out-of-office-replies">
<term><menuchoice>
<guimenu>Tools</guimenu>
<guisubmenu>Edit "Out of Office" Replies...</guisubmenu>
@@ -1143,7 +1126,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Launch the <guilabel>Configure "Out of Office" Replies</guilabel> dialog,</action> which allows you to set-up vacation notifications.</para>
<note><para><guilabel>Out of Office reply</guilabel> functionality relies on server-side filtering. To be able to use it you need to configure the <link linkend="receiving-mail">Filtering tab</link> (see option relevant to kolab server) of your &imap; account set-up.</para></note></listitem>
</varlistentry>
-<varlistentry id="tools-debug-sieve">
+<varlistentry id="reader-tools-debug-sieve">
<term><menuchoice>
<guimenu>Tools</guimenu>
<guisubmenu>Debug Sieve...</guisubmenu>
@@ -1151,7 +1134,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Launch the <guilabel>Sieve Diagnostics</guilabel> dialog.</action> This is useful to debug sieve if you are having problems with it.</para>
<note><para>You must have sieve support on your email server.</para></note></listitem>
</varlistentry>
-<varlistentry id="tools-filter-log-viewer">
+<varlistentry id="reader-tools-filter-log-viewer">
<term><menuchoice>
<guimenu>Tools</guimenu>
<guisubmenu>Filter Log Viewer...</guisubmenu>
@@ -1160,7 +1143,7 @@ Please see next section for details.</para></note></listitem>
control the logging of the filtering process. In the log you will find valuable
information about what filter rules were used, what was the result of the evaluation of those rules, and which filter actions were applied to a message.</para></listitem>
</varlistentry>
-<varlistentry id="tools-import-wizard">
+<varlistentry id="reader-tools-import-wizard">
<term><menuchoice>
<guimenu>Tools</guimenu>
<guisubmenu>Import Wizard...</guisubmenu>
@@ -1168,7 +1151,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Brings up the Import Wizard dialog</action> which assists in easily importing settings and email.
Please see <link linkend="import-wizard">Import Wizard</link> for details.</para></listitem>
</varlistentry>
-<varlistentry id="tools-export-data">
+<varlistentry id="reader-tools-export-data">
<term><menuchoice>
<guimenu>Tools</guimenu>
<guisubmenu>Export &kmail; Data...</guisubmenu>
@@ -1176,14 +1159,14 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Brings up the Export Data Wizard dialog</action> which assists in easily exporting your settings and email.
Please see <link linkend="export-data-wizard">Export &kmail; Data</link> for details.</para></listitem>
</varlistentry>
-<varlistentry id="tools-configure-automatic-archiving">
+<varlistentry id="reader-tools-configure-automatic-archiving">
<term><menuchoice>
<guimenu>Tools</guimenu>
<guimenuitem>Configure Automatic Archiving...</guimenuitem>
</menuchoice></term>
<listitem><para><action>Brings up the dialog to set up automatic archiving.</action> Please see <link linkend="auto-archive">Automatic Archiving</link> for details.</para></listitem>
</varlistentry>
-<varlistentry id="tools-configure-send-later-agent">
+<varlistentry id="reader-tools-configure-send-later-agent">
<term><menuchoice>
<guimenu>Tools</guimenu>
<guimenuitem>Configure Send Later Agent...</guimenuitem>
@@ -1191,7 +1174,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Brings up a dialog that allows you to modify and remove emails that have been sent using the send later feature.</action>
Please see <link linkend="send-later">Send Later</link> for details.</para></listitem>
</varlistentry>
-<varlistentry id="tools-account-wizard">
+<varlistentry id="reader-tools-account-wizard">
<term><menuchoice>
<guimenu>Tools</guimenu>
<guisubmenu>Account Wizard...</guisubmenu>
@@ -1199,7 +1182,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Brings up the Account Wizard dialog</action> which assists in easily setting up accounts.
Please see <link linkend="account-wizard">Account Wizard</link> for details.</para></listitem>
</varlistentry>
-<varlistentry id="tools-anti-spam-wizard">
+<varlistentry id="reader-tools-anti-spam-wizard">
<term><menuchoice>
<guimenu>Tools</guimenu>
<guimenuitem>Anti-Spam Wizard...</guimenuitem>
@@ -1207,7 +1190,7 @@ Please see next section for details.</para></note></listitem>
<listitem><para><action>Brings up the Anti-Spam Wizard</action> which can help you to set up spam filtering.
Please see <link linkend="the-anti-spam-wizard">Anti-Spam Wizard</link> for details.</para></listitem>
</varlistentry>
-<varlistentry id="tools-anti-virus-wizard">
+<varlistentry id="reader-tools-anti-virus-wizard">
<term><menuchoice>
<guimenu>Tools</guimenu>
<guimenuitem>Anti-Virus Wizard...</guimenuitem>
@@ -1224,7 +1207,7 @@ Please see next section for details.</para></note></listitem>
<para>If the menu item you are looking for is missing, please see <ulink url="help:/fundamentals/ui.html#menus-settings">Settings Menu</ulink> of the &kde; Fundamentals.
The items listed here are &kmail; specific.</para>
<variablelist>
-<varlistentry id="settings-show-quick-search-bar">
+<varlistentry id="reader-settings-show-quick-search-bar">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>H</keycap></keycombo>
@@ -1234,22 +1217,26 @@ Please see next section for details.</para></note></listitem>
</menuchoice></term>
<listitem><para><action>Allows you to enable the Quick Search bar,</action> which allows you to quickly search for messages matching a search text, is visible.</para></listitem>
</varlistentry>
-<varlistentry id="settings-configure-filters">
+<varlistentry id="reader-settings-configure-filters">
<term><menuchoice>
<guimenu>Settings</guimenu>
<guimenuitem>Configure Filters...</guimenuitem>
</menuchoice></term>
<listitem><para><action>Opens the <link linkend="filters">Message Filters</link> window.</action></para></listitem>
</varlistentry>
+<<<<<<< Updated upstream
<!--FIXME http://www.aegiap.eu/kdeblog/2013/08/new-in-kdepim-4-12-sieve-12/ -->
<varlistentry id="settings-manage-sieve-scripts">
+=======
+<varlistentry id="reader-settings-manage-sieve-scripts">
+>>>>>>> Stashed changes
<term><menuchoice>
<guimenu>Settings</guimenu>
<guimenuitem>Manage Sieve Scripts...</guimenuitem>
</menuchoice></term>
<listitem><para>If your mail server supports sieve (server side filtering), you would <action>configure your scripts here</action>.</para></listitem>
</varlistentry>
-<varlistentry id="settings-configure-notifications">
+<varlistentry id="reader-settings-configure-notifications">
<term><menuchoice>
<guimenu>Settings</guimenu>
<guimenuitem>Configure Notifications...</guimenuitem>
@@ -1271,7 +1258,7 @@ Help Menu</ulink> of the &kde; Fundamentals.</para>
<sect2 id="composer-file-menu">
<title>Message Menu</title>
<variablelist>
-<varlistentry id="message-new-composer">
+<varlistentry id="composer-message-new-composer">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>
@@ -1281,21 +1268,21 @@ Help Menu</ulink> of the &kde; Fundamentals.</para>
</menuchoice></term>
<listitem><para><action>Opens up a new composer window.</action></para></listitem>
</varlistentry>
-<varlistentry id="message-new-main-window">
+<varlistentry id="composer-message-new-main-window">
<term><menuchoice>
<guimenu>Message</guimenu>
<guimenuitem>New Main Window</guimenuitem>
</menuchoice></term>
<listitem><para><action>Creates a new main window.</action></para></listitem>
</varlistentry>
-<varlistentry id="message-new-addressbook-contact">
+<varlistentry id="composer-message-new-addressbook-contact">
<term><menuchoice>
<guimenu>Message</guimenu>
<guimenuitem>New AddressBook Contact</guimenuitem>
</menuchoice></term>
<listitem><para><action>Brings up the &kontact; New Contact Dialog</action> to add a new contact your addressbook.</para></listitem>
</varlistentry>
-<varlistentry id="message-send-mail">
+<varlistentry id="composer-message-send-mail">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>Return</keycap></keycombo>
@@ -1307,14 +1294,14 @@ Help Menu</ulink> of the &kde; Fundamentals.</para>
messages and the &SMTP; server is not reachable, the message will be put into the outbox and you will get an error message.
After the connection issues are resolved, you can send the messages in the outbox using <menuchoice><guimenu>File</guimenu><guimenuitem>Send Queued Messages</guimenuitem></menuchoice>.</para></listitem>
</varlistentry>
-<varlistentry id="message-send-mail-via">
+<varlistentry id="composer-message-send-mail-via">
<term><menuchoice>
<guimenu>Message</guimenu>
<guimenuitem>Send Mail Via</guimenuitem>
</menuchoice></term>
<listitem><para>Allows you to select which outgoing mail server you wish to use to send the message.</para></listitem>
</varlistentry>
-<varlistentry id="message-send-later">
+<varlistentry id="composer-message-send-later">
<term><menuchoice>
<guimenu>Message</guimenu>
<guimenuitem>Send Later</guimenuitem>
@@ -1322,21 +1309,21 @@ Help Menu</ulink> of the &kde; Fundamentals.</para>
<listitem><para><action>Brings up the send later dialog.</action>
Please see <link linkend="send-later">Send Later</link> for details.</para></listitem>
</varlistentry>
-<varlistentry id="message-send-later-via">
+<varlistentry id="composer-message-send-later-via">
<term><menuchoice>
<guimenu>Message</guimenu>
<guimenuitem>Send Later Via</guimenuitem>
</menuchoice></term>
<listitem><para>Allows you to choose which outgoing account to send your send later configured message.</para></listitem>
</varlistentry>
-<varlistentry id="message-save-as-file">
+<varlistentry id="composer-message-save-as-file">
<term><menuchoice>
<guimenu>Message</guimenu>
<guimenuitem>Save as File</guimenuitem>
</menuchoice></term>
<listitem><para><action>Saves the message as a text document.</action></para></listitem>
</varlistentry>
-<varlistentry id="message-save-as-draft">
+<varlistentry id="composer-message-save-as-draft">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>
@@ -1346,7 +1333,7 @@ Help Menu</ulink> of the &kde; Fundamentals.</para>
</menuchoice></term>
<listitem><para><action>Save the message in the <guilabel>drafts</guilabel> folder</action> so you can later edit and send it.</para></listitem>
</varlistentry>
-<varlistentry id="message-save-as-template">
+<varlistentry id="composer-message-save-as-template">
<term><menuchoice>
<guimenu>Message</guimenu>
<guimenuitem>Save as Template</guimenuitem>
@@ -1354,21 +1341,21 @@ Help Menu</ulink> of the &kde; Fundamentals.</para>
<listitem><para>Allows you to <action>save your message as a template.</action>
Please see <link linkend="new-compose-from-templates">Compose from templates</link> for details on templates.</para></listitem>
</varlistentry>
-<varlistentry id="message-insert-text-file">
+<varlistentry id="composer-message-insert-text-file">
<term><menuchoice>
<guimenu>Message</guimenu>
<guimenuitem>Insert Text File...</guimenuitem>
</menuchoice></term>
<listitem><para><action>Inserts a text file into the message text,</action> starting at the cursor position.</para></listitem>
</varlistentry>
-<varlistentry id="message-insert-recent-text-file">
+<varlistentry id="composer-message-insert-recent-text-file">
<term><menuchoice>
<guimenu>Message</guimenu>
<guimenuitem>Insert Recent Text File...</guimenuitem>
</menuchoice></term>
<listitem><para>Allows you to choose from a list of recently inserted text files to insert into your message. Select <guimenuitem>Clear List</guimenuitem> to clear the list.</para></listitem>
</varlistentry>
-<varlistentry id="message-print">
+<varlistentry id="composer-message-print">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo>
@@ -1378,7 +1365,7 @@ Help Menu</ulink> of the &kde; Fundamentals.</para>
</menuchoice></term>
<listitem><para><action>Prints the current text.</action></para></listitem>
</varlistentry>
-<varlistentry id="message-close">
+<varlistentry id="composer-message-close">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo>
@@ -1398,7 +1385,7 @@ Help Menu</ulink> of the &kde; Fundamentals.</para>
<para>If the menu item you are looking for is missing, please see <ulink url="help:/fundamentals/ui.html#menus-edit">Edit Menu</ulink> of the &kde; Fundamentals.
The items listed here are &kmail; specific.</para>
<variablelist>
-<varlistentry id="edit-paste-quotation">
+<varlistentry id="composer-edit-paste-quotation">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;&Shift;<keycap>O</keycap></keycombo>
@@ -1408,14 +1395,14 @@ Help Menu</ulink> of the &kde; Fundamentals.</para>
</menuchoice></term>
<listitem><para><action>Pastes the text from the clipboard</action> marked as quotation.</para></listitem>
</varlistentry>
-<varlistentry id="edit-paste-attachment">
+<varlistentry id="composer-edit-paste-attachment">
<term><menuchoice>
<guimenu>Edit</guimenu>
<guimenuitem>Paste as Attachment</guimenuitem>
</menuchoice></term>
<listitem><para><action>Pastes the text from the clipboard</action> as an attachment.</para></listitem>
</varlistentry>
-<varlistentry id="edit-paste-without-formatting">
+<varlistentry id="composer-edit-paste-without-formatting">
<term><menuchoice>
<shortcut>
<keycombo action="simul">&Ctrl;&Shift;<keycap>V</keycap></keycombo>
@@ -1425,7 +1412,7 @@ Help Menu</ulink> of the &kde; Fundamentals.</para>
</menuchoice></term>
<listitem><para><action>Pastes the text from the clipboard</action> exactly as is, with no formatting.</para></listitem>
</varlistentry>
-<varlistentry id="edit-clean-spaces">
+<varlistentry id="composer-edit-clean-spaces">
<term><menuchoice>
<guimenu>Edit</guimenu>
<guimenuitem>Clean Spaces</guimenuitem>
@@ -1433,35 +1420,35 @@ Help Menu</ulink> of the &kde; Fundamentals.</para>
<listitem><para>This replaces multiple line breaks or spaces with single line breaks or spaces.
It works on the current selection or the complete message text if there is no selection.</para></listitem>
</varlistentry>
-<varlistentry id="edit-add-quote-characters">
+<varlistentry id="composer-edit-add-quote-characters">
<term><menuchoice>
<guimenu>Edit</guimenu>
<guimenuitem>Add Quote Characters</guimenuitem>
</menuchoice></term>
<listitem><para>Prepends the selected text with quotation marks.</para></listitem>
</varlistentry>
-<varlistentry id="edit-remove-quote-characters">
+<varlistentry id="composer-edit-remove-quote-characters">
<term><menuchoice>
<guimenu>Edit</guimenu>
<guimenuitem>Remove Quote Characters</guimenuitem>
</menuchoice></term>
<listitem><para>Removes the left-most quotation marks from the selected text.</para></listitem>
</varlistentry>
-<varlistentry id="edit-uppercase">
+<varlistentry id="composer-edit-uppercase">
<term><menuchoice>
<guimenu>Edit</guimenu>
<guimenuitem>Uppercase</guimenuitem>
</menuchoice></term>
<listitem><para>Convert the selected text to uppercase.</para></listitem>
</varlistentry>
-<varlistentry id="edit-lowercase">
+<varlistentry id="composer-edit-lowercase">
<term><menuchoice>
<guimenu>Edit</guimenu>
<guimenuitem>Lowercase</guimenuitem>
</menuchoice></term>
<listitem><para>Convert the selected text to lowercase.</para></listitem>
</varlistentry>
-<varlistentry id="edit-insert-special-characters">
+<varlistentry id="composer-edit-insert-special-characters">
<term><menuchoice>
<guimenu>Edit</guimenu>
<guimenuitem>Insert Special Characters</guimenuitem>
@@ -1476,196 +1463,154 @@ It works on the current selection or the complete message text if there is no se
<title>View Menu</title>
<para>This menu lets you toggle the display of the header fields and other
-options in this composer window.</para>
+options in the composer window.</para>
+<para>Currently visible items will have a checkmark shown next to their name in the
+menu.</para>
<para>Options available are:</para>
<itemizedlist>
-<listitem>
-<para><guimenuitem>All Fields</guimenuitem></para>
-</listitem>
-<listitem>
-<para><guimenuitem>Identity</guimenuitem></para>
-</listitem>
-<listitem>
-<para><guimenuitem>Dictionary</guimenuitem></para>
-</listitem>
-<listitem>
-<para><guimenuitem>Sent-Mail folder</guimenuitem></para>
-</listitem>
-<listitem>
-<para><guimenuitem>Mail Transport</guimenuitem></para>
-</listitem>
-<listitem>
-<para><guimenuitem>From</guimenuitem></para>
-</listitem>
-<listitem>
-<para><guimenuitem>Reply To</guimenuitem></para>
-</listitem>
-<listitem>
-<para><guimenuitem>Subject</guimenuitem></para>
-</listitem>
+ <listitem>
+ <para><guimenuitem>All Fields</guimenuitem></para>
+ </listitem>
+ <listitem>
+ <para><guimenuitem>Identity</guimenuitem></para>
+ </listitem>
+ <listitem>
+ <para><guimenuitem>Dictionary</guimenuitem></para>
+ </listitem>
+ <listitem>
+ <para><guimenuitem>Sent-Mail folder</guimenuitem></para>
+ </listitem>
+ <listitem>
+ <para><guimenuitem>Mail Transport</guimenuitem></para>
+ </listitem>
+ <listitem>
+ <para><guimenuitem>From</guimenuitem></para>
+ </listitem>
+ <listitem>
+ <para><guimenuitem>Reply To</guimenuitem></para>
+ </listitem>
+ <listitem>
+ <para><guimenuitem>Subject</guimenuitem></para>
+ </listitem>
</itemizedlist>
-<para>Currently visible items have a checkmark shown next to their name in the
-menu.</para>
+<para>Please see <link linkend="composer-headers">Composer Headers</link> for details on these options.</para>
<variablelist>
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="composer-view-use-fixed-font">
+<term><menuchoice>
<guimenu>View</guimenu>
<guimenuitem>Use Fixed Font</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Uses a fixed width (monospaced) font to display the currently
+</menuchoice></term>
+<listitem><para>Uses a fixed width (monospaced) font to display the currently
edited message. The font to be used can be configured in the
-<guilabel>Appearance</guilabel> section of &kmail;'s configuration
-dialog.</para>
-</listitem>
+<guilabel>Appearance</guilabel> section of &kmail;'s configuration dialog.</para></listitem>
+</varlistentry>
+<varlistentry id="composer-view-snippets">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guimenuitem>Snippets</guimenuitem>
+</menuchoice></term>
+<listitem><para>Displays a column on the right side of the composer window that allows you to use and create snippets.
+Please see <link linkend="setup-text-snippets">Snippets</link> for more information.</para></listitem>
+</varlistentry>
+<varlistentry id="composer-view-translator">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guimenuitem>Translator</guimenuitem>
+</menuchoice></term>
+<listitem><para>Displays the translator tool at the bottom of the composer window. Please see
+<link linkend="using-the-translator">Using the Translator</link> for more information.</para></listitem>
</varlistentry>
-
-
-
-<!-- Snippets missing lueck 31.05.2011-->
</variablelist>
</sect2>
<sect2 id="composer-options-menu">
<title>Options Menu</title>
-
+<para>This menu lets you toggle various options for the current message.</para>
+<para>Currently used options will have a checkmark shown next to their name in the
+menu.</para>
<variablelist>
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="composer-options-urgent">
+<term><menuchoice>
<guimenu>Options</guimenu>
<guimenuitem>Urgent</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Sets the priority of the message to Urgent. The receiver's email client has to support
-this or it will have no effect. &kmail; itself does not support priorities for
-incoming messages.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Sets the priority of the message to Urgent. The receiver's email client has to support
+this or it will have no effect. &kmail; itself does not support priorities for incoming messages.</para></listitem>
+</varlistentry>
+<varlistentry id="composer-options-request-mdn">
+<term><menuchoice>
+<guimenu>Options</guimenu>
+<guimenuitem>Request Disposition Notification</guimenuitem>
+</menuchoice></term>
+<listitem><para>If you choose this option, you request a confirmation
+email once your message is downloaded and read by its
+recipient. This has to be supported and enabled by the
+receiver's email client in order to work.</para>
+<para>See <xref linkend="configure-security-reading-mdns"/>
+for background information and ways to customize the
+read receipts that &kmail; itself sends.</para></listitem>
</varlistentry>
-
- <varlistentry id="composer-options-request-mdn">
- <term>
- <menuchoice>
- <guimenu>Options</guimenu>
- <guimenuitem>Request Disposition Notification</guimenuitem>
- </menuchoice>
- </term>
- <listitem>
- <para>
- If you choose this option, you request a confirmation
- email once your message is downloaded and read by its
- recipient. This has to be supported and enabled by the
- receiver's email client in order to work.
- </para>
- <para>
- See <xref linkend="configure-security-reading-mdns"/>
- for background information and ways to customize the
- read receipts that &kmail; itself sends.
- </para>
- </listitem>
- </varlistentry>
-
<varlistentry id="composer-options-sign-message">
-<term>
-<menuchoice>
+<term><menuchoice>
<guimenu>Options</guimenu>
<guisubmenu>Sign Message</guisubmenu>
-</menuchoice>
-</term>
-<listitem>
-<para>Digitally sign the message using <application>OpenPGP</application>.
-You can learn more about this in the <link linkend="pgp">chapter on OpenPGP</link>.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Digitally sign the message using <application>OpenPGP</application>.
+You can learn more about this in the <link linkend="pgp">chapter on OpenPGP</link>.</para></listitem>
</varlistentry>
-
<varlistentry id="composer-options-encrypt-message">
-<term>
-<menuchoice>
+<term><menuchoice>
<guimenu>Options</guimenu>
<guisubmenu>Encrypt Message</guisubmenu>
-</menuchoice>
-</term>
-<listitem>
-<para>Encrypt the message using <application>OpenPGP</application>.
-You can learn more about this in the <link linkend="pgp">chapter on OpenPGP</link>.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Encrypt the message using <application>OpenPGP</application>.
+You can learn more about this in the <link linkend="pgp">chapter on OpenPGP</link>.</para></listitem>
</varlistentry>
-
- <varlistentry id="composer-options-select-crypto-message-format">
- <term>
- <menuchoice>
- <guimenu>Options</guimenu>
- <guisubmenu>Cryptographic Message Format</guisubmenu>
- </menuchoice>
- </term>
- <listitem>
- <para>
- Choose the cryptographic message format to use to
- digitally sign and/or encrypt the message in. See <link
- linkend="cryptographic-message-formats">the previous
- description of each option</link> for more information.
- </para>
- </listitem>
- </varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="composer-options-select-crypto-message-format">
+<term><menuchoice>
+<guimenu>Options</guimenu>
+<guisubmenu>Cryptographic Message Format</guisubmenu>
+</menuchoice></term>
+<listitem><para>Choose the cryptographic message format to use to
+digitally sign and/or encrypt the message in. Please see <link linkend="cryptographic-message-formats">
+Cryptographic Message Formats</link> for more information.</para></listitem>
+</varlistentry>
+<varlistentry id="composer-options-rich-text-editing">
+<term><menuchoice>
<guimenu>Options</guimenu>
<guisubmenu>Rich Text Editing</guisubmenu>
-</menuchoice>
-</term>
-<listitem>
-<para>Enables &html; editing.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Enables Rich Text/&html; editing.</para></listitem>
</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="composer-options-encoding">
+<term><menuchoice>
<guimenu>Options</guimenu>
<guisubmenu>Encoding</guisubmenu>
-</menuchoice>
-</term>
-<listitem>
-<para>Set the charset encoding of this message. The chosen encoding will appear in the header of
+</menuchoice></term>
+<listitem><para>Set the charset encoding of this message. The chosen encoding will appear in the header of
the outgoing mail. You can use <guilabel>Auto</guilabel> for almost all
-cases, &kmail; will tell you if you need to select a different encoding manually.</para>
-</listitem>
+cases, &kmail; will tell you if you need to select a different encoding manually.</para></listitem>
</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="composer-options-wordwrap">
+<term><menuchoice>
<guimenu>Options</guimenu>
<guimenuitem>Wordwrap</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Toggles the automatic wordwrap. It may be useful to turn it off if you want
-to paste long lines that should not wrap.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Toggles the automatic wordwrap. It may be useful to turn it off if you want
+to paste long lines that should not wrap.</para></listitem>
</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="composer-options-automatic-spellchecking">
+<term><menuchoice>
<guimenu>Options</guimenu>
<guimenuitem>Automatic Spellchecking</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Toggles automatic spellchecking.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Toggles automatic spellchecking.</para></listitem>
</varlistentry>
</variablelist>
@@ -1680,93 +1625,90 @@ to paste long lines that should not wrap.</para>
<variablelist>
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="composer-attach-append-signature">
+<term><menuchoice>
<guimenu>Attach</guimenu>
<guimenuitem>Append Signature</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Appends your signature (<quote>footer</quote>) to the end of the message.
-<!-- fixme: nothing to do with crypto stuff --></para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Appends your signature (<quote>footer</quote>) to the end of the message. Please see
+<link linkend="configure-identity-signature">Configure Identity Signature</link> for details on
+configuring your signature.</para></listitem>
</varlistentry>
-<!-- Prepend Signature + Insert Signature At Cursor Position missing lueck 31.05.2011-->
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="composer-attach-prepend-signature">
+<term><menuchoice>
+<guimenu>Attach</guimenu>
+<guimenuitem>Prepend Signature</guimenuitem>
+</menuchoice></term>
+<listitem><para>Prepends your signature (<quote>header</quote>) to the beginning of the message. Please see
+<link linkend="configure-identity-signature">Configure Identity Signature</link> for details on
+configuring your signature.</para></listitem>
+</varlistentry>
+<varlistentry id="composer-attach-curser-signature">
+<term><menuchoice>
+<guimenu>Attach</guimenu>
+<guimenuitem>Append Signature At Curser Position</guimenuitem>
+</menuchoice></term>
+<listitem><para>Appends your signature to the currrent location of your curser to the message. Please see
+<link linkend="configure-identity-signature">Configure Identity Signature</link> for details on
+configuring your signature.</para></listitem>
+</varlistentry>
+<varlistentry id="composer-attach-public-key">
+<term><menuchoice>
<guimenu>Attach</guimenu>
<guimenuitem>Attach Public Key...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Attaches the corresponding <application>GnuPG</application>
-key to your message.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Opens the <guilabel>Attach Public OpenPGP Key</guilabel> dialog. Please see
+<link linkend="configure-identity-cryptography-openpgp-sign">Configure Identity Cryptography OpenPGP Signing</link> for details.</para></listitem>
</varlistentry>
-
<varlistentry id="composer-attach-attach-my-public-key">
-<term>
-<menuchoice>
+<term><menuchoice>
<guimenu>Attach</guimenu>
<guimenuitem>Attach My Public Key</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Attaches your <application>GnuPG</application>
-public key to your message.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Attaches your <application>GnuPG</application> public key to your message.</para></listitem>
</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="composer-attach-file">
+<term><menuchoice>
<guimenu>Attach</guimenu>
-<guimenuitem>Attach File...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Attaches one or more files to the current message.</para>
-<!-- fixme: not encrypted unless... -->
-</listitem>
+<guimenuitem>Attach</guimenuitem>
+<guisubmenu>Attach File...</guisubmenu>
+</menuchoice></term>
+<listitem><para>Attaches one or more files to the current message. By default attachments are not
+encrypted, please see <link linkend="cryptographic-message-formats">Cryptographic Message Formats</link> for information
+on encryption and attachments.</para></listitem>
</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="composer-attach-vcard">
+<term><menuchoice>
+<guimenu>Attach</guimenu>
+<guimenuitem>Attach</guimenuitem>
+<guisubmenu>Attach Own Vcard</guisubmenu>
+</menuchoice></term>
+<listitem><para>Attaches your Vcard to the current message.</para></listitem>
+</varlistentry>
+<varlistentry id="composer-attach-remove-attachment">
+<term><menuchoice>
<guimenu>Attach</guimenu>
<guimenuitem>Remove Attachment</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Removes the attachment that is selected in the attachment part of the composer.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Removes the attachment that is selected in the attachment part of the composer.</para></listitem>
</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="composer-attach-save-attachment">
+<term><menuchoice>
<guimenu>Attach</guimenu>
<guimenuitem>Save Attachment As...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Saves the attachment that is selected in the attachment window to a
-file.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Saves the attachment that is selected in the attachment window to a file.</para></listitem>
</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="composer-attach-attachment-properties">
+<term><menuchoice>
<guimenu>Attach</guimenu>
<guimenuitem>Attachment Properties</guimenuitem>
</menuchoice>
</term>
<listitem>
<para>Displays the <link linkend="attachments">properties of the attachment</link> that is selected in the
-attachment window.</para>
+attachment window. It also allows you to sign/encrypt the attachment. Please see <link linkend="configure-security-composing">Configure Security Composing</link> to set
+up encryption.</para>
</listitem>
</varlistentry>
@@ -1779,21 +1721,21 @@ attachment window.</para>
<para>If the menu item you are looking for is missing, please see <ulink url="help:/fundamentals/ui.html#menus-tools">Tools Menu</ulink> of the &kde; Fundamentals.
The items listed here are &kmail; specific.</para>
<variablelist>
-<varlistentry id="tools-select-recipients">
+<varlistentry id="composer-tools-select-recipients">
<term><menuchoice>
<guimenu>Tools</guimenu>
<guimenuitem>Select Recipients...</guimenuitem>
</menuchoice></term>
<listitem><para><action>Opens up the <guilabel>Select Recipient</guilabel> dialog</action> with your personal contacts to select from.</para></listitem>
</varlistentry>
-<varlistentry id="tools-addressbook">
+<varlistentry id="composer-tools-addressbook">
<term><menuchoice>
<guimenu>Tools</guimenu>
<guimenuitem>Addressbook...</guimenuitem>
</menuchoice></term>
<listitem><para><action>Opens up <ulink url="help:/kaddressbook">&kaddressbook;</ulink></action>.</para></listitem>
</varlistentry>
-<varlistentry id="tools-save-distribution-list">
+<varlistentry id="composer-tools-save-distribution-list">
<term><menuchoice>
<guimenu>Tools</guimenu>
<guimenuitem>Save Distribution List...</guimenuitem>
More information about the kde-doc-english
mailing list