Git commit 946aefa342a31929c9944059533cfc80c573998a by Burkhard L?ck, on behalf of Yuri Chornoivan. Committed on 05/09/2013 at 05:48. Pushed by lueck into branch 'KDE/4.11'.
Fix typos found by Antoni Bella P?rez (cherry picked from commit d8e7b6099f2e4f167a241ec4e548dbc614898689) backport to 4.11.2 M +2 -2 doc/kabcclient/man-kabcclient.1.docbook M +5 -5 doc/kmail/configure.docbook M +1 -1 doc/kmail/importing.docbook M +7 -7 doc/kmail/menus.docbook M +3 -3 doc/kmail/using-kmail.docbook http://commits.kde.org/kdepim/946aefa342a31929c9944059533cfc80c573998a diff --git a/doc/kabcclient/man-kabcclient.1.docbook b/doc/kabcclient/man-kabcclient.1.docbook index 2884b38..6574b87 100644 --- a/doc/kabcclient/man-kabcclient.1.docbook +++ b/doc/kabcclient/man-kabcclient.1.docbook @@ -173,7 +173,7 @@ settings.</para> <para>Formats the output text according to given formatting rules. See <option>-of</option><replaceable> help</replaceable> for available formats. Default is -<emphasis>vcard</emphasis></para> +<emphasis>vcard</emphasis>.</para> </listitem> </varlistentry> <varlistentry> @@ -392,7 +392,7 @@ kabcclient -of email -of-opts allemails -S Marilyn kabcclient --remove -if dialog </literallayout> -<para><emphasis>Export selected contacts to a VCard (default output format) file</emphasis></para> +<para><emphasis>Export selected contacts to a vCard (default output format) file</emphasis></para> <literallayout> kabcclient -S -if dialog > contacts.vcf </literallayout> diff --git a/doc/kmail/configure.docbook b/doc/kmail/configure.docbook index 981724e..27c76c3 100644 --- a/doc/kmail/configure.docbook +++ b/doc/kmail/configure.docbook @@ -897,7 +897,7 @@ activated, &kmail; will close the message window after replying to or forwarding is displayed in the window. This only applies to the separate message window, not to the embedded message preview pane.</para> <para>By default, <guilabel>Enable access key</guilabel> is enabled. Access keys allow you to use the keyboard keys for functions which would perhaps normally be done with the mouse, such as following links. - For more information on access keys please see <ulink url="http://docs.kde.org/stable/en/applications/konqueror/accesskeys.html";>Access keys</ulink></para> + For more information on access keys please see <ulink url="http://docs.kde.org/stable/en/applications/konqueror/accesskeys.html";>Access keys</ulink>.</para> <para><guilabel>Show HTML status bar</guilabel> activates a bar at the left side of the reader pane that tells you if a message is &html; or not. This is important because &html; messages might imitate the look of a signed and encrypted message, so @@ -1251,8 +1251,8 @@ of key words can be modified.</para> <listitem> <para> You can enter custom automatic word replacement by checking this option. To enter a custom string to replace automatically - enter the word to be replaced in the <guilabel>Find</guilabel> box, and the replacement word in the <guilabel>Replace</guilabel> box and click the add button. - To remove a custom word replacement string, highlight the string and click remove. + enter the word to be replaced in the <guilabel>Find</guilabel> box, and the replacement word in the <guilabel>Replace</guilabel> box and click the <guibutton>Add</guibutton> button. + To remove a custom word replacement string, highlight the string and click <guibutton>Remove</guibutton>. </para> </listitem> </varlistentry> @@ -1260,8 +1260,8 @@ of key words can be modified.</para> <term><guilabel>Exceptions</guilabel></term> <listitem> <para> - This allows you to set exceptions where you would like &kmail; to ignore your autocorrect selections for end of sentence and two uppercase letters. Enter the exception and click add. - To remove the exception, highlight the string and click remove. + This allows you to set exceptions where you would like &kmail; to ignore your autocorrect selections for end of sentence and two uppercase letters. Enter the exception and click <guibutton>Add</guibutton> button. + To remove the exception, highlight the string and click <guibutton>Remove</guibutton> button. </para> </listitem> </varlistentry> diff --git a/doc/kmail/importing.docbook b/doc/kmail/importing.docbook index 218c672..73eb539 100644 --- a/doc/kmail/importing.docbook +++ b/doc/kmail/importing.docbook @@ -48,7 +48,7 @@ and click the <guibutton>Next</guibutton> button. The wizard will then ask if yo or give you options to select which types of materials you want to import. Depending on your selections in the materials to import screen, you will see one or more of the following screens:</para> <itemizedlist> - <listitem><para>To <guilabel>Import mail messages</guilabel>, you need to select the folder you want your email messages to import into. Once selected, click the <guibutton>Import Mail</guibutton> button. + <listitem><para>To <guilabel>Import mail messages</guilabel>, you need to select the folder you want your email messages to import into. Once selected, click the <guibutton>Import Mails</guibutton> button. Once the progress bar reaches 100%, click the <guibutton>Next</guibutton> button, or the <guibutton>Finish</guibutton> button, if this was your last material selection.</para></listitem> <listitem><para>To <guilabel>Import mail filters</guilabel>, click the <guibutton>Import Filters</guibutton> button and it will import any filters it found, once finished click the <guibutton>Next</guibutton> button, or the <guibutton>Finish</guibutton> button, if this was your last material selection.</para></listitem> diff --git a/doc/kmail/menus.docbook b/doc/kmail/menus.docbook index 312cab5..ddbe45c 100644 --- a/doc/kmail/menus.docbook +++ b/doc/kmail/menus.docbook @@ -76,7 +76,7 @@ performs a menu item function, the default shortcut is listed with the menu item <guisubmenu>Message from Template</guisubmenu> </menuchoice></term> <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> +<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="reader-add-folder"> <term><menuchoice> @@ -92,7 +92,7 @@ performs a menu item function, the default shortcut is listed with the menu item <guisubmenu>New</guisubmenu> <guimenuitem>New AddressBook Contact...</guimenuitem> </menuchoice></term> -<listitem><para><action>Brings up the new contact dialog</action></para></listitem> +<listitem><para><action>Brings up the <guilabel>New Contact</guilabel> dialog.</action></para></listitem> </varlistentry> <varlistentry id="reader-file-open"> <term><menuchoice> @@ -245,7 +245,7 @@ This allows you to choose which server to send your queued messages from. They m <guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice></term> -<listitem><para><action>Exits &kmail;</action></para></listitem> +<listitem><para><action>Exits &kmail;.</action></para></listitem> </varlistentry> </variablelist> @@ -467,7 +467,7 @@ servers have been used to send the message by looking at the <literal>Received:< <guimenuitem>Use Fixed Font</guimenuitem> </menuchoice></term> <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> + The font to be used can be configured in the <link linkend="configure-appearance-fonts">Fonts</link> tab on the <guilabel>Appearance</guilabel> page of the &kmail; configuration dialog.</para></listitem> </varlistentry> <varlistentry id="reader-view-set-encoding"> <term><menuchoice> @@ -1233,7 +1233,7 @@ Please see next section for details.</para></note></listitem> <guimenu>Settings</guimenu> <guimenuitem>Configure Notifications...</guimenuitem> </menuchoice></term> -<listitem><para><action>Opens a dialog that lets you configure what happens when new mail arrives,</action> ⪚ play a sound, display a popup.</para></listitem> +<listitem><para><action>Opens a dialog that lets you configure what happens when new mail arrives,</action> ⪚ play a sound, display a popup, &etc;</para></listitem> </varlistentry> </variablelist> </sect2> @@ -1673,9 +1673,9 @@ on encryption and attachments.</para></listitem> <term><menuchoice> <guimenu>Attach</guimenu> <guisubmenu>Attach</guisubmenu> -<guimenuitem>Attach Own Vcard</guimenuitem> +<guimenuitem>Attach Own vCard</guimenuitem> </menuchoice></term> -<listitem><para>Attaches your Vcard to the current message.</para></listitem> +<listitem><para>Attaches your vCard to the current message.</para></listitem> </varlistentry> <varlistentry id="composer-attach-remove-attachment"> <term><menuchoice> diff --git a/doc/kmail/using-kmail.docbook b/doc/kmail/using-kmail.docbook index e853c39..f66b86d 100644 --- a/doc/kmail/using-kmail.docbook +++ b/doc/kmail/using-kmail.docbook @@ -77,8 +77,8 @@ and try them out until you find one you like! Details for the various headers ar <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>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> <para>If you prefer to view your email in &HTML; format instead of plain text (Default) click on the bar located on the left hand side of the pane. @@ -1806,7 +1806,7 @@ you need to debug your filtering process. <listitem><para>By default <guilabel>Archive all subfolders</guilabel> is enabled. Uncheck this if you only want the parent folder archived.</para></listitem> <listitem><para>You can type in the location you would like to save your archive, or click the <guibutton>Open File Dialog</guibutton> button to select the folder.</para></listitem> <listitem><para>Select how often you wish to backup through the dropdown menues next to <guilabel>Backup each:</guilabel>.</para></listitem> - <listitem><para>If you are limited on drive space you will want to set a limit on <guilabel>Maximum number of archive:</guilabel></para></listitem> + <listitem><para>If you are limited on drive space you will want to set a limit on <guilabel>Maximum number of archive:</guilabel>.</para></listitem> </itemizedlist> </listitem> </varlistentry>
