Git commit b5fdf42b9f53868731796fd0336ef3ea47fbc56c by Burkhard L?ck. Committed on 17/08/2013 at 12:53. Pushed by lueck into branch 'KDE/4.11'.
fix wrong positions of menu items (master already != 4.11) M +16 -24 doc/kmail/menus.docbook http://commits.kde.org/kdepim/b5fdf42b9f53868731796fd0336ef3ea47fbc56c diff --git a/doc/kmail/menus.docbook b/doc/kmail/menus.docbook index bcf064b..4e487e1 100644 --- a/doc/kmail/menus.docbook +++ b/doc/kmail/menus.docbook @@ -649,7 +649,7 @@ servers have been used to send the message by looking at the <literal>Received:< <varlistentry id="folder-move-all-messages-to-trash"> <term><menuchoice> <guimenu>Folder</guimenu> -<guimenuitem>Move All Messages to Trash</guimenuitem> +<guimenuitem>Move All to Trash</guimenuitem> </menuchoice></term> <listitem><para><action>Moves all of the messages in the selected folder into the trash folder.</action></para> <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>. @@ -1180,6 +1180,21 @@ 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="settings-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="settings-configure-send-later-agent"> +<term><menuchoice> +<guimenu>Tools</guimenu> +<guimenuitem>Configure Send Later Agent...</guimenuitem> +</menuchoice></term> +<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"> <term><menuchoice> <guimenu>Tools</guimenu> @@ -1236,29 +1251,6 @@ Please see next section for details.</para></note></listitem> </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-automatic-archiving"> -<term><menuchoice> -<guimenu>Settings</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="settings-configure-send-later-agent"> -<term><menuchoice> -<guimenu>Settings</guimenu> -<guimenuitem>Configure Send Later Agent...</guimenuitem> -</menuchoice></term> -<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="settings-configure-folder-archive-agent"> -<term><menuchoice> -<guimenu>Settings</guimenu> -<guimenuitem>Configure Folder Archive Agent...</guimenuitem> -</menuchoice></term> -<listitem><para><action>Brings up a dialog that allows you to configure archive folders.</action> - Please see <link linkend="archive-folder">Folder Archive Agent</link> for details.</para></listitem> -</varlistentry> <varlistentry id="settings-configure-notifications"> <term><menuchoice> <guimenu>Settings</guimenu>
